commit 1dd63fc0441ff9e9ee10702f27786e54ee8244b9
Author: Deon George <deon@leenooks.net>
Date:   Wed Jul 20 22:57:07 2011 +1000

    Init with KH 3.1.3.1

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..c8dada9
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,21 @@
+# Turn on URL rewriting
+RewriteEngine On
+
+# Installation directory
+RewriteBase /
+
+# Protect hidden files from being viewed
+<Files .*>
+	Order Deny,Allow
+	Deny From All
+</Files>
+
+# Protect application and system files from being viewed
+RewriteRule ^(?:application|modules|includes/kohana)\b.* index.php/$0 [L]
+
+# Allow any files or directories that exist to be displayed directly
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+# Rewrite all other URLs to index.php/URL
+RewriteRule .* index.php/$0 [PT]
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     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 General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  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 GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/application/bootstrap.php b/application/bootstrap.php
new file mode 100644
index 0000000..772327e
--- /dev/null
+++ b/application/bootstrap.php
@@ -0,0 +1,138 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// -- Environment setup --------------------------------------------------------
+
+// Load the core Kohana class
+require SYSPATH.'classes/kohana/core'.EXT;
+
+if (is_file(APPPATH.'classes/kohana'.EXT))
+{
+	// Application extends the core
+	require APPPATH.'classes/kohana'.EXT;
+}
+else
+{
+	// Load empty core extension
+	require SYSPATH.'classes/kohana'.EXT;
+}
+
+/**
+ * Set the default time zone.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ * @see  http://php.net/timezones
+ */
+date_default_timezone_set('Australia/Melbourne');
+
+/**
+ * Set the default locale.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ * @see  http://php.net/setlocale
+ */
+setlocale(LC_ALL, 'en_US.utf-8');
+
+/**
+ * Enable the Kohana auto-loader.
+ *
+ * @see  http://kohanaframework.org/guide/using.autoloading
+ * @see  http://php.net/spl_autoload_register
+ */
+spl_autoload_register(array('Kohana', 'auto_load'));
+
+/**
+ * Enable the Kohana auto-loader for unserialization.
+ *
+ * @see  http://php.net/spl_autoload_call
+ * @see  http://php.net/manual/var.configuration.php#unserialize-callback-func
+ */
+ini_set('unserialize_callback_func', 'spl_autoload_call');
+
+// -- Configuration and initialization -----------------------------------------
+
+/**
+ * Set the default language
+ */
+I18n::lang('en-us');
+
+/**
+ * Set Kohana::$environment if a 'KOHANA_ENV' environment variable has been supplied.
+ *
+ * Note: If you supply an invalid environment name, a PHP warning will be thrown
+ * saying "Couldn't find constant Kohana::<INVALID_ENV_NAME>"
+ */
+if (isset($_SERVER['KOHANA_ENV']))
+{
+	Kohana::$environment = constant('Kohana::'.strtoupper($_SERVER['KOHANA_ENV']));
+}
+
+/**
+ * Initialize Kohana, setting the default options.
+ *
+ * The following options are available:
+ *
+ * - string   base_url    path, and optionally domain, of your application   NULL
+ * - string   index_file  name of your index file, usually "index.php"       index.php
+ * - string   charset     internal character set used for input and output   utf-8
+ * - string   cache_dir   set the internal cache directory                   APPPATH/cache
+ * - boolean  errors      enable or disable error handling                   TRUE
+ * - boolean  profile     enable or disable internal profiling               TRUE
+ * - boolean  caching     enable or disable internal caching                 FALSE
+ */
+Kohana::init(array(
+	'base_url'   => '/',
+	'index_file' => '',
+	'caching'    => TRUE,
+	'cache_dir'  => '/dev/shm/lnapp',
+));
+
+/**
+ * Attach the file write to logging. Multiple writers are supported.
+ */
+Kohana::$log->attach(new Log_File(APPPATH.'logs'));
+
+/**
+ * Attach a file reader to config. Multiple readers are supported.
+ */
+Kohana::$config->attach(new Config_File);
+
+/**
+ * Enable modules. Modules are referenced by a relative or absolute path.
+ */
+Kohana::modules(array(
+	'auth'       => SMDPATH.'auth',       // Basic authentication
+	'cache'      => SMDPATH.'cache',      // Caching with multiple backends
+	// 'codebench'  => SMDPATH.'codebench',  // Benchmarking tool
+	'database'   => SMDPATH.'database',   // Database access
+	// 'image'      => SMDPATH.'image',      // Image manipulation
+	'orm'        => SMDPATH.'orm',        // Object Relationship Mapping
+	// 'unittest'   => SMDPATH.'unittest',   // Unit testing
+	'userguide'  => SMDPATH.'userguide',  // User guide and API documentation
+	));
+
+/**
+ * Enable specalised interfaces
+ */
+Route::set('sections', '<directory>/<controller>(/<action>(/<id>(/<sid>)))',
+	array(
+		'directory' => '('.implode('|',Kohana::config('config.method_directory')).')'
+	));
+
+// Static file serving (CSS, JS, images)
+Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'media',
+		'file'       => NULL,
+	));
+
+/**
+ * Set the routes. Each route must have a minimum of a name, a URI and a set of
+ * defaults for the URI.
+ */
+Route::set('default', '(<controller>(/<action>(/<id>)))', array('id' => '[a-zA-Z0-9_.-]+'))
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'index',
+	));
+?>
diff --git a/application/cache/.htaccess b/application/cache/.htaccess
new file mode 100644
index 0000000..281d5c3
--- /dev/null
+++ b/application/cache/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
diff --git a/application/classes/auth/orm.php b/application/classes/auth/orm.php
new file mode 100644
index 0000000..02e3ac3
--- /dev/null
+++ b/application/classes/auth/orm.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's Auth
+ *
+ * @package    lnApp/Modifications
+ * @subpackage Auth
+ * @category   Overrides
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Auth_ORM extends Kohana_Auth_ORM {
+	// Override Kohana Auth requirement to have a hash_key
+	public function hash($str) {
+		switch ($this->_config['hash_method']) {
+			case '' : return $str;
+			case 'md5': return md5($str);
+			default: return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']);
+		}
+	}
+}
+?>
diff --git a/application/classes/block.php b/application/classes/block.php
new file mode 100644
index 0000000..0b6b536
--- /dev/null
+++ b/application/classes/block.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Block extends lnApp_Block {}
+?>
diff --git a/application/classes/breadcrumb.php b/application/classes/breadcrumb.php
new file mode 100644
index 0000000..61fc697
--- /dev/null
+++ b/application/classes/breadcrumb.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Breadcrumb extends lnApp_Breadcrumb {}
+?>
diff --git a/application/classes/config.php b/application/classes/config.php
new file mode 100644
index 0000000..fd71789
--- /dev/null
+++ b/application/classes/config.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Config extends lnApp_Config {}
+?>
diff --git a/application/classes/controller/account.php b/application/classes/controller/account.php
new file mode 100644
index 0000000..2b8e3c9
--- /dev/null
+++ b/application/classes/controller/account.php
@@ -0,0 +1,64 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Controller_Account extends Controller_TemplateDefault {
+	public function action_login() {
+		# If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			# Redirect to the user account
+			Request::instance()->redirect('welcome/index');
+		}
+
+		Block::add(array(
+			'title'=>_('Login to server'),
+			'body'=>View::factory('blogin'),
+			'style'=>array('css/blogin.css'=>'screen'),
+		));
+
+		# @todo this is not being updated - want to make this automatic
+		$this->template->control = sprintf('%s -&gt; %s',
+			HTML::anchor(URL::site(),'Home'),
+			HTML::anchor($this->request->uri(),'Login',array('id'=>'ajxbody'))
+		);
+
+		$this->template->content = Block::factory();
+
+		# If there is a post and $_POST is not empty
+		if ($_POST) {
+			# Instantiate a new user
+			$user = ORM::factory('account');
+
+			# Check Auth
+			$status = $user->login($_POST);
+
+			# If the post data validates using the rules setup in the user model
+			if ($status) {
+				# Redirect to the user account
+				Request::instance()->redirect('welcome/index');
+
+			} else {
+				# @todo Get errors for display in view
+				#$this->template->content = $_POST->errors('signin');
+			}
+		}
+
+		$js = '';
+		$js .= '<script type="text/javascript">
+$(document).ready(function() {
+	$("#ajxbody").click(function() {alert("hello login - body!"); $("#ajBODY").load("/"); return false;});
+	$("#ajRIGHT").ajaxSend(function() {$(this).text("Triggered ajaxSend handler.");});
+});
+</script>';
+		$this->template->content .= $js;
+	}
+
+	public function action_logout() {
+		# If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			Auth::instance()->logout();
+
+			Request::instance()->redirect('account/login');
+		}
+
+		Request::instance()->redirect('welcome/index');
+	}
+} // End Welcome
diff --git a/application/classes/controller/account/welcome.php b/application/classes/controller/account/welcome.php
new file mode 100644
index 0000000..665c550
--- /dev/null
+++ b/application/classes/controller/account/welcome.php
@@ -0,0 +1,33 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Controller_Account_Welcome extends Controller_TemplateDefault {
+	public function action_index() {
+		Block::add(array(
+			'title'=>'Welcome to lnApp (account)',
+			'subtitle'=>'Using lnApp',
+			'body'=>'Sample lnApp application',
+			'footer'=>'lnApp makes building websites easy! '.time(),
+		));
+
+		$this->template->control = sprintf('%s -&gt; %s -&gt; %s -&gt; %s',
+			HTML::anchor(URL::site(),_('Home')),
+			HTML::anchor($this->request->uri(),'Body',array('id'=>'ajxbody')),
+			HTML::anchor($this->request->uri(),'Left',array('id'=>'ajxleft')),
+			HTML::anchor($this->request->uri(),'Right',array('id'=>'ajxright'))
+		);
+
+		$this->template->content = Block::factory();
+
+		// @todo Change this to Script::add();
+		$js = '';
+		$js .= '<script type="text/javascript">
+$(document).ready(function() {
+	$("#ajxbody").click(function() {alert("hello - body!"); $("#ajBODY").load("/"); return false;});
+	$("#ajxleft").click(function() {alert("hello - left!"); $("#ajLEFT").load("/welcome/left"); return false;});
+	$("#ajxright").click(function() {alert("hello - right!"); $("#ajRIGHT").load("/welcome/right"); return false});
+	$("#ajRIGHT").ajaxSend(function() {$(this).text("Triggered ajaxSend handler.");});
+});
+</script>';
+		$this->template->content .= $js;
+	}
+} // End Welcome
diff --git a/application/classes/controller/admin/welcome.php b/application/classes/controller/admin/welcome.php
new file mode 100644
index 0000000..eddbe7f
--- /dev/null
+++ b/application/classes/controller/admin/welcome.php
@@ -0,0 +1,33 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Controller_Admin_Welcome extends Controller_TemplateDefault {
+	public function action_index() {
+		Block::add(array(
+			'title'=>'Welcome to lnApp (admin)',
+			'subtitle'=>'Using lnApp',
+			'body'=>'Sample lnApp application',
+			'footer'=>'lnApp makes building websites easy! '.time(),
+		));
+
+		$this->template->control = sprintf('%s -&gt; %s -&gt; %s -&gt; %s',
+			HTML::anchor(URL::site(),_('Home')),
+			HTML::anchor($this->request->uri(),'Body',array('id'=>'ajxbody')),
+			HTML::anchor($this->request->uri(),'Left',array('id'=>'ajxleft')),
+			HTML::anchor($this->request->uri(),'Right',array('id'=>'ajxright'))
+		);
+
+		$this->template->content = Block::factory();
+
+		// @todo Change this to Script::add();
+		$js = '';
+		$js .= '<script type="text/javascript">
+$(document).ready(function() {
+	$("#ajxbody").click(function() {alert("hello - body!"); $("#ajBODY").load("/"); return false;});
+	$("#ajxleft").click(function() {alert("hello - left!"); $("#ajLEFT").load("/welcome/left"); return false;});
+	$("#ajxright").click(function() {alert("hello - right!"); $("#ajRIGHT").load("/welcome/right"); return false});
+	$("#ajRIGHT").ajaxSend(function() {$(this).text("Triggered ajaxSend handler.");});
+});
+</script>';
+		$this->template->content .= $js;
+	}
+} // End Welcome
diff --git a/application/classes/controller/default.php b/application/classes/controller/default.php
new file mode 100644
index 0000000..478f8ee
--- /dev/null
+++ b/application/classes/controller/default.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Controller_Default extends Controller_lnApp_Default {}
+?>
diff --git a/application/classes/controller/lnapp/default.php b/application/classes/controller/lnapp/default.php
new file mode 100644
index 0000000..b004078
--- /dev/null
+++ b/application/classes/controller/lnapp/default.php
@@ -0,0 +1,90 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides the default controller for rendering pages.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Abstract/Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class Controller_lnApp_Default extends Controller {
+	/**
+	 * The variable that our output is stored in
+	 */
+	protected $output = NULL;
+	/**
+	 * @var string page media route as per [Route]
+	 */
+	protected $mediaroute = 'default/media';
+	/**
+	 * Controls access to this controller.
+	 * Can be set to a string or an array, for example 'login' or array('login', 'admin')
+	 * Note that in second(array) example, user must have both 'login' AND 'admin' roles set in database
+	 *
+	 * @var boolean is authenticate required with this controller
+	 */
+	protected $auth_required = FALSE;
+	/**
+	 * If redirecting to a login page, which page to redirect to
+	 */
+	protected $noauth_redirect = 'login';
+	/**
+	 * Controls access for separate actions, eg:
+	 * 'adminpanel' => 'admin' will only allow users with the role admin to access action_adminpanel
+	 * 'moderatorpanel' => array('login', 'moderator') will only allow users with the roles login and moderator to access action_moderatorpanel
+	 *
+	 * @var array actions that require a valid user
+	 */
+	protected $secure_actions = array();
+
+	/**
+	 * Check and see if this controller needs authentication
+	 *
+	 * if $this->auth_required is TRUE, then the user must be logged in only.
+	 * if $this->auth_required is FALSE, AND $this->secure_actions has an array of
+	 * methods set to TRUE, then the user must be logged in AND a member of the
+	 * role.
+	 *
+	 * @return boolean
+	 */
+	protected function _auth_required() {
+		// If our global configurable is disabled, then continue
+		if (! Kohana::Config('config.method_security'))
+			return FALSE;
+
+		return (($this->auth_required !== FALSE && Auth::instance()->logged_in() === FALSE) ||
+			(is_array($this->secure_actions) && array_key_exists($this->request->action(),$this->secure_actions) &&
+			Auth::instance()->logged_in($this->secure_actions[$this->request->action()]) === FALSE));
+	}
+
+	public function before() {
+		parent::before();
+
+		// Check user auth and role
+		if ($this->_auth_required()) {
+			// For AJAX/JSON requests, authorisation is controlled in the method.
+			if (Request::current()->is_ajax() && $this->request->action() === 'json') {
+				// Nothing required.
+
+			// For no AJAX/JSON requests, display an access page
+			} elseif (Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__)) {
+				Request::current()->redirect('login/noaccess');
+
+			} else {
+				Session::instance()->set('afterlogin',Request::detect_uri());
+				Request::current()->redirect($this->noauth_redirect);
+			}
+		}
+	}
+
+	public function after() {
+		parent::after();
+
+		// Generate and check the ETag for this file
+		$this->response->check_cache(NULL,$this->request);
+	}
+}
+?>
diff --git a/application/classes/controller/lnapp/login.php b/application/classes/controller/lnapp/login.php
new file mode 100644
index 0000000..4c8405d
--- /dev/null
+++ b/application/classes/controller/lnapp/login.php
@@ -0,0 +1,199 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides login capability
+ *
+ * @package    lnApp
+ * @subpackage Page/Login
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ * @also       [logout]
+ */
+class Controller_lnApp_Login extends Controller_TemplateDefault {
+	protected $auth_required = FALSE;
+
+	public function action_index() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::current()->redirect('welcome/index');
+		}
+
+		// If there is a post and $_POST is not empty
+		if ($_POST) {
+			// Store our details in a session key
+			Session::instance()->set(Kohana::config('auth.session_key'),$_POST['username']);
+			Session::instance()->set('password',$_POST['password']);
+
+			// If the post data validates using the rules setup in the user model
+			if (Auth::instance()->login($_POST['username'],$_POST['password'])) {
+				// Redirect to the user account
+				if ($redir = Session::instance()->get('afterlogin')) {
+					Session::instance()->delete('afterlogin');
+					Request::current()->redirect($redir);
+					
+				} else
+					Request::current()->redirect('welcome/index');
+
+			} else {
+				SystemMessage::add(array(
+					'title'=>_('Invalid username or password'), 
+					'type'=>'error',
+					'body'=>_('The username or password was invalid.')
+				));
+			}
+		}
+
+		Block::add(array(
+			'title'=>_('Login to server'),
+			'body'=>View::factory('login'),
+			'style'=>array('css/login.css'=>'screen'),
+		));
+
+		Script::add(array('type'=>'stdin','data'=>'
+			$(document).ready(function() {
+				$("#ajxbody").click(function() {$("#ajBODY").load("'.$this->request->uri().'/"); return false;});
+			});'
+		));
+	}
+
+	public function action_register() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::current()->redirect('welcome/index');
+		}
+
+		// Instantiate a new user
+		$account = ORM::factory('account');
+
+		// If there is a post and $_POST is not empty
+		if ($_POST) {
+			// Check Auth
+			$status = $account->values($_POST)->check();
+
+			if (! $status) {
+				foreach ($account->validation()->errors('form/register') as $f => $r) {
+					// $r[0] has our reason for validation failure
+					switch ($r[0]) {
+						// Generic validation reason
+						default:
+							SystemMessage::add(array(
+								'title'=>_('Validation failed'), 
+								'type'=>'error',
+								'body'=>sprintf(_('The defaults on your submission were not valid for field %s (%s).'),$f,$r)
+							));
+					}
+				}
+			}
+
+			$ido = ORM::factory('module')
+				->where('name','=','account')
+				->find();
+
+			$account->id = $ido->record_id->next_id($ido->id);
+			// Save the user details
+			if ($account->save()) {}
+
+		}
+
+		SystemMessage::add(array(
+			'title'=>_('Already have an account?'), 
+			'type'=>'info',
+			'body'=>_('If you already have an account, please login..')
+		));
+
+		Block::add(array(
+			'title'=>_('Register'),
+			'body'=>View::factory('bregister')
+				->set('account',$account)
+				->set('errors',$account->validation()->errors('form/register')),
+		));
+
+		$this->template->left = HTML::anchor('login','Login').'...';
+	}
+
+	/**
+	 * Enable user password reset
+	 */
+	public function action_reset() {
+		// If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			// Redirect to the user account
+			Request::current()->redirect('welcome/index');
+		}
+
+		// If the user posted their details to reset their password
+		if ($_POST) {
+			// If the email address is correct, create a method token
+			if (! empty($_POST['email']) AND ($ao=ORM::factory('account',array('email'=>$_POST['email']))) AND $ao->loaded()) {
+				$mt = ORM::factory('module_method_token');
+
+				// Find out our password reset method id
+				// @todo move this to a more generic method, so that it can be called by other methods
+				$mo = ORM::factory('module',array('name'=>'account'));
+				$mmo = ORM::factory('module_method',array('name'=>'user_resetpassword','module_id'=>$mo->id));
+
+				// Check to see if there is already a token, if so, do nothing.
+				if ($mt->where('account_id','=',$ao->id)->and_where('method_id','=',$mmo->id)->find()) {
+					if ($mt->date_expire < time()) {
+						$mt->delete();
+						$mt->clear();
+					}
+				}
+
+				if (! $mt->loaded()) {
+					$mt->account_id = $ao->id;
+					$mt->method_id = $mmo->id;
+					$mt->date_expire = time() + 15*3600;
+					$mt->token = md5(sprintf('%s:%s:%s',$mt->account_id,$mt->method_id,$mt->date_expire));
+					$mt->save();
+
+					// Send our email with the token
+					$et = EmailTemplate::instance('account_reset_password');
+					$et->to = array($mt->account->email=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name));
+					$et->variables = array(
+						'SITE'=>URL::base(TRUE,TRUE),
+						'SITE_ADMIN'=>Config::sitename(),
+						'SITE_NAME'=>Config::sitename(),
+						'TOKEN'=>$mt->token,
+						'USER_NAME'=>sprintf('%s %s',$mt->account->first_name,$mt->account->last_name),
+					);
+					$et->send();
+				}
+
+			// Redirect to our password reset, the Auth will validate the token.
+			} elseif (! empty($_REQUEST['token'])) {
+				Request::current()->redirect(sprintf('user/account/resetpassword?token=%s',$_REQUEST['token']));
+			}
+
+			// Show our token screen even if the email was invalid.
+			if (isset($_POST['email']))
+				Block::add(array(
+					'title'=>_('Reset your password'),
+					'body'=>View::factory('login_reset_sent'),
+					'style'=>array('css/login.css'=>'screen'),
+				));
+			else
+				Request::current()->redirect('login');
+
+		} else {
+			Block::add(array(
+				'title'=>_('Reset your password'),
+				'body'=>View::factory('login_reset'),
+				'style'=>array('css/login.css'=>'screen'),
+			));
+		}
+	}
+
+	public function action_noaccess() {
+		SystemMessage::add(array(
+			'title'=>_('No access to requested resource'), 
+			'type'=>'error',
+			'body'=>_('You do not have access to the requested resource, please contact your administrator.')
+		));
+	}
+}
+?>
diff --git a/application/classes/controller/lnapp/logout.php b/application/classes/controller/lnapp/logout.php
new file mode 100644
index 0000000..1613d17
--- /dev/null
+++ b/application/classes/controller/lnapp/logout.php
@@ -0,0 +1,26 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides logout capability
+ *
+ * @package    lnApp
+ * @subpackage Page/Logout
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ * @also       [login]
+ */
+class Controller_lnApp_Logout extends Controller {
+	public function action_index() {
+		# If user already signed-in
+		if (Auth::instance()->logged_in()!= 0) {
+			Auth::instance()->logout();
+
+			Request::current()->redirect('login');
+		}
+
+		Request::current()->redirect('welcome/index');
+	}
+}
+?>
diff --git a/application/classes/controller/lnapp/templatedefault.php b/application/classes/controller/lnapp/templatedefault.php
new file mode 100644
index 0000000..83620d1
--- /dev/null
+++ b/application/classes/controller/lnapp/templatedefault.php
@@ -0,0 +1,284 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides the default template controller for rendering pages.
+ *
+ * @package    lnApp
+ * @subpackage Page/Template
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
+	/**
+	 * @var string page template
+	 */
+	public $template = 'lnapp/default';
+	/**
+	 * @var object meta object information as per [meta]
+	 */
+	protected $meta;
+	/**
+	 * Controls access to this controller.
+	 * Can be set to a string or an array, for example 'login' or array('login', 'admin')
+	 * Note that in second(array) example, user must have both 'login' AND 'admin' roles set in database
+	 *
+	 * @var boolean is authenticate required with this controller
+	 */
+	protected $auth_required = FALSE;
+	/**
+	 * If redirecting to a login page, which page to redirect to
+	 */
+	protected $noauth_redirect = 'login';
+	/**
+	 * Controls access for separate actions, eg:
+	 * 'adminpanel' => 'admin' will only allow users with the role admin to access action_adminpanel
+	 * 'moderatorpanel' => array('login', 'moderator') will only allow users with the roles login and moderator to access action_moderatorpanel
+	 *
+	 * @var array actions that require a valid user
+	 */
+	protected $secure_actions = array(
+		'menu' => TRUE,
+	);
+
+	/**
+	 * Check and see if this controller needs authentication
+	 *
+	 * if $this->auth_required is TRUE, then the user must be logged in only.
+	 * if $this->auth_required is FALSE, AND $this->secure_actions has an array of
+	 * methods set to TRUE, then the user must be logged in AND a member of the
+	 * role.
+	 *
+	 * @return boolean
+	 */
+	protected function _auth_required() {
+		// If our global configurable is disabled, then continue
+		if (! Kohana::Config('config.method_security'))
+			return FALSE;
+
+		return (($this->auth_required !== FALSE && Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__) === FALSE) ||
+			(is_array($this->secure_actions) && array_key_exists($this->request->action(),$this->secure_actions) &&
+			Auth::instance()->logged_in($this->secure_actions[$this->request->action()],get_class($this).'|'.__METHOD__) === FALSE));
+	}
+
+	/**
+	 * Loads the template [View] object.
+	 *
+	 * Page information is provided by [meta].
+	 * @uses meta
+	 */
+	public function before() {
+		// Do not template media files
+		if ($this->request->action() === 'media') {
+			$this->auto_render = FALSE;
+			return;
+		}
+
+		parent::before();
+
+		// Check user auth and role
+		if ($this->_auth_required()) {
+			if (Kohana::$is_cli)
+				throw new Kohana_Exception('Cant run :method, authentication not possible',array(':method'=>$this->request->action()));
+
+			// If auth is required and the user is logged in, then they dont have access.
+			// (We have already checked authorisation.)
+			if (Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__)) {
+				if (Config::sitemode() == Kohana::DEVELOPMENT)
+					SystemMessage::add(array(
+						'title'=>_('Insufficient Access'),
+						'type'=>'debug',
+						'body'=>Kohana::debug(array('required'=>$this->auth_required,'action'=>$this->request->action(),'user'=>Auth::instance()->get_user()->username)),
+					));
+
+				// @todo Login No Access redirects are not handled in JS?
+				if ($this->request->is_ajax()) {
+					echo _('You dont have enough permissions.');
+					die();
+				} else
+					Request::current()->redirect('login/noaccess');
+
+			} else {
+				Session::instance()->set('afterlogin',Request::detect_uri());
+				Request::current()->redirect($this->noauth_redirect);
+			}
+		}
+
+		// For AJAX calls, we dont need to render the complete page.
+		if ($this->request->is_ajax()) {
+			$this->auto_render = FALSE;
+			return;
+		}
+
+		// Bind our template meta variable
+		$this->meta = new meta;
+		View::bind_global('meta',$this->meta);
+
+		// Our default style sheet
+		Style::add(array(
+			'type'=>'file',
+			'data'=>'css/default.css',
+		));
+
+		// Our default scripts
+		// This is in a reverse list, since we push them to the beginging of the scripts to render.
+		foreach (array('file'=>array(
+			'js/jquery.cookie.js',
+			'js/jquery.jstree-1.0rc.js',
+			'js/jquery-1.4.2.js',
+			)) as $type => $datas) {
+
+			foreach ($datas as $data) {
+				Script::add(array(
+					'type'=>$type,
+					'data'=>$data,
+				),TRUE);
+			}
+		}
+
+		// Initialise our content
+		$this->template->left = '';
+		$this->template->content = '';
+		$this->template->right = '';
+	}
+
+	public function after() {
+		if (! is_string($this->template) AND empty($this->template->content))
+			$this->template->content = Block::factory();
+
+		if ($this->auto_render) {
+			// Application Title
+			$this->meta->title = 'Application Title';
+			$this->template->title = '';
+
+			// Style Sheets Properties
+			$this->meta->styles = Style::factory();
+
+			// Script Properties
+			$this->meta->scripts = Script::factory();
+
+			// Application logo
+			$this->template->logo = Config::logo();
+
+			// Link images on the header line
+			$this->template->headimages = $this->_headimages();
+
+			// Control Line
+			$this->template->control = $this->_control();
+
+			// System Messages line
+			$this->template->sysmsg = $this->_sysmsg();
+
+			// Left Item
+			$this->template->left = $this->_left();
+
+			// Right Item
+			$this->template->right = $this->_right();
+
+			// Footer
+			$this->template->footer = $this->_footer();
+
+		// For any ajax rendered actions, we'll need to capture the content and put it in the response
+		} elseif ($this->request->is_ajax() && isset($this->template->content) && ! $this->response->body()) {
+			// @todo move this formatting to a view?
+			if ($s = $this->_sysmsg() AND (string)$s)
+				$this->response->body(sprintf('<table class="sysmsg"><tr><td>%s</td></tr></table>',$s));
+
+			# In case there any style sheets or scrpits for this render.
+			$this->response->bodyadd(Style::factory());
+
+			# Get the response body
+			$this->response->bodyadd(sprintf('<table class="content"><tr><td>%s</td></tr></table>',$this->template->content));
+		}
+
+		parent::after();
+
+		// Generate and check the ETag for this file
+		$this->response->check_cache(NULL,$this->request);
+	}
+
+	/**
+	 * Default Method to call from the tree menu
+	 */
+	public function action_menu() {
+		$this->template->content = 'See menu on tree';
+	}
+
+	protected function _headimages() {
+		HeadImages::add(array(
+			'url'=>'http://dev.leenooks.net',
+			'img'=>'img/forum-big.png',
+			'attrs'=>array('onclick'=>"target='_blank';",'title'=>'Link')
+		));
+
+		return HeadImages::factory();
+	}
+
+	/**
+	 * Render our control menu bar
+	 */
+	protected function _control() {
+		return Breadcrumb::factory();
+	}
+
+	protected function _sysmsg() {
+		return SystemMessage::factory();
+	}
+
+	protected function _left() {
+		return empty($this->template->left) ? Controller_Tree::js() : $this->template->left;
+	}
+
+	protected function _right() {
+		return empty($this->template->right) ? '' : $this->template->right;
+	}
+
+	public function _footer() {
+		return sprintf('&copy; %s',Config::SiteName());
+	}
+
+	/**
+	 * This action will render all the media related files for a page
+	 * @return void
+	 */
+	final public function action_media() {
+		// Get the file path from the request
+		$file = $this->request->param('file');
+
+		// Find the file extension
+		$ext = pathinfo($file, PATHINFO_EXTENSION);
+
+		// Remove the extension from the filename
+		$file = substr($file, 0, -(strlen($ext) + 1));
+		$f = '';
+
+		// If our file is pathed with session, our file is in our session.
+		if ($fd = Session::instance()->get_once($this->request->param('file'))) {
+			$this->response->body($fd);
+
+		// First try and find media files for the site_id
+		} elseif ($f = Kohana::find_file(sprintf('media/%s',Config::siteid()), $file, $ext)) {
+			// Send the file content as the response
+			$this->response->body(file_get_contents($f));
+
+		// If not found try a default media file
+		} elseif ($f = Kohana::find_file('media', $file, $ext)) {
+			// Send the file content as the response
+			$this->response->body(file_get_contents($f));
+
+		} else {
+			// Return a 404 status
+			$this->response->status(404);
+		}
+
+		// Generate and check the ETag for this file
+		$this->response->check_cache(NULL,$this->request);
+
+		// Set the proper headers to allow caching
+		$this->response->headers('Content-Type',File::mime_by_ext($ext));
+		$this->response->headers('Content-Length',(string)$this->response->content_length());
+		$this->response->headers('Last-Modified',date('r', $f ? filemtime($f) : time()));
+	}
+}
+?>
diff --git a/application/classes/controller/lnapp/tree.php b/application/classes/controller/lnapp/tree.php
new file mode 100644
index 0000000..bc04e00
--- /dev/null
+++ b/application/classes/controller/lnapp/tree.php
@@ -0,0 +1,107 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class extends renders OSB menu tree.
+ *
+ * @package    lnApp
+ * @subpackage Tree
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Controller_lnApp_Tree extends Controller_Default {
+	/**
+	 * @var string page media route as per [Route]
+	 */
+	protected static $jsmediaroute = 'default/media';
+
+	public function after() {
+		parent::after();
+
+		$this->response->headers('Content-Type','application/json');
+		$this->response->body(sprintf('[%s]',json_encode($this->output)));
+	}
+
+	public static function js() {
+		$mediapath = Route::get(static::$jsmediaroute);
+
+		return '
+<div id="tree" class=""></div>
+<script type="text/javascript">
+$(function () {
+	$("#tree").jstree({
+		themes : {
+			"theme" : "default",
+			"url" : "'.URL::site($mediapath->uri(array('file'=>'css/jquery.jstree.css'))).'",
+		},
+		ui : {
+			"select_limit" : 1,
+			"select_node" : false,
+		},
+		cookies : {
+			"save_selected" : false,
+		},
+		json_data : {
+			"correct_state" : "true",
+			"progressive_render" : "true",
+			"ajax" : {
+				"url" : "'.URL::site('/tree/json').'",
+				"data" : function (n) {
+					return { id : n.attr ? n.attr("id") : "N_"+0 };
+				}
+			}
+		},
+		plugins : [ "themes", "json_data", "ui", "cookies" ],
+	});
+
+	// On selection
+	$("#tree").bind("select_node.jstree", function (e, data) {
+		if (a = data.rslt.obj.attr(\'id\').indexOf(\'_\')) {
+			id = data.rslt.obj.attr(\'id\').substr(a+1);
+
+			if (href = $("#N_"+id).attr("href"))
+				$("#ajBODY").load(href, function(r,s,x) {
+					if (s == "error") {
+						var msg = "Sorry but there was an error: ";
+						$("#ajBODY").html(msg + x.status + " " + x.statusText + r);
+					}
+				});
+			else
+				alert("Unknown: "+id+" HREF:"+href);
+		}
+	});
+});
+</script>';
+	}
+
+	/**
+	 * Draw the Tree Menu
+	 *
+	 * The incoming ID is either a Branch B_x or a Node N_x
+	 * Where X is actually the module.
+	 *
+	 * @param id
+	 */
+	public function action_json($id=null,array $data=array()) {
+		if ($this->_auth_required() AND ! Auth::instance()->logged_in()) {
+			$this->output = array('attr'=>array('id'=>'a_login'),
+				'data'=>array('title'=>_('Please Login').'...','attr'=>array('id'=>'N_login','href'=>URL::site('/login'))));
+
+			return;
+		}
+
+		$this->output = array();
+
+		foreach ($data as $branch) {
+			array_push($this->output,array(
+				'attr'=>array('id'=>sprintf('B_%s',$branch['id'])),
+				'state'=>$branch['state'],
+				'data'=>array('title'=>$branch['name']),
+				'attr'=>array('id'=>sprintf('N_%s',$branch['id']),'href'=>empty($branch['attr_href']) ? URL::site(sprintf('/%s/menu',$branch['name'])) : $branch['attr_href']),
+				)
+			);
+		}
+	}
+}
+?>
diff --git a/application/classes/controller/login.php b/application/classes/controller/login.php
new file mode 100644
index 0000000..59a728d
--- /dev/null
+++ b/application/classes/controller/login.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Controller_Login extends Controller_lnApp_Login {}
+?>
diff --git a/application/classes/controller/logout.php b/application/classes/controller/logout.php
new file mode 100644
index 0000000..671e24d
--- /dev/null
+++ b/application/classes/controller/logout.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Controller_Logout extends Controller_lnApp_Logout {}
+?>
diff --git a/application/classes/controller/redir.php b/application/classes/controller/redir.php
new file mode 100644
index 0000000..26b70d6
--- /dev/null
+++ b/application/classes/controller/redir.php
@@ -0,0 +1,20 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * Redirection Engine
+ *
+ * @package    lnApp
+ * @subpackage Page/Home
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_Redir extends Controller_TemplateDefault {
+	protected $auth_required = FALSE;
+
+	public function action_index() {
+		echo debug::vars($_SERVER['SERVER_NAME']);
+	}
+}
+?>
diff --git a/application/classes/controller/templatedefault.php b/application/classes/controller/templatedefault.php
new file mode 100644
index 0000000..969d035
--- /dev/null
+++ b/application/classes/controller/templatedefault.php
@@ -0,0 +1,36 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class provides the default template controller for rendering pages.
+ *
+ * @package    lnApp
+ * @subpackage Page/Template
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_TemplateDefault extends Controller_lnApp_TemplateDefault {
+	protected function _left() {
+		if ($this->template->left)
+			return $this->template->left;
+
+		elseif (Auth::instance()->logged_in(NULL,get_class($this).'|'.__METHOD__))
+			return Controller_Tree::js();
+	}
+
+	protected function _right() {
+		if ($this->template->right)
+			return $this->template->right;
+		else
+			return $this->_cart();
+	}
+
+	private function _cart() {
+		if (! Cart::instance()->contents()->reset(FALSE)->count_all())
+			return '';
+
+		return Cart::instance()->cart_block();
+	}
+}
+?>
diff --git a/application/classes/controller/tree.php b/application/classes/controller/tree.php
new file mode 100644
index 0000000..eeebcf6
--- /dev/null
+++ b/application/classes/controller/tree.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Controller_Tree extends Controller_lnApp_Tree {}
+?>
diff --git a/application/classes/controller/welcome.php b/application/classes/controller/welcome.php
new file mode 100644
index 0000000..6a55a29
--- /dev/null
+++ b/application/classes/controller/welcome.php
@@ -0,0 +1,41 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp Main home page
+ *
+ * @package    lnApp
+ * @subpackage Page/Home
+ * @category   Controllers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Controller_Welcome extends Controller_TemplateDefault {
+	protected $auth_required = FALSE;
+
+	public function action_index() {
+		if (! Kohana::config('config.client'))
+			Request::current()->redirect('guide/app');
+
+		if (! Auth::instance()->logged_in())
+			Request::current()->redirect('login');
+
+		Block::add(array(
+			'title'=>'Welcome to lnApp (public)!',
+			'subtitle'=>'Using lnApp',
+			'body'=>'Sample lnApp application',
+			'footer'=>'lnApp makes building websites easy! '.time(),
+		));
+
+		// @todo Show a login/logout on the breadcrumb
+		if (! Auth::instance()->logged_in()) {
+			Script::add(array('type'=>'stdin','data'=>'
+				$(document).ready(function() {
+					$("#ajxbody").click(function() {$("#ajBODY").load("'.URL::site('/login').'",null,function(x,s,r) {}); return false;});
+					$("#ajBODY").ajaxSend(function() {$(this).html(\''.sprintf('%s <span class="ajaxmsg">%s<\/span>...',HTML::image('media/img/ajax-progress.gif',array('alt'=>_('Loading Login').'...')),_('Loading Login')).'\');return  true;});
+				});'
+			));
+		}
+	}
+}
+?>
diff --git a/application/classes/database/mysql.php b/application/classes/database/mysql.php
new file mode 100644
index 0000000..4cf17ba
--- /dev/null
+++ b/application/classes/database/mysql.php
@@ -0,0 +1,20 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * MySQL database connection.
+ *
+ * Modified for OSB, so that ORM can use enhanced SQL queries. This has been
+ * achieved by simply removing the identifier backtick.
+ *
+ * @package    OSB/Modifications
+ * @subpackage Database
+ * @category   Drivers
+ * @author     Deon George
+ * @copyright  (c) 2010 Open Source Billing
+ * @license    http://dev.osbill.net/license
+ */
+class Database_MySQL extends Kohana_Database_MySQL {
+	// MySQL uses a backtick for identifiers
+	protected $_identifier = '';
+}
+?>
diff --git a/application/classes/editor.php b/application/classes/editor.php
new file mode 100644
index 0000000..20432e3
--- /dev/null
+++ b/application/classes/editor.php
@@ -0,0 +1,53 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering the tinyMCE editor
+ *
+ * @package    lnApp
+ * @subpackage Editor
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Editor {
+	private static $added = FALSE;
+
+	public static function add() {
+		if (static::$added)
+			return;
+
+		static::$added = TRUE;
+
+		Script::add(array(
+			'type'=>'file',
+			'data'=>'js/jquery-1.4.2.js',
+		));
+		Script::add(array(
+			'type'=>'file',
+			'data'=>'js/tiny_mce/tiny_mce.js',
+		));
+		Script::add(array(
+			'type'=>'stdin',
+			'data'=>'
+tinyMCE.init({
+    mode : "specific_textareas",
+    editor_selector : "mceEditor",
+    theme : "advanced",
+    plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,print",
+    theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+    theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor",
+    theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
+    theme_advanced_buttons3_add_before : "tablecontrols,separator",
+    theme_advanced_buttons3_add : "iespell,media,advhr",
+    theme_advanced_toolbar_location : "bottom",
+    theme_advanced_toolbar_align : "center", 
+    plugin_insertdate_dateFormat : "%Y-%m-%d",
+    plugin_insertdate_timeFormat : "%H:%M:%S",
+    extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+    relative_urls: "true",
+    width : "100%"
+});'));
+	}
+}
+?>
diff --git a/application/classes/form.php b/application/classes/form.php
new file mode 100644
index 0000000..cabca21
--- /dev/null
+++ b/application/classes/form.php
@@ -0,0 +1,19 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's Form
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Form extends Kohana_Form {
+	// Enable 3.0 features, default to current URI for empty Form::open()
+	public static function open($action = NULL, array $attributes = NULL) {
+		return parent::open(is_null($action) ? Request::detect_uri() : $action,$attributes);
+	}
+}
+?>
diff --git a/application/classes/headimages.php b/application/classes/headimages.php
new file mode 100644
index 0000000..74d735e
--- /dev/null
+++ b/application/classes/headimages.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class HeadImages extends lnApp_HeadImages {}
+?>
diff --git a/application/classes/html.php b/application/classes/html.php
new file mode 100644
index 0000000..8cad46f
--- /dev/null
+++ b/application/classes/html.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class HTML extends lnApp_HTML {}
+?>
diff --git a/application/classes/htmlrender.php b/application/classes/htmlrender.php
new file mode 100644
index 0000000..e887d1b
--- /dev/null
+++ b/application/classes/htmlrender.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class HTMLRender extends lnApp_HTMLRender {}
+?>
diff --git a/application/classes/http/exception/404.php b/application/classes/http/exception/404.php
new file mode 100644
index 0000000..a72b75d
--- /dev/null
+++ b/application/classes/http/exception/404.php
@@ -0,0 +1,30 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's 404 Exception
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {
+	public function __construct($message, array $variables = NULL, $code = 0)
+	{
+		set_exception_handler(array(get_class($this),'handler'));
+		parent::__construct($message, $variables, (int) $code);
+	}
+
+	public static function handler(Exception $e)
+	{
+		SystemMessage::add(array(
+			'title'=>_('Page not found'), 
+			'type'=>'error',
+			'body'=>sprintf(_('The page [%s] you requested was not found?'),Request::detect_uri()),
+		));
+
+		Request::factory()->redirect('welcome');
+	}
+}
diff --git a/application/classes/lnapp/block.php b/application/classes/lnapp/block.php
new file mode 100644
index 0000000..1d73847
--- /dev/null
+++ b/application/classes/lnapp/block.php
@@ -0,0 +1,81 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering HTML body blocks (left, center, right).
+ *
+ * It will provide a header, body and footer.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ * @uses       Style
+ */
+class lnApp_Block extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = '<table><tr class="spacer"><td>&nbsp;</td></tr></table>';
+	protected static $_required_keys = array('body');
+
+	/**
+	 * Add a block to be rendered
+	 *
+	 * @param array Block attributes
+	 */
+	public static function add($block,$prepend=FALSE) {
+		parent::add($block);
+
+		// Detect any style sheets.
+		if (! empty($block['style']) && is_array($block['style']))
+			foreach ($block['style'] as $data=>$media)
+				Style::add(array(
+					'type'=>'file',
+					'data'=>$data,
+					'media'=>$media,
+				));
+	}
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return Block
+	 */
+	public static function factory() {
+		return new Block;
+	}
+
+	/**
+	 * Render this block
+	 *
+	 * @see HTMLRender::render()
+	 */
+	protected function render() {
+		$output = '';
+		$styles = array();
+
+		$i = 0;
+		foreach (static::$_data as $value) {
+			if ($i++)
+				$output .= static::$_spacer;
+
+			$output .= '<table class="block" border="0">';
+
+			if (! empty($value['title']))
+				$output .= sprintf('<tr class="title"><td>%s</td></tr>',$value['title']);
+
+			if (! empty($value['subtitle']))
+				$output .= sprintf('<tr class="subtitle"><td>%s</td></tr>',$value['subtitle']);
+
+			$output .= sprintf('<tr class="body"><td>%s</td></tr>',$value['body']);
+
+			if (! empty($value['footer']))
+				$output .= sprintf('<tr class="footer"><td>%s</td></tr>',$value['footer']);
+
+			$output .= '</table>';
+		}
+
+		return $output;
+	}
+}
+?>
diff --git a/application/classes/lnapp/breadcrumb.php b/application/classes/lnapp/breadcrumb.php
new file mode 100644
index 0000000..04125f5
--- /dev/null
+++ b/application/classes/lnapp/breadcrumb.php
@@ -0,0 +1,64 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering a breadcrumb menu.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_Breadcrumb extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = ' &raquo; ';
+	protected static $_required_keys = array('body');
+
+	/**
+	 * Set the breadcrumb path
+	 *
+	 * @param array Block attributes
+	 */
+	public static function set($path) {
+		if (is_string($path))
+			static::$_data['path'] = explode('/',$path);
+		else
+			static::$_data['path'] = $path;
+	}
+
+	/**
+	 * Enable a friendly name to be used for a path
+	 */
+	public static function name($path,$name) {
+		static::$_data['name'][$path] = $name;
+	}
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return Breadcrumb
+	 */
+	public static function factory() {
+		return new Breadcrumb;
+	}
+
+	/**
+	 * Render this Breadcrumb
+	 */
+	protected function render() {
+		$output = HTML::anchor('/',_('Home'));
+
+		$data = empty(static::$_data['path']) ? explode('/',preg_replace('/^\//','',Request::detect_uri())) : static::$_data['path'];
+
+		foreach ($data as $k => $v) {
+			$output .= static::$_spacer;
+
+			$p = join('/',array_slice($data,0,$k+1));
+			$output .= HTML::anchor($p,empty(static::$_data['name'][$p]) ? ucfirst($v) : static::$_data['name'][$p]);
+		}
+
+		return $output;
+	}
+}
+?>
diff --git a/application/classes/lnapp/config.php b/application/classes/lnapp/config.php
new file mode 100644
index 0000000..33369cf
--- /dev/null
+++ b/application/classes/lnapp/config.php
@@ -0,0 +1,102 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class extends the core Kohana class by adding some core application
+ * specific functions, and configuration.
+ *
+ * @package    lnApp
+ * @subpackage Core
+ * @category   Overrides
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class lnApp_Config extends Kohana_Config {
+	/**
+	 * Return our site name
+	 */
+	public static function site() {
+		if (! empty($_SERVER['SERVER_NAME']))
+			return $_SERVER['SERVER_NAME'];
+
+		if (! $site = CLI::options('site'))
+			throw new Kohana_Exception(_('Cant figure out the site, use --site= for CLI'));
+
+		return $site['site'];
+	}
+
+	/**
+	 * Work out our site ID for multiehosting
+	 * @todo Change this to query the DB for site number.
+	 */
+	public static function siteid() {
+		$sites = Kohana::config('config.site');
+
+		// If we havent been configured for sites
+		if (is_null($sites) OR ! is_array($sites) OR ! isset($sites[static::site()]))
+			return 0;
+		else
+			return $sites[static::site()];
+	}
+
+	/**
+	 * Work out our site mode (dev,test,prod)
+	 * @todo Change this to query the DB for mode.
+	 */
+	public static function sitemode() {
+		$sites = Kohana::config('config.site_mode');
+
+		// If we havent been configured for sites
+		if (is_null($sites) OR ! is_array($sites) OR ! isset($sites[static::site()]))
+			return Kohana::PRODUCTION;
+		else
+			return $sites[static::site()];
+	}
+
+	public static function sitename() {
+		return Kohana::config('config.site_name');
+	}
+
+	public static function logo_file() {
+		// @todo Move the logo filename to a config file
+		return Kohana::find_file(sprintf('media/%s',Config::siteid()),'img/logo-small','png');
+	}
+
+	public static function logo() {
+		// @todo Move the logo filename to a config file
+		$mediapath = Route::get('default/media');
+		$logo = $mediapath->uri(array('file'=>'img/logo-small.png'),array('alt'=>static::sitename()));
+
+		return HTML::image($logo,array('class'=>'headlogo','alt'=>_('Logo')));
+	}
+
+	/**
+	 * Return our caching mechanism
+	 */
+	public static function cachetype() {
+		return is_null(Kohana::config('config.cache_type')) ? 'file' : Kohana::config('config.cache_type');
+	}
+
+	/**
+	 * Show a date using a site configured format
+	 */
+	public static function date($date) {
+		return date(Kohana::config('config.date_format'),$date);
+	}
+
+	/**
+	 * See if our emails for the template should be sent to configured admin(s)
+	 *
+	 * @param string template - Template to test for
+	 * @return mixed|array - Email to send test emails to
+	 */
+	public static function testmail($template) {
+		$config = Kohana::config('config.email_admin_only');
+
+		if (is_null($config) OR ! is_array($config) OR empty($config[$template]))
+			return FALSE;
+		else
+			return $config[$template];
+	}
+}
+?>
diff --git a/application/classes/lnapp/headimages.php b/application/classes/lnapp/headimages.php
new file mode 100644
index 0000000..21f3ac7
--- /dev/null
+++ b/application/classes/lnapp/headimages.php
@@ -0,0 +1,45 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for all image icons shown on the page header.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_HeadImages extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = '&nbsp;';
+	protected static $_required_keys = array('url','img');
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return HeadImage
+	 */
+	public static function factory() {
+		return new HeadImages;
+	}
+
+	/**
+	 * Render this Header Image
+	 *
+	 * @see HTMLRender::render()
+	 */
+	protected function render() {
+		$output = '';
+		$mediapath = Route::get(static::$_media_path);
+
+		foreach (static::$_data as $value) {
+			$i = HTML::image($mediapath->uri(array('file'=>$value['img'])),array('alt'=>isset($value['attrs']['title']) ? $value['attrs']['title'] : ''));
+			$output .= HTML::anchor($value['url'],$i,(isset($value['attrs']) && is_array($value['attrs'])) ? $value['attrs'] : null);
+			$output .= static::$_spacer;
+		}
+
+		return $output;
+	}
+}
+?>
diff --git a/application/classes/lnapp/html.php b/application/classes/lnapp/html.php
new file mode 100644
index 0000000..7c43317
--- /dev/null
+++ b/application/classes/lnapp/html.php
@@ -0,0 +1,21 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class extends Kohana's HTML
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_HTML extends Kohana_HTML {
+	public static function nbsp($string) {
+		if (strlen((string)$string))
+			return $string;
+		else
+			return '&nbsp;';
+	}
+}
+?>
diff --git a/application/classes/lnapp/htmlrender.php b/application/classes/lnapp/htmlrender.php
new file mode 100644
index 0000000..b140401
--- /dev/null
+++ b/application/classes/lnapp/htmlrender.php
@@ -0,0 +1,94 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is the base used for common static methods that are used
+ * for rendering.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Abstract/Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+abstract class lnApp_HTMLRender {
+	protected static $_media_path = 'default/media';
+	protected static $_required_keys = array();
+	protected static $_unique_vals = array();
+
+	public function __construct() {
+		if (! isset(static::$_data))
+			throw new Kohana_Exception(':class is missing important static variables',array(':class'=>get_called_class()));
+	}
+
+	/**
+	 * Add an item to be rendered
+	 *
+	 * @param array Item to be added
+	 */
+	public static function add($item,$prepend=FALSE) {
+		foreach (static::$_required_keys as $key)
+			if (! isset($item[$key]))
+				throw new Kohana_Exception('Missing key :key for image',array(':key'=>$key));
+
+		// Check for unique keys
+		if (static::$_unique_vals)
+			foreach (static::$_unique_vals as $v=>$u)
+				foreach (static::$_data as $d)
+					if (isset($d[$u]) && $d['data'] == $item['data'])
+						return;
+
+		if ($prepend)
+			array_unshift(static::$_data,$item);
+		else
+			array_push(static::$_data,$item);
+	}
+
+	/**
+	 * Set the space used between rendering output
+	 */
+	public static function setSpacer($spacer) {
+		static::$_spacer = $spacer;
+	}
+
+	/**
+	 * Set the Kohana Media Path, used to determine where to find additional
+	 * HTML content required for rendering.
+	 */
+	public static function setMediaPath($path) {
+		static::$_media_path = $path;
+	}
+
+	/**
+	 * Factory instance method must be declared by the child class
+	 */
+	public static function factory() {
+		throw new Kohana_Exception(':class is calling :method, when it should have its own method',
+			array(':class'=>get_called_class(),':method'=>__METHOD__));
+	}
+
+	/**
+	 * Return the HTML to render the header images
+	 */
+	public function __toString() {
+		try {
+			return static::render();
+		}
+
+		// Display the exception message
+		catch (Exception $e) {
+			Kohana::exception_handler($e);
+
+			return '';
+		}
+	}
+
+	/**
+	 * Rendering must be declared by the child class
+	 */
+	protected function render() {
+		throw new Kohana_Exception(':class is calling :method, when it should have its own method',
+			array(':class'=>get_called_class(),':method'=>__METHOD__));
+	}
+}
+?>
diff --git a/application/classes/lnapp/meta.php b/application/classes/lnapp/meta.php
new file mode 100644
index 0000000..4fcce6d
--- /dev/null
+++ b/application/classes/lnapp/meta.php
@@ -0,0 +1,34 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This is class is for all HTML page attributes.
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_Meta {
+	private $_data = array();
+	private $_array_keys = array();
+
+	public function __get($key) {
+		if (in_array($key,$this->_array_keys) && empty($this->_data[$key]))
+				return array();
+
+		if (empty($this->_data[$key]))
+			return null;
+		else
+			return $this->_data[$key];
+	}
+
+	public function __set($key,$value) {
+		if (in_array($key,$this->_array_keys) && ! is_array($value))
+			throw new Kohana_Exception('Key :key must be an array',array(':key'=>$key));
+
+		$this->_data[$key] = $value;
+	}
+}
+?>
diff --git a/application/classes/lnapp/script.php b/application/classes/lnapp/script.php
new file mode 100644
index 0000000..0763512
--- /dev/null
+++ b/application/classes/lnapp/script.php
@@ -0,0 +1,59 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering HTML script tags
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_Script extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = "\n";
+	protected static $_required_keys = array('type','data');
+	protected static $_unique_vals = array('file'=>'type');
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return Script
+	 */
+	public static function factory() {
+		return new Script;
+	}
+
+	/**
+	 * Render the script tag
+	 *
+	 * @see HTMLRender::render()
+	 */
+	protected function render() {
+		$foutput = $soutput = '';
+		$mediapath = Route::get(static::$_media_path);
+
+		$i = $j = 0;
+		foreach (static::$_data as $value) {
+
+			switch ($value['type']) {
+				case 'file':
+					$foutput .= HTML::script($mediapath->uri(array('file'=>$value['data'])));
+					if ($i++)
+						$foutput .= static::$_spacer;
+					break;
+				case 'stdin':
+					$soutput .= sprintf("<script type=\"text/javascript\">//<![CDATA[\n%s\n//]]></script>",$value['data']);
+					if ($j++)
+						$soutput .= static::$_spacer;
+					break;
+				default:
+					throw new Kohana_Exception('Unknown style type :type',array(':type'=>$value['type']));
+			}
+		}
+
+		return $foutput.static::$_spacer.$soutput;
+	}
+}
+?>
diff --git a/application/classes/lnapp/sort.php b/application/classes/lnapp/sort.php
new file mode 100644
index 0000000..7fe6259
--- /dev/null
+++ b/application/classes/lnapp/sort.php
@@ -0,0 +1,105 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is used to sort multiple dimension arrays.
+ *
+ * @package    lnApp
+ * @subpackage Sort
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ * @uses       Style
+ */
+class lnApp_Sort {
+	/**
+	 * Sort a multi dimensional array.
+	 *
+	 * @param array Multi demension array passed by reference
+	 * @param string Comma delimited string of sort keys.
+	 * @param boolean Whether to reverse sort.
+	 * @return array Sorted multi demension array.
+	 */
+	public static function masort(&$data,$sortby,$rev=0) {
+		// if the array to sort is null or empty
+		if (! $data)
+			return;
+	
+		static $MASORT_CACHE = array();
+	
+		if (empty($MASORT_CACHE[$sortby])) {
+			$code = "\$c=0;\n";
+	
+			foreach (explode(',',$sortby) as $key) {
+				$code .= "if (is_object(\$a) || is_object(\$b)) {\n";
+	
+				$code .= "	if (is_array(\$a->$key)) {\n";
+				$code .= "		asort(\$a->$key);\n";
+				$code .= "		\$aa = array_shift(\$a->$key);\n";
+				$code .= "	} else\n";
+				$code .= "		\$aa = \$a->$key;\n";
+	
+				$code .= "	if (is_array(\$b->$key)) {\n";
+				$code .= "		asort(\$b->$key);\n";
+				$code .= "		\$bb = array_shift(\$b->$key);\n";
+				$code .= "	} else\n";
+				$code .= "		\$bb = \$b->$key;\n";
+	
+				$code .= "	if (\$aa != \$bb)";
+				if ($rev)
+					$code .= "	return (\$aa < \$bb ? 1 : -1);\n";
+				else
+					$code .= "	return (\$aa > \$bb ? 1 : -1);\n";
+	
+				$code .= "} else {\n";
+	
+				$code .= "	\$a = array_change_key_case(\$a);\n";
+				$code .= "	\$b = array_change_key_case(\$b);\n";
+	
+				$key = strtolower($key);
+	
+				$code .= "	if ((! isset(\$a['$key'])) && isset(\$b['$key'])) return 1;\n";
+				$code .= "	if (isset(\$a['$key']) && (! isset(\$b['$key']))) return -1;\n";
+	
+				$code .= "	if ((isset(\$a['$key'])) && (isset(\$b['$key']))) {\n";
+				$code .= "		if (is_array(\$a['$key'])) {\n";
+				$code .= "			asort(\$a['$key']);\n";
+				$code .= "			\$aa = array_shift(\$a['$key']);\n";
+				$code .= "		} else\n";
+				$code .= "			\$aa = \$a['$key'];\n";
+	
+				$code .= "		if (is_array(\$b['$key'])) {\n";
+				$code .= "			asort(\$b['$key']);\n";
+				$code .= "			\$bb = array_shift(\$b['$key']);\n";
+				$code .= "		} else\n";
+				$code .= "			\$bb = \$b['$key'];\n";
+	
+				$code .= "		if (\$aa != \$bb)\n";
+				$code .= "			if (is_numeric(\$aa) && is_numeric(\$bb)) {\n";
+	
+				if ($rev)
+					$code .= "				return (\$aa < \$bb ? 1 : -1);\n";
+				else
+					$code .= "				return (\$aa > \$bb ? 1 : -1);\n";
+	
+				$code .= "			} else {\n";
+	
+				if ($rev)
+					$code .= "				if ( (\$c = strcasecmp(\$bb,\$aa)) != 0 ) return \$c;\n";
+				else
+					$code .= "				if ( (\$c = strcasecmp(\$aa,\$bb)) != 0 ) return \$c;\n";
+	
+				$code .= "		}\n";
+				$code .= "	}\n";
+				$code .= "}\n";
+			}
+	
+			$code .= 'return $c;';
+	
+			$MASORT_CACHE[$sortby] = create_function('$a, $b',$code);
+		}
+	
+		uasort($data,$MASORT_CACHE[$sortby]);
+	}
+}
+?>
diff --git a/application/classes/lnapp/style.php b/application/classes/lnapp/style.php
new file mode 100644
index 0000000..1481567
--- /dev/null
+++ b/application/classes/lnapp/style.php
@@ -0,0 +1,54 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering HTML style tags
+ *
+ * @package    lnApp
+ * @subpackage Page
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_Style extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = "\n";
+	protected static $_required_keys = array('type','data');
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return Style
+	 */
+	public static function factory() {
+		return new Style;
+	}
+
+	/**
+	 * Render the style tag
+	 *
+	 * @see HTMLRender::render()
+	 */
+	protected function render() {
+		$output = '';
+		$mediapath = Route::get(static::$_media_path);
+
+		$i = 0;
+		foreach (static::$_data as $value) {
+			if ($i++)
+				$output .= static::$_spacer;
+
+			switch ($value['type']) {
+				case 'file':
+					$output .= HTML::style($mediapath->uri(array('file'=>$value['data'])),
+						array('media'=>(! empty($value['media'])) ? $value['media'] : 'screen'),TRUE);
+					break;
+				default:
+					throw new Kohana_Exception('Unknown style type :type',array(':type'=>$value['type']));
+			}
+		}
+
+		return $output;
+	}
+}
+?>
diff --git a/application/classes/lnapp/systemmessage.php b/application/classes/lnapp/systemmessage.php
new file mode 100644
index 0000000..237bf01
--- /dev/null
+++ b/application/classes/lnapp/systemmessage.php
@@ -0,0 +1,129 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class is for rendering system information messages.
+ *
+ * @package    lnApp
+ * @subpackage SystemMessage
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class lnApp_SystemMessage extends HTMLRender {
+	protected static $_data = array();
+	protected static $_spacer = '<table><tr class="spacer"><td>&nbsp;</td></tr></table>';
+	protected static $_required_keys = array('title','body','type');
+
+	/**
+	 * Add a system message to be rendered
+	 *
+	 * @param array System Message attributes
+	 */
+	public static function add($msg,$prepend=FALSE) {
+		if ($msgs = Session::instance()->get('sessionmsgs')) {
+			static::$_data = $msgs;
+		}
+
+		parent::add($msg);
+
+		// Add a gribber popup
+		Style::add(array(
+			'type'=>'file',
+			'data'=>'css/jquery.gritter.css',
+			'media'=>'screen',
+		));
+		Script::add(array(
+			'type'=>'file',
+			'data'=>'js/jquery.gritter-1.5.js',
+		));
+		Script::add(array(
+			'type'=>'stdin',
+			'data'=>sprintf(
+'$(document).ready(function() {
+	$.extend($.gritter.options, {
+		fade_in_speed: "medium",
+		fade_out_speed: 2000,
+		time: "3000",
+		sticky: false,
+	});
+	$.gritter.add({
+	title: "%s",
+	text: "%s",
+	image: "%s",
+});});',$msg['title'],$msg['body'],URL::site().static::image($msg['type'],true))));
+
+		// Save our messages in our session, so that we get them for redirects
+		Session::instance()->set('sessionmsgs',static::$_data);
+	}
+
+	/**
+	 * Return an instance of this class
+	 *
+	 * @return SystemMessage
+	 */
+	public static function factory() {
+		return new SystemMessage;
+	}
+
+	/**
+	 * Render an image for the System Message
+	 */
+	private static function image($type,$raw=false,$big=false,$alt='') {
+		$mediapath = Route::get(static::$_media_path);
+
+		switch ($type) {
+			case 'error':
+				$file = sprintf('img/dialog-error%s.png',$big ? '-big' : '');
+				break;
+			case 'info':
+				$file = sprintf('img/dialog-information%s.png',$big ? '-big' : '');
+				break;
+			case 'warning':
+				$file = sprintf('img/dialog-warning%s.png',$big ? '-big' : '');
+				break;
+			case 'debug':
+				$file = sprintf('img/dialog-question%s.png',$big ? '-big' : '');
+				break;
+			default:
+				throw new Kohana_Exception('Unknown system message type :type',array(':type'=>$value['type']));
+		}
+
+		if ($raw)
+			return $mediapath->uri(array('file'=>$file));
+		else
+			return HTML::image($mediapath->uri(array('file'=>$file)),array('alt'=>$alt ? $alt : '','class'=>'sysicon'));
+	}
+
+	/**
+	 * Render this system message
+	 *
+	 * @see HTMLRender::render()
+	 */
+	protected function render() {
+		$output = '';
+		$mediapath = Route::get(static::$_media_path);
+
+		// Reload our message from the session
+		if ($msgs = Session::instance()->get('sessionmsgs')) {
+			Session::instance()->delete('sessionmsgs');
+			static::$_data = $msgs;
+		}
+
+		$i = 0;
+		foreach (static::$_data as $value) {
+			if ($i++)
+				$output .= static::$_spacer;
+
+			$output .= '<table><tr>';
+			$output .= sprintf('<td class="icon" rowspan="2">%s</td>',static::image($value['type'],false,false,isset($value['alt']) ? $value['alt'] : ''));
+			$output .= sprintf('<td class="head">%s</td>',$value['title']);
+			$output .= '</tr><tr>';
+			$output .= sprintf('<td class="body">%s</td>',$value['body']);
+			$output .= '</tr></table>';
+		}
+
+		return $output;
+	}
+}
+?>
diff --git a/application/classes/meta.php b/application/classes/meta.php
new file mode 100644
index 0000000..006de23
--- /dev/null
+++ b/application/classes/meta.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Meta extends lnApp_Meta {}
+?>
diff --git a/application/classes/orm.php b/application/classes/orm.php
new file mode 100644
index 0000000..a71c8ad
--- /dev/null
+++ b/application/classes/orm.php
@@ -0,0 +1,70 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's ORM
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class ORM extends Kohana_ORM {
+	protected $_table_names_plural = false;
+	protected $_model_names_plural = false;
+	private $_object_formated = array();
+	private $_formated = FALSE;
+	// Our filters used to display values in a friendly format
+	protected $_display_filters = array();
+
+	// Override check() so that it doesnt throw an exception.
+	// @todo Need to figure out how to show the items that fail validation
+	final public function check(Validation $extra_validation = NULL) {
+		// Determine if any external validation failed
+		$extra_errors = ($extra_validation AND ! $extra_validation->check());
+
+		// Always build a new validation object
+		$this->_validation();
+
+		$array = $this->_validation;
+
+		if (($this->_valid = $array->check()) === FALSE OR $extra_errors)
+		{
+			return FALSE;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Format fields for display purposes
+	 *
+	 * @param   string  column name
+	 * @return  mixed
+	 */
+	private function _format() {
+		foreach ($this->_display_filters as $column => $formats)
+			$this->_object_formated[$column] = $this->run_filter($column,$this->__get($column),array($column=>$formats));
+
+		$this->_formated = TRUE;
+	}
+
+	/**
+	 * Return a formated columns, as per the model definition
+	 */
+	public function display($column) {
+		// Trigger a load of the record.
+		$value = $this->__get($column);
+
+		// If some of our fields need to be formated for display purposes.
+		if ($this->_loaded AND ! $this->_formated AND $this->_display_filters)
+			$this->_format();
+
+		if (isset($this->_object_formated[$column]))
+			return $this->_object_formated[$column];
+		else
+			return HTML::nbsp($value);
+	}
+}
+?>
diff --git a/application/classes/response.php b/application/classes/response.php
new file mode 100644
index 0000000..62f0e8c
--- /dev/null
+++ b/application/classes/response.php
@@ -0,0 +1,19 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This class overrides Kohana's Response
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Response extends Kohana_Response {
+	// Append to the body.
+	public function bodyadd($content) {
+		$this->_body .= (string) $content;
+	}
+}
+?>
diff --git a/application/classes/script.php b/application/classes/script.php
new file mode 100644
index 0000000..1e03000
--- /dev/null
+++ b/application/classes/script.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Script extends lnApp_Script {}
+?>
diff --git a/application/classes/sort.php b/application/classes/sort.php
new file mode 100644
index 0000000..cccb437
--- /dev/null
+++ b/application/classes/sort.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class sort extends lnApp_Sort {}
+?>
diff --git a/application/classes/style.php b/application/classes/style.php
new file mode 100644
index 0000000..18e54da
--- /dev/null
+++ b/application/classes/style.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Style extends lnApp_Style {}
+?>
diff --git a/application/classes/systemmessage.php b/application/classes/systemmessage.php
new file mode 100644
index 0000000..6753b7c
--- /dev/null
+++ b/application/classes/systemmessage.php
@@ -0,0 +1,4 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class SystemMessage extends lnApp_SystemMessage {}
+?>
diff --git a/application/classes/valid.php b/application/classes/valid.php
new file mode 100644
index 0000000..fa0d3ec
--- /dev/null
+++ b/application/classes/valid.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * Array and variable validation.
+ *
+ * @package    lnApp/Modifications
+ * @category   Classes
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+class Valid extends Kohana_Valid {
+	/**
+	 * Checks if a field matches the value of another field, if it is set.
+	 * Field is ignored if it is blank.
+	 *
+	 * @param   array    array of values
+	 * @param   string   field name
+	 * @param   string   field name to match
+	 * @return  boolean
+	 */
+	public static function matches_ifset($array, $field, $match)
+	{   
+		return isset($array[$match]) ? ($array[$field] === $array[$match]) : TRUE;
+	}
+}
+?>
diff --git a/application/config/auth.php b/application/config/auth.php
new file mode 100644
index 0000000..acfe24f
--- /dev/null
+++ b/application/config/auth.php
@@ -0,0 +1,21 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp authentication configuration
+ *
+ * @package    lnApp
+ * @category   Configuration
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+
+return array(
+	'driver'       => 'ORM',
+	'hash_method'  => 'md5',
+	'salt_pattern' => '1, 3, 5, 9, 14, 15, 20, 21, 28, 30',
+	'lifetime'     => 1209600,
+	'session_key'  => 'auth_user',
+	'forced_key'   => 'auth_forced',
+);
+?>
diff --git a/application/config/cache.php b/application/config/cache.php
new file mode 100644
index 0000000..c7946c3
--- /dev/null
+++ b/application/config/cache.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp Configuration - Cache Driver
+ *
+ * @package    lnApp
+ * @subpackage Cache
+ * @category   Configuration
+ * @author     Deon George
+ * @copyright  (c) 2010 phpTSMadmin Development Team
+ * @license    http://phptsmadmin.sf.net/license.html
+ */
+
+return array
+(
+	'file'    => array
+	(
+		'driver'             => 'file',
+		'cache_dir'          => Kohana::$cache_dir ? Kohana::$cache_dir : '/dev/shm/lnapp',
+		'default_expire'     => 3600,
+	)
+);
+?>
diff --git a/application/config/config.php b/application/config/config.php
new file mode 100644
index 0000000..cd0ecf6
--- /dev/null
+++ b/application/config/config.php
@@ -0,0 +1,37 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp system default configurable items.
+ *
+ * @package    lnApp
+ * @category   Configuration
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+return array(
+	'cache_type'      => 'file',
+	'date_format'     => 'd-M-Y',
+	'email_admin_only'=> array(
+		'adsl_traffic_notice'=>array('deon@c5t61p.leenooks.vpn'=>'Deon George'),
+	),
+	'method_directory'=> array(		// Out method paths for the different functions
+		'admin',
+		'affiliate',
+		'reseller',
+		'task',
+		'user',
+		),
+	'method_security' => TRUE,		// Enables Method Security. Setting to false means any method can be run without authentication
+	'site'            => array(
+		'172.31.9.4'=>1,
+		'www.graytech.net.au'=>1,
+	),
+	'site_debug'      => FALSE,
+	'site_mode'       => array(
+		'172.31.10.200'=>Kohana::DEVELOPMENT,
+		'www.graytech.net.au'=>Kohana::PRODUCTION,
+	),
+	'site_name'       => 'lnApp',
+);
+?>
diff --git a/application/config/database.php b/application/config/database.php
new file mode 100644
index 0000000..cdefb2f
--- /dev/null
+++ b/application/config/database.php
@@ -0,0 +1,42 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * lnApp Database configuration
+ *
+ * @package    lnApp
+ * @category   Configuration
+ * @author     Deon George
+ * @copyright  (c) 2010 Deon George
+ * @license    http://dev.leenooks.net/license.html
+ */
+
+return array
+(
+	'default' => array
+	(
+		'type'       => 'mysql',
+		'connection' => array(
+			/**
+			 * The following options are available for MySQL:
+			 *
+			 * string   hostname     server hostname, or socket
+			 * string   database     database name
+			 * string   username     database username
+			 * string   password     database password
+			 * boolean  persistent   use persistent connections?
+			 *
+			 * Ports and sockets may be appended to the hostname.
+			 */
+			'hostname'   => 'localhost',
+			'username'   => FALSE,
+			'password'   => FALSE,
+			'persistent' => FALSE,
+			'database'   => 'kohana',
+		),
+		'table_prefix' => '',
+		'charset'      => 'utf8',
+		'caching'      => FALSE,
+		'profiling'    => TRUE,
+	),
+);
+?>
diff --git a/application/i18n/.htaccess b/application/i18n/.htaccess
new file mode 100644
index 0000000..281d5c3
--- /dev/null
+++ b/application/i18n/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
diff --git a/application/media/css/default.css b/application/media/css/default.css
new file mode 100644
index 0000000..2a4dc0b
--- /dev/null
+++ b/application/media/css/default.css
@@ -0,0 +1,296 @@
+/* Default Template CSS */
+
+table.box-left { border: 1px solid #AAAACC; margin-right: auto; }
+table.box-center { border: 1px solid #AAAACC; margin-left: auto; margin-right: auto; }
+table.box-full { border: 1px solid #AAAACC; margin-right: auto; width: 100%; }
+tr.head { font-weight: bold; }
+tr.subhead { background-color: #BBBBDD; }
+td.head { font-weight: bold; }
+td.bold { font-weight: bold; }
+td.bold-right { font-weight: bold; text-align: right; }
+td.data { font-weight: bold; }
+span.data { font-weight: bold; }
+td.data-right { font-weight: bold; text-align: right; }
+td.right { text-align: right; }
+tr.odd { background-color: #FCFCFE; }
+tr.even { background-color: #F6F6F8; }
+
+/* Global Page */
+table.page {
+	width: 100%;
+	border: 0px solid #000000;
+	font-weight: normal;
+	color: #000000;
+
+	font-family: "bitstream vera sans","luxi sans",verdana,geneva,arial,helvetica,sans-serif;
+	background-color: #FFFFFF;
+	font-size: 13px;
+	empty-cells: hide;
+}
+
+/* Page Header - Logo & Title */
+table.page tr.pagehead td table.pagehead {
+	width: 100%;
+}
+
+table.page tr.pagehead td table.pagehead td.headlogo {
+	width: 100px;
+	height: 50px;
+	vertical-align: bottom;
+	text-align: center;
+}
+
+table.page tr.pagehead td table.pagehead img.headlogo {
+	border: 0px;
+	max-width: 100px;
+	max-height: 50px;
+}
+
+table.page tr.pagehead td table.pagehead td.headtitle {
+	vertical-align: bottom;
+	text-align: left;
+	padding-left: 5px;
+	font-weight: bold;
+}
+
+table.page tr.pagehead td table.pagehead td.headimages {
+	vertical-align: bottom;
+	text-align: right;
+}
+
+table.page tr.pagehead td table.pagehead td.headimages img {
+	border: 0px;
+}
+
+/* Page Control */
+table.page tr.pagecontrol td {
+	border-top: 1px solid #AAAACC;
+	border-bottom: 1px solid #AAAACC;
+}
+
+table.page tr.pagecontrol td table.pagecontrol {
+	width: 100%;
+}
+
+table.page tr.pagecontrol td table.pagecontrol td.none {
+	border-top: 0px;
+	border-bottom: 0px;
+	font-size: 11px;
+	text-align: left;
+	vertical-align: top;
+	font-weight: bold;
+	color: #000000;
+
+	padding: 0px;
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+table.page tr.pagecontrol td table.pagecontrol a {
+	text-decoration: none;
+	color: #000000;
+}
+
+table.page tr.pagecontrol td table.pagecontrol a:hover {
+	text-decoration: none;
+	background-color: #FFFFFF;
+	color: #0000AA;
+}
+
+/* Main Page */
+/** LEFT **/
+table.page tr.pagemain td.pageleft {
+	background-color: #FCFCFE;
+/*	display: show; */
+	vertical-align: top;
+	border-right: 1px solid #88AACC;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft table {
+	width: 100%;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft tr.title {
+	text-align: center;
+	margin: 0px;
+	padding: 10px;
+	border: 1px solid #000000;
+	font-weight: bold;
+	font-size: 110%;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft tr.footer {
+	font-size: 75%;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft tr.footer td {
+	border-top: 1px solid #AAAACC;
+	border-bottom: 1px solid #AAAACC;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft tr.spacer {
+	font-size: 5px;
+}
+
+table.page tr.pagemain td.pageleft table.pageleft tr.spacer td {
+	border-top: 2px solid #AAAACC;
+}
+
+/** BODY **/
+table.page tr.pagemain td.pagebody {
+	background-color: #FCFCFE;
+	width: 85%;
+	vertical-align: top;
+	font-size: 8pt;
+}
+
+/*** Body System Message ***/
+table.page tr.pagemain td.pagebody table.sysmsg {
+	border-bottom: 1px solid #88AACC;
+	width: 100%;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg table {
+	width: 100%;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg td.icon {
+	text-align: center;
+	vertical-align: top;
+	width: 25px;
+	height: 50px;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg td.icon img.sysicon {
+	border: 5px;
+	max-width: 25px;
+	max-height: 50px;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg td.head {
+	font-size: small;
+	text-align: left;
+	font-weight: bold;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg td.body {
+	font-weight: normal;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg tr.spacer {
+	font-size: 5px;
+}
+
+table.page tr.pagemain td.pagebody table.sysmsg tr.spacer td {
+	border-top: 1px solid #AAAACC;
+}
+
+/*** Body Content ***/
+table.page tr.pagemain td.pagebody table.content {
+	font-weight: normal;
+	background-color: #FCFCFE;
+	width: 100%;
+	color: #000000;
+}
+
+table.page tr.pagemain td.pagebody table.content table.block {
+	width: 100%;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.title {
+	text-align: left;
+	margin: 0px;
+	color: #000000;
+	background-color: #F8F8FA;
+	border: 1px solid #000000;
+	font-weight: bold;
+	font-size: 150%;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.title td {
+	padding: 5px;
+	border-bottom: 1px solid #AAAACC;
+	color: #000000;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.subtitle {
+	text-align: left;
+	margin: 0px;
+	margin-bottom: 15px;
+	font-size: 75%;
+	color: #000000;
+	border-bottom: 1px solid #000000;
+	border-left: 1px solid #000000;
+	border-right: 1px solid #000000;
+	background: #FFFFFF;
+	font-weight: normal;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.subtitle td {
+	padding: 5px;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.footer {
+	font-size: 75%;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.footer td {
+	border-top: 1px solid #AAAACC;
+	border-bottom: 1px solid #AAAACC;
+	padding: 5px;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.spacer {
+	font-size: 5px;
+}
+
+table.page tr.pagemain td.pagebody table.content tr.spacer td {
+	border: 0px solid #AAAACC;
+}
+
+/** RIGHT **/
+table.page tr.pagemain td.pageright {
+	background-color: #FCFCFE;
+/*	display: none; */
+	vertical-align: top;
+	border-left: 1px solid #88AACC;
+}
+
+table.page tr.pagemain td.pageright table.pageright table {
+	width: 100%;
+}
+
+table.page tr.pagemain td.pageright table.pageright tr.title {
+	text-align: center;
+	margin: 0px;
+	padding: 10px;
+	border: 1px solid #000000;
+	font-weight: bold;
+	font-size: 110%;
+}
+
+table.page tr.pagemain td.pageright table.pageright tr.footer {
+	font-size: 75%;
+}
+
+table.page tr.pagemain td.pageright table.pageright tr.footer td {
+	border-top: 1px solid #AAAACC;
+	border-bottom: 1px solid #AAAACC;
+}
+
+table.page tr.pagemain td.pageright table.pageright tr.spacer {
+	font-size: 5px;
+}
+
+table.page tr.pagemain td.pageright table.pageright tr.spacer td {
+	border-top: 2px solid #AAAACC;
+}
+
+/* Footer */
+table.page tr.pagefoot td {
+	border-top: 1px solid #AAAACC;
+	font-weight: bold;
+	font-size: 10px;
+	text-align: right;
+	color: #000000;
+}
diff --git a/application/media/css/jquery.gritter.css b/application/media/css/jquery.gritter.css
new file mode 100644
index 0000000..0d6cba5
--- /dev/null
+++ b/application/media/css/jquery.gritter.css
@@ -0,0 +1,92 @@
+/* ie6 trash */
+* html #gritter-notice-wrapper {
+	position:absolute; 
+}
+* html .gritter-top {
+	margin-bottom:-10px;
+}
+* html .gritter-item {
+	padding-bottom:0;
+}
+* html .gritter-bottom {
+	margin-bottom:0;
+}
+* html .gritter-close {
+	background:url(../img/jquery.gritter-close-ie6.gif);
+	width:22px;
+	height:22px;
+	top:7px;
+	left:7px;
+}
+
+/* the norm */
+#gritter-notice-wrapper {
+	position:fixed;
+	top:20px;
+	right:20px;
+	width:301px;
+	z-index:9999;
+}
+.gritter-item-wrapper {
+	position:relative;
+	margin:0 0 10px 0;
+}
+.gritter-top {
+	background:url(../img/jquery.gritter.png) no-repeat left -30px;
+	height:10px;
+}
+.hover .gritter-top {
+	background-position:right -30px;
+}
+.gritter-bottom {
+	background:url(../img/jquery.gritter.png) no-repeat left bottom;
+	height:8px;
+	margin:0;
+}
+.hover .gritter-bottom {
+	background-position: bottom right;
+}
+.gritter-item {
+	display:block;
+	background:url(../img/jquery.gritter.png) no-repeat left -40px;
+	color:#eee;
+	padding:2px 11px 8px 11px;
+	font-size: 11px;
+	font-family:verdana;
+}
+.hover .gritter-item {
+	background-position:right -40px;
+}
+.gritter-item p {
+	padding:0;
+	margin:0;
+}
+.gritter-close {
+	position:absolute;
+	top:5px;
+	left:3px;
+	background:url(../img/jquery.gritter.png) no-repeat left top;
+	cursor:pointer;
+	width:30px;
+	height:30px;
+}
+.gritter-title {
+	font-size:14px;
+	font-weight:bold;
+	padding:0 0 7px 0;
+	display:block;
+	text-shadow:1px 1px #000; /* Not supported by IE :( */
+}
+.gritter-image {
+	width:24px;
+	height:24px;
+	float:left;
+}
+.gritter-with-image,
+.gritter-without-image {
+	padding:0 0 0px 0;
+}
+.gritter-with-image {
+	width:250px;
+	float:right;
+}
diff --git a/application/media/css/jquery.jstree.css b/application/media/css/jquery.jstree.css
new file mode 100644
index 0000000..633edee
--- /dev/null
+++ b/application/media/css/jquery.jstree.css
@@ -0,0 +1,56 @@
+/*
+ * jsTree default theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-default li, 
+.jstree-default ins { background-image:url("../img/jquery.jstree.d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-default li.jstree-last { background:transparent; }
+.jstree-default .jstree-open > ins { background-position:-72px 0; }
+.jstree-default .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default .jstree-hovered { background:#FFF0C0; border:1px solid #841212; padding:0 2px 0 1px; color: #841212;}
+.jstree-default .jstree-clicked { background:#FCFCFC; border:1px solid #FCFCFC; padding:0 2px 0 1px; color: #841212;}
+.jstree-default a .jstree-icon { background-position:-56px -19px; }
+.jstree-default a.jstree-loading .jstree-icon { background:url("../img/jquery.jstree.throbber.gif") center center no-repeat !important; }
+
+.jstree-default.jstree-focused { background:#FCFCFC; }
+
+.jstree-default .jstree-no-dots li, 
+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default .jstree-search { font-style:italic; }
+
+.jstree-default .jstree-no-icons .checkbox { display:inline-block; }
+.jstree-default .jstree-no-checkboxes .checkbox { display:none !important; }
+.jstree-default .jstree-checked > a > .checkbox { background-position:-38px -19px; }
+.jstree-default .jstree-unchecked > a > .checkbox { background-position:-2px -19px; }
+.jstree-default .jstree-undetermined > a > .checkbox { background-position:-20px -19px; }
+.jstree-default .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
+.jstree-default .jstree-unchecked > a > .checkbox:hover { background-position:-2px -37px; }
+.jstree-default .jstree-undetermined > a > .checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-default ins { background:transparent !important; }
+#vakata-dragged.jstree-default .jstree-ok { background:url("../img/jquery.jstree.d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-default .jstree-invalid { background:url("../img/jquery.jstree.d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-default { background:url("../img/jquery.jstree.d.png") -41px -57px no-repeat !important; }
+
+.jstree-default a.jstree-search { color:aqua; }
+
+#vakata-contextmenu.jstree-default-context, 
+#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-default-context li { }
+#vakata-contextmenu.jstree-default-context a { color:black; }
+#vakata-contextmenu.jstree-default-context a:hover, 
+#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
+
+/* TODO: IE6 support - the `>` selectors */
diff --git a/application/media/css/login.css b/application/media/css/login.css
new file mode 100644
index 0000000..baabd9e
--- /dev/null
+++ b/application/media/css/login.css
@@ -0,0 +1,43 @@
+/** Login Style Sheet **/
+
+table.login {
+	margin-left: auto;
+	margin-right: auto;
+	background-color: #F9F9FA;
+	border: 1px solid #AAAACC;
+	padding: 10px;
+}
+
+#login-uid {
+	background: url('../img/login.user.png') no-repeat 0 1px;
+	background-color: #FAFAFF;
+	color: #000000;
+	padding-left: 24px;
+}
+
+#login-uid:focus {
+	background-color: #F0F0FF;
+	color: #000000;
+}
+
+#login-uid:disabled {
+	background-color: #DDDDFF;
+	color: #000000;
+}
+
+#login-pwd {
+	background: url('../img/dialog-password.png') no-repeat 0 1px;
+	background-color: #FAFAFF;
+	color: #000000;
+	padding-left: 24px;
+}
+
+#login-pwd:focus {
+	background-color: #F0F0FF;
+	color: #000000;
+}
+
+#login-pwd:disabled {
+	background-color: #DDDDFF;
+	color: #000000;
+}
diff --git a/application/media/img/address-book-new-big.png b/application/media/img/address-book-new-big.png
new file mode 100644
index 0000000..aa7c4e0
Binary files /dev/null and b/application/media/img/address-book-new-big.png differ
diff --git a/application/media/img/address-book-new.png b/application/media/img/address-book-new.png
new file mode 100644
index 0000000..e37385c
Binary files /dev/null and b/application/media/img/address-book-new.png differ
diff --git a/application/media/img/ajax-progress.gif b/application/media/img/ajax-progress.gif
new file mode 100644
index 0000000..994bfab
Binary files /dev/null and b/application/media/img/ajax-progress.gif differ
diff --git a/application/media/img/bug-big.png b/application/media/img/bug-big.png
new file mode 100644
index 0000000..0758a85
Binary files /dev/null and b/application/media/img/bug-big.png differ
diff --git a/application/media/img/dialog-error-big.png b/application/media/img/dialog-error-big.png
new file mode 100644
index 0000000..49ed530
Binary files /dev/null and b/application/media/img/dialog-error-big.png differ
diff --git a/application/media/img/dialog-error.png b/application/media/img/dialog-error.png
new file mode 100644
index 0000000..f805012
Binary files /dev/null and b/application/media/img/dialog-error.png differ
diff --git a/application/media/img/dialog-information-big.png b/application/media/img/dialog-information-big.png
new file mode 100644
index 0000000..cca5804
Binary files /dev/null and b/application/media/img/dialog-information-big.png differ
diff --git a/application/media/img/dialog-information.png b/application/media/img/dialog-information.png
new file mode 100644
index 0000000..00accf1
Binary files /dev/null and b/application/media/img/dialog-information.png differ
diff --git a/application/media/img/dialog-password-big.png b/application/media/img/dialog-password-big.png
new file mode 100644
index 0000000..e40a48d
Binary files /dev/null and b/application/media/img/dialog-password-big.png differ
diff --git a/application/media/img/dialog-password.png b/application/media/img/dialog-password.png
new file mode 100644
index 0000000..eb8dd24
Binary files /dev/null and b/application/media/img/dialog-password.png differ
diff --git a/application/media/img/dialog-question-big.png b/application/media/img/dialog-question-big.png
new file mode 100644
index 0000000..2361f74
Binary files /dev/null and b/application/media/img/dialog-question-big.png differ
diff --git a/application/media/img/dialog-question.png b/application/media/img/dialog-question.png
new file mode 100644
index 0000000..ec07761
Binary files /dev/null and b/application/media/img/dialog-question.png differ
diff --git a/application/media/img/dialog-warning-big.png b/application/media/img/dialog-warning-big.png
new file mode 100644
index 0000000..a9ff09b
Binary files /dev/null and b/application/media/img/dialog-warning-big.png differ
diff --git a/application/media/img/dialog-warning.png b/application/media/img/dialog-warning.png
new file mode 100644
index 0000000..63b08f9
Binary files /dev/null and b/application/media/img/dialog-warning.png differ
diff --git a/application/media/img/forum-big.png b/application/media/img/forum-big.png
new file mode 100644
index 0000000..bbda895
Binary files /dev/null and b/application/media/img/forum-big.png differ
diff --git a/application/media/img/gritter-close-ie6.gif b/application/media/img/gritter-close-ie6.gif
new file mode 100644
index 0000000..aea6e42
Binary files /dev/null and b/application/media/img/gritter-close-ie6.gif differ
diff --git a/application/media/img/gritter.png b/application/media/img/gritter.png
new file mode 100755
index 0000000..0ca3bc0
Binary files /dev/null and b/application/media/img/gritter.png differ
diff --git a/application/media/img/help-about-big.png b/application/media/img/help-about-big.png
new file mode 100644
index 0000000..45b5d62
Binary files /dev/null and b/application/media/img/help-about-big.png differ
diff --git a/application/media/img/help-about.png b/application/media/img/help-about.png
new file mode 100644
index 0000000..435ea0e
Binary files /dev/null and b/application/media/img/help-about.png differ
diff --git a/application/media/img/help-big.png b/application/media/img/help-big.png
new file mode 100644
index 0000000..bbda895
Binary files /dev/null and b/application/media/img/help-big.png differ
diff --git a/application/media/img/help-faq-big.png b/application/media/img/help-faq-big.png
new file mode 100644
index 0000000..1d57544
Binary files /dev/null and b/application/media/img/help-faq-big.png differ
diff --git a/application/media/img/help-faq.png b/application/media/img/help-faq.png
new file mode 100644
index 0000000..69e0ce1
Binary files /dev/null and b/application/media/img/help-faq.png differ
diff --git a/application/media/img/help.png b/application/media/img/help.png
new file mode 100644
index 0000000..674a8e9
Binary files /dev/null and b/application/media/img/help.png differ
diff --git a/application/media/img/jquery.gritter.close-ie6.gif b/application/media/img/jquery.gritter.close-ie6.gif
new file mode 100644
index 0000000..aea6e42
Binary files /dev/null and b/application/media/img/jquery.gritter.close-ie6.gif differ
diff --git a/application/media/img/jquery.gritter.png b/application/media/img/jquery.gritter.png
new file mode 100644
index 0000000..0ca3bc0
Binary files /dev/null and b/application/media/img/jquery.gritter.png differ
diff --git a/application/media/img/jquery.jstree.d.png b/application/media/img/jquery.jstree.d.png
new file mode 100644
index 0000000..8540175
Binary files /dev/null and b/application/media/img/jquery.jstree.d.png differ
diff --git a/application/media/img/jquery.jstree.throbber.gif b/application/media/img/jquery.jstree.throbber.gif
new file mode 100644
index 0000000..5b33f7e
Binary files /dev/null and b/application/media/img/jquery.jstree.throbber.gif differ
diff --git a/application/media/img/login.user.png b/application/media/img/login.user.png
new file mode 100644
index 0000000..7be48fb
Binary files /dev/null and b/application/media/img/login.user.png differ
diff --git a/application/media/img/logo-small.png b/application/media/img/logo-small.png
new file mode 100644
index 0000000..726933b
Binary files /dev/null and b/application/media/img/logo-small.png differ
diff --git a/application/media/img/logo.png b/application/media/img/logo.png
new file mode 100644
index 0000000..1cb1554
Binary files /dev/null and b/application/media/img/logo.png differ
diff --git a/application/media/img/request-feature-big.png b/application/media/img/request-feature-big.png
new file mode 100644
index 0000000..b7b1241
Binary files /dev/null and b/application/media/img/request-feature-big.png differ
diff --git a/application/media/img/smile-big.png b/application/media/img/smile-big.png
new file mode 100644
index 0000000..22fba5f
Binary files /dev/null and b/application/media/img/smile-big.png differ
diff --git a/application/media/img/toggle-closed.png b/application/media/img/toggle-closed.png
new file mode 100644
index 0000000..f66b1a8
Binary files /dev/null and b/application/media/img/toggle-closed.png differ
diff --git a/application/media/img/toggle-open.png b/application/media/img/toggle-open.png
new file mode 100644
index 0000000..6ff9066
Binary files /dev/null and b/application/media/img/toggle-open.png differ
diff --git a/application/media/js/jquery-1.4.2.js b/application/media/js/jquery-1.4.2.js
new file mode 100644
index 0000000..7c24308
--- /dev/null
+++ b/application/media/js/jquery-1.4.2.js
@@ -0,0 +1,154 @@
+/*!
+ * jQuery JavaScript Library v1.4.2
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Sat Feb 13 22:33:48 2010 -0500
+ */
+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
+"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
+"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
+cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
+this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
+null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
+"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
+if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
+this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
+j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/application/media/js/jquery.cookie.js b/application/media/js/jquery.cookie.js
new file mode 100644
index 0000000..6036754
--- /dev/null
+++ b/application/media/js/jquery.cookie.js
@@ -0,0 +1,96 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ *       used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
+ *                             when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ *                        require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+        }
+        // CAUTION: Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};
\ No newline at end of file
diff --git a/application/media/js/jquery.gritter-1.5.js b/application/media/js/jquery.gritter-1.5.js
new file mode 100644
index 0000000..bf3bd47
--- /dev/null
+++ b/application/media/js/jquery.gritter-1.5.js
@@ -0,0 +1,21 @@
+(function($){$.gritter={};$.gritter.options={fade_in_speed:'medium',fade_out_speed:2000,time:6000}
+$.gritter.add=function(params){try{if(!params.title||!params.text){throw'You need to fill out the first 2 params: "title" and "text"';}}catch(e){alert('Gritter Error: '+e);}
+return Gritter.add(params);}
+$.gritter.remove=function(id,params){Gritter.removeSpecific(id,params||'');}
+$.gritter.removeAll=function(params){Gritter.stop(params||'');}
+var Gritter={fade_in_speed:'',fade_out_speed:'',time:'',_custom_timer:0,_item_count:0,_is_setup:0,_tpl_close:'<div class="gritter-close"></div>',_tpl_item:'<div id="gritter-item-[[number]]" class="gritter-item-wrapper" style="display:none"><div class="gritter-top"></div><div class="gritter-item">[[image]]<div class="[[class_name]]"><span class="gritter-title">[[username]]</span><p>[[text]]</p></div><div style="clear:both"></div></div><div class="gritter-bottom"></div></div>',_tpl_wrap:'<div id="gritter-notice-wrapper"></div>',add:function(params){if(!this._is_setup){this._runSetup();}
+var user=params.title,text=params.text,image=params.image||'',sticky=params.sticky||false,time_alive=params.time||'';this._verifyWrapper();this._item_count++;var number=this._item_count,tmp=this._tpl_item;this['_before_open_'+number]=($.isFunction(params.before_open))?params.before_open:function(){};this['_after_open_'+number]=($.isFunction(params.after_open))?params.after_open:function(){};this['_before_close_'+number]=($.isFunction(params.before_close))?params.before_close:function(){};this['_after_close_'+number]=($.isFunction(params.after_close))?params.after_close:function(){};this._custom_timer=0;if(time_alive){this._custom_timer=time_alive;}
+var image_str=(image!='')?'<img src="'+image+'" class="gritter-image" />':'',class_name=(image!='')?'gritter-with-image':'gritter-without-image';tmp=this._str_replace(['[[username]]','[[text]]','[[image]]','[[number]]','[[class_name]]'],[user,text,image_str,this._item_count,class_name],tmp);this['_before_open_'+number]();$('#gritter-notice-wrapper').append(tmp);var item=$('#gritter-item-'+this._item_count);item.fadeIn(this.fade_in_speed,function(){Gritter['_after_open_'+number]($(this));});if(!sticky){this._setFadeTimer(item,number);}
+$(item).bind('mouseenter mouseleave',function(event){if(event.type=='mouseenter'){if(!sticky){Gritter.restoreItemIfFading(this,number);}}
+else{if(!sticky){Gritter._setFadeTimer(this,number);}}
+Gritter._hoverState(this,event.type);});return number;},_countRemoveWrapper:function(unique_id){this['_after_close_'+unique_id]($('#gritter-item-'+unique_id));if($('.gritter-item-wrapper').length==0){$('#gritter-notice-wrapper').remove();}},_fade:function(e,unique_id){Gritter['_before_close_'+unique_id]($(e));$(e).animate({opacity:0},Gritter.fade_out_speed,function(){$(e).animate({height:0},300,function(){$(e).remove();Gritter._countRemoveWrapper(unique_id);})})},_hoverState:function(e,type){if(type=='mouseenter'){$(e).addClass('hover');if($(e).find('img').length){$(e).find('img').before(this._tpl_close);}
+else{$(e).find('span').before(this._tpl_close);}
+$(e).find('.gritter-close').click(function(){Gritter._remove(this);});}
+else{$(e).removeClass('hover');$(e).find('.gritter-close').remove();}},_remove:function(e){var gritter_wrap=$(e).parents('.gritter-item-wrapper');var unique_id=gritter_wrap.attr('id').split('-')[2];this['_before_close_'+unique_id](gritter_wrap);gritter_wrap.fadeOut('medium',function(){$(this).remove();Gritter._countRemoveWrapper(unique_id);});},removeSpecific:function(unique_id,params){var e=$('#gritter-item-'+unique_id);this['_before_close_'+unique_id](e);if(typeof(params)==='object'){if(params.fade){var speed=this.fade_out_speed;if(params.speed){speed=params.speed;}
+e.fadeOut(speed,function(){e.remove();});}}
+else{e.remove();}
+this._countRemoveWrapper(unique_id);},restoreItemIfFading:function(e,number){window.clearTimeout(Gritter['_int_id_'+number]);$(e).stop().css({opacity:1});},_runSetup:function(){for(opt in $.gritter.options){this[opt]=$.gritter.options[opt];}
+this._is_setup=1;},_setFadeTimer:function(item,number){var timer_str=(this._custom_timer)?this._custom_timer:this.time;Gritter['_int_id_'+number]=window.setTimeout(function(){Gritter._fade(item,number);},timer_str);},stop:function(params){var before_close=($.isFunction(params.before_close))?params.before_close:function(){};var after_close=($.isFunction(params.after_close))?params.after_close:function(){};var wrap=$('#gritter-notice-wrapper');before_close(wrap);wrap.fadeOut(function(){$(this).remove();after_close();});},_str_replace:function(search,replace,subject,count){var i=0,j=0,temp='',repl='',sl=0,fl=0,f=[].concat(search),r=[].concat(replace),s=subject,ra=r instanceof Array,sa=s instanceof Array;s=[].concat(s);if(count){this.window[count]=0;}
+for(i=0,sl=s.length;i<sl;i++){if(s[i]===''){continue;}
+for(j=0,fl=f.length;j<fl;j++){temp=s[i]+'';repl=ra?(r[j]!==undefined?r[j]:''):r[0];s[i]=(temp).split(f[j]).join(repl);if(count&&s[i]!==temp){this.window[count]+=(temp.length-s[i].length)/f[j].length;}}}
+return sa?s:s[0];},_verifyWrapper:function(){if($('#gritter-notice-wrapper').length==0){$('body').append(this._tpl_wrap);}}}})(jQuery);
\ No newline at end of file
diff --git a/application/media/js/jquery.jstree-1.0rc.js b/application/media/js/jquery.jstree-1.0rc.js
new file mode 100644
index 0000000..f3debe3
--- /dev/null
+++ b/application/media/js/jquery.jstree-1.0rc.js
@@ -0,0 +1,142 @@
+(function(c){c.vakata={};c.vakata.css={get_css:function(a,d,g){a=a.toLowerCase();var f=g.cssRules||g.rules,b=0;do{if(f.length&&b>f.length+5)return false;if(f[b].selectorText&&f[b].selectorText.toLowerCase()==a)if(d===true){g.removeRule&&g.removeRule(b);g.deleteRule&&g.deleteRule(b);return true}else return f[b]}while(f[++b]);return false},add_css:function(a,d){if(c.jstree.css.get_css(a,false,d))return false;d.insertRule?d.insertRule(a+" { }",0):d.addRule(a,null,0);return c.vakata.css.get_css(a)},remove_css:function(a,
+d){return c.vakata.css.get_css(a,true,d)},add_sheet:function(a){var d;if(a.str){d=document.createElement("style");d.setAttribute("type","text/css");if(d.styleSheet){document.getElementsByTagName("head")[0].appendChild(d);d.styleSheet.cssText=a.str}else{d.appendChild(document.createTextNode(a.str));document.getElementsByTagName("head")[0].appendChild(d)}return d.sheet||d.styleSheet}if(a.url)if(document.createStyleSheet)try{document.createStyleSheet(a.url)}catch(g){}else{d=document.createElement("link");
+d.rel="stylesheet";d.type="text/css";d.media="all";d.href=a.url;document.getElementsByTagName("head")[0].appendChild(d);return d.styleSheet}}}})(jQuery);
+(function(c){var a=[],d=-1,g={},f={};c.fn.jstree=function(b){var e=typeof b=="string",h=Array.prototype.slice.call(arguments,1),k=this;!e&&c.meta&&h.push(c.metadata.get(this).jstree);b=!e&&h.length?c.extend.apply(null,[true,b].concat(h)):b;if(e&&b.substring(0,1)=="_")return k;e?this.each(function(){var j=a[c.data(this,"jstree-instance-id")];j=j&&c.isFunction(j[b])?j[b].apply(j,h):j;if(typeof j!=="undefined"&&j!==true&&j!==false){k=j;return false}}):this.each(function(){var j=c.data(this,"jstree-instance-id"),
+i=false;j&&a[j]&&a[j].destroy();j=parseInt(a.push({}),10)-1;c.data(this,"jstree-instance-id",j);b.plugins=c.isArray(b.plugins)?b.plugins:c.jstree.defaults.plugins;c.inArray("core",b.plugins)===-1&&b.plugins.unshift("core");i=c.extend(true,{},c.jstree.defaults,b);i.plugins=b.plugins;a[j]=new c.jstree._instance(j,c(this).addClass("jstree jstree-"+j),i);c.each(a[j].get_settings().plugins,function(m,l){a[j].data[l]={}});c.each(a[j].get_settings().plugins,function(m,l){g[l]&&g[l].__init.apply(a[j])});
+a[j].init()});return k};c.jstree={defaults:{plugins:[]},_focused:function(){return a[d]||null},_reference:function(b){if(a[b])return a[b];var e=c(b);if(!e.length&&typeof b==="string")e=c("#"+b);if(!e.length)return null;return a[e.closest(".jstree").data("jstree-instance-id")]||null},_instance:function(b,e,h){this.data={core:{}};this.get_settings=function(){return c.extend(true,{},h)};this.get_index=function(){return b};this.get_container=function(){return e};this._set_settings=function(k){h=c.extend(true,
+{},h,k)}},_fn:{},plugin:function(b,e){e=c.extend({},{__init:c.noop,__destroy:c.noop,_fn:{},defaults:false},e);g[b]=e;c.jstree.defaults[b]=e.defaults;c.each(e._fn,function(h,k){k.plugin=b;k.old=c.jstree._fn[h];c.jstree._fn[h]=function(){var j,i=k,m=Array.prototype.slice.call(arguments);j=this.get_settings();var l=new c.Event("before.jstree"),o=false;do{if(i&&i.plugin&&c.inArray(i.plugin,j.plugins)!==-1)break;i=i.old}while(i);if(i){j=this.get_container().triggerHandler(l,{func:h,inst:this,args:m});
+if(j!==false){if(typeof j!=="undefined")m=j;return j=i.apply(c.extend({},this,{__callback:function(n){this.get_container().triggerHandler(h+".jstree",{inst:this,args:m,rslt:n,rlbk:o})},__rollback:function(){return o=this.get_rollback()},__call_old:function(n){return i.old.apply(this,n?Array.prototype.slice.call(arguments,1):m)}}),m)}}};c.jstree._fn[h].old=k.old;c.jstree._fn[h].plugin=b})},rollback:function(b){if(b){c.isArray(b)||(b=[b]);c.each(b,function(e,h){a[h.i].set_rollback(h.h,h.d)})}}};c.jstree._fn=
+c.jstree._instance.prototype={};c(function(){var b=navigator.userAgent.toLowerCase(),e=(b.match(/.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],h=".jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } .jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; } .jstree > ul > li { margin-left:0px; } .jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } .jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } .jstree a:focus { outline: none; } .jstree a > ins { height:16px; width:16px; } .jstree a > .jstree-icon { margin-right:3px; } li.jstree-open > ul { display:block; } li.jstree-closed > ul { display:none; } ";
+if(/msie/.test(b)&&parseInt(e,10)==6)h+=".jstree li { height:18px; margin-left:0; } .jstree li li { margin-left:18px; } li.jstree-open ul { display:block; } li.jstree-closed ul { display:none !important; } .jstree li a { display:inline; } .jstree li a ins { height:16px; width:16px; margin-right:3px; } ";c.vakata.css.add_sheet({str:h})});c.jstree.plugin("core",{__init:function(){this.data.core.to_open=c.map(c.makeArray(this.get_settings().core.initially_open),function(b){return"#"+b.toString().replace(/^#/,
+"").replace("\\/","/").replace("/","\\/")})},defaults:{html_titles:false,animation:500,initially_open:[]},_fn:{init:function(){this.set_focus();this.get_container().html("<ul><li class='jstree-last jstree-leaf'><ins>&#160;</ins><a class='jstree-loading' href='#'><ins class='jstree-icon'>&#160;</ins>Loading ...</a></li></ul>");this.data.core.li_height=this.get_container().find("ul li.jstree-closed, ul li.jstree-leaf").eq(0).height()||18;this.get_container().delegate("li > ins","click.jstree",c.proxy(function(b){var e=
+c(b.target);e.is("ins")&&b.pageY-e.offset().top<this.data.core.li_height&&this.toggle_node(e)},this)).bind("mousedown.jstree",c.proxy(function(){this.set_focus()},this)).bind("dblclick.jstree",function(){var b;if(document.selection&&document.selection.empty)document.selection.empty();else if(window.getSelection){b=window.getSelection();try{b.removeAllRanges();b.collapse()}catch(e){}}});this.__callback();this.load_node(-1,function(){this.loaded();this.reopen()})},destroy:function(){var b,e=this.get_index(),
+h=this.get_settings(),k=this;c.each(h.plugins,function(j,i){g[i].__destroy.apply(k)});this.__callback();if(this.is_focused())for(b in a)if(a.hasOwnProperty(b)&&b!=e){a[b].set_focus();break}if(e===d)d=-1;this.get_container().unbind(".jstree").undelegate(".jstree").removeData("jstree-instance-id").find("[class^='jstree']").andSelf().attr("class",function(){return this.className.replace(/jstree[^ ]*|$/ig,"")});a[e]=null;delete a[e]},save_opened:function(){var b=this;this.data.core.to_open=[];this.get_container().find(".jstree-open").each(function(){b.data.core.to_open.push("#"+
+this.id.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/"))});this.__callback(b.data.core.to_open)},reopen:function(b){var e=this,h=true,k=[],j=[];if(!b){this.data.core.reopen=false;this.data.core.refreshing=true}if(this.data.core.to_open.length){c.each(this.data.core.to_open,function(i,m){if(m=="#")return true;c(m).length&&c(m).is(".jstree-closed")?k.push(m):j.push(m)});if(k.length){this.data.core.to_open=j;c.each(k,function(i,m){e.open_node(m,function(){e.reopen(true)},true)});h=
+false}}if(h){this.data.core.reopen&&clearTimeout(this.data.core.reopen);this.data.core.reopen=setTimeout(function(){e.__callback({},e)},50);this.data.core.refreshing=false}},refresh:function(b){var e=this;this.save_opened();b||(b=-1);this.load_node(b,function(){e.__callback({});e.reopen()})},loaded:function(){this.__callback()},set_focus:function(){var b=c.jstree._focused();b&&b!==this&&b.get_container().removeClass("jstree-focused");if(b!==this){this.get_container().addClass("jstree-focused");d=
+this.get_index()}this.__callback()},is_focused:function(){return d==this.get_index()},_get_node:function(b){var e=c(b,this.get_container());if(e.is(".jstree")||b==-1)return-1;e=e.closest("li",this.get_container());return e.length?e:false},_get_next:function(b,e){b=this._get_node(b);if(b===-1)return this.get_container().find("> ul > li:first-child");if(!b.length)return false;if(e)return b.nextAll("li").size()>0?b.nextAll("li:eq(0)"):false;return b.hasClass("jstree-open")?b.find("li:eq(0)"):b.nextAll("li").size()>
+0?b.nextAll("li:eq(0)"):b.parentsUntil(this.get_container(),"li").next("li").eq(0)},_get_prev:function(b,e){b=this._get_node(b);if(b===-1)return this.get_container().find("> ul > li:last-child");if(!b.length)return false;if(e)return b.prevAll("li").length>0?b.prevAll("li:eq(0)"):false;if(b.prev("li").length){for(b=b.prev("li").eq(0);b.hasClass("jstree-open");)b=b.children("ul:eq(0)").children("li:last");return b}else{var h=b.parentsUntil(this.get_container(),"li:eq(0)");return h.length?h:false}},
+_get_parent:function(b){b=this._get_node(b);if(b==-1||!b.length)return false;b=b.parentsUntil(this.get_container(),"li:eq(0)");return b.length?b:-1},_get_children:function(b){b=this._get_node(b);if(b===-1)return this.get_container().children("ul:eq(0)").children("li");if(!b.length)return false;return b.children("ul:eq(0)").children("li")},get_path:function(b,e){var h=[],k=this;b=this._get_node(b);if(b===-1||!b||!b.length)return false;b.parentsUntil(this.get_container(),"li").each(function(){h.push(e?
+this.id:k.get_text(this))});h.reverse();h.push(e?b.attr("id"):this.get_text(b));return h},open_node:function(b,e,h){b=this._get_node(b);if(!b.length)return false;var k=h?0:this.get_settings().core.animation,j=this;if(this._is_loaded(b)){k&&b.children("ul").css("display","none");b.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");k&&b.children("ul").slideDown(k,function(){this.style.display=""});this.__callback({obj:b});e&&e.call()}else{b.children("a").addClass("jstree-loading");
+this.load_node(b,function(){j.open_node(b,e,h)},e)}},close_node:function(b,e){b=this._get_node(b);var h=e?0:this.get_settings().core.animation;if(!b.length)return false;h&&b.children("ul").attr("style","display:block !important");b.removeClass("jstree-open").addClass("jstree-closed");h&&b.children("ul").slideUp(h,function(){this.style.display=""});this.__callback({obj:b})},toggle_node:function(b){b=this._get_node(b);if(b.hasClass("jstree-closed"))return this.open_node(b);if(b.hasClass("jstree-open"))return this.close_node(b)},
+open_all:function(b,e){b=b?this._get_node(b):this.get_container();if(e)b=b.find("li.jstree-closed");else{e=b;b=b.is(".jstree-closed")?b.find("li.jstree-closed").andSelf():b.find("li.jstree-closed")}var h=this;b.each(function(){var k=this;h._is_loaded(this)?h.open_node(this,false,true):h.open_node(this,function(){h.open_all(k,e)},true)});e.find("li.jstree-closed").length===0&&this.__callback({obj:e})},close_all:function(b){var e=this;b=b?this._get_node(b):this.get_container();b.find("li.jstree-open").andSelf().each(function(){e.close_node(this)});
+this.__callback({obj:b})},clean_node:function(b){b=b&&b!=-1?c(b):this.get_container();b=b.is("li")?b.find("li").andSelf():b.find("li");b.removeClass("jstree-last").filter("li:last-child").addClass("jstree-last").end().filter(":has(ul)").not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");b.not(".jstree-open, .jstree-closed").addClass("jstree-leaf");this.__callback({obj:b})},get_rollback:function(){this.__callback();return{i:this.get_index(),h:this.get_container().children("ul").clone(true),
+d:this.data}},set_rollback:function(b,e){this.get_container().empty().append(b);this.data=e;this.__callback()},load_node:function(b){this.__callback({obj:b})},_is_loaded:function(){return true},create_node:function(b,e,h,k,j){b=this._get_node(b);e=typeof e==="undefined"?"last":e;var i=c("<li>"),m=this.get_settings().core.html_titles,l;if(b!==-1&&!b.length)return false;if(!j&&!this._is_loaded(b)){this.load_node(b,function(){this.create_node(b,e,h,k,true)});return false}this.__rollback();if(typeof h===
+"string")h={data:h};h||(h={});h.attr&&i.attr(h.attr);h.state&&i.addClass("jstree-"+h.state);if(!h.data)h.data="New node";if(!c.isArray(h.data)){l=h.data;h.data=[];h.data.push(l)}c.each(h.data,function(o,n){l=c("<a>");if(c.isFunction(n))n=n.call(this,h);if(typeof n=="string")l.attr("href","#")[m?"html":"text"](n);else{if(!n.attr)n.attr={};if(!n.attr.href)n.attr.href="#";l.attr(n.attr)[m?"html":"text"](n.title);n.language&&l.addClass(n.language)}l.prepend("<ins class='jstree-icon'>&#160;</ins>");if(n.icon)n.icon.indexOf("/")===
+-1?l.children("ins").addClass(n.icon):l.children("ins").css("background","url('"+n.icon+"') center center no-repeat;");i.append(l)});i.prepend("<ins class='jstree-icon'>&#160;</ins>");if(b===-1){b=this.get_container();if(e==="before")e="first";if(e==="after")e="last"}switch(e){case "before":b.before(i);l=this._get_parent(b);break;case "after":b.after(i);l=this._get_parent(b);break;case "inside":case "first":b.children("ul").length||b.append("<ul>");b.children("ul").prepend(i);l=b;break;case "last":b.children("ul").length||
+b.append("<ul>");b.children("ul").append(i);l=b;break;default:b.children("ul").length||b.append("<ul>");e||(e=0);l=b.children("ul").children("li").eq(e);l.length?l.before(i):b.children("ul").append(i);l=b;break}if(l===-1||l.get(0)===this.get_container().get(0))l=-1;this.clean_node(l);this.__callback({obj:i,parent:l});k&&k.call(this,i);return i},get_text:function(b){b=this._get_node(b);if(!b.length)return false;var e=this.get_settings().core.html_titles;b=b.children("a:eq(0)");if(e){b=b.clone();b.children("INS").remove();
+return b.html()}else{b=b.contents().filter(function(){return this.nodeType==3})[0];return b.nodeValue}},set_text:function(b,e){b=this._get_node(b);if(!b.length)return false;b=b.children("a:eq(0)");if(this.get_settings().core.html_titles){var h=b.children("INS").clone();b.html(e).prepend(h);this.__callback({obj:b,name:e});return true}else{b=b.contents().filter(function(){return this.nodeType==3})[0];this.__callback({obj:b,name:e});return b.nodeValue=e}},rename_node:function(b,e){b=this._get_node(b);
+this.__rollback();b&&b.length&&this.set_text.apply(this,Array.prototype.slice.call(arguments))&&this.__callback({obj:b,name:e})},delete_node:function(b){b=this._get_node(b);if(!b.length)return false;this.__rollback();var e=this._get_parent(b);this.deselect_node(b);b=b.remove();e!==-1&&e.find("> ul > li").length===0&&e.removeClass("jstree-open, jstree-closed").addClass("jstree-leaf");this.clean_node(e);this.__callback({obj:b});return b},prepare_move:function(b,e,h,k,j){var i={};i.ot=c.jstree._reference(i.o)||
+this;i.o=i.ot._get_node(b);i.r=e===-1?-1:this._get_node(e);i.p=typeof i==="undefined"?"last":h;if(!(!j&&f.o&&f.o[0]===i.o[0]&&f.r[0]===i.r[0]&&f.p===i.p)){i.ot=c.jstree._reference(i.o)||this;i.rt=e===-1?i.ot:c.jstree._reference(i.r)||this;if(i.r===-1){i.cr=-1;switch(i.p){case "first":case "before":case "inside":i.cp=0;break;case "after":case "last":i.cp=i.rt.get_container().find(" > ul > li").length;break;default:i.cp=i.p;break}}else{if(!/^(before|after)$/.test(i.p)&&!this._is_loaded(i.r))return this.load_node(i.r,
+function(){this.prepare_move(b,e,i,k,true)});switch(i.p){case "before":i.cp=i.r.index();i.cr=i.rt._get_parent(i.r);break;case "after":i.cp=i.r.index()+1;i.cr=i.rt._get_parent(i.r);break;case "inside":case "first":i.cp=0;i.cr=i.r;break;case "last":i.cp=i.r.find(" > ul > li").length;i.cr=i.r;break;default:i.cp=i.p;i.cr=i.r;break}}i.np=i.cr==-1?i.rt.get_container():i.cr;i.op=i.ot._get_parent(i.o);i.or=i.np.find(" > ul > li:nth-child("+(i.cp+1)+")");f=i}this.__callback(f);k&&k.call(this,f)},check_move:function(){var b=
+f;if(b.or[0]===b.o[0]||b.r.parentsUntil(".jstree").andSelf().filter("li").index(b.o)!==-1)return false;return true},move_node:function(b,e,h,k,j,i){if(!j)return this.prepare_move(b,e,h,function(l){this.move_node(l,false,false,k,true,i)});if(!i&&!this.check_move())return false;this.__rollback();e=false;if(k){e=b.o.clone();e.find("*[id]").andSelf().each(function(){if(this.id)this.id="copy_"+this.id})}else e=b.o;if(b.or.length)b.or.before(e);else{b.np.children("ul").length||c("<ul>").appendTo(b.np);
+b.np.children("ul:eq(0)").append(e)}try{b.ot.clean_node(b.op);b.rt.clean_node(b.np);b.op.find("> ul > li").length||b.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove()}catch(m){}if(k){f.cy=true;f.oc=e}this.__callback(f);return f},_get_move:function(){return f}}})})(jQuery);
+(function(c){c.jstree.plugin("ui",{__init:function(){this.data.ui.selected=c();this.data.ui.last_selected=false;this.data.ui.hovered=null;this.data.ui.to_select=this.get_settings().ui.initially_select;this.get_container().delegate("a","click.jstree",c.proxy(function(a){a.preventDefault();this.select_node(a.currentTarget,true,a)},this)).delegate("a","mouseenter.jstree",c.proxy(function(a){this.hover_node(a.target)},this)).delegate("a","mouseleave.jstree",c.proxy(function(a){this.dehover_node(a.target)},
+this)).bind("reopen.jstree",c.proxy(function(){this.reselect()},this)).bind("get_rollback.jstree",c.proxy(function(){this.dehover_node();this.save_selected()},this)).bind("set_rollback.jstree",c.proxy(function(){this.reselect()},this)).bind("close_node.jstree",c.proxy(function(a,d){var g=this.get_settings().ui,f=this._get_node(d.args[0]),b=f&&f.length?f.find(".jstree-clicked"):[],e=this;g.selected_parent_close===false||!b.length||b.each(function(){e.deselect_node(this);g.selected_parent_close==="select_parent"&&
+e.select_node(f)})},this)).bind("delete_node.jstree",c.proxy(function(a,d){var g=this._get_node(d.rslt.obj),f=this;(g&&g.length?g.find(".jstree-clicked"):[]).each(function(){f.deselect_node(this)})},this)).bind("move_node.jstree",c.proxy(function(a,d){d.rslt.cy&&d.rslt.oc.find(".jstree-clicked").removeClass("jstree-clicked")},this))},defaults:{select_limit:-1,select_multiple_modifier:"ctrl",selected_parent_close:"select_parent",initially_select:[]},_fn:{_get_node:function(a,d){if(typeof a==="undefined"||
+a===null)return d?this.data.ui.selected:this.data.ui.last_selected;return this.__call_old()},save_selected:function(){var a=this;this.data.ui.to_select=[];this.data.ui.selected.each(function(){a.data.ui.to_select.push("#"+this.id.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/"))});this.__callback(this.data.ui.to_select)},reselect:function(){var a=this,d=this.data.ui.to_select;d=c.map(c.makeArray(d),function(g){return"#"+g.toString().replace(/^#/,"").replace("\\/","/").replace("/",
+"\\/")});this.deselect_all();c.each(d,function(g,f){f&&f!=="#"&&a.select_node(f)});this.__callback()},refresh:function(){this.save_selected();return this.__call_old()},hover_node:function(a){a=this._get_node(a);if(!a.length)return false;a.hasClass("jstree-hovered")||this.dehover_node();this.data.ui.hovered=a.children("a").addClass("jstree-hovered").parent();this.__callback({obj:a})},dehover_node:function(){var a=this.data.ui.hovered;if(!a||!a.length)return false;if(this.data.ui.hovered[0]===a.children("a").removeClass("jstree-hovered").parent()[0])this.data.ui.hovered=
+null;this.__callback({obj:a})},select_node:function(a,d,g){a=this._get_node(a);if(!a.length)return false;var f=this.get_settings().ui;g=f.select_multiple_modifier=="on"||f.select_multiple_modifier!==false&&g&&g[f.select_multiple_modifier+"Key"];var b=this.is_selected(a),e=true;if(d){e=false;switch(true){case b&&!g:break;case !b&&!g:if(f.select_limit==-1||f.select_limit>0){this.deselect_all();e=true}break;case b&&g:this.deselect_node(a);break;case !b&&g:if(f.select_limit==-1||this.data.ui.selected.length+
+1<=f.select_limit)e=true;break}}if(e&&!b){a.children("a").addClass("jstree-clicked");this.data.ui.selected=this.data.ui.selected.add(a);this.data.ui.last_selected=a;this.__callback({obj:a})}},deselect_node:function(a){a=this._get_node(a);if(!a.length)return false;if(this.is_selected(a)){a.children("a").removeClass("jstree-clicked");this.data.ui.selected=this.data.ui.selected.not(a);if(this.data.ui.last_selected.get(0)===a.get(0))this.data.ui.last_selected=this.data.ui.selected.eq(0);this.__callback({obj:a})}},
+toggle_select:function(a){a=this._get_node(a);if(!a.length)return false;this.is_selected(a)?this.deselect_node(a):this.select_node(a)},is_selected:function(a){return this.data.ui.selected.index(this._get_node(a))>=0},get_selected:function(a){return a?c(a).find(".jstree-clicked").parent():this.data.ui.selected},deselect_all:function(a){a?c(a).find(".jstree-clicked").removeClass("jstree-clicked"):this.get_container().find(".jstree-clicked").removeClass("jstree-clicked");this.data.ui.selected=c([]);
+this.data.ui.last_selected=false;this.__callback()}}});c.jstree.defaults.plugins.push("ui")})(jQuery);
+(function(c){c.jstree.plugin("crrm",{__init:function(){this.get_container().bind("move_node.jstree",c.proxy(function(a,d){if(this.get_settings().crrm.move.open_onmove){var g=this;d.rslt.np.parentsUntil(".jstree").andSelf().filter(".jstree-closed").each(function(){g.open_node(this,false,true)})}},this))},defaults:{input_width_limit:200,move:{always_copy:false,open_onmove:true,default_position:"last",check_move:function(){return true}}},_fn:{_show_input:function(a,d){a=this._get_node(a);var g=this.get_settings().crrm.input_width_limit,
+f=a.children("ins").width(),b=a.find("> a:visible > ins").width()*a.find("> a:visible > ins").length,e=this.get_text(a),h=c("<div>",{css:{position:"absolute",top:"-200px",left:"-1000px",visibility:"hidden"}}).appendTo("body"),k=a.css("position","relative").append(c("<input>",{value:e,css:{padding:"0",border:"1px solid silver",position:"absolute",left:f+b+4+"px",top:"0px",height:this.data.core.li_height-2+"px",lineHeight:this.data.core.li_height-2+"px",width:"150px"},blur:c.proxy(function(){var j=
+a.children("input"),i=j.val();if(i==="")i=e;this.rename_node(a,i);d.call(this,a,i,e);j.remove();a.css("position","")},this),keyup:function(j){j=j.keyCode||j.which;if(j==27){this.value=e;this.blur()}else j==13?this.blur():k.width(Math.min(h.text("pW"+this.value).width(),g))}})).children("input");this.set_text(a,"");h.css({fontFamily:k.css("fontFamily")||"",fontSize:k.css("fontSize")||"",fontWeight:k.css("fontWeight")||"",fontStyle:k.css("fontStyle")||"",fontStretch:k.css("fontStretch")||"",fontVariant:k.css("fontVariant")||
+"",letterSpacing:k.css("letterSpacing")||"",wordSpacing:k.css("wordSpacing")||""});k.width(Math.min(h.text("pW"+k[0].value).width(),g))[0].select()},rename:function(a){a=this._get_node(a);this.__rollback();var d=this.__callback;this._show_input(a,function(g,f,b){d.call(this,{obj:g,new_name:f,old_name:b})})},create:function(a,d,g,f,b){var e=this;(a=this._get_node(a))||(a=-1);this.__rollback();return this.create_node(a,d,g,function(h){var k=this._get_parent(h),j=c(h).index();f&&f.call(this,h);k.length&&
+k.hasClass("jstree-closed")&&this.open_node(k,false,true);b?e.__callback({obj:h,name:this.get_text(h),parent:k,position:j}):this._show_input(h,function(i,m){e.__callback({obj:i,name:m,parent:k,position:j})})})},remove:function(a){a=this._get_node(a,true);this.__rollback();this.delete_node(a);this.__callback({obj:a})},check_move:function(){if(!this.__call_old())return false;if(!this.get_settings().crrm.move.check_move.call(this,this._get_move()))return false;return true},move_node:function(a,d,g,f,
+b,e){var h=this.get_settings().crrm.move;if(!b){if(!g)g=h.default_position;return this.__call_old(true,a,d,g,f,false,e)}if(h.always_copy===true||h.always_copy==="multitree"&&a.rt.get_index()===a.ot.get_index())f=true;this.__call_old(true,a,d,g,f,true,e)},cut:function(a){a=this._get_node(a);this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=false;if(!a||!a.length)return false;this.data.crrm.ct_nodes=a},copy:function(a){a=this._get_node(a);this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=false;
+if(!a||!a.length)return false;this.data.crrm.cp_nodes=a},paste:function(a){a=this._get_node(a);if(!a||!a.length)return false;if(!this.data.crrm.ct_nodes&&!this.data.crrm.cp_nodes)return false;this.data.crrm.ct_nodes&&this.move_node(this.data.crrm.ct_nodes,a);this.data.crrm.cp_nodes&&this.move_node(this.data.crrm.cp_nodes,a,false,true)}}});c.jstree.defaults.plugins.push("crrm")})(jQuery);
+(function(c){var a=[];c.jstree._themes=false;c.jstree.plugin("themes",{__init:function(){this.get_container().bind("init.jstree",c.proxy(function(){var d=this.get_settings().themes;this.data.themes.dots=d.dots;this.data.themes.icons=d.icons;this.set_theme(d.theme,d.url)},this)).bind("loaded.jstree",c.proxy(function(){this.data.themes.dots?this.show_dots():this.hide_dots();this.data.themes.icons?this.show_icons():this.hide_icons()},this))},defaults:{theme:"default",url:false,dots:true,icons:true},
+_fn:{set_theme:function(d,g){if(!d)return false;g||(g=c.jstree._themes+d+"/style.css");if(c.inArray(g,a)==-1){c.vakata.css.add_sheet({url:g,rel:"jstree"});a.push(g)}if(this.data.theme!=d){this.get_container().removeClass("jstree-"+this.data.theme);this.data.themes.theme=d}this.get_container().addClass("jstree-"+d);this.data.themes.dots?this.show_dots():this.hide_dots();this.data.themes.icons?this.show_icons():this.hide_icons();this.__callback()},get_theme:function(){return this.data.themes.theme},
+show_dots:function(){this.data.themes.dots=true;this.get_container().children("ul").removeClass("jstree-no-dots")},hide_dots:function(){this.data.themes.dots=false;this.get_container().children("ul").addClass("jstree-no-dots")},toggle_dots:function(){this.data.themes.dots?this.hide_dots():this.show_dots()},show_icons:function(){this.data.themes.icons=true;this.get_container().children("ul").removeClass("jstree-no-icons")},hide_icons:function(){this.data.themes.icons=false;this.get_container().children("ul").addClass("jstree-no-icons")},
+toggle_icons:function(){this.data.themes.icons?this.hide_icons():this.show_icons()}}});c(function(){c.jstree._themes===false&&c("script").each(function(){if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)){c.jstree._themes=this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/,"")+"themes/";return false}});if(c.jstree._themes===false)c.jstree._themes="themes/"});c.jstree.defaults.plugins.push("themes")})(jQuery);
+(function(c){c.jstree.plugin("html_data",{__init:function(){this.data.html_data.original_container_html=this.get_container().html().replace(/<\/([^>]+)>\s+</ig,"</$1><").replace(/>\s+<([a-z]{1})/ig,"><$1")},defaults:{data:false,ajax:false,correct_state:false},_fn:{load_node:function(a,d,g){var f=this;this.load_node_html(a,function(){f.__callback({obj:a});d.call(this)},g)},_is_loaded:function(a){a=this._get_node(a);return a==-1||!a||!this.get_settings().html_data.ajax||a.is(".jstree-open, .jstree-leaf")||
+a.children("ul").children("li").size()>0},load_node_html:function(a,d,g){var f,b=this.get_settings().html_data,e=function(){};switch(true){case !b.data&&!b.ajax:if(!a||a==-1){this.get_container().html(this.data.html_data.original_container_html).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend("<ins class='jstree-icon'>&#160;</ins>");this.clean_node()}d&&d.call(this);break;case !!b.data&&!b.ajax||!!b.data&&!!b.ajax&&(!a||a===-1):if(!a||a==-1){f=c(b.data);f.is("ul")||
+(f=c("<ul>").append(f));this.get_container().children("ul").empty().append(f.children()).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend("<ins class='jstree-icon'>&#160;</ins>");this.clean_node()}d&&d.call(this);break;case !b.data&&!!b.ajax||!!b.data&&!!b.ajax&&a&&a!==-1:a=this._get_node(a);e=function(h,k,j){var i=this.get_settings().html_data.ajax.error;i&&i.call(this,h,k,j);if(a!=-1&&a.length){a.children(".jstree-loading").removeClass("jstree-loading");b.correct_state&&
+a.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}g&&g.call(this)};b.ajax.context=this;b.ajax.error=e;b.ajax.success=function(h,k,j){if(j.responseText=="")return e.call(this,j,k,"");var i=this.get_settings().html_data.ajax.success;if(i)h=i.call(this,h,k,j)||h;if(h){h=c(h);h.is("ul")||(h=c("<ul>").append(h));if(a==-1||!a)this.get_container().children("ul").empty().append(h.children()).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend("<ins class='jstree-icon'>&#160;</ins>");
+else{a.children(".jstree-loading").removeClass("jstree-loading");a.append(h).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend("<ins class='jstree-icon'>&#160;</ins>")}this.clean_node(a);d&&d.call(this)}else{a.children(".jstree-loading").removeClass("jstree-loading");b.correct_state&&a.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}};if(c.isFunction(b.ajax.data))b.ajax.data=b.ajax.data.call(this,a);c.ajax(b.ajax);break}}}});c.jstree.defaults.plugins.push("html_data")})(jQuery);
+(function(c){var a=[];c.jstree.plugin("hotkeys",{__init:function(){if(typeof c.hotkeys==="undefined")throw"jsTree hotkeys: jQuery hotkeys plugin not included.";if(!this.data.ui)throw"jsTree hotkeys: jsTree UI plugin not included.";c.each(this.get_settings().hotkeys,function(d){if(c.inArray(d,a)==-1){c(document).bind("keydown",d,function(g){var f;var b=c.jstree._focused();if(b&&b.data&&b.data.hotkeys&&b.data.hotkeys.enabled)if(b.get_settings().hotkeys[d])f=b.get_settings().hotkeys[d].call(b,g);return f});
+a.push(d)}});this.enable_hotkeys()},defaults:{up:function(){this.hover_node(this._get_prev(this.data.ui.hovered||this.data.ui.last_selected||-1));return false},down:function(){this.hover_node(this._get_next(this.data.ui.hovered||this.data.ui.last_selected||-1));return false},left:function(){var d=this.data.ui.hovered||this.data.ui.last_selected;if(d)d.hasClass("jstree-open")?this.close_node(d):this.hover_node(this._get_prev(d));return false},right:function(){var d=this.data.ui.hovered||this.data.ui.last_selected;
+if(d&&d.length)d.hasClass("jstree-closed")?this.open_node(d):this.hover_node(this._get_next(d));return false},space:function(){this.data.ui.hovered&&this.data.ui.hovered.children("a:eq(0)").click();return false},"ctrl+space":function(d){d.type="click";this.data.ui.hovered&&this.data.ui.hovered.children("a:eq(0)").trigger(d);return false},f2:function(){this.rename(this.data.ui.hovered||this.data.ui.last_selected)},del:function(){this.remove(this.data.ui.hovered||this._get_node(null))}},_fn:{enable_hotkeys:function(){this.data.hotkeys.enabled=
+true},disable_hotkeys:function(){this.data.hotkeys.enabled=false}}})})(jQuery);
+(function(c){c.jstree.plugin("json_data",{defaults:{data:false,ajax:false,correct_state:false,progressive_render:false},_fn:{load_node:function(a,d,g){var f=this;this.load_node_json(a,function(){f.__callback({obj:a});d.call(this)},g)},_is_loaded:function(a){var d=this.get_settings().json_data;if((a=this._get_node(a))&&a!==-1&&d.progressive_render){a.append(this.parse_json(a.data("jstree-children")));c.removeData(a,"jstree-children");this.clean_node(a)}return a==-1||!a||!d.ajax||a.is(".jstree-open, .jstree-leaf")||
+a.children("ul").children("li").size()>0},load_node_json:function(a,d,g){var f=this.get_settings().json_data,b=function(){};switch(true){case !f.data&&!f.ajax:throw"Neither data nor ajax settings supplied.";case !!f.data&&!f.ajax||!!f.data&&!!f.ajax&&(!a||a===-1):if(!a||a==-1){this.get_container().children("ul").empty().append(this.parse_json(f.data).children());this.clean_node()}d&&d.call(this);break;case !f.data&&!!f.ajax||!!f.data&&!!f.ajax&&a&&a!==-1:a=this._get_node(a);b=function(e,h,k){var j=
+this.get_settings().json_data.ajax.error;j&&j.call(this,e,h,k);if(a!=-1&&a.length){a.children(".jstree-loading").removeClass("jstree-loading");f.correct_state&&a.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}g&&g.call(this)};f.ajax.context=this;f.ajax.error=b;f.ajax.success=function(e,h,k){if(k.responseText==""||!c.isArray(e)&&!c.isPlainObject(e))return b.call(this,k,h,"");var j=this.get_settings().json_data.ajax.success;if(j)e=j.call(this,e,h,k)||e;if(e=this.parse_json(e)){a==
+-1||!a?this.get_container().children("ul").empty().append(e.children()):a.append(e).children(".jstree-loading").removeClass("jstree-loading");this.clean_node(a);d&&d.call(this)}else{a.children(".jstree-loading").removeClass("jstree-loading");f.correct_state&&a.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}};if(c.isFunction(f.ajax.data))f.ajax.data=f.ajax.data.call(this,a);c.ajax(f.ajax);break}},parse_json:function(a,d){var g=c(),f,b,e;b=this.get_settings().json_data;var h=this.get_settings().core.html_titles;
+if(!a)return g;if(c.isFunction(a))a=a.call(this);if(c.isArray(a)){if(!a.length)return false;b=0;for(e=a.length;b<e;b++){f=this.parse_json(a[b],true);if(f.length)g=g.add(f)}}else{if(typeof a=="string")a={data:a};if(!a.data&&a.data!=="")return g;g=c("<li>");a.attr&&g.attr(a.attr);a.metadata&&g.data("jstree",a.metadata);a.state&&g.addClass("jstree-"+a.state);if(!c.isArray(a.data)){f=a.data;a.data=[];a.data.push(f)}c.each(a.data,function(k,j){f=c("<a>");if(c.isFunction(j))j=j.call(this,a);if(typeof j==
+"string")f.attr("href","#")[h?"html":"text"](j);else{if(!j.attr)j.attr={};if(!j.attr.href)j.attr.href="#";f.attr(j.attr)[h?"html":"text"](j.title);j.language&&f.addClass(j.language)}f.prepend("<ins class='jstree-icon'>&#160;</ins>");if(j.icon)j.icon.indexOf("/")===-1?f.children("ins").addClass(j.icon):f.children("ins").css("background","url('"+j.icon+"') center center no-repeat;");g.append(f)});g.prepend("<ins class='jstree-icon'>&#160;</ins>");if(a.children)if(b.progressive_render&&a.state!=="open")g.addClass("jstree-closed").data("jstree-children",
+a.children);else{if(c.isFunction(a.children))a.children=a.children.call(this,a);if(c.isArray(a.children)&&a.children.length){f=this.parse_json(a.children,true);if(f.length){b=c("<ul>");b.append(f);g.append(b)}}}}if(!d){b=c("<ul>");b.append(g);g=b}return g},get_json:function(a,d,g){var f=[],b=this.get_settings(),e=this,h,k,j,i,m,l;a=this._get_node(a);if(!a||a===-1)a=this.get_container().find("> ul > li");d=c.isArray(d)?d:["id","class"];this.data.types&&d.push(b.types.type_attr);g=c.isArray(g)?g:[];
+a.each(function(){j=c(this);h={data:[]};if(d.length)h.attr={};c.each(d,function(o,n){if((k=j.attr(n))&&k.length&&k.replace(/jstree[^ ]*|$/ig,"").length)h.attr[n]=k.replace(/jstree[^ ]*|$/ig,"")});if(j.hasClass("jstree-open"))h.state="open";if(j.hasClass("jstree-closed"))h.state="closed";i=j.children("a");i.each(function(){m=c(this);if(g.length||c.inArray("languages",b.plugins)!==-1||m.children("ins").get(0).style.backgroundImage.length||m.children("ins").get(0).className&&m.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,
+"").length){l=false;c.inArray("languages",b.plugins)!==-1&&c.isArray(b.languages)&&b.languages.length&&c.each(b.languages,function(o,n){if(m.hasClass(n)){l=n;return false}});k={attr:{},title:e.get_text(m,l)};c.each(g,function(o,n){h.attr[n]=j.attr(n).replace(/jstree[^ ]*|$/ig,"")});c.each(b.languages,function(o,n){if(m.hasClass(n)){k.language=n;return true}});if(m.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"").length)k.icon=m.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,
+"").replace(/^\s+$/ig,"");if(m.children("ins").get(0).style.backgroundImage.length)k.icon=m.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","")}else k=e.get_text(m);if(i.length>1)h.data.push(k);else h.data=k});j=j.find("> ul > li");if(j.length)h.children=e.get_json(j,d,g);f.push(h)});return f}}})})(jQuery);
+(function(c){c.jstree.plugin("languages",{__init:function(){this._load_css()},defaults:[],_fn:{set_lang:function(a){var d=this.get_settings().languages,g=false,f=".jstree-"+this.get_index()+" a";if(!c.isArray(d)||d.length===0)return false;if(c.inArray(a,d)==-1)if(d[a])a=d[a];else return false;if(a==this.data.languages.current_language)return true;g=c.vakata.css.get_css(f+"."+this.data.languages.current_language,false,this.data.languages.language_css);if(g!==false)g.style.display="none";g=c.vakata.css.get_css(f+
+"."+a,false,this.data.languages.language_css);if(g!==false)g.style.display="";this.data.languages.current_language=a;this.__callback(a);return true},get_lang:function(){return this.data.languages.current_language},get_text:function(a,d){a=this._get_node(a)||this.data.ui.last_selected;if(!a.size())return false;var g=this.get_settings().languages,f=this.get_settings().core.html_titles;if(c.isArray(g)&&g.length){d=d&&c.inArray(d,g)!=-1?d:this.data.languages.current_language;a=a.children("a."+d)}else a=
+a.children("a:eq(0)");if(f){a=a.clone();a.children("INS").remove();return a.html()}else{a=a.contents().filter(function(){return this.nodeType==3})[0];return a.nodeValue}},set_text:function(a,d,g){a=this._get_node(a)||this.data.ui.last_selected;if(!a.size())return false;var f=this.get_settings().languages,b=this.get_settings().core.html_titles;if(c.isArray(f)&&f.length){g=g&&c.inArray(g,f)!=-1?g:this.data.languages.current_language;a=a.children("a."+g)}else a=a.children("a:eq(0)");if(b){f=a.children("INS").clone();
+a.html(d).prepend(f);this.__callback({obj:a,name:d,lang:g});return true}else{a=a.contents().filter(function(){return this.nodeType==3})[0];this.__callback({obj:a,name:d,lang:g});return a.nodeValue=d}},_load_css:function(){var a=this.get_settings().languages,d="/* languages css */",g=".jstree-"+this.get_index()+" a",f;if(c.isArray(a)&&a.length){this.data.languages.current_language=a[0];for(f=0;f<a.length;f++){d+=g+"."+a[f]+" {";if(a[f]!=this.data.languages.current_language)d+=" display:none; ";d+=
+" } "}this.data.languages.language_css=c.vakata.css.add_sheet({str:d})}},create_node:function(a,d,g,f){return this.__call_old(true,a,d,g,function(b){var e=this.get_settings().languages,h=b.children("a"),k;if(c.isArray(e)&&e.length){for(k=0;k<e.length;k++)h.is("."+e[k])||b.append(h.eq(0).clone().removeClass(e.join(" ")).addClass(e[k]));h.not("."+e.join(", .")).remove()}f&&f.call(this,b)})}}})})(jQuery);
+(function(c){c.jstree.plugin("cookies",{__init:function(){if(typeof c.cookie==="undefined")throw"jsTree cookie: jQuery cookie plugin not included.";var a=this.get_settings().cookies,d;if(a.save_opened)if((d=c.cookie(a.save_opened))&&d.length)this.data.core.to_open=d.split(",");if(a.save_selected)if((d=c.cookie(a.save_selected))&&d.length)this.data.ui.to_select=d.split(",");this.get_container().one((this.data.ui?"reselect":"reopen")+".jstree",c.proxy(function(){this.get_container().bind("open_node.jstree close_node.jstree select_node.jstree deselect_node.jstree",
+c.proxy(function(g){this.get_settings().cookies.auto_save&&this.save_cookie((g.handleObj.namespace+g.handleObj.type).replace("jstree",""))},this))},this))},defaults:{save_opened:"jstree_open",save_selected:"jstree_select",auto_save:true,cookie_options:{}},_fn:{save_cookie:function(a){if(!this.data.core.refreshing){var d=this.get_settings().cookies;if(a)switch(a){case "open_node":case "close_node":if(d.save_opened){this.save_opened();c.cookie(d.save_opened,this.data.core.to_open.join(","),d.cookie_options)}break;
+case "select_node":case "deselect_node":if(d.save_selected&&this.data.ui){this.save_selected();c.cookie(d.save_selected,this.data.ui.to_select.join(","),d.cookie_options)}break}else{if(d.save_opened){this.save_opened();c.cookie(d.save_opened,this.data.core.to_open.join(","),d.cookie_options)}if(d.save_selected&&this.data.ui){this.save_selected();c.cookie(d.save_selected,this.data.ui.to_select.join(","),d.cookie_options)}}}}}});c.jstree.defaults.plugins.push("cookies")})(jQuery);
+(function(c){c.jstree.plugin("sort",{__init:function(){this.get_container().bind("load_node.jstree",c.proxy(function(a,d){var g=this._get_node(d.rslt.obj);g=g===-1?this.get_container().children("ul"):g.children("ul");this.sort(g)},this)).bind("rename_node.jstree",c.proxy(function(a,d){this.sort(d.rslt.obj.parent())},this)).bind("move_node.jstree",c.proxy(function(a,d){this.sort((d.rslt.np==-1?this.get_container():d.rslt.np).children("ul"))},this))},defaults:function(a,d){return this.get_text(a)>this.get_text(d)?
+1:-1},_fn:{sort:function(a){var d=this.get_settings().sort,g=this;a.append(c.makeArray(a.children("li")).sort(c.proxy(d,g)));a.find("> li > ul").each(function(){g.sort(c(this))});this.clean_node(a)}}})})(jQuery);
+(function(c){var a=false,d=false,g=false;c.vakata.dnd={is_down:false,is_drag:false,helper:false,init_x:0,init_y:0,threshold:5,user_data:{},drag_start:function(f,b,e){c.vakata.dnd.is_drag&&c.vakata.drag_stop({});try{f.currentTarget.unselectable="on";f.currentTarget.onselectstart=function(){return false};if(f.currentTarget.style)f.currentTarget.style.MozUserSelect="none"}catch(h){}c.vakata.dnd.init_x=f.pageX;c.vakata.dnd.init_y=f.pageY;c.vakata.dnd.user_data=b;c.vakata.dnd.is_down=true;c.vakata.dnd.helper=
+c("<div id='vakata-dragged'>").html(e).css("opacity","0.75");c(document).bind("mousemove",c.vakata.dnd.drag);c(document).bind("mouseup",c.vakata.dnd.drag_stop);return false},drag:function(f){if(c.vakata.dnd.is_down){if(!c.vakata.dnd.is_drag)if(Math.abs(f.pageX-c.vakata.dnd.init_x)>5||Math.abs(f.pageY-c.vakata.dnd.init_y)>5){c.vakata.dnd.helper.appendTo("body");c.vakata.dnd.is_drag=true;c(document).triggerHandler("vakata.drag_start",{event:f,data:c.vakata.dnd.user_data})}else return;c.vakata.dnd.helper.css({left:f.pageX+
+5+"px",top:f.pageY+10+"px"});c(document).triggerHandler("vakata.drag",{event:f,data:c.vakata.dnd.user_data})}},drag_stop:function(f){c(document).unbind("mousemove",c.vakata.dnd.drag);c(document).unbind("mouseup",c.vakata.dnd.drag_stop);c(document).triggerHandler("vakata.drag_stop",{event:f,data:c.vakata.dnd.user_data});c.vakata.dnd.helper.remove();c.vakata.dnd.init_x=0;c.vakata.dnd.init_y=0;c.vakata.dnd.user_data={};c.vakata.dnd.is_down=false;c.vakata.dnd.is_drag=false}};c(function(){c.vakata.css.add_sheet({str:"#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; left:-2000px; top:-2000px; line-height:16px; } "})});
+c.jstree.plugin("dnd",{__init:function(){this.data.dnd={active:false,after:false,inside:false,before:false,off:false,prepared:false,w:0,to1:false,to2:false,cof:false,cw:false,ch:false,i1:false,i2:false};this.get_container().bind("mouseenter.jstree",c.proxy(function(){if(c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree&&this.data.themes){g.attr("class","jstree-"+this.data.themes.theme);c.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme)}},this)).bind("mouseleave.jstree",
+c.proxy(function(){if(c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree){this.data.dnd.i1&&clearInterval(this.data.dnd.i1);this.data.dnd.i2&&clearInterval(this.data.dnd.i2)}},this)).bind("mousemove.jstree",c.proxy(function(b){if(c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree){var e=this.get_container()[0];if(b.pageX+20>this.data.dnd.cof.left+this.data.dnd.cw){this.data.dnd.i1&&clearInterval(this.data.dnd.i1);this.data.dnd.i1=setInterval(c.proxy(function(){this.scrollLeft+=5},e),100)}else if(b.pageX-
+20<this.data.dnd.cof.left){this.data.dnd.i1&&clearInterval(this.data.dnd.i1);this.data.dnd.i1=setInterval(c.proxy(function(){this.scrollLeft-=5},e),100)}else this.data.dnd.i1&&clearInterval(this.data.dnd.i1);if(b.pageY+20>this.data.dnd.cof.top+this.data.dnd.ch){this.data.dnd.i2&&clearInterval(this.data.dnd.i2);this.data.dnd.i2=setInterval(c.proxy(function(){this.scrollTop+=5},e),100)}else if(b.pageY-20<this.data.dnd.cof.top){this.data.dnd.i2&&clearInterval(this.data.dnd.i2);this.data.dnd.i2=setInterval(c.proxy(function(){this.scrollTop-=
+5},e),100)}else this.data.dnd.i2&&clearInterval(this.data.dnd.i2)}},this)).delegate("a","mousedown.jstree",c.proxy(function(b){this.start_drag(b.currentTarget,b);return false},this)).delegate("a","mouseenter.jstree",c.proxy(function(b){c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree&&this.dnd_enter(b.currentTarget)},this)).delegate("a","mousemove.jstree",c.proxy(function(b){if(c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree){if(typeof this.data.dnd.off.top==="undefined")this.data.dnd.off=
+c(b.target).offset();this.data.dnd.w=(b.pageY-(this.data.dnd.off.top||0))%this.data.core.li_height;if(this.data.dnd.w<0)this.data.dnd.w+=this.data.core.li_height;this.dnd_show()}},this)).delegate("a","mouseleave.jstree",c.proxy(function(b){if(c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree){this.data.dnd.after=false;this.data.dnd.before=false;this.data.dnd.inside=false;c.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");g.hide();if(d&&d[0]===b.target.parentNode){if(this.data.dnd.to1){clearTimeout(this.data.dnd.to1);
+this.data.dnd.to1=false}if(this.data.dnd.to2){clearTimeout(this.data.dnd.to2);this.data.dnd.to2=false}}}},this)).delegate("a","mouseup.jstree",c.proxy(function(b){c.vakata.dnd.is_drag&&c.vakata.dnd.user_data.jstree&&this.dnd_finish(b)},this));c(document).bind("vakata.drag_stop",c.proxy(function(){this.data.dnd.after=false;this.data.dnd.before=false;this.data.dnd.inside=false;this.data.dnd.off=false;this.data.dnd.prepared=false;this.data.dnd.w=false;this.data.dnd.to1=false;this.data.dnd.to2=false;
+this.data.dnd.active=false;this.data.dnd.foreign=false;g&&g.css({left:"-2000px",top:"-2000px"})},this)).bind("vakata.drag_start",c.proxy(function(b,e){if(e.data.jstree){var h=c(e.event.target);h.closest(".jstree").hasClass("jstree-"+this.get_index())&&this.dnd_enter(h)}},this));var f=this.get_settings().dnd;f.drag_target&&c(document).delegate(f.drag_target,"mousedown.jstree",c.proxy(function(b){a=b.target;c.vakata.dnd.drag_start(b,{jstree:true,obj:b.target},"<ins class='jstree-icon'></ins>"+c(b.target).text());
+if(this.data.themes){g.attr("class","jstree-"+this.data.themes.theme);c.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme)}c.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");b=this.get_container();this.data.dnd.cof=b.children("ul").offset();this.data.dnd.cw=parseInt(b.width(),10);this.data.dnd.ch=parseInt(b.height(),10);this.data.dnd.foreign=true;return false},this));f.drop_target&&c(document).delegate(f.drop_target,"mouseenter.jstree",c.proxy(function(b){this.data.dnd.active&&
+this.get_settings().dnd.drop_check.call(this,{o:a,r:c(b.target)})&&c.vakata.dnd.helper.children("ins").attr("class","jstree-ok")},this)).delegate(f.drop_target,"mouseleave.jstree",c.proxy(function(){this.data.dnd.active&&c.vakata.dnd.helper.children("ins").attr("class","jstree-invalid")},this)).delegate(f.drop_target,"mouseup.jstree",c.proxy(function(b){this.data.dnd.active&&c.vakata.dnd.helper.children("ins").hasClass("jstree-ok")&&this.get_settings().dnd.drop_finish.call(this,{o:a,r:c(b.target)})},
+this))},defaults:{copy_modifier:"ctrl",check_timeout:200,open_timeout:500,drop_target:".jstree-drop",drop_check:function(){return true},drop_finish:c.noop,drag_target:".jstree-draggable",drag_finish:c.noop,drag_check:function(){return{after:false,before:false,inside:true}}},_fn:{dnd_prepare:function(){this.data.dnd.off=d.offset();if(this.data.dnd.foreign){var f=this.get_settings().dnd.drag_check.call(this,{o:a,r:d});this.data.dnd.after=f.after;this.data.dnd.before=f.before;this.data.dnd.inside=f.inside;
+this.data.dnd.prepared=true;return this.dnd_show()}this.prepare_move(a,d,"before");this.data.dnd.before=this.check_move();this.prepare_move(a,d,"after");this.data.dnd.after=this.check_move();if(this._is_loaded(d)){this.prepare_move(a,d,"inside");this.data.dnd.inside=this.check_move()}else this.data.dnd.inside=false;this.data.dnd.prepared=true;return this.dnd_show()},dnd_show:function(){if(this.data.dnd.prepared){var f=["before","inside","after"],b=false;f=this.data.dnd.w<this.data.core.li_height/
+3?["before","inside","after"]:this.data.dnd.w<=this.data.core.li_height*2/3?this.data.dnd.w<this.data.core.li_height/2?["inside","before","after"]:["inside","after","before"]:["after","inside","before"];c.each(f,c.proxy(function(e,h){if(this.data.dnd[h]){c.vakata.dnd.helper.children("ins").attr("class","jstree-ok");b=h;return false}},this));b===false&&c.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");switch(b){case "before":g.css({left:this.data.dnd.off.left+10+"px",top:this.data.dnd.off.top-
+6+"px"}).show();break;case "after":g.css({left:this.data.dnd.off.left+10+"px",top:this.data.dnd.off.top+this.data.core.li_height-7+"px"}).show();break;case "inside":g.css({left:this.data.dnd.off.left+14+"px",top:this.data.dnd.off.top+this.data.core.li_height/2-5+"px"}).show();break;default:g.hide();break}return b}},dnd_open:function(){this.data.dnd.to2=false;this.open_node(d,c.proxy(this.dnd_prepare,this),true)},dnd_finish:function(f){if(this.data.dnd.foreign){if(this.data.dnd.after||this.data.dnd.before||
+this.data.dnd.inside)this.get_settings().dnd.drag_finish.call(this,{o:a,r:d})}else{this.dnd_prepare();this.move_node(a,d,this.dnd_show(),f[this.get_settings().dnd.copy_modifier+"Key"])}d=a=false;g.hide()},dnd_enter:function(f){var b=this.get_settings().dnd;this.data.dnd.prepared=false;d=this._get_node(f);if(b.check_timeout){this.data.dnd.to1&&clearTimeout(this.data.dnd.to1);this.data.dnd.to1=setTimeout(c.proxy(this.dnd_prepare,this),b.check_timeout)}else this.dnd_prepare();if(b.open_timeout){this.data.dnd.to2&&
+clearTimeout(this.data.dnd.to2);if(d.hasClass("jstree-closed"))this.data.dnd.to2=setTimeout(c.proxy(this.dnd_open,this),b.open_timeout)}else d.hasClass("jstree-closed")&&this.dnd_open()},start_drag:function(f,b){a=this._get_node(f);if(this.data.ui&&this.is_selected(a))a=this._get_node(null,true);c.vakata.dnd.drag_start(b,{jstree:true,obj:a},"<ins class='jstree-icon'></ins>"+(a.length>1?"Multiple selection":this.get_text(a)));if(this.data.themes){g.attr("class","jstree-"+this.data.themes.theme);c.vakata.dnd.helper.attr("class",
+"jstree-dnd-helper jstree-"+this.data.themes.theme)}var e=this.get_container();this.data.dnd.cof=e.children("ul").offset();this.data.dnd.cw=parseInt(e.width(),10);this.data.dnd.ch=parseInt(e.height(),10);this.data.dnd.active=true}}});c(function(){c.vakata.css.add_sheet({str:"#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; } #vakata-dragged .jstree-ok { background:green; } #vakata-dragged .jstree-invalid { background:red; } #jstree-marker { padding:0; margin:0; line-height:12px; font-size:1px; overflow:hidden; height:12px; width:8px; position:absolute; left:-45px; top:-30px; z-index:1000; background-repeat:no-repeat; display:none; background-color:silver; } "});
+g=c("<div>").attr({id:"jstree-marker"}).hide().appendTo("body");c(document).bind("vakata.drag_start",function(f,b){b.data.jstree&&g.show()});c(document).bind("vakata.drag_stop",function(f,b){b.data.jstree&&g.hide()})})})(jQuery);
+(function(c){c.jstree.plugin("checkbox",{__init:function(){if(!this.data.ui)throw"jsTree checkboxes: jsTree UI plugin not included";this.select_node=this.deselect_node=this.deselect_all=c.noop;this.get_selected=this.get_checked;this.get_container().bind("open_node.jstree create_node.jstree",c.proxy(function(a,d){this._prepare_checkboxes(d.rslt.obj)},this)).bind("loaded.jstree",c.proxy(function(){this._prepare_checkboxes()},this)).bind("clean_node.jstree",c.proxy(function(a,d){this._repair_state(d.args[0])},
+this)).delegate("a","click.jstree",c.proxy(function(a){this.change_state(a.target);this.save_selected();this.data.cookies&&this.save_cookie("select_node");a.preventDefault()},this))},_fn:{_prepare_checkboxes:function(a){a=!a||a==-1?this.get_container():this._get_node(a);var d=a.is("li")&&a.hasClass("jstree-checked")?"jstree-checked":"jstree-unchecked";a.find("a").not(":has(.checkbox)").prepend("<ins class='checkbox'>&#160;</ins>").parent().addClass(d)},change_state:function(a,d){a=this._get_node(a);
+if(d=d===false||d===true?d:a.hasClass("jstree-checked"))a.find("li").andSelf().removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");else{a.find("li").andSelf().removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");this.data.ui.last_selected=a}var g=this;a.parentsUntil(this.get_container(),"li").each(function(){var f=c(this);if(d)if(f.children("ul").children(".jstree-checked, .jstree-undetermined").length){f.parentsUntil(g.get_container(),"li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
+return false}else f.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");else if(f.children("ul").children(".jstree-unchecked, .jstree-undetermined").length){f.parentsUntil(g.get_container(),"li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");return false}else f.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked")});this.data.ui.selected=this.get_checked();this.__callback(a)},check_node:function(a){this.change_state(a,
+false)},uncheck_node:function(a){this.change_state(a,true)},check_all:function(){var a=this;this.get_container().children("ul").children("li").each(function(){a.check_node(this,false)})},uncheck_all:function(){var a=this;this.get_container().children("ul").children("li").each(function(){a.change_state(this,true)})},is_checked:function(a){a=this._get_node(a);return a.length?a.is(".jstree-checked"):false},get_checked:function(a){a=!a||a===-1?this.get_container():this._get_node(a);return a.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked")},
+get_unchecked:function(a){a=!a||a===-1?this.get_container():this._get_node(a);return a.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked")},show_checkboxes:function(){this.get_container().children("ul").removeClass("jstree-no-checkboxes")},hide_checkboxes:function(){this.get_container().children("ul").addClass("jstree-no-checkboxes")},_repair_state:function(a){a=this._get_node(a);if(a.length){var d=a.find("> ul > .jstree-checked").length,g=a.find("> ul > .jstree-undetermined").length,
+f=a.find("> ul > li").length;if(f===0)a.hasClass("jstree-undetermined")&&this.check_node(a);else if(d===0&&g===0)this.uncheck_node(a);else d===f?this.check_node(a):a.parentsUntil(this.get_container(),"li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined")}},reselect:function(){var a=this,d=this.data.ui.to_select;d=c.map(c.makeArray(d),function(g){return"#"+g.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/")});this.deselect_all();c.each(d,function(g,
+f){a.check_node(f)});this.__callback()}}})})(jQuery);
+(function(c){c.vakata.xslt=function(d,g){var f="",b,e;if(document.recalc){b=document.createElement("xml");e=document.createElement("xml");b.innerHTML=d;e.innerHTML=g;c("body").append(b).append(e);f=b.transformNode(e.XMLDocument);c("body").remove(b).remove(e);return f}if(typeof window.DOMParser!=="undefined"&&typeof window.XMLHttpRequest!=="undefined"&&typeof window.XSLTProcessor!=="undefined"){b=new XSLTProcessor;f=c.isFunction(b.transformDocument)?typeof window.XMLSerializer!=="undefined":true;if(!f)return false;
+d=(new DOMParser).parseFromString(d,"text/xml");g=(new DOMParser).parseFromString(g,"text/xml");if(c.isFunction(b.transformDocument)){f=document.implementation.createDocument("","",null);b.transformDocument(d,g,f,null);return(new XMLSerializer).serializeToString(f)}else{b.importStylesheet(g);f=b.transformToFragment(d,document);return c("<div>").append(f).html()}}return false};var a={nest:'<?xml version="1.0" encoding="utf-8" ?><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ><xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/html" /><xsl:template match="/">\t<xsl:call-template name="nodes">\t\t<xsl:with-param name="node" select="/root" />\t</xsl:call-template></xsl:template><xsl:template name="nodes">\t<xsl:param name="node" />\t<ul>\t<xsl:for-each select="$node/item">\t\t<xsl:variable name="children" select="count(./item) &gt; 0" />\t\t<li>\t\t\t<xsl:attribute name="class">\t\t\t\t<xsl:if test="position() = last()">jstree-last </xsl:if>\t\t\t\t<xsl:choose>\t\t\t\t\t<xsl:when test="@state = \'open\'">jstree-open </xsl:when>\t\t\t\t\t<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>\t\t\t\t\t<xsl:otherwise>jstree-leaf </xsl:otherwise>\t\t\t\t</xsl:choose>\t\t\t\t<xsl:value-of select="@class" />\t\t\t</xsl:attribute>\t\t\t<xsl:for-each select="@*">\t\t\t\t<xsl:if test="name() != \'class\' and name() != \'state\' and name() != \'hasChildren\'">\t\t\t\t\t<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>\t\t\t\t</xsl:if>\t\t\t</xsl:for-each>\t<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>\t\t\t<xsl:for-each select="content/name">\t\t\t\t<a>\t\t\t\t<xsl:attribute name="href">\t\t\t\t\t<xsl:choose>\t\t\t\t\t<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>\t\t\t\t\t<xsl:otherwise>#</xsl:otherwise>\t\t\t\t\t</xsl:choose>\t\t\t\t</xsl:attribute>\t\t\t\t<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>\t\t\t\t<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>\t\t\t\t<xsl:for-each select="@*">\t\t\t\t\t<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">\t\t\t\t\t\t<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>\t\t\t\t\t</xsl:if>\t\t\t\t</xsl:for-each>\t\t\t\t\t<ins>\t\t\t\t\t\t<xsl:attribute name="class">jstree-icon \t\t\t\t\t\t\t<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>\t\t\t\t\t\t</xsl:attribute>\t\t\t\t\t\t<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>\t\t\t\t\t\t<xsl:text>&#xa0;</xsl:text>\t\t\t\t\t</ins>\t\t\t\t\t<xsl:value-of select="current()" />\t\t\t\t</a>\t\t\t</xsl:for-each>\t\t\t<xsl:if test="$children or @hasChildren"><xsl:call-template name="nodes"><xsl:with-param name="node" select="current()" /></xsl:call-template></xsl:if>\t\t</li>\t</xsl:for-each>\t</ul></xsl:template></xsl:stylesheet>',
+flat:'<?xml version="1.0" encoding="utf-8" ?><xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ><xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/xml" /><xsl:template match="/">\t<ul>\t<xsl:for-each select="//item[not(@parent_id) or @parent_id=0]">\t\t<xsl:call-template name="nodes">\t\t\t<xsl:with-param name="node" select="." />\t\t\t<xsl:with-param name="is_last" select="number(position() = last())" />\t\t</xsl:call-template>\t</xsl:for-each>\t</ul></xsl:template><xsl:template name="nodes">\t<xsl:param name="node" />\t<xsl:param name="is_last" />\t<xsl:variable name="children" select="count(//item[@parent_id=$node/attribute::id]) &gt; 0" />\t<li>\t<xsl:attribute name="class">\t\t<xsl:if test="$is_last = true()">jstree-last </xsl:if>\t\t<xsl:choose>\t\t\t<xsl:when test="@state = \'open\'">jstree-open </xsl:when>\t\t\t<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>\t\t\t<xsl:otherwise>jstree-leaf </xsl:otherwise>\t\t</xsl:choose>\t\t<xsl:value-of select="@class" />\t</xsl:attribute>\t<xsl:for-each select="@*">\t\t<xsl:if test="name() != \'parent_id\' and name() != \'hasChildren\' and name() != \'class\' and name() != \'state\'">\t\t<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>\t\t</xsl:if>\t</xsl:for-each>\t<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>\t<xsl:for-each select="content/name">\t\t<a>\t\t<xsl:attribute name="href">\t\t\t<xsl:choose>\t\t\t<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>\t\t\t<xsl:otherwise>#</xsl:otherwise>\t\t\t</xsl:choose>\t\t</xsl:attribute>\t\t<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>\t\t<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>\t\t<xsl:for-each select="@*">\t\t\t<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">\t\t\t\t<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>\t\t\t</xsl:if>\t\t</xsl:for-each>\t\t\t<ins>\t\t\t\t<xsl:attribute name="class">jstree-icon \t\t\t\t\t<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>\t\t\t\t</xsl:attribute>\t\t\t\t<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>\t\t\t\t<xsl:text>&#xa0;</xsl:text>\t\t\t</ins>\t\t\t<xsl:value-of select="current()" />\t\t</a>\t</xsl:for-each>\t<xsl:if test="$children">\t\t<ul>\t\t<xsl:for-each select="//item[@parent_id=$node/attribute::id]">\t\t\t<xsl:call-template name="nodes">\t\t\t\t<xsl:with-param name="node" select="." />\t\t\t\t<xsl:with-param name="is_last" select="number(position() = last())" />\t\t\t</xsl:call-template>\t\t</xsl:for-each>\t\t</ul>\t</xsl:if>\t</li></xsl:template></xsl:stylesheet>'};
+c.jstree.plugin("xml_data",{defaults:{data:false,ajax:false,xsl:"flat",clean_node:false},_fn:{load_node:function(d,g,f){var b=this;this.load_node_xml(d,function(){b.__callback({obj:d});g.call(this)},f)},_is_loaded:function(d){var g=this.get_settings().xml_data;return d==-1||!d||!g.ajax||d.is(".jstree-open, .jstree-leaf")||d.children("ul").children("li").size()>0},load_node_xml:function(d,g,f){var b=this.get_settings().xml_data,e=function(){};switch(true){case !b.data&&!b.ajax:throw"Neither data nor ajax settings supplied.";
+case !!b.data&&!b.ajax||!!b.data&&!!b.ajax&&(!d||d===-1):if(!d||d==-1){this.get_container().children("ul").empty().append(this.parse_xml(b.data).children());b.clean_node&&this.clean_node(d)}g&&g.call(this);break;case !b.data&&!!b.ajax||!!b.data&&!!b.ajax&&d&&d!==-1:d=this._get_node(d);e=function(h,k,j){var i=this.get_settings().xml_data.ajax.error;i&&i.call(this,h,k,j);if(d!==-1&&d.length){d.children(".jstree-loading").removeClass("jstree-loading");b.correct_state&&d.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}f&&
+f.call(this)};b.ajax.context=this;b.ajax.error=e;b.ajax.success=function(h,k,j){if(j.responseText=="")return e.call(this,j,k,"");h=j.responseText;var i=this.get_settings().xml_data.ajax.success;if(i)h=i.call(this,h,k,j)||h;if(h=this.parse_xml(h)){d===-1||!d?this.get_container().children("ul").empty().append(this.parse_xml(j.responseText).children()):d.append(this.parse_xml(j.responseText)).children(".jstree-loading").removeClass("jstree-loading");b.clean_node&&this.clean_node(d);g&&g.call(this)}else{d.children(".jstree-loading").removeClass("jstree-loading");
+b.correct_state&&d.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}};if(c.isFunction(b.ajax.data))b.ajax.data=b.ajax.data.call(null,d);c.ajax(b.ajax);break}},parse_xml:function(d){var g=this.get_settings().xml_data;d=c.vakata.xslt(d,a[g.xsl]);if(d!==false)d=c(d);return d},get_xml:function(d,g,f,b,e){var h="",k=this.get_settings(),j=this,i,m,l,o,n;d||(d="flat");e||(e=0);g=this._get_node(g);if(!g||g===-1)g=this.get_container().find("> ul > li");f=c.isArray(f)?f:["id","class"];this.data.types&&
+f.push(k.types.type_attr);b=c.isArray(b)?b:[];e||(h+="<root>");g.each(function(){h+="<item";l=c(this);c.each(f,function(q,p){h+=" "+p+'="'+l.attr(p).replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"")+'"'});if(l.hasClass("jstree-open"))h+=' state="open"';if(l.hasClass("jstree-closed"))h+=' state="closed"';if(d==="flat")h+=' parent_id="'+e+'"';h+=">";h+="<content>";o=l.children("a");o.each(function(){i=c(this);n=false;h+="<name";c.inArray("languages",k.plugins)!==-1&&c.each(k.languages,function(q,
+p){if(i.hasClass(p)){h+=' lang="'+p+'"';n=p;return false}});b.length&&c.each(b,function(q,p){h+=" "+p+'="'+l.attr(p).replace(/jstree[^ ]*|$/ig,"")+'"'});if(i.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"").length)h+=' icon="'+i.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"")+'"';if(i.children("ins").get(0).style.backgroundImage.length)h+=' icon="'+i.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")",
+"")+'"';h+=">";h+="<![CDATA["+j.get_text(i,n)+"]]\>";h+="</name>"});h+="</content>";m=l[0].id;l=l.find("> ul > li");if(l.length)m=j.get_xml(d,l,f,b,m);if(d=="nest")h+=m;h+="</item>";if(d=="flat")h+=m});e||(h+="</root>");return h}}})})(jQuery);
+(function(c){c.expr[":"].jstree_contains=function(a,d,g){return(a.textContent||a.innerText||"").toLowerCase().indexOf(g[3].toLowerCase())>=0};c.jstree.plugin("search",{__init:function(){this.data.search.str="";this.data.search.result=c()},defaults:{ajax:false,case_insensitive:false},_fn:{search:function(a,d){var g=this.get_settings().search,f=this;this.data.search.str=a;if(!d&&g.ajax!==false&&this.get_container().find(".jstree-closed:eq(0)").length>0){this.search.supress_callback=true;g.ajax.context=
+this;g.ajax.error=function(){};g.ajax.success=function(b,e,h){var k=this.get_settings().search.ajax.success;if(k)b=k.call(this,b,e,h)||b;this.data.search.to_open=b;this._search_open()};if(c.isFunction(g.ajax.data))g.ajax.data=g.ajax.data.call(this,a);if(!g.ajax.data)g.ajax.data={search_string:a};if(!g.ajax.dataType||/^json/.exec(g.ajax.dataType))g.ajax.dataType="json";c.ajax(g.ajax)}else{this.data.search.result.length&&this.clear_search();this.data.search.result=this.get_container().find("a"+(this.data.languages?
+"."+this.get_lang():"")+":"+(g.case_insensitive?"jstree_contains":"contains")+"("+this.data.search.str+")");this.data.search.result.addClass("jstree-search").parents(".jstree-closed").each(function(){f.open_node(this,false,true)});this.__callback({nodes:this.data.search.result,str:a})}},clear_search:function(){this.data.search.result.removeClass("jstree-search");this.__callback(this.data.search.result);this.data.search.result=c()},_search_open:function(){var a=this,d=true,g=[],f=[];if(this.data.search.to_open.length){c.each(this.data.search.to_open,
+function(b,e){if(e=="#")return true;c(e).length&&c(e).is(".jstree-closed")?g.push(e):f.push(e)});if(g.length){this.data.search.to_open=f;c.each(g,function(b,e){a.open_node(e,function(){a._search_open(true)})});d=false}}d&&this.search(this.data.search.str,true)}}})})(jQuery);
+(function(c){c.vakata.context={cnt:c("<div id='vakata-contextmenu'>"),vis:false,tgt:false,func:false,data:false,show:function(a,d,g,f,b){if(a=c.vakata.context.parse(a)){c.vakata.context.vis=true;c.vakata.context.tgt=d;c.vakata.context.data=b||null;c.vakata.context.cnt.html(a).css({visibility:"hidden",display:"block",left:0,top:0});b=c.vakata.context.cnt.height();a=c.vakata.context.cnt.width();if(g+a>c(document).width()){g=c(document).width()-(a+5);c.vakata.context.cnt.find("li > ul").addClass("right")}if(f+
+b>c(document).height()){f-=b+d[0].offsetHeight;c.vakata.context.cnt.find("li > ul").addClass("bottom")}c.vakata.context.cnt.css({left:g,top:f}).find("li:has(ul)").bind("mouseenter",function(){var e=c(document).width(),h=c(document).height(),k=c(this).children("ul").show();e!==c(document).width()&&k.toggleClass("right");h!==c(document).height()&&k.toggleClass("bottom")}).bind("mouseleave",function(){c(this).children("ul").hide()}).end().css({visibility:"visible"}).show();c(document).triggerHandler("vakata.context_show")}},
+hide:function(){c.vakata.context.vis=false;c.vakata.context.cnt.attr("class","").hide();c(document).triggerHandler("vakata.context_hide")},parse:function(a,d){var g="",f=false;if(!d)c.vakata.context.func={};g+="<ul>";c.each(a,function(b,e){if(!e)return true;c.vakata.context.func[b]=e.action;if(e.separator_before)g+="<li class='vakata-separator vakata-separator-before'></li>";g+="<li><ins ";if(e.icon&&e.icon.indexOf("/")===-1)g+=" class='"+e.icon+"' ";if(e.icon&&e.icon.indexOf("/")!==-1)g+=" style='background:url("+
+e.icon+") center center no-repeat;' ";g+=">&#160;</ins><a href='#' rel='"+b+"'>"+e.label;if(e.submenu)g+="<span style='float:right;'>&raquo;</span>";g+="</a>";if(e.submenu)if(f=c.vakata.context.parse(e.submenu,true))g+=f;g+="</li>";if(e.separator_after)g+="<li class='vakata-separator vakata-separator-after'></li>"});g+="</ul>";return g.length>10?g:false},exec:function(a){if(c.isFunction(c.vakata.context.func[a])){c.vakata.context.func[a].call(c.vakata.context.data,c.vakata.context.tgt);return true}else return false}};
+c(function(){c.vakata.css.add_sheet({str:"#vakata-contextmenu { display:none; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; } #vakata-contextmenu ul { min-width:180px; } #vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } #vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } #vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } #vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } #vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } #vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } #vakata-contextmenu .right { right:100%; left:auto; } #vakata-contextmenu .bottom { bottom:-1px; top:auto; } #vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } "});
+c.vakata.context.cnt.delegate("a","click",function(a){a.preventDefault()}).delegate("a","mouseup",function(){c.vakata.context.exec(c(this).attr("rel"))&&c.vakata.context.hide()}).delegate("a","mouseover",function(){c.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover")}).appendTo("body");c(document).bind("mousedown",function(a){c.vakata.context.vis&&!c.contains(c.vakata.context.cnt[0],a.target)&&c.vakata.context.hide()});typeof c.hotkeys!=="undefined"&&c(document).bind("keydown","up",
+function(a){if(c.vakata.context.vis){var d=c.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();d.length||(d=c.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last());d.addClass("vakata-hover");a.stopImmediatePropagation();a.preventDefault()}}).bind("keydown","down",function(a){if(c.vakata.context.vis){var d=c.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();
+d.length||(d=c.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first());d.addClass("vakata-hover");a.stopImmediatePropagation();a.preventDefault()}}).bind("keydown","right",function(a){if(c.vakata.context.vis){c.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");a.stopImmediatePropagation();a.preventDefault()}}).bind("keydown","left",function(a){if(c.vakata.context.vis){c.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");
+a.stopImmediatePropagation();a.preventDefault()}}).bind("keydown","esc",function(a){c.vakata.context.hide();a.preventDefault()}).bind("keydown","space",function(a){c.vakata.context.cnt.find(".vakata-hover").last().children("a").click();a.preventDefault()})});c.jstree.plugin("contextmenu",{__init:function(){this.get_container().delegate("a","contextmenu.jstree",c.proxy(function(a){a.preventDefault();this.show_contextmenu(a.currentTarget,a.pageX,a.pageY)},this))},defaults:{show_at_node:true,items:{create:{separator_before:false,
+separator_after:true,label:"Create",action:function(a){this.create(a)}},rename:{separator_before:false,separator_after:false,label:"Rename",action:function(a){this.rename(a)}},remove:{separator_before:false,icon:false,separator_after:false,label:"Delete",action:function(a){this.remove(a)}},ccp:{separator_before:true,icon:false,separator_after:false,label:"Edit",action:function(a){this.remove(a)},submenu:{cut:{separator_before:false,separator_after:false,label:"Cut",action:function(a){this.cut(a)}},
+copy:{separator_before:false,icon:false,separator_after:false,label:"Copy",action:function(a){this.copy(a)}},paste:{separator_before:false,icon:false,separator_after:false,label:"Paste",action:function(a){this.paste(a)}}}}}},_fn:{show_contextmenu:function(a,d,g){a=this._get_node(a);var f=this.get_settings().contextmenu,b=a.children("a:visible:eq(0)"),e=false;if(f.show_at_node||typeof d==="undefined"||typeof g==="undefined"){e=b.offset();d=e.left;g=e.top+this.data.core.li_height}if(c.isFunction(f.items))f.items=
+f.items.call(this,a);c.vakata.context.show(f.items,b,d,g,this);this.data.themes&&c.vakata.context.cnt.attr("class","jstree-"+this.data.themes.theme+"-context")}}})})(jQuery);
+(function(c){c.jstree.plugin("types",{__init:function(){var a=this.get_settings().types;this.data.types.attach_to=[];this.get_container().bind("init.jstree",c.proxy(function(){var d=a.type_attr,g="",f=this;c.each(a.types,function(b,e){c.each(e,function(h){/^(max_depth|max_children|icon|valid_children)$/.test(h)||f.data.types.attach_to.push(h)});if(!e.icon)return true;if(e.icon.image||e.icon.position){g+=b=="default"?".jstree-"+f.get_index()+" a > .jstree-icon { ":".jstree-"+f.get_index()+" li["+d+
+"="+b+"] > a > .jstree-icon { ";if(e.icon.image)g+=" background-image:url("+e.icon.image+"); ";g+=e.icon.position?" background-position:"+e.icon.position+"; ":" background-position:0 0; ";g+="} "}});g!=""&&c.vakata.css.add_sheet({str:g})},this)).bind("before.jstree",c.proxy(function(d,g){if(c.inArray(g.func,this.data.types.attach_to)!==-1){var f=this.get_settings().types.types,b=this._get_type(g.args[0]);if(f[b]&&typeof f[b][g.func]!=="undefined"&&!this._check(g.func,g.args[0])){d.stopImmediatePropagation();
+return false}}},this))},defaults:{max_children:-1,max_depth:-1,valid_children:"all",type_attr:"rel",types:{"default":{max_children:-1,max_depth:-1,valid_children:"all"}}},_fn:{_get_type:function(a){a=this._get_node(a);return!a||!a.length?false:a.attr(this.get_settings().types.type_attr)||"default"},set_type:function(a,d){d=this._get_node(d);return!d.length||!a?false:d.attr(this.get_settings().types.type_attr,a)},_check:function(a,d,g){var f=false,b=this._get_type(d),e=0,h=this,k=this.get_settings().types;
+if(d===-1)if(k[a])f=k[a];else return;else{if(b===false)return;if(k.types[b]&&k.types[b][a])f=k.types[b][a];else if(k.types["default"]&&k.types["default"][a])f=k.types["default"][a]}if(c.isFunction(f))f=f.call(this,d);a==="max_depth"&&d!==-1&&g!==false&&k.max_depth!==-2&&f!==0&&this._get_node(d).parentsUntil(this.get_container(),"li").each(function(j){e=h._check(a,this,false);if(e!==-1&&e-(j+1)<=0){f=0;return false}if(e>=0&&(e-(j+1)<f||f<0))f=e-(j+1)});return f},check_move:function(){if(!this.__call_old())return false;
+var a=this._get_move(),d=a.rt.get_settings().types,g=a.rt._check("max_children",a.cr),f=a.rt._check("max_depth",a.cr),b=a.rt._check("valid_children",a.cr),e=0,h=1;if(b==="none")return false;if(c.isArray(b)&&a.ot&&a.ot._get_type){a.o.each(function(){if(c.inArray(a.ot._get_type(this),b)===-1)return h=false});if(h===false)return false}if(d.max_children!==-2&&g!==-1){e=a.cr===-1?this.get_container().children("> ul > li").not(a.o).length:a.cr.children("> ul > li").not(a.o).length;if(e+a.o.length>g)return false}if(d.max_depth!==
+-2&&f!==-1){h=0;if(f===0)return false;if(typeof a.o.d==="undefined"){for(d=a.o;d.length>0;){d=d.find("> ul > li");h++}a.o.d=h}if(f-a.o.d<0)return false}return true},create_node:function(a,d,g,f,b,e){if(!e&&(b||this._is_loaded(a))){var h=d&&d.match(/^before|after$/i)?this._get_parent(a):this._get_node(a),k=this.get_settings().types,j=this._check("max_children",h),i=this._check("max_depth",h),m=this._check("valid_children",h);g||(g={});if(m==="none")return false;if(c.isArray(m))if(!g.attr||!g.attr[k.type_attr]){if(!g.attr)g.attr=
+{};g.attr[k.type_attr]=m[0]}else if(c.inArray(g.attr[k.type_attr],m)===-1)return false;if(k.max_children!==-2&&j!==-1){h=h===-1?this.get_container().children("> ul > li").length:h.children("> ul > li").length;if(h+1>j)return false}if(k.max_depth!==-2&&i!==-1&&i-1<=0)return false}return this.__call_old(true,a,d,g,f,b,e)}}})})(jQuery);
\ No newline at end of file
diff --git a/application/media/js/jquery.stickyfloat-1.0.js b/application/media/js/jquery.stickyfloat-1.0.js
new file mode 100644
index 0000000..9ef886e
--- /dev/null
+++ b/application/media/js/jquery.stickyfloat-1.0.js
@@ -0,0 +1,48 @@
+/*
+ * stickyfloat - jQuery plugin for verticaly floating anything in a constrained area
+ * 
+ * Example: jQuery('#menu').stickyfloat({duration: 400});
+ * parameters:
+ * 		duration 	- the duration of the animation
+ *		startOffset - the amount of scroll offset after it the animations kicks in
+ *		offsetY		- the offset from the top when the object is animated
+ *		lockBottom	- 'true' by default, set to false if you don't want your floating box to stop at parent's bottom
+ * $Version: 05.16.2009 r1
+ * Copyright (c) 2009 Yair Even-Or
+ * vsync.design@gmail.com
+ */
+
+$.fn.stickyfloat = function(options, lockBottom) {
+	var $obj 				= this;
+	var parentPaddingTop 	= parseInt($obj.parent().css('padding-top'));
+	var startOffset 		= $obj.parent().offset().top;
+	var opts 				= $.extend({ startOffset: startOffset, offsetY: parentPaddingTop, duration: 200, lockBottom:true }, options);
+	
+	$obj.css({ position: 'absolute' });
+	
+	if(opts.lockBottom){
+		var bottomPos = $obj.parent().height() - $obj.height() + parentPaddingTop; //get the maximum scrollTop value
+		if( bottomPos < 0 )
+			bottomPos = 0;
+	}
+	
+	$(window).scroll(function () { 
+		$obj.stop(); // stop all calculations on scroll event
+
+		var pastStartOffset			= $(document).scrollTop() > opts.startOffset;	// check if the window was scrolled down more than the start offset declared.
+		var objFartherThanTopPos	= $obj.offset().top > startOffset;	// check if the object is at it's top position (starting point)
+		var objBiggerThanWindow 	= $obj.outerHeight() < $(window).height();	// if the window size is smaller than the Obj size, then do not animate.
+		
+		// if window scrolled down more than startOffset OR obj position is greater than
+		// the top position possible (+ offsetY) AND window size must be bigger than Obj size
+		if( (pastStartOffset || objFartherThanTopPos) && objBiggerThanWindow ){ 
+			var newpos = ($(document).scrollTop() -startOffset + opts.offsetY );
+			if ( newpos > bottomPos )
+				newpos = bottomPos;
+			if ( $(document).scrollTop() < opts.startOffset ) // if window scrolled < starting offset, then reset Obj position (opts.offsetY);
+				newpos = parentPaddingTop;
+
+			$obj.animate({ top: newpos }, opts.duration );
+		}
+	});
+};
diff --git a/application/media/js/themes/default/d.png b/application/media/js/themes/default/d.png
new file mode 100644
index 0000000..8540175
Binary files /dev/null and b/application/media/js/themes/default/d.png differ
diff --git a/application/media/js/themes/default/dot_for_ie.gif b/application/media/js/themes/default/dot_for_ie.gif
new file mode 100644
index 0000000..c0cc5fd
Binary files /dev/null and b/application/media/js/themes/default/dot_for_ie.gif differ
diff --git a/application/media/js/themes/default/style.css b/application/media/js/themes/default/style.css
new file mode 100644
index 0000000..2ca17ea
--- /dev/null
+++ b/application/media/js/themes/default/style.css
@@ -0,0 +1,56 @@
+/*
+ * jsTree default theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-default li, 
+.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-default li.jstree-last { background:transparent; }
+.jstree-default .jstree-open > ins { background-position:-72px 0; }
+.jstree-default .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default .jstree-hovered { background:#FFF0C0; border:1px solid #841212; padding:0 2px 0 1px; color: #841212;}
+.jstree-default .jstree-clicked { background:#FCFCFC; border:1px solid #FCFCFC; padding:0 2px 0 1px; color: #841212;}
+.jstree-default a .jstree-icon { background-position:-56px -19px; }
+.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-default.jstree-focused { background:#FCFCFC; }
+
+.jstree-default .jstree-no-dots li, 
+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default .jstree-search { font-style:italic; }
+
+.jstree-default .jstree-no-icons .checkbox { display:inline-block; }
+.jstree-default .jstree-no-checkboxes .checkbox { display:none !important; }
+.jstree-default .jstree-checked > a > .checkbox { background-position:-38px -19px; }
+.jstree-default .jstree-unchecked > a > .checkbox { background-position:-2px -19px; }
+.jstree-default .jstree-undetermined > a > .checkbox { background-position:-20px -19px; }
+.jstree-default .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
+.jstree-default .jstree-unchecked > a > .checkbox:hover { background-position:-2px -37px; }
+.jstree-default .jstree-undetermined > a > .checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-default ins { background:transparent !important; }
+#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; }
+
+.jstree-default a.jstree-search { color:aqua; }
+
+#vakata-contextmenu.jstree-default-context, 
+#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-default-context li { }
+#vakata-contextmenu.jstree-default-context a { color:black; }
+#vakata-contextmenu.jstree-default-context a:hover, 
+#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
+
+/* TODO: IE6 support - the `>` selectors */
diff --git a/application/media/js/themes/default/throbber.gif b/application/media/js/themes/default/throbber.gif
new file mode 100644
index 0000000..5b33f7e
Binary files /dev/null and b/application/media/js/themes/default/throbber.gif differ
diff --git a/application/messages/.htaccess b/application/messages/.htaccess
new file mode 100644
index 0000000..281d5c3
--- /dev/null
+++ b/application/messages/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
diff --git a/application/views/.htaccess b/application/views/.htaccess
new file mode 100644
index 0000000..281d5c3
--- /dev/null
+++ b/application/views/.htaccess
@@ -0,0 +1,2 @@
+order allow,deny
+deny from all
diff --git a/application/views/lnapp/default.php b/application/views/lnapp/default.php
new file mode 100644
index 0000000..57d9566
--- /dev/null
+++ b/application/views/lnapp/default.php
@@ -0,0 +1,93 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- Default Template Layout for lnApp -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="auto" lang="auto">
+	<head>
+		<title><?php echo $meta->title; ?></title>
+		<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '#'; ?>" type="image/vnd.microsoft.icon" />
+		<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+		<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />
+		<meta name="keywords" content="<?php echo $meta->keywords; ?>" />
+		<meta name="description" content="<?php echo $meta->description; ?>" />
+		<meta name="copyright" content="<?php echo $meta->copywrite; ?>" />
+		<?php echo $meta->styles; ?>
+		<?php echo $meta->scripts; ?>
+	</head>
+	<body>
+		<table class="page">
+			<tr class="pagehead">
+				<td colspan="3">
+					<div id="ajHEAD">
+						<table class="pagehead">
+							<tr>
+								<td class="headlogo">
+									<a href="<?php echo URL::site(); ?>" class="headlogo"><?php echo $logo;?></a>
+								</td>
+								<td class="headtitle"><?php echo $title; ?></td>
+								<td class="headimages"><?php echo $headimages; ?></td>
+							</tr>
+						</table>
+					</div>
+				</td>
+			</tr>
+			<tr class="pagecontrol">
+				<td colspan="3">
+					<div id="ajCONTROL">
+						<table class="pagecontrol">
+							<tr>
+								<td class="none"><?php echo $control; ?></td>
+							</tr>
+						</table>
+					</div>
+				</td>
+			</tr>
+			<tr class="pagemain">
+				<!-- Left Pane -->
+				<td class="pageleft" <?php echo $left ? '' : 'style="display: none;"'?>>
+					<div id="ajLEFT">
+						<table class="pageleft" width="100%">
+							<tr>
+								<td><?php echo $left; ?></td>
+							</tr>
+						</table>
+					</div>
+				</td>
+				<!-- Main Body Pane -->
+				<td class="pagebody">
+					<div id="ajBODY">
+						<?php if ((string)$sysmsg) {?>
+						<table class="sysmsg">
+							<tr>
+								<td><?php echo $sysmsg; ?></td>
+							</tr>
+						</table>
+						<?php }?>
+						<table class="content">
+							<tr>
+								<td><?php echo $content; ?></td>
+							</tr>
+						</table>
+					</div>
+				</td>
+				<!-- Right Pane -->
+				<td class="pageright" <?php echo trim($right) ? '' : 'style="display: none;"'?>>
+					<div id="ajRIGHT">
+						<table class="pageright" width="100%">
+							<tr>
+								<td><?php echo $right; ?></td>
+							</tr>
+						</table>
+					</div>
+				</td>
+			</tr>
+			<tr class="pagefoot">
+				<td colspan="3">
+					<div id="ajFOOT"><?php echo $footer; ?></div>
+					<?php if (Config::sitemode() == Kohana::DEVELOPMENT) { ?>
+					<div id="kohana-profiler" style="display: none;"><?php echo View::factory('profiler/stats'); ?></div>
+					<script type="text/javascript">$("#ajFOOT").click(function() {$('#kohana-profiler').toggle();});</script>
+					<?php }?>
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
diff --git a/application/views/login.php b/application/views/login.php
new file mode 100644
index 0000000..fd491b1
--- /dev/null
+++ b/application/views/login.php
@@ -0,0 +1,16 @@
+<br/>
+<?php echo Form::open(); ?>
+	<table class="login">
+		<tr><td><b>User Name:</b></td></tr>
+		<tr><td><?php echo Form::input('username',null,array('id'=>'login-uid','size'=>40));?></td></tr>
+		<tr><td colspan="2">&nbsp;</td></tr>
+		<tr><td><b>Password:</b></td></tr>
+		<tr><td><?php echo Form::password('password',null,array('id'=>'login-pwd','size'=>40));?></td></tr>
+		<tr><td colspan="2">&nbsp;</td></tr>
+		<!-- @todo Password reset ability should be a config option (or auto detected) -->
+		<tr><td colspan="2"><?echo HTML::anchor('login/reset',_('Forgot your password?')); ?></td></tr>
+		<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Authenticate'));?></td></tr>
+	</table>
+<?php echo Form::close(); ?>
+<!-- @todo The following focus() is not ajax/jscript friendly -->
+<script type="text/javascript">document.getElementById('login-uid').focus();</script>
diff --git a/application/views/login_reset.php b/application/views/login_reset.php
new file mode 100644
index 0000000..5d4294d
--- /dev/null
+++ b/application/views/login_reset.php
@@ -0,0 +1,14 @@
+<div style="text-align: center;">
+<p>If you have forgotten your password, we can issue you a temporary access code via email that will allow you to change your password.</p>
+<p>To start this process, please enter your email address.</p>
+</div>
+
+<?php echo Form::open(); ?>
+	<table class="login">
+		<tr><td><b>Email Address</b></td></tr>
+		<tr><td><?php echo Form::input('email',null,array('id'=>'login-uid','size'=>40));?></td></tr>
+		<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'));?></td></tr>
+	</table>
+<?php echo Form::close(); ?>
+<!-- @todo The following focus() is not ajax/jscript friendly -->
+<script type="text/javascript">document.getElementById('login-uid').focus();</script>
diff --git a/application/views/login_reset_sent.php b/application/views/login_reset_sent.php
new file mode 100644
index 0000000..dd2554b
--- /dev/null
+++ b/application/views/login_reset_sent.php
@@ -0,0 +1,13 @@
+<div style="text-align: center;">
+<p>You should have received an email with a pass code. Please enter that pass code here.</p>
+</div>
+
+<?php echo Form::open(); ?>
+	<table class="login">
+		<tr><td><b>Pass code</b></td></tr>
+		<tr><td><?php echo Form::input('token',null,array('id'=>'login-pwd','size'=>40));?></td></tr>
+		<tr><td colspan="2" style="text-align: center;"><?php echo Form::submit('submit',_('Reset'));?></td></tr>
+	</table>
+<?php echo Form::close(); ?>
+<!-- @todo The following focus() is not ajax/jscript friendly -->
+<script type="text/javascript">document.getElementById('login-pwd').focus();</script>
diff --git a/application/views/template.php b/application/views/template.php
new file mode 100644
index 0000000..6f72764
--- /dev/null
+++ b/application/views/template.php
@@ -0,0 +1 @@
+<!-- This template is shown via CLI tasks -->
diff --git a/application/views/userguide/template.php b/application/views/userguide/template.php
new file mode 100644
index 0000000..cfd4a19
--- /dev/null
+++ b/application/views/userguide/template.php
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $l = substr(I18n::$lang, 0, 2) ?>" lang="<?php echo $l ?>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+<title><?php echo $title ?> | Kohana <?php echo __('User Guide'); ?></title>
+
+<?php foreach ($styles as $style => $media) echo HTML::style($style, array('media' => $media), NULL, TRUE), "\n" ?>
+
+<?php foreach ($scripts as $script) echo HTML::script($script, NULL, NULL, TRUE), "\n" ?>
+
+<!--[if lt IE 9]>
+<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
+<![endif]-->
+</head>
+<body>
+
+	<div id="header">
+		<div class="container">
+			<a href="http://phpTSMadmin.sf.net/" id="logo">
+				<img src="<?php echo Route::url('docs/media', array('file' => 'img/logo-small.png')) ?>" />
+			</a>
+			<div id="menu">
+				<ul>
+					<li class="guide first">
+						<a href="<?php echo Route::url('docs/guide') ?>"><?php echo __('User Guide') ?></a>
+					</li>
+					<li class="api">
+						<a href="<?php echo Route::url('docs/api') ?>"><?php echo __('API Browser') ?></a>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+
+	<div id="content">
+		<div class="wrapper">
+			<div class="container">
+				<div class="span-22 prefix-1 suffix-1">
+					<ul id="breadcrumb">
+						<?php foreach ($breadcrumb as $link => $title): ?>
+							<?php if (is_string($link)): ?>
+							<li><?php echo HTML::anchor($link, $title, NULL, NULL, TRUE) ?></li>
+							<?php else: ?>
+							<li class="last"><?php echo $title ?></li>
+							<?php endif ?>
+						<?php endforeach ?>
+					</ul>
+				</div>
+				<div class="span-6 prefix-1">
+					<div id="topics">
+						<?php echo $menu ?>
+					</div>
+				</div>
+				<div id="body" class="span-16 suffix-1 last">
+					<?php echo $content ?>
+
+					<?php if (Kohana::$environment === Kohana::PRODUCTION AND empty($hide_disqus)): ?>
+					<div id="disqus_thread" class="clear"></div>
+					<script type="text/javascript">
+						var disqus_identifier = '<?php echo HTML::chars(Request::current()->uri()) ?>';
+						(function() {
+							var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+							dsq.src = 'http://kohana.disqus.com/embed.js';
+							(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+							})();
+					</script>
+					<noscript><?php echo __('Please enable JavaScript to view the :anchor_open comments powered by Disqus.:anchor_close', array(':anchor_open' => '<a href="http://disqus.com/?ref_noscript=kohana">', ':anchor_close' => '</a>')); ?></noscript>
+					<a href="http://disqus.com" class="dsq-brlink">Documentation comments powered by <span class="logo-disqus">Disqus</span></a>
+					<?php endif ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div id="footer">
+		<div class="container">
+			<div class="span-12">
+			<?php if (isset($copyright)): ?>
+				<p><?php echo $copyright ?></p>
+			<?php else: ?>
+				&nbsp;
+			<?php endif ?>
+			</div>
+			<div class="span-12 last right">
+			<p>Powered by <?php echo HTML::anchor('http://kohanaframework.org/', 'Kohana') ?> v<?php echo Kohana::VERSION ?></p>
+			</div>
+		</div>
+	</div>
+
+<?php if (Kohana::$environment === Kohana::PRODUCTION): ?>
+<script type="text/javascript">
+//<![CDATA[
+(function() {
+	var links = document.getElementsByTagName('a');
+	var query = '?';
+	for(var i = 0; i < links.length; i++) {
+	if(links[i].href.indexOf('#disqus_thread') >= 0) {
+		query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+	}
+	}
+	document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/kohana/get_num_replies.js' + query + '"></' + 'script>');
+})();
+//]]>
+</script>
+<?php endif ?>
+</body>
+</html>
diff --git a/includes/kohana/LICENSE.md b/includes/kohana/LICENSE.md
new file mode 100644
index 0000000..87af9ad
--- /dev/null
+++ b/includes/kohana/LICENSE.md
@@ -0,0 +1,14 @@
+# Kohana License Agreement
+
+This license is a legal agreement between you and the Kohana Team for the use of Kohana Framework (the "Software"). By obtaining the Software you agree to comply with the terms and conditions of this license.
+
+Copyright (c) 2007-2010 Kohana Team  
+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 Kohana 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/includes/kohana/README.md b/includes/kohana/README.md
new file mode 100644
index 0000000..e19aba8
--- /dev/null
+++ b/includes/kohana/README.md
@@ -0,0 +1,3 @@
+# Kohana PHP Framework, version 3.1 (release)
+
+This is the current release version of [Kohana](http://kohanaframework.org/).
diff --git a/includes/kohana/application/bootstrap.php b/includes/kohana/application/bootstrap.php
new file mode 100644
index 0000000..d6081cd
--- /dev/null
+++ b/includes/kohana/application/bootstrap.php
@@ -0,0 +1,118 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// -- Environment setup --------------------------------------------------------
+
+// Load the core Kohana class
+require SYSPATH.'classes/kohana/core'.EXT;
+
+if (is_file(APPPATH.'classes/kohana'.EXT))
+{
+	// Application extends the core
+	require APPPATH.'classes/kohana'.EXT;
+}
+else
+{
+	// Load empty core extension
+	require SYSPATH.'classes/kohana'.EXT;
+}
+
+/**
+ * Set the default time zone.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ * @see  http://php.net/timezones
+ */
+date_default_timezone_set('America/Chicago');
+
+/**
+ * Set the default locale.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ * @see  http://php.net/setlocale
+ */
+setlocale(LC_ALL, 'en_US.utf-8');
+
+/**
+ * Enable the Kohana auto-loader.
+ *
+ * @see  http://kohanaframework.org/guide/using.autoloading
+ * @see  http://php.net/spl_autoload_register
+ */
+spl_autoload_register(array('Kohana', 'auto_load'));
+
+/**
+ * Enable the Kohana auto-loader for unserialization.
+ *
+ * @see  http://php.net/spl_autoload_call
+ * @see  http://php.net/manual/var.configuration.php#unserialize-callback-func
+ */
+ini_set('unserialize_callback_func', 'spl_autoload_call');
+
+// -- Configuration and initialization -----------------------------------------
+
+/**
+ * Set the default language
+ */
+I18n::lang('en-us');
+
+/**
+ * Set Kohana::$environment if a 'KOHANA_ENV' environment variable has been supplied.
+ *
+ * Note: If you supply an invalid environment name, a PHP warning will be thrown
+ * saying "Couldn't find constant Kohana::<INVALID_ENV_NAME>"
+ */
+if (isset($_SERVER['KOHANA_ENV']))
+{
+	Kohana::$environment = constant('Kohana::'.strtoupper($_SERVER['KOHANA_ENV']));
+}
+
+/**
+ * Initialize Kohana, setting the default options.
+ *
+ * The following options are available:
+ *
+ * - string   base_url    path, and optionally domain, of your application   NULL
+ * - string   index_file  name of your index file, usually "index.php"       index.php
+ * - string   charset     internal character set used for input and output   utf-8
+ * - string   cache_dir   set the internal cache directory                   APPPATH/cache
+ * - boolean  errors      enable or disable error handling                   TRUE
+ * - boolean  profile     enable or disable internal profiling               TRUE
+ * - boolean  caching     enable or disable internal caching                 FALSE
+ */
+Kohana::init(array(
+	'base_url'   => '/',
+));
+
+/**
+ * Attach the file write to logging. Multiple writers are supported.
+ */
+Kohana::$log->attach(new Log_File(APPPATH.'logs'));
+
+/**
+ * Attach a file reader to config. Multiple readers are supported.
+ */
+Kohana::$config->attach(new Config_File);
+
+/**
+ * Enable modules. Modules are referenced by a relative or absolute path.
+ */
+Kohana::modules(array(
+	// 'auth'       => MODPATH.'auth',       // Basic authentication
+	// 'cache'      => MODPATH.'cache',      // Caching with multiple backends
+	// 'codebench'  => MODPATH.'codebench',  // Benchmarking tool
+	// 'database'   => MODPATH.'database',   // Database access
+	// 'image'      => MODPATH.'image',      // Image manipulation
+	// 'orm'        => MODPATH.'orm',        // Object Relationship Mapping
+	// 'unittest'   => MODPATH.'unittest',   // Unit testing
+	// 'userguide'  => MODPATH.'userguide',  // User guide and API documentation
+	));
+
+/**
+ * Set the routes. Each route must have a minimum of a name, a URI and a set of
+ * defaults for the URI.
+ */
+Route::set('default', '(<controller>(/<action>(/<id>)))')
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'index',
+	));
diff --git a/includes/kohana/application/classes/controller/welcome.php b/includes/kohana/application/classes/controller/welcome.php
new file mode 100644
index 0000000..0984eff
--- /dev/null
+++ b/includes/kohana/application/classes/controller/welcome.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Controller_Welcome extends Controller {
+
+	public function action_index()
+	{
+		$this->response->body('hello, world!');
+	}
+
+} // End Welcome
diff --git a/includes/kohana/install.php b/includes/kohana/install.php
new file mode 100644
index 0000000..cbb0a4c
--- /dev/null
+++ b/includes/kohana/install.php
@@ -0,0 +1,217 @@
+<?php defined('SYSPATH') or exit('Install tests must be loaded from within index.php!'); ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>Kohana Installation</title>
+
+	<style type="text/css">
+	body { width: 42em; margin: 0 auto; font-family: sans-serif; background: #fff; font-size: 1em; }
+	h1 { letter-spacing: -0.04em; }
+	h1 + p { margin: 0 0 2em; color: #333; font-size: 90%; font-style: italic; }
+	code { font-family: monaco, monospace; }
+	table { border-collapse: collapse; width: 100%; }
+		table th,
+		table td { padding: 0.4em; text-align: left; vertical-align: top; }
+		table th { width: 12em; font-weight: normal; }
+		table tr:nth-child(odd) { background: #eee; }
+		table td.pass { color: #191; }
+		table td.fail { color: #911; }
+	#results { padding: 0.8em; color: #fff; font-size: 1.5em; }
+	#results.pass { background: #191; }
+	#results.fail { background: #911; }
+	</style>
+
+</head>
+<body>
+
+	<h1>Environment Tests</h1>
+
+	<p>
+		The following tests have been run to determine if <a href="http://kohanaframework.org/">Kohana</a> will work in your environment.
+		If any of the tests have failed, consult the <a href="http://kohanaframework.org/guide/about.install">documentation</a>
+		for more information on how to correct the problem.
+	</p>
+
+	<?php $failed = FALSE ?>
+
+	<table cellspacing="0">
+		<tr>
+			<th>PHP Version</th>
+			<?php if (version_compare(PHP_VERSION, '5.2.3', '>=')): ?>
+				<td class="pass"><?php echo PHP_VERSION ?></td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">Kohana requires PHP 5.2.3 or newer, this version is <?php echo PHP_VERSION ?>.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>System Directory</th>
+			<?php if (is_dir(SYSPATH) AND is_file(SYSPATH.'classes/kohana'.EXT)): ?>
+				<td class="pass"><?php echo SYSPATH ?></td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The configured <code>system</code> directory does not exist or does not contain required files.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Application Directory</th>
+			<?php if (is_dir(APPPATH) AND is_file(APPPATH.'bootstrap'.EXT)): ?>
+				<td class="pass"><?php echo APPPATH ?></td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The configured <code>application</code> directory does not exist or does not contain required files.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Cache Directory</th>
+			<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'cache') AND is_writable(APPPATH.'cache')): ?>
+				<td class="pass"><?php echo APPPATH.'cache/' ?></td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The <code><?php echo APPPATH.'cache/' ?></code> directory is not writable.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Logs Directory</th>
+			<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'logs') AND is_writable(APPPATH.'logs')): ?>
+				<td class="pass"><?php echo APPPATH.'logs/' ?></td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The <code><?php echo APPPATH.'logs/' ?></code> directory is not writable.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>PCRE UTF-8</th>
+			<?php if ( ! @preg_match('/^.$/u', 'ñ')): $failed = TRUE ?>
+				<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with UTF-8 support.</td>
+			<?php elseif ( ! @preg_match('/^\pL$/u', 'ñ')): $failed = TRUE ?>
+				<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with Unicode property support.</td>
+			<?php else: ?>
+				<td class="pass">Pass</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>SPL Enabled</th>
+			<?php if (function_exists('spl_autoload_register')): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">PHP <a href="http://www.php.net/spl">SPL</a> is either not loaded or not compiled in.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Reflection Enabled</th>
+			<?php if (class_exists('ReflectionClass')): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">PHP <a href="http://www.php.net/reflection">reflection</a> is either not loaded or not compiled in.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Filters Enabled</th>
+			<?php if (function_exists('filter_list')): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The <a href="http://www.php.net/filter">filter</a> extension is either not loaded or not compiled in.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>Iconv Extension Loaded</th>
+			<?php if (extension_loaded('iconv')): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">The <a href="http://php.net/iconv">iconv</a> extension is not loaded.</td>
+			<?php endif ?>
+		</tr>
+		<?php if (extension_loaded('mbstring')): ?>
+		<tr>
+			<th>Mbstring Not Overloaded</th>
+			<?php if (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING): $failed = TRUE ?>
+				<td class="fail">The <a href="http://php.net/mbstring">mbstring</a> extension is overloading PHP's native string functions.</td>
+			<?php else: ?>
+				<td class="pass">Pass</td>
+			<?php endif ?>
+		</tr>
+		<?php endif ?>
+		<tr>
+			<th>Character Type (CTYPE) Extension</th>
+			<?php if ( ! function_exists('ctype_digit')): $failed = TRUE ?>
+				<td class="fail">The <a href="http://php.net/ctype">ctype</a> extension is not enabled.</td>
+			<?php else: ?>
+				<td class="pass">Pass</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>URI Determination</th>
+			<?php if (isset($_SERVER['REQUEST_URI']) OR isset($_SERVER['PHP_SELF']) OR isset($_SERVER['PATH_INFO'])): ?>
+				<td class="pass">Pass</td>
+			<?php else: $failed = TRUE ?>
+				<td class="fail">Neither <code>$_SERVER['REQUEST_URI']</code>, <code>$_SERVER['PHP_SELF']</code>, or <code>$_SERVER['PATH_INFO']</code> is available.</td>
+			<?php endif ?>
+		</tr>
+	</table>
+
+	<?php if ($failed === TRUE): ?>
+		<p id="results" class="fail">✘ Kohana may not work correctly with your environment.</p>
+	<?php else: ?>
+		<p id="results" class="pass">✔ Your environment passed all requirements.<br />
+			Remove or rename the <code>install<?php echo EXT ?></code> file now.</p>
+	<?php endif ?>
+
+	<h1>Optional Tests</h1>
+
+	<p>
+		The following extensions are not required to run the Kohana core, but if enabled can provide access to additional classes.
+	</p>
+
+	<table cellspacing="0">
+		<tr>
+			<th>PECL HTTP Enabled</th>
+			<?php if (extension_loaded('http')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana can use the <a href="http://php.net/http">http</a> extension for the Request_Client_External class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>cURL Enabled</th>
+			<?php if (extension_loaded('curl')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana can use the <a href="http://php.net/curl">cURL</a> extension for the Request_Client_External class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>mcrypt Enabled</th>
+			<?php if (extension_loaded('mcrypt')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana requires <a href="http://php.net/mcrypt">mcrypt</a> for the Encrypt class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>GD Enabled</th>
+			<?php if (function_exists('gd_info')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana requires <a href="http://php.net/gd">GD</a> v2 for the Image class.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>MySQL Enabled</th>
+			<?php if (function_exists('mysql_connect')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana can use the <a href="http://php.net/mysql">MySQL</a> extension to support MySQL databases.</td>
+			<?php endif ?>
+		</tr>
+		<tr>
+			<th>PDO Enabled</th>
+			<?php if (class_exists('PDO')): ?>
+				<td class="pass">Pass</td>
+			<?php else: ?>
+				<td class="fail">Kohana can use <a href="http://php.net/pdo">PDO</a> to support additional databases.</td>
+			<?php endif ?>
+		</tr>
+	</table>
+
+</body>
+</html>
diff --git a/includes/kohana/modules/auth/README.md b/includes/kohana/modules/auth/README.md
new file mode 100644
index 0000000..27ac9cd
--- /dev/null
+++ b/includes/kohana/modules/auth/README.md
@@ -0,0 +1,13 @@
+New Age Auth
+---
+
+I've forked the main Auth module because there were some fundamental flaws with it:
+
+ 1. It's trivial to [bruteforce](http://dev.kohanaframework.org/issues/3163) publicly hidden salt hashes.
+    - I've fixed this by switching the password hashing algorithm to the more secure secret-key based hash_hmac method.
+ 2. ORM drivers were included.
+    - I've fixed this by simply removing them. They cause confusion with new users because they think that Auth requires ORM. The only driver currently provided by default is the file driver.
+ 3. Auth::get_user()'s api is inconsistent because it returns different data types.
+    - I've fixed this by returning an empty user model by default. You can override what gets returned (if you've changed your user model class name for instance) by overloading the get_user() method in your application.
+
+These changes should be merged into the mainline branch eventually, but they completely break the API, so likely won't be done until 3.1.
\ No newline at end of file
diff --git a/includes/kohana/modules/auth/classes/auth.php b/includes/kohana/modules/auth/classes/auth.php
new file mode 100644
index 0000000..a02b1e5
--- /dev/null
+++ b/includes/kohana/modules/auth/classes/auth.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+abstract class Auth extends Kohana_Auth { }
\ No newline at end of file
diff --git a/includes/kohana/modules/auth/classes/auth/file.php b/includes/kohana/modules/auth/classes/auth/file.php
new file mode 100644
index 0000000..24b8d81
--- /dev/null
+++ b/includes/kohana/modules/auth/classes/auth/file.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Auth_File extends Kohana_Auth_File { }
\ No newline at end of file
diff --git a/includes/kohana/modules/auth/classes/kohana/auth.php b/includes/kohana/modules/auth/classes/kohana/auth.php
new file mode 100644
index 0000000..c5030e8
--- /dev/null
+++ b/includes/kohana/modules/auth/classes/kohana/auth.php
@@ -0,0 +1,175 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * User authorization library. Handles user login and logout, as well as secure
+ * password hashing.
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Auth {
+
+	// Auth instances
+	protected static $_instance;
+
+	/**
+	 * Singleton pattern
+	 *
+	 * @return Auth
+	 */
+	public static function instance()
+	{
+		if ( ! isset(Auth::$_instance))
+		{
+			// Load the configuration for this type
+			$config = Kohana::config('auth');
+
+			if ( ! $type = $config->get('driver'))
+			{
+				$type = 'file';
+			}
+
+			// Set the session class name
+			$class = 'Auth_'.ucfirst($type);
+
+			// Create a new session instance
+			Auth::$_instance = new $class($config);
+		}
+
+		return Auth::$_instance;
+	}
+
+	protected $_session;
+
+	protected $_config;
+
+	/**
+	 * Loads Session and configuration options.
+	 *
+	 * @return  void
+	 */
+	public function __construct($config = array())
+	{
+		// Save the config in the object
+		$this->_config = $config;
+
+		$this->_session = Session::instance();
+	}
+
+	abstract protected function _login($username, $password, $remember);
+
+	abstract public function password($username);
+
+	abstract public function check_password($password);
+
+	/**
+	 * Gets the currently logged in user from the session.
+	 * Returns NULL if no user is currently logged in.
+	 *
+	 * @return  mixed
+	 */
+	public function get_user($default = NULL)
+	{
+		return $this->_session->get($this->_config['session_key'], $default);
+	}
+
+	/**
+	 * Attempt to log in a user by using an ORM object and plain-text password.
+	 *
+	 * @param   string   username to log in
+	 * @param   string   password to check against
+	 * @param   boolean  enable autologin
+	 * @return  boolean
+	 */
+	public function login($username, $password, $remember = FALSE)
+	{
+		if (empty($password))
+			return FALSE;
+
+		if (is_string($password))
+		{
+			// Create a hashed password
+			$password = $this->hash($password);
+		}
+
+		return $this->_login($username, $password, $remember);
+	}
+
+	/**
+	 * Log out a user by removing the related session variables.
+	 *
+	 * @param   boolean  completely destroy the session
+	 * @param   boolean  remove all tokens for user
+	 * @return  boolean
+	 */
+	public function logout($destroy = FALSE, $logout_all = FALSE)
+	{
+		if ($destroy === TRUE)
+		{
+			// Destroy the session completely
+			$this->_session->destroy();
+		}
+		else
+		{
+			// Remove the user from the session
+			$this->_session->delete($this->_config['session_key']);
+
+			// Regenerate session_id
+			$this->_session->regenerate();
+		}
+
+		// Double check
+		return ! $this->logged_in();
+	}
+
+	/**
+	 * Check if there is an active session. Optionally allows checking for a
+	 * specific role.
+	 *
+	 * @param   string   role name
+	 * @return  mixed
+	 */
+	public function logged_in($role = NULL)
+	{
+		return ($this->get_user() !== NULL);
+	}
+
+	/**
+	 * Creates a hashed hmac password from a plaintext password. This
+	 * method is deprecated, [Auth::hash] should be used instead.
+	 *
+	 * @deprecated
+	 * @param   string  plaintext password
+	 */
+	public function hash_password($password)
+	{
+		return $this->hash($password);
+	}
+
+	/**
+	 * Perform a hmac hash, using the configured method.
+	 *
+	 * @param   string  string to hash
+	 * @return  string
+	 */
+	public function hash($str)
+	{
+		if ( ! $this->_config['hash_key'])
+			throw new Kohana_Exception('A valid hash key must be set in your auth config.');
+
+		return hash_hmac($this->_config['hash_method'], $str, $this->_config['hash_key']);
+	}
+
+	protected function complete_login($user)
+	{
+		// Regenerate session_id
+		$this->_session->regenerate();
+
+		// Store username in session
+		$this->_session->set($this->_config['session_key'], $user);
+
+		return TRUE;
+	}
+
+} // End Auth
diff --git a/includes/kohana/modules/auth/classes/kohana/auth/file.php b/includes/kohana/modules/auth/classes/kohana/auth/file.php
new file mode 100644
index 0000000..31ca0c3
--- /dev/null
+++ b/includes/kohana/modules/auth/classes/kohana/auth/file.php
@@ -0,0 +1,88 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * File Auth driver.
+ * [!!] this Auth driver does not support roles nor autologin.
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Auth_File extends Auth {
+
+	// User list
+	protected $_users;
+
+	/**
+	 * Constructor loads the user list into the class.
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Load user list
+		$this->_users = Arr::get($config, 'users', array());
+	}
+
+	/**
+	 * Logs a user in.
+	 *
+	 * @param   string   username
+	 * @param   string   password
+	 * @param   boolean  enable autologin (not supported)
+	 * @return  boolean
+	 */
+	protected function _login($username, $password, $remember)
+	{
+		if (isset($this->_users[$username]) AND $this->_users[$username] === $password)
+		{
+			// Complete the login
+			return $this->complete_login($username);
+		}
+
+		// Login failed
+		return FALSE;
+	}
+
+	/**
+	 * Forces a user to be logged in, without specifying a password.
+	 *
+	 * @param   mixed    username
+	 * @return  boolean
+	 */
+	public function force_login($username)
+	{
+		// Complete the login
+		return $this->complete_login($username);
+	}
+
+	/**
+	 * Get the stored password for a username.
+	 *
+	 * @param   mixed   username
+	 * @return  string
+	 */
+	public function password($username)
+	{
+		return Arr::get($this->_users, $username, FALSE);
+	}
+
+	/**
+	 * Compare password with original (plain text). Works for current (logged in) user
+	 *
+	 * @param   string  $password
+	 * @return  boolean
+	 */
+	public function check_password($password)
+	{
+		$username = $this->get_user();
+
+		if ($username === FALSE)
+		{
+			return FALSE;
+		}
+
+		return ($password === $this->password($username));
+	}
+
+} // End Auth File
\ No newline at end of file
diff --git a/includes/kohana/modules/auth/config/auth.php b/includes/kohana/modules/auth/config/auth.php
new file mode 100644
index 0000000..0d80208
--- /dev/null
+++ b/includes/kohana/modules/auth/config/auth.php
@@ -0,0 +1,16 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+return array(
+
+	'driver'       => 'file',
+	'hash_method'  => 'sha256',
+	'hash_key'     => NULL,
+	'lifetime'     => 1209600,
+	'session_key'  => 'auth_user',
+
+	// Username/password combinations for the Auth File driver
+	'users' => array(
+		// 'admin' => 'b3154acf3a344170077d11bdb5fff31532f679a1919e716a02',
+	),
+
+);
diff --git a/includes/kohana/modules/auth/guide/auth/config.md b/includes/kohana/modules/auth/guide/auth/config.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/edit.md b/includes/kohana/modules/auth/guide/auth/edit.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/index.md b/includes/kohana/modules/auth/guide/auth/index.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/login.md b/includes/kohana/modules/auth/guide/auth/login.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/menu.md b/includes/kohana/modules/auth/guide/auth/menu.md
new file mode 100644
index 0000000..1708caa
--- /dev/null
+++ b/includes/kohana/modules/auth/guide/auth/menu.md
@@ -0,0 +1,7 @@
+## [Auth]()
+- [Config](config)
+- [User Model](user)
+- [Register Users](register)
+- [Log in and out](login)
+- [Edit User](edit)
+- [Using Roles](roles)
diff --git a/includes/kohana/modules/auth/guide/auth/register.md b/includes/kohana/modules/auth/guide/auth/register.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/roles.md b/includes/kohana/modules/auth/guide/auth/roles.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/auth/guide/auth/user.md b/includes/kohana/modules/auth/guide/auth/user.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/cache/README.md b/includes/kohana/modules/cache/README.md
new file mode 100644
index 0000000..cd04fbd
--- /dev/null
+++ b/includes/kohana/modules/cache/README.md
@@ -0,0 +1,61 @@
+Kohana Cache library
+====================
+
+The cache library for Kohana 3 provides a simple interface to the most common cache solutions. Developers are free to add their own caching solutions that follow the cache design pattern defined within this module.
+
+Supported cache solutions
+-------------------------
+
+Currently this module supports the following cache methods.
+
+1. APC
+2. eAccelerator
+3. Memcache
+4. Memcached-tags (Supports tags)
+5. SQLite (Supports tags)
+6. File
+7. Xcache
+8. Wincache
+
+Planned support
+---------------
+
+In the near future, additional support for the following methods will be included.
+
+1. Memcached
+
+Introduction to caching
+-----------------------
+
+To use caching to the maximum potential, your application should be designed with caching in mind from the outset. In general, the most effective caches contain lots of small collections of data that are the result of expensive computational operations, such as searching through a large data set.
+
+There are many different caching methods available for PHP, from the very basic file based caching to opcode caching in eAccelerator and APC. Caching engines that use physical memory over disk based storage are always faster, however many do not support more advanced features such as tagging.
+
+Using Cache
+-----------
+
+To use Kohana Cache, download and extract the latest stable release of Kohana Cache from [Github](http://github.com/samsoir/kohana-cache). Place the module into your Kohana instances modules folder. Finally enable the module within the application bootstrap within the section entitled _modules_.
+
+Quick example
+-------------
+
+The following is a quick example of how to use Kohana Cache. The example is using the SQLite driver.
+
+	<?php
+	// Get a Sqlite Cache instance  
+	$mycache = Cache::instance('sqlite');
+	
+	// Create some data
+	$data = array('foo' => 'bar', 'apples' => 'pear', 'BDFL' => 'Shadowhand');
+	
+	// Save the data to cache, with an id of test_id and a lifetime of 10 minutes
+	$mycache->set('test_id', $data, 600);
+	
+	// Retrieve the data from cache
+	$retrieved_data = $mycache->get('test_id');
+	
+	// Remove the cache item
+	$mycache->delete('test_id');
+	
+	// Clear the cache of all stored items
+	$mycache->delete_all();
diff --git a/includes/kohana/modules/cache/classes/cache.php b/includes/kohana/modules/cache/classes/cache.php
new file mode 100644
index 0000000..2b43c93
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Cache extends Kohana_Cache {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/apc.php b/includes/kohana/modules/cache/classes/cache/apc.php
new file mode 100644
index 0000000..2b01242
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/apc.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Apc extends Kohana_Cache_Apc {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/eaccelerator.php b/includes/kohana/modules/cache/classes/cache/eaccelerator.php
new file mode 100644
index 0000000..0aa168d
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/eaccelerator.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Eaccelerator extends Kohana_Cache_Eaccelerator {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/file.php b/includes/kohana/modules/cache/classes/cache/file.php
new file mode 100644
index 0000000..ad30fd0
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/file.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_File extends Kohana_Cache_File {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/memcache.php b/includes/kohana/modules/cache/classes/cache/memcache.php
new file mode 100644
index 0000000..2a898e3
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/memcache.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Memcache extends Kohana_Cache_Memcache {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/memcachetag.php b/includes/kohana/modules/cache/classes/cache/memcachetag.php
new file mode 100644
index 0000000..855794f
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/memcachetag.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_MemcacheTag extends Kohana_Cache_MemcacheTag {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/sqlite.php b/includes/kohana/modules/cache/classes/cache/sqlite.php
new file mode 100644
index 0000000..24fea21
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/sqlite.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Sqlite extends Kohana_Cache_Sqlite {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/wincache.php b/includes/kohana/modules/cache/classes/cache/wincache.php
new file mode 100644
index 0000000..603e446
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/wincache.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Wincache extends Kohana_Cache_Wincache {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/cache/xcache.php b/includes/kohana/modules/cache/classes/cache/xcache.php
new file mode 100644
index 0000000..1603629
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/cache/xcache.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cache_Xcache extends Kohana_Cache_Xcache {}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/kohana/cache.php b/includes/kohana/modules/cache/classes/kohana/cache.php
new file mode 100644
index 0000000..cdef449
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache.php
@@ -0,0 +1,256 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache provides a common interface to a variety of caching engines. Tags are
+ * supported where available natively to the cache system. Kohana Cache supports multiple 
+ * instances of cache engines through a grouped singleton pattern.
+ * 
+ * ### Supported cache engines
+ * 
+ * *  [APC](http://php.net/manual/en/book.apc.php)
+ * *  [eAccelerator](http://eaccelerator.net/)
+ * *  File
+ * *  [Memcache](http://memcached.org/)
+ * *  [Memcached-tags](http://code.google.com/p/memcached-tags/)
+ * *  [SQLite](http://www.sqlite.org/)
+ * *  [Xcache](http://xcache.lighttpd.net/)
+ * 
+ * ### Introduction to caching
+ * 
+ * Caching should be implemented with consideration. Generally, caching the result of resources
+ * is faster than reprocessing them. Choosing what, how and when to cache is vital. PHP APC is
+ * presently one of the fastest caching systems available, closely followed by Memcache. SQLite
+ * and File caching are two of the slowest cache methods, however usually faster than reprocessing
+ * a complex set of instructions.
+ * 
+ * Caching engines that use memory are considerably faster than the file based alternatives. But
+ * memory is limited whereas disk space is plentiful. If caching large datasets it is best to use
+ * file caching.
+ * 
+ * ### Configuration settings
+ * 
+ * Kohana Cache uses configuration groups to create cache instances. A configuration group can
+ * use any supported driver, with successive groups using the same driver type if required.
+ * 
+ * #### Configuration example
+ * 
+ * Below is an example of a _memcache_ server configuration.
+ * 
+ *     return array(
+ *          'default'       => array(                      // Default group
+ *                  'driver'         => 'memcache',        // using Memcache driver
+ *                  'servers'        => array(             // Available server definitions
+ *                         array(
+ *                              'host'       => 'localhost',
+ *                              'port'       => 11211,
+ *                              'persistent' => FALSE
+ *                         )
+ *                  ),
+ *                  'compression'    => FALSE,             // Use compression?
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * 
+ * Details of the settings specific to each driver are available within the drivers documentation.
+ * 
+ * ### System requirements
+ * 
+ * *  Kohana 3.0.x
+ * *  PHP 5.2.4 or greater
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @version    2.0
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_Cache {
+
+	const DEFAULT_EXPIRE = 3600;
+
+	/**
+	 * @var   string     default driver to use
+	 */
+	public static $default = 'file';
+
+	/**
+	 * @var   Kohana_Cache instances
+	 */
+	public static $instances = array();
+
+	/**
+	 * Creates a singleton of a Kohana Cache group. If no group is supplied
+	 * the __default__ cache group is used.
+	 * 
+	 *     // Create an instance of the default group
+	 *     $default_group = Cache::instance();
+	 * 
+	 *     // Create an instance of a group
+	 *     $foo_group = Cache::instance('foo');
+	 * 
+	 *     // Access an instantiated group directly
+	 *     $foo_group = Cache::$instances['default'];
+	 *
+	 * @param   string   the name of the cache group to use [Optional]
+	 * @return  Kohana_Cache
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public static function instance($group = NULL)
+	{
+		// If there is no group supplied
+		if ($group === NULL)
+		{
+			// Use the default setting
+			$group = Cache::$default;
+		}
+
+		if (isset(Cache::$instances[$group]))
+		{
+			// Return the current group if initiated already
+			return Cache::$instances[$group];
+		}
+
+		$config = Kohana::config('cache');
+
+		if ( ! $config->offsetExists($group))
+		{
+			throw new Kohana_Cache_Exception('Failed to load Kohana Cache group: :group', array(':group' => $group));
+		}
+
+		$config = $config->get($group);
+
+		// Create a new cache type instance
+		$cache_class = 'Cache_'.ucfirst($config['driver']);
+		Cache::$instances[$group] = new $cache_class($config);
+
+		// Return the instance
+		return Cache::$instances[$group];
+	}
+
+	/**
+	 * @var  Config
+	 */
+	protected $_config;
+
+	/**
+	 * Ensures singleton pattern is observed, loads the default expiry
+	 * 
+	 * @param  array     configuration
+	 */
+	protected function __construct(array $config)
+	{
+		$this->_config = $config;
+	}
+
+	/**
+	 * Overload the __clone() method to prevent cloning
+	 *
+	 * @return  void
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function __clone()
+	{
+		throw new Kohana_Cache_Exception('Cloning of Kohana_Cache objects is forbidden');
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from default group
+	 *     $data = Cache::instance()->get('foo');
+	 * 
+	 *     // Retrieve cache entry from default group and return 'bar' if miss
+	 *     $data = Cache::instance()->get('foo', 'bar');
+	 * 
+	 *     // Retrieve cache entry from memcache group
+	 *     $data = Cache::instance('memcache')->get('foo');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	abstract public function get($id, $default = NULL);
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in default group, using default expiry
+	 *     Cache::instance()->set('foo', $data);
+	 * 
+	 *     // Set 'bar' to 'foo' in default group for 30 seconds
+	 *     Cache::instance()->set('foo', $data, 30);
+	 * 
+	 *     // Set 'bar' to 'foo' in memcache group for 10 minutes
+	 *     if (Cache::instance('memcache')->set('foo', $data, 600))
+	 *     {
+	 *          // Cache was set successfully
+	 *          return
+	 *     }
+	 *
+	 * @param   string   id of cache entry
+	 * @param   string   data to set to cache
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 */
+	abstract public function set($id, $data, $lifetime = 3600);
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete 'foo' entry from the default group
+	 *     Cache::instance()->delete('foo');
+	 * 
+	 *     // Delete 'foo' entry from the memcache group
+	 *     Cache::instance('memcache')->delete('foo')
+	 *
+	 * @param   string   id to remove from cache
+	 * @return  boolean
+	 */
+	abstract public function delete($id);
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the default group
+	 *     Cache::instance()->delete_all();
+	 * 
+	 *     // Delete all cache entries in the memcache group
+	 *     Cache::instance('memcache')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	abstract public function delete_all();
+
+	/**
+	 * Replaces troublesome characters with underscores.
+	 *
+	 *     // Sanitize a cache id
+	 *     $id = $this->_sanitize_id($id);
+	 * 
+	 * @param   string   id of cache to sanitize
+	 * @return  string
+	 */
+	protected function _sanitize_id($id)
+	{
+		// Change slashes and spaces to underscores
+		return str_replace(array('/', '\\', ' '), '_', $id);
+	}
+}
+// End Kohana_Cache
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/apc.php b/includes/kohana/modules/cache/classes/kohana/cache/apc.php
new file mode 100644
index 0000000..78765fe
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/apc.php
@@ -0,0 +1,135 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Kohana Cache](api/Kohana_Cache) APC driver. Provides an opcode based
+ * driver for the Kohana Cache library.
+ * 
+ * ### Configuration example
+ * 
+ * Below is an example of an _apc_ server configuration.
+ * 
+ *     return array(
+ *          'apc' => array(                          // Driver group
+ *                  'driver'         => 'apc',         // using APC driver
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * 
+ * ### System requirements
+ * 
+ * *  Kohana 3.0.x
+ * *  PHP 5.2.4 or greater
+ * *  APC PHP extension
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Apc extends Cache {
+
+	/**
+	 * Check for existence of the APC extension This method cannot be invoked externally. The driver must
+	 * be instantiated using the `Cache::instance()` method.
+	 *
+	 * @param  array     configuration
+	 * @throws Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		if ( ! extension_loaded('apc'))
+		{
+			throw new Kohana_Cache_Exception('PHP APC extension is not available.');
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from apc group
+	 *     $data = Cache::instance('apc')->get('foo');
+	 * 
+	 *     // Retrieve cache entry from apc group and return 'bar' if miss
+	 *     $data = Cache::instance('apc')->get('foo', 'bar');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		$data = apc_fetch($this->_sanitize_id($id), $success);
+
+		return $success ? $data : $default;
+	}
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in apc group, using default expiry
+	 *     Cache::instance('apc')->set('foo', $data);
+	 * 
+	 *     // Set 'bar' to 'foo' in apc group for 30 seconds
+	 *     Cache::instance('apc')->set('foo', $data, 30);
+	 *
+	 * @param   string   id of cache entry
+	 * @param   string   data to set to cache
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		if ($lifetime === NULL)
+		{
+			$lifetime = Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
+		}
+
+		return apc_store($this->_sanitize_id($id), $data, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete 'foo' entry from the apc group
+	 *     Cache::instance('apc')->delete('foo');
+	 *
+	 * @param   string   id to remove from cache
+	 * @return  boolean
+	 */
+	public function delete($id)
+	{
+		return apc_delete($this->_sanitize_id($id));
+	}
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the apc group
+	 *     Cache::instance('apc')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		return apc_clear_cache('user');
+	}
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/eaccelerator.php b/includes/kohana/modules/cache/classes/kohana/cache/eaccelerator.php
new file mode 100644
index 0000000..96c97f5
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/eaccelerator.php
@@ -0,0 +1,133 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Kohana Cache](api/Kohana_Cache) Eaccelerator driver. Provides an opcode based
+ * driver for the Kohana Cache library.
+ * 
+ * ### Configuration example
+ * 
+ * Below is an example of an _eaccelerator_ server configuration.
+ * 
+ *     return array(
+ *          'eaccelerator' => array(                          // Driver group
+ *                  'driver'         => 'eaccelerator',         // using Eaccelerator driver
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * 
+ * ### System requirements
+ * 
+ * *  Kohana 3.0.x
+ * *  PHP 5.2.4 or greater
+ * *  Eaccelerator PHP extension
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Eaccelerator extends Cache {
+
+	/**
+	 * Check for existence of the eAccelerator extension This method cannot be invoked externally. The driver must
+	 * be instantiated using the `Cache::instance()` method.
+	 *
+	 * @param  array     configuration
+	 * @throws Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		if ( ! extension_loaded('eaccelerator'))
+		{
+			throw new Kohana_Cache_Exception('PHP eAccelerator extension is not available.');
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from eaccelerator group
+	 *     $data = Cache::instance('eaccelerator')->get('foo');
+	 * 
+	 *     // Retrieve cache entry from eaccelerator group and return 'bar' if miss
+	 *     $data = Cache::instance('eaccelerator')->get('foo', 'bar');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		return (($data = eaccelerator_get($this->_sanitize_id($id))) === FALSE) ? $default : $data;
+	}
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in eaccelerator group, using default expiry
+	 *     Cache::instance('eaccelerator')->set('foo', $data);
+	 * 
+	 *     // Set 'bar' to 'foo' in eaccelerator group for 30 seconds
+	 *     Cache::instance('eaccelerator')->set('foo', $data, 30);
+	 *
+	 * @param   string   id of cache entry
+	 * @param   string   data to set to cache
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		if ($lifetime === NULL)
+		{
+			$lifetime = time() + Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
+		}
+
+		return eaccelerator_put($this->_sanitize_id($id), $data, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete 'foo' entry from the eaccelerator group
+	 *     Cache::instance('eaccelerator')->delete('foo');
+	 *
+	 * @param   string   id to remove from cache
+	 * @return  boolean
+	 */
+	public function delete($id)
+	{
+		return eaccelerator_rm($this->_sanitize_id($id));
+	}
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the eaccelerator group
+	 *     Cache::instance('eaccelerator')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		return eaccelerator_clean();
+	}
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/exception.php b/includes/kohana/modules/cache/classes/kohana/cache/exception.php
new file mode 100644
index 0000000..d89d25e
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/exception.php
@@ -0,0 +1,11 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache Exception
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Exception extends Kohana_Exception {}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/file.php b/includes/kohana/modules/cache/classes/kohana/cache/file.php
new file mode 100644
index 0000000..0ace205
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/file.php
@@ -0,0 +1,463 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Kohana Cache](api/Kohana_Cache) File driver. Provides a file based
+ * driver for the Kohana Cache library. This is one of the slowest
+ * caching methods.
+ * 
+ * ### Configuration example
+ * 
+ * Below is an example of a _file_ server configuration.
+ * 
+ *     return array(
+ *          'file'   => array(                          // File driver group
+ *                  'driver'         => 'file',         // using File driver
+ *                  'cache_dir'     => APPPATH.'cache/.kohana_cache', // Cache location
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * cache_dir      | __NO__   | (_string_) The cache directory to use for this cache instance
+ * 
+ * ### System requirements
+ * 
+ * *  Kohana 3.0.x
+ * *  PHP 5.2.4 or greater
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_File extends Cache implements Kohana_Cache_GarbageCollect {
+
+	/**
+	 * Creates a hashed filename based on the string. This is used
+	 * to create shorter unique IDs for each cache filename.
+	 * 
+	 *     // Create the cache filename
+	 *     $filename = Cache_File::filename($this->_sanitize_id($id));
+	 *
+	 * @param   string   string to hash into filename
+	 * @return  string
+	 */
+	protected static function filename($string)
+	{
+		return sha1($string).'.json';
+	}
+
+	/**
+	 * @var  string   the caching directory
+	 */
+	protected $_cache_dir;
+
+	/**
+	 * Constructs the file cache driver. This method cannot be invoked externally. The file cache driver must
+	 * be instantiated using the `Cache::instance()` method.
+	 *
+	 * @param   array    config 
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		// Setup parent
+		parent::__construct($config);
+
+		try
+		{
+			$directory = Arr::get($this->_config, 'cache_dir', Kohana::$cache_dir);
+			$this->_cache_dir = new SplFileInfo($directory);
+		}
+		// PHP < 5.3 exception handle
+		catch (ErrorException $e)
+		{
+			$this->_cache_dir = $this->_make_directory($directory, 0777, TRUE);
+		}
+		// PHP >= 5.3 exception handle
+		catch (UnexpectedValueException $e)
+		{
+			$this->_cache_dir = $this->_make_directory($directory, 0777, TRUE);
+		}
+
+		// If the defined directory is a file, get outta here
+		if ($this->_cache_dir->isFile())
+		{
+			throw new Kohana_Cache_Exception('Unable to create cache directory as a file already exists : :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+		}
+
+		// Check the read status of the directory
+		if ( ! $this->_cache_dir->isReadable())
+		{
+			throw new Kohana_Cache_Exception('Unable to read from the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+		}
+
+		// Check the write status of the directory
+		if ( ! $this->_cache_dir->isWritable())
+		{
+			throw new Kohana_Cache_Exception('Unable to write to the cache directory :resource', array(':resource' => $this->_cache_dir->getRealPath()));
+		}
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from file group
+	 *     $data = Cache::instance('file')->get('foo');
+	 * 
+	 *     // Retrieve cache entry from file group and return 'bar' if miss
+	 *     $data = Cache::instance('file')->get('foo', 'bar');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		$filename = Cache_File::filename($this->_sanitize_id($id));
+		$directory = $this->_resolve_directory($filename);
+
+		// Wrap operations in try/catch to handle notices
+		try
+		{
+			// Open file
+			$file = new SplFileInfo($directory.$filename);
+
+			// If file does not exist
+			if ( ! $file->isFile())
+			{
+				// Return default value
+				return $default;
+			}
+			else
+			{
+				// Open the file and extract the json
+				$json = $file->openFile()->current();
+
+				// Decode the json into PHP object
+				$data = json_decode($json);
+
+				// Test the expiry
+				if ($data->expiry < time())
+				{
+					// Delete the file
+					$this->_delete_file($file, NULL, TRUE);
+
+					// Return default value
+					return $default;
+				}
+				else
+				{
+					return ($data->type === 'string') ? $data->payload : unserialize($data->payload);
+				}
+			}
+			
+		}
+		catch (ErrorException $e)
+		{
+			// Handle ErrorException caused by failed unserialization
+			if ($e->getCode() === E_NOTICE)
+			{
+				throw new Kohana_Cache_Exception(__METHOD__.' failed to unserialize cached object with message : '.$e->getMessage());
+			}
+
+			// Otherwise throw the exception
+			throw $e;
+		}
+	}
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in file group, using default expiry
+	 *     Cache::instance('file')->set('foo', $data);
+	 * 
+	 *     // Set 'bar' to 'foo' in file group for 30 seconds
+	 *     Cache::instance('file')->set('foo', $data, 30);
+	 *
+	 * @param   string   id of cache entry
+	 * @param   string   data to set to cache
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		$filename = Cache_File::filename($this->_sanitize_id($id));
+		$directory = $this->_resolve_directory($filename);
+
+		// If lifetime is NULL
+		if ($lifetime === NULL)
+		{
+			// Set to the default expiry
+			$lifetime = Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
+		}
+
+		// Open directory
+		$dir = new SplFileInfo($directory);
+
+		// If the directory path is not a directory
+		if ( ! $dir->isDir())
+		{
+			// Create the directory 
+			if ( ! mkdir($directory, 0777, TRUE))
+			{
+				throw new Kohana_Cache_Exception(__METHOD__.' unable to create directory : :directory', array(':directory' => $directory));
+			}
+
+			// chmod to solve potential umask issues
+			chmod($directory, 0777);
+		}
+
+		// Open file to inspect
+		$resouce = new SplFileInfo($directory.$filename);
+		$file = $resouce->openFile('w');
+
+		try
+		{
+			$type = gettype($data);
+
+			// Serialize the data
+			$data = json_encode( (object) array(
+				'payload'  => ($type === 'string') ? $data : serialize($data),
+				'expiry'   => time() + $lifetime,
+				'type'     => $type
+			));
+
+			$size = strlen($data);
+		}
+		catch (ErrorException $e)
+		{
+			// If serialize through an error exception
+			if ($e->getCode() === E_NOTICE)
+			{
+				// Throw a caching error
+				throw new Kohana_Cache_Exception(__METHOD__.' failed to serialize data for caching with message : '.$e->getMessage());
+			}
+
+			// Else rethrow the error exception
+			throw $e;
+		}
+
+		try
+		{
+			$file->fwrite($data, $size);
+			return (bool) $file->fflush();
+		}
+		catch (Exception $e)
+		{
+			throw $e;
+		}
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete 'foo' entry from the file group
+	 *     Cache::instance('file')->delete('foo');
+	 *
+	 * @param   string   id to remove from cache
+	 * @return  boolean
+	 */
+	public function delete($id)
+	{
+		$filename = Cache_File::filename($this->_sanitize_id($id));
+		$directory = $this->_resolve_directory($filename);
+
+		return $this->_delete_file(new SplFileInfo($directory.$filename), NULL, TRUE);
+	}
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the file group
+	 *     Cache::instance('file')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		return $this->_delete_file($this->_cache_dir, TRUE);
+	}
+
+	/**
+	 * Garbage collection method that cleans any expired
+	 * cache entries from the cache.
+	 *
+	 * @return  void
+	 */
+	public function garbage_collect()
+	{
+		$this->_delete_file($this->_cache_dir, TRUE, FALSE, TRUE);
+		return;
+	}
+
+	/**
+	 * Deletes files recursively and returns FALSE on any errors
+	 * 
+	 *     // Delete a file or folder whilst retaining parent directory and ignore all errors
+	 *     $this->_delete_file($folder, TRUE, TRUE);
+	 *
+	 * @param   SplFileInfo  file
+	 * @param   boolean  retain the parent directory
+	 * @param   boolean  ignore_errors to prevent all exceptions interrupting exec
+	 * @param   boolean  only expired files
+	 * @return  boolean
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function _delete_file(SplFileInfo $file, $retain_parent_directory = FALSE, $ignore_errors = FALSE, $only_expired = FALSE)
+	{
+		// Allow graceful error handling
+		try
+		{
+			// If is file
+			if ($file->isFile())
+			{
+				try
+				{
+					// If only expired is not set
+					if ($only_expired === FALSE)
+					{
+						// We want to delete the file
+						$delete = TRUE;
+					}
+					// Otherwise...
+					else
+					{
+						// Assess the file expiry to flag it for deletion
+						$json = $file->openFile('r')->current();
+						$data = json_decode($json);
+						$delete = $data->expiry < time();
+					}
+
+					// If the delete flag is set
+					if ($delete === TRUE)
+					{
+						// Try to delete
+						unlink($file->getRealPath());
+					}
+				}
+				catch (ErrorException $e)
+				{
+					// Catch any delete file warnings
+					if ($e->getCode() === E_WARNING)
+					{
+						throw new Kohana_Cache_Exception(__METHOD__.' failed to delete file : :file', array(':file' => $file->getRealPath()));
+					}
+				}
+			}
+			// Else, is directory
+			elseif ($file->isDir())
+			{
+				// Create new DirectoryIterator
+				$files = new DirectoryIterator($file->getPathname());
+
+				// Iterate over each entry
+				while ($files->valid())
+				{
+					// Extract the entry name
+					$name = $files->getFilename();
+
+					// If the name is not a dot
+					if ($name != '.' AND $name != '..' AND substr($file->getFilename(), 0, 1) == '.')
+					{
+						// Create new file resource
+						$fp = new SplFileInfo($files->getRealPath());
+						// Delete the file
+						$this->_delete_file($fp);
+					}
+
+					// Move the file pointer on
+					$files->next();
+				}
+
+				// If set to retain parent directory, return now
+				if ($retain_parent_directory)
+				{
+					return TRUE;
+				}
+
+				try
+				{
+					// Remove the files iterator
+					// (fixes Windows PHP which has permission issues with open iterators)
+					unset($files);
+
+					// Try to remove the parent directory
+					return rmdir($file->getRealPath());
+				}
+				catch (ErrorException $e)
+				{
+					// Catch any delete directory warnings
+					if ($e->getCode() === E_WARNING)
+					{
+						throw new Kohana_Cache_Exception(__METHOD__.' failed to delete directory : :directory', array(':directory' => $file->getRealPath()));
+					}
+				}
+			}
+		}
+		// Catch all exceptions
+		catch (Exception $e)
+		{
+			// If ignore_errors is on
+			if ($ignore_errors === TRUE)
+			{
+				// Return
+				return FALSE;
+			}
+			// Throw exception
+			throw $e;
+		}
+	}
+
+	/**
+	 * Resolves the cache directory real path from the filename
+	 * 
+	 *      // Get the realpath of the cache folder
+	 *      $realpath = $this->_resolve_directory($filename);
+	 *
+	 * @param   string   filename to resolve
+	 * @return  string
+	 */
+	protected function _resolve_directory($filename)
+	{
+		return $this->_cache_dir->getRealPath().DIRECTORY_SEPARATOR.$filename[0].$filename[1].DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * Makes the cache directory if it doesn't exist. Simply a wrapper for
+	 * `mkdir` to ensure DRY principles
+	 *
+	 * @see     http://php.net/manual/en/function.mkdir.php
+	 * @param   string   directory 
+	 * @param   string   mode 
+	 * @param   string   recursive 
+	 * @param   string   context 
+	 * @return  SplFileInfo
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function _make_directory($directory, $mode = 0777, $recursive = FALSE, $context = NULL)
+	{
+		if ( ! mkdir($directory, $mode, $recursive, $context))
+		{
+			throw new Kohana_Cache_Exception('Failed to create the defined cache directory : :directory', array(':directory' => $directory));
+		}
+		chmod($directory, $mode);
+
+		return new SplFileInfo($directory);;
+	}
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/garbagecollect.php b/includes/kohana/modules/cache/classes/kohana/cache/garbagecollect.php
new file mode 100644
index 0000000..62c3148
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/garbagecollect.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Garbage Collection interface for caches that have no GC methods
+ * of their own, such as [Cache_File] and [Cache_Sqlite]. Memory based
+ * cache systems clean their own caches periodically.
+ *
+ * @package    Kohana/Cache
+ * @category   Base
+ * @version    2.0
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ * @since      3.0.8
+ */
+interface Kohana_Cache_GarbageCollect {
+	/**
+	 * Garbage collection method that cleans any expired
+	 * cache entries from the cache.
+	 *
+	 * @return void
+	 */
+	public function garbage_collect();
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/memcache.php b/includes/kohana/modules/cache/classes/kohana/cache/memcache.php
new file mode 100644
index 0000000..c377dc4
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/memcache.php
@@ -0,0 +1,324 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Kohana Cache](api/Kohana_Cache) Memcache driver,
+ * 
+ * ### Supported cache engines
+ * 
+ * *  [Memcache](http://www.php.net/manual/en/book.memcache.php)
+ * *  [Memcached-tags](http://code.google.com/p/memcached-tags/)
+ * 
+ * ### Configuration example
+ * 
+ * Below is an example of a _memcache_ server configuration.
+ * 
+ *     return array(
+ *          'default'   => array(                          // Default group
+ *                  'driver'         => 'memcache',        // using Memcache driver
+ *                  'servers'        => array(             // Available server definitions
+ *                         // First memcache server server
+ *                         array(
+ *                              'host'             => 'localhost',
+ *                              'port'             => 11211,
+ *                              'persistent'       => FALSE
+ *                              'weight'           => 1,
+ *                              'timeout'          => 1,
+ *                              'retry_interval'   => 15,
+ *                              'status'           => TRUE,
+ *				'instant_death'	   => TRUE,
+ *                              'failure_callback' => array('className', 'classMethod')
+ *                         ),
+ *                         // Second memcache server
+ *                         array(
+ *                              'host'             => '192.168.1.5',
+ *                              'port'             => 22122,
+ *                              'persistent'       => TRUE
+ *                         )
+ *                  ),
+ *                  'compression'    => FALSE,             // Use compression?
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * servers        | __YES__  | (_array_) Associative array of server details, must include a __host__ key. (see _Memcache server configuration_ below)
+ * compression    | __NO__   | (_boolean_) Use data compression when caching
+ * 
+ * #### Memcache server configuration
+ * 
+ * The following settings should be used when defining each memcache server
+ * 
+ * Name             | Required | Description
+ * ---------------- | -------- | ---------------------------------------------------------------
+ * host             | __YES__  | (_string_) The host of the memcache server, i.e. __localhost__; or __127.0.0.1__; or __memcache.domain.tld__
+ * port             | __NO__   | (_integer_) Point to the port where memcached is listening for connections. Set this parameter to 0 when using UNIX domain sockets.  Default __11211__
+ * persistent       | __NO__   | (_boolean_) Controls the use of a persistent connection. Default __TRUE__
+ * weight           | __NO__   | (_integer_) Number of buckets to create for this server which in turn control its probability of it being selected. The probability is relative to the total weight of all servers. Default __1__
+ * timeout          | __NO__   | (_integer_) Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow. Default __1__
+ * retry_interval   | __NO__   | (_integer_) Controls how often a failed server will be retried, the default value is 15 seconds. Setting this parameter to -1 disables automatic retry. Default __15__
+ * status           | __NO__   | (_boolean_) Controls if the server should be flagged as online. Default __TRUE__
+ * failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback)_) Allows the user to specify a callback function to run upon encountering an error. The callback is run before failover is attempted. The function takes two parameters, the hostname and port of the failed server. Default __NULL__
+ * 
+ * ### System requirements
+ * 
+ * *  Kohana 3.0.x
+ * *  PHP 5.2.4 or greater
+ * *  Memcache (plus Memcached-tags for native tagging support)
+ * *  Zlib
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @version    2.0
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Memcache extends Cache {
+
+	// Memcache has a maximum cache lifetime of 30 days
+	const CACHE_CEILING = 2592000;
+
+	/**
+	 * Memcache resource
+	 *
+	 * @var Memcache
+	 */
+	protected $_memcache;
+
+	/**
+	 * Flags to use when storing values
+	 *
+	 * @var string
+	 */
+	protected $_flags;
+
+	/**
+	 * The default configuration for the memcached server
+	 *
+	 * @var array
+	 */
+	protected $_default_config = array();
+
+	/**
+	 * Constructs the memcache Kohana_Cache object
+	 *
+	 * @param   array     configuration
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		// Check for the memcache extention
+		if ( ! extension_loaded('memcache'))
+		{
+			throw new Kohana_Cache_Exception('Memcache PHP extention not loaded');
+		}
+
+		parent::__construct($config);
+
+		// Setup Memcache
+		$this->_memcache = new Memcache;
+
+		// Load servers from configuration
+		$servers = Arr::get($this->_config, 'servers', NULL);
+
+		if ( ! $servers)
+		{
+			// Throw an exception if no server found
+			throw new Kohana_Cache_Exception('No Memcache servers defined in configuration');
+		}
+
+		// Setup default server configuration
+		$this->_default_config = array(
+				'host'             => 'localhost',
+				'port'             => 11211,
+				'persistent'       => FALSE,
+				'weight'           => 1,
+				'timeout'          => 1,
+				'retry_interval'   => 15,
+				'status'           => TRUE,
+				'instant_death'	   => TRUE,
+				'failure_callback' => array($this, '_failed_request'),
+		);
+
+		// Add the memcache servers to the pool
+		foreach ($servers as $server)
+		{
+			// Merge the defined config with defaults
+			$server += $this->_default_config;
+
+			if ( ! $this->_memcache->addServer($server['host'], $server['port'], $server['persistent'], $server['weight'], $server['timeout'], $server['retry_interval'], $server['status'], $server['failure_callback']))
+			{
+				throw new Kohana_Cache_Exception('Memcache could not connect to host \':host\' using port \':port\'', array(':host' => $server['host'], ':port' => $server['port']));
+			}
+		}
+
+		// Setup the flags
+		$this->_flags = Arr::get($this->_config, 'compression', FALSE) ? MEMCACHE_COMPRESSED : FALSE;
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from memcache group
+	 *     $data = Cache::instance('memcache')->get('foo');
+	 * 
+	 *     // Retrieve cache entry from memcache group and return 'bar' if miss
+	 *     $data = Cache::instance('memcache')->get('foo', 'bar');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		// Get the value from Memcache
+		$value = $this->_memcache->get($this->_sanitize_id($id));
+
+		// If the value wasn't found, normalise it
+		if ($value === FALSE)
+		{
+			$value = (NULL === $default) ? NULL : $default;
+		}
+
+		// Return the value
+		return $value;
+	}
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in memcache group for 10 minutes
+	 *     if (Cache::instance('memcache')->set('foo', $data, 600))
+	 *     {
+	 *          // Cache was set successfully
+	 *          return
+	 *     }
+	 *
+	 * @param   string   id of cache entry
+	 * @param   mixed    data to set to cache
+	 * @param   integer  lifetime in seconds, maximum value 2592000
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = 3600)
+	{
+		// If the lifetime is greater than the ceiling
+		if ($lifetime > Cache_Memcache::CACHE_CEILING)
+		{
+			// Set the lifetime to maximum cache time
+			$lifetime = Cache_Memcache::CACHE_CEILING + time();
+		}
+		// Else if the lifetime is greater than zero
+		elseif ($lifetime > 0)
+		{
+			$lifetime += time();
+		}
+		// Else
+		else
+		{
+			// Normalise the lifetime
+			$lifetime = 0;
+		}
+
+		// Set the data to memcache
+		return $this->_memcache->set($this->_sanitize_id($id), $data, $this->_flags, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete the 'foo' cache entry immediately
+	 *     Cache::instance('memcache')->delete('foo');
+	 * 
+	 *     // Delete the 'bar' cache entry after 30 seconds
+	 *     Cache::instance('memcache')->delete('bar', 30);
+	 *
+	 * @param   string   id of entry to delete
+	 * @param   integer  timeout of entry, if zero item is deleted immediately, otherwise the item will delete after the specified value in seconds
+	 * @return  boolean
+	 */
+	public function delete($id, $timeout = 0)
+	{
+		// Delete the id
+		return $this->_memcache->delete($this->_sanitize_id($id), $timeout);
+	}
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the default group
+	 *     Cache::instance('memcache')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		$result = $this->_memcache->flush();
+
+		// We must sleep after flushing, or overwriting will not work!
+		// @see http://php.net/manual/en/function.memcache-flush.php#81420
+		sleep(1);
+
+		return $result;
+	}
+
+	/**
+	 * Callback method for Memcache::failure_callback to use if any Memcache call
+	 * on a particular server fails. This method switches off that instance of the
+	 * server if the configuration setting `instant_death` is set to `TRUE`.
+	 *
+	 * @param   string   hostname 
+	 * @param   integer  port 
+	 * @return  void|boolean
+	 * @since   3.0.8
+	 */
+	public function _failed_request($hostname, $port)
+	{
+		if ( ! $this->_config['instant_death'])
+			return; 
+
+		// Setup non-existent host
+		$host = FALSE;
+
+		// Get host settings from configuration
+		foreach ($this->_config['servers'] as $server)
+		{
+			// Merge the defaults, since they won't always be set
+			$server += $this->_default_config;
+			// We're looking at the failed server
+			if ($hostname == $server['host'] and $port == $server['port'])
+			{
+				// Server to disable, since it failed
+				$host = $server;
+				continue;
+			}
+		}
+
+		if ( ! $host)
+			return;
+		else
+		{
+			return $this->_memcache->setServerParams(
+				$host['host'],
+				$host['port'],
+				$host['timeout'],
+				$host['retry_interval'],
+				FALSE, // Server is offline
+				array($this, '_failed_request'
+				));
+		}
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/memcachetag.php b/includes/kohana/modules/cache/classes/kohana/cache/memcachetag.php
new file mode 100644
index 0000000..866ab9b
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/memcachetag.php
@@ -0,0 +1,76 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * See [Kohana_Cache_Memcache]
+ * 
+* @package    Kohana/Cache
+* @category   Base
+* @version    2.0
+* @author     Kohana Team
+* @copyright  (c) 2009-2010 Kohana Team
+* @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_MemcacheTag extends Cache_Memcache implements Kohana_Cache_Tagging {
+
+	/** 
+	 * Constructs the memcache object
+	 *
+	 * @param  array     configuration
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		parent::__construct($config);
+
+		if ( ! method_exists($this->_memcache, 'tag_add'))
+		{
+			throw new Kohana_Cache_Exception('Memcached-tags PHP plugin not present. Please see http://code.google.com/p/memcached-tags/ for more information');
+		}
+	}
+
+	/**
+	 * Set a value based on an id with tags
+	 * 
+	 * @param   string   id 
+	 * @param   mixed    data 
+	 * @param   integer  lifetime [Optional]
+	 * @param   array    tags [Optional]
+	 * @return  boolean
+	 */
+	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL)
+	{
+		$result = $this->set($id, $data, $lifetime);
+
+		if ($result and $tags)
+		{
+			foreach ($tags as $tag)
+			{
+				$this->_memcache->tag_add($tag, $id);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @return  boolean
+	 */
+	public function delete_tag($tag)
+	{
+		return $this->_memcache->tag_delete($tag);
+	}
+
+	/**
+	 * Find cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @return  void
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function find($tag)
+	{
+		throw new Kohana_Cache_Exception('Memcached-tags does not support finding by tag');
+	}	
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/sqlite.php b/includes/kohana/modules/cache/classes/kohana/cache/sqlite.php
new file mode 100644
index 0000000..70045e5
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/sqlite.php
@@ -0,0 +1,336 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache Sqlite Driver
+ * 
+ * Requires SQLite3 and PDO
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Sqlite extends Cache implements Kohana_Cache_Tagging, Kohana_Cache_GarbageCollect {
+
+	/**
+	 * Database resource
+	 *
+	 * @var  PDO
+	 */
+	protected $_db;
+
+	/**
+	 * Sets up the PDO SQLite table and
+	 * initialises the PDO connection
+	 *
+	 * @param  array     configuration
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		parent::__construct($config);
+
+		$database = Arr::get($this->_config, 'database', NULL);
+
+		if ($database === NULL)
+		{
+			throw new Kohana_Cache_Exception('Database path not available in Kohana Cache configuration');
+		}
+
+		// Load new Sqlite DB
+		$this->_db = new PDO('sqlite:'.$database);
+
+		// Test for existing DB
+		$result = $this->_db->query("SELECT * FROM sqlite_master WHERE name = 'caches' AND type = 'table'")->fetchAll();
+
+		// If there is no table, create a new one
+		if (0 == count($result))
+		{
+			$database_schema = Arr::get($this->_config, 'schema', NULL);
+
+			if ($database_schema === NULL)
+			{
+				throw new Kohana_Cache_Exception('Database schema not found in Kohana Cache configuration');
+			}
+
+			try
+			{
+				// Create the caches table
+				$this->_db->query(Arr::get($this->_config, 'schema', NULL));
+			}
+			catch (PDOException $e)
+			{
+				throw new Kohana_Cache_Exception('Failed to create new SQLite caches table with the following error : :error', array(':error' => $e->getMessage()));
+			}
+		}
+	}
+
+	/**
+	 * Retrieve a value based on an id
+	 *
+	 * @param   string   id 
+	 * @param   string   default [Optional] Default value to return if id not found
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		// Prepare statement
+		$statement = $this->_db->prepare('SELECT id, expiration, cache FROM caches WHERE id = :id LIMIT 0, 1');
+
+		// Try and load the cache based on id
+		try
+		{
+			$statement->execute(array(':id' => $this->_sanitize_id($id)));
+		}
+		catch (PDOException $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		if ( ! $result = $statement->fetch(PDO::FETCH_OBJ))
+		{
+			return $default;
+		}
+
+		// If the cache has expired
+		if ($result->expiration != 0 and $result->expiration <= time())
+		{
+			// Delete it and return default value
+			$this->delete($id);
+			return $default;
+		}
+		// Otherwise return cached object
+		else
+		{
+			// Disable notices for unserializing
+			$ER = error_reporting(~E_NOTICE);
+			
+			// Return the valid cache data
+			$data = unserialize($result->cache);
+
+			// Turn notices back on
+			error_reporting($ER);
+
+			// Return the resulting data
+			return $data;
+		}
+	}
+
+	/**
+	 * Set a value based on an id. Optionally add tags.
+	 *
+	 * @param   string   id 
+	 * @param   mixed    data 
+	 * @param   integer  lifetime [Optional]
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		return (bool) $this->set_with_tags($id, $data, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 *
+	 * @param   string   id 
+	 * @param   integer  timeout [Optional]
+	 * @return  boolean
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function delete($id)
+	{
+		// Prepare statement
+		$statement = $this->_db->prepare('DELETE FROM caches WHERE id = :id');
+
+		// Remove the entry
+		try
+		{
+			$statement->execute(array(':id' => $this->_sanitize_id($id)));
+		}
+		catch (PDOException $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		return (bool) $statement->rowCount();
+	}
+
+	/**
+	 * Delete all cache entries
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		// Prepare statement
+		$statement = $this->_db->prepare('DELETE FROM caches');
+
+		// Remove the entry
+		try
+		{
+			$statement->execute();
+		}
+		catch (PDOException $e)
+		{
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		return (bool) $statement->rowCount();
+	}
+
+	/**
+	 * Set a value based on an id. Optionally add tags.
+	 * 
+	 * @param   string   id 
+	 * @param   mixed    data 
+	 * @param   integer  lifetime [Optional]
+	 * @param   array    tags [Optional]
+	 * @return  boolean
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL)
+	{
+		// Serialize the data
+		$data = serialize($data);
+
+		// Normalise tags
+		$tags = (NULL === $tags) ? NULL : ('<'.implode('>,<', $tags).'>');
+
+		// Setup lifetime
+		if ($lifetime === NULL)
+		{
+			$lifetime = (0 === Arr::get('default_expire', NULL)) ? 0 : (Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE) + time());
+		}
+		else
+		{
+			$lifetime = (0 === $lifetime) ? 0 : ($lifetime + time());
+		}
+
+		// Prepare statement
+		// $this->exists() may throw Kohana_Cache_Exception, no need to catch/rethrow
+		$statement = $this->exists($id) ? $this->_db->prepare('UPDATE caches SET expiration = :expiration, cache = :cache, tags = :tags WHERE id = :id') : $this->_db->prepare('INSERT INTO caches (id, cache, expiration, tags) VALUES (:id, :cache, :expiration, :tags)');
+
+		// Try to insert
+		try
+		{
+			$statement->execute(array(':id' => $this->_sanitize_id($id), ':cache' => $data, ':expiration' => $lifetime, ':tags' => $tags));
+		}
+		catch (PDOException $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		return (bool) $statement->rowCount();
+	}
+
+	/**
+	 * Delete cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @param   integer  timeout [Optional]
+	 * @return  boolean
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function delete_tag($tag)
+	{
+		// Prepare the statement
+		$statement = $this->_db->prepare('DELETE FROM caches WHERE tags LIKE :tag');
+
+		// Try to delete
+		try
+		{
+			$statement->execute(array(':tag' => "%<{$tag}>%"));
+		}
+		catch (PDOException $e)
+		{
+			throw new Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		return (bool) $statement->rowCount();
+	}
+
+	/**
+	 * Find cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @return  array
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function find($tag)
+	{
+		// Prepare the statement
+		$statement = $this->_db->prepare('SELECT id, cache FROM caches WHERE tags LIKE :tag');
+
+		// Try to find
+		try
+		{
+			if ( ! $statement->execute(array(':tag' => "%<{$tag}>%")))
+			{
+				return array();
+			}
+		}
+		catch (PDOException $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		$result = array();
+
+		while ($row = $statement->fetchObject())
+		{
+			// Disable notices for unserializing
+			$ER = error_reporting(~E_NOTICE);
+
+			$result[$row->id] = unserialize($row->cache);
+
+			// Turn notices back on
+			error_reporting($ER);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Garbage collection method that cleans any expired
+	 * cache entries from the cache.
+	 *
+	 * @return  void
+	 */
+	public function garbage_collect()
+	{
+		// Create the sequel statement
+		$statement = $this->_db->prepare('DELETE FROM caches WHERE expiration < :expiration');
+
+		try
+		{
+			$statement->execute(array(':expiration' => time()));
+		}
+		catch (PDOException $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+	}
+
+	/**
+	 * Tests whether an id exists or not
+	 *
+	 * @param   string   id 
+	 * @return  boolean
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function exists($id)
+	{
+		$statement = $this->_db->prepare('SELECT id FROM caches WHERE id = :id');
+		try
+		{
+			$statement->execute(array(':id' => $this->_sanitize_id($id)));
+		}
+		catch (PDOExeption $e)
+		{
+			throw new Kohana_Cache_Exception('There was a problem querying the local SQLite3 cache. :error', array(':error' => $e->getMessage()));
+		}
+
+		return (bool) $statement->fetchAll();
+	}
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/tagging.php b/includes/kohana/modules/cache/classes/kohana/cache/tagging.php
new file mode 100644
index 0000000..001a224
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/tagging.php
@@ -0,0 +1,42 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache Tagging Interface
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+interface Kohana_Cache_Tagging {
+
+	/**
+	 * Set a value based on an id. Optionally add tags.
+	 * 
+	 * Note : Some caching engines do not support
+	 * tagging
+	 *
+	 * @param   string   id 
+	 * @param   mixed    data 
+	 * @param   integer  lifetime [Optional]
+	 * @param   array    tags [Optional]
+	 * @return  boolean
+	 */
+	public function set_with_tags($id, $data, $lifetime = NULL, array $tags = NULL);
+
+	/**
+	 * Delete cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @param   integer  timeout [Optional]
+	 */
+	public function delete_tag($tag);
+
+	/**
+	 * Find cache entries based on a tag
+	 *
+	 * @param   string   tag 
+	 * @return  array
+	 */
+	public function find($tag);
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/wincache.php b/includes/kohana/modules/cache/classes/kohana/cache/wincache.php
new file mode 100644
index 0000000..51484f4
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/wincache.php
@@ -0,0 +1,140 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Kohana Cache](api/Kohana_Cache) Wincache driver. Provides an opcode based
+ * driver for the Kohana Cache library.
+ * 
+ * ### Configuration example
+ * 
+ * Below is an example of an _wincache_ server configuration.
+ * 
+ *     return array(
+ *          'wincache' => array(                     // Driver group
+ *                  'driver'         => 'wincache',  // using wincache driver
+ *           ),
+ *     )
+ * 
+ * In cases where only one cache group is required, if the group is named `default` there is
+ * no need to pass the group name when instantiating a cache instance.
+ * 
+ * #### General cache group configuration settings
+ * 
+ * Below are the settings available to all types of cache driver.
+ * 
+ * Name           | Required | Description
+ * -------------- | -------- | ---------------------------------------------------------------
+ * driver         | __YES__  | (_string_) The driver type to use
+ * 
+ * ### System requirements
+ * 
+ * *  Windows XP SP3 with IIS 5.1 and » FastCGI Extension
+ * *  Windows Server 2003 with IIS 6.0 and » FastCGI Extension
+ * *  Windows Vista SP1 with IIS 7.0 and FastCGI Module
+ * *  Windows Server 2008 with IIS 7.0 and FastCGI Module
+ * *  Windows 7 with IIS 7.5 and FastCGI Module
+ * *  Windows Server 2008 R2 with IIS 7.5 and FastCGI Module
+ * *  PHP 5.2.X, Non-thread-safe build
+ * *  PHP 5.3 X86, Non-thread-safe VC9 build
+ * 
+ * @package    Kohana/Cache
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Wincache extends Cache {
+
+	/**
+	 * Check for existence of the wincache extension This method cannot be invoked externally. The driver must
+	 * be instantiated using the `Cache::instance()` method.
+	 *
+	 * @param  array     configuration
+	 * @throws Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		if ( ! extension_loaded('wincache'))
+		{
+			throw new Kohana_Cache_Exception('PHP wincache extension is not available.');
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Retrieve a cached value entry by id.
+	 * 
+	 *     // Retrieve cache entry from wincache group
+	 *     $data = Cache::instance('wincache')->get('foo');
+	 * 
+	 *     // Retrieve cache entry from wincache group and return 'bar' if miss
+	 *     $data = Cache::instance('wincache')->get('foo', 'bar');
+	 *
+	 * @param   string   id of cache to entry
+	 * @param   string   default value to return if cache miss
+	 * @return  mixed
+	 * @throws  Kohana_Cache_Exception
+	 */
+	public function get($id, $default = NULL)
+	{
+		$data = wincache_ucache_get($this->_sanitize_id($id), $success);
+
+		return $success ? $data : $default;
+	}
+
+	/**
+	 * Set a value to cache with id and lifetime
+	 * 
+	 *     $data = 'bar';
+	 * 
+	 *     // Set 'bar' to 'foo' in wincache group, using default expiry
+	 *     Cache::instance('wincache')->set('foo', $data);
+	 * 
+	 *     // Set 'bar' to 'foo' in wincache group for 30 seconds
+	 *     Cache::instance('wincache')->set('foo', $data, 30);
+	 *
+	 * @param   string   id of cache entry
+	 * @param   string   data to set to cache
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		if ($lifetime === NULL)
+		{
+			$lifetime = Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
+		}
+
+		return wincache_ucache_set($this->_sanitize_id($id), $data, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 * 
+	 *     // Delete 'foo' entry from the wincache group
+	 *     Cache::instance('wincache')->delete('foo');
+	 *
+	 * @param   string   id to remove from cache
+	 * @return  boolean
+	 */
+	public function delete($id)
+	{
+		return wincache_ucache_delete($this->_sanitize_id($id));
+	}
+
+	/**
+	 * Delete all cache entries.
+	 * 
+	 * Beware of using this method when
+	 * using shared memory cache systems, as it will wipe every
+	 * entry within the system for all clients.
+	 * 
+	 *     // Delete all cache entries in the wincache group
+	 *     Cache::instance('wincache')->delete_all();
+	 *
+	 * @return  boolean
+	 */
+	public function delete_all()
+	{
+		return wincache_ucache_clear();
+	}
+}
diff --git a/includes/kohana/modules/cache/classes/kohana/cache/xcache.php b/includes/kohana/modules/cache/classes/kohana/cache/xcache.php
new file mode 100644
index 0000000..133f18b
--- /dev/null
+++ b/includes/kohana/modules/cache/classes/kohana/cache/xcache.php
@@ -0,0 +1,84 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana Cache Xcache Driver
+ * 
+ * Requires Xcache
+ * http://xcache.lighttpd.net/
+ * 
+ * @package    Kohana
+ * @category   Cache
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Cache_Xcache extends Cache {
+
+	/**
+	 * Check for existence of the APC extension
+	 *
+	 * @param  array     configuration
+	 * @throws  Kohana_Cache_Exception
+	 */
+	protected function __construct(array $config)
+	{
+		if ( ! extension_loaded('xcache'))
+		{
+			throw new Kohana_Cache_Exception('PHP Xcache extension is not available.');
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Retrieve a value based on an id
+	 *
+	 * @param   string   id 
+	 * @param   string   default [Optional] Default value to return if id not found
+	 * @return  mixed
+	 */
+	public function get($id, $default = NULL)
+	{
+		return (($data = xcache_get($this->_sanitize_id($id))) === NULL) ? $default : $data;
+	}
+
+	/**
+	 * Set a value based on an id. Optionally add tags.
+	 * 
+	 * @param   string   id 
+	 * @param   string   data 
+	 * @param   integer  lifetime [Optional]
+	 * @return  boolean
+	 */
+	public function set($id, $data, $lifetime = NULL)
+	{
+		if (NULL === $lifetime)
+		{
+			$lifetime = Arr::get($this->_config, 'default_expire', Cache::DEFAULT_EXPIRE);
+		}
+
+		return xcache_set($this->_sanitize_id($id), $data, $lifetime);
+	}
+
+	/**
+	 * Delete a cache entry based on id
+	 *
+	 * @param   string   id 
+	 * @param   integer  timeout [Optional]
+	 * @return  boolean
+	 */
+	public function delete($id)
+	{
+		return xcache_unset($this->_sanitize_id($id));
+	}
+
+	/**
+	 * Delete all cache entries
+	 * To use this method xcache.admin.enable_auth has to be Off in xcache.ini
+	 *
+	 * @return  void
+	 */
+	public function delete_all()
+	{
+		xcache_clear_cache(XC_TYPE_PHP, 0);
+	}
+}
diff --git a/includes/kohana/modules/cache/config/cache.php b/includes/kohana/modules/cache/config/cache.php
new file mode 100644
index 0000000..9ec311c
--- /dev/null
+++ b/includes/kohana/modules/cache/config/cache.php
@@ -0,0 +1,76 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+return array
+(
+	'memcache' => array
+	(
+		'driver'             => 'memcache',
+		'default_expire'     => 3600,
+		'compression'        => FALSE,              // Use Zlib compression (can cause issues with integers)
+		'servers'            => array
+		(
+			array
+			(
+				'host'             => 'localhost',  // Memcache Server
+				'port'             => 11211,        // Memcache port number
+				'persistent'       => FALSE,        // Persistent connection
+				'weight'           => 1,
+				'timeout'          => 1,
+				'retry_interval'   => 15,
+				'status'           => TRUE,
+			),
+		),
+		'instant_death'      => TRUE,               // Take server offline immediately on first fail (no retry)
+	),
+	'memcachetag' => array
+	(
+		'driver'             => 'memcachetag',
+		'default_expire'     => 3600,
+		'compression'        => FALSE,              // Use Zlib compression (can cause issues with integers)
+		'servers'            => array
+		(
+			array
+			(
+				'host'             => 'localhost',  // Memcache Server
+				'port'             => 11211,        // Memcache port number
+				'persistent'       => FALSE,        // Persistent connection
+				'weight'           => 1,
+				'timeout'          => 1,
+				'retry_interval'   => 15,
+				'status'           => TRUE,
+			),
+		),
+		'instant_death'      => TRUE,
+	),
+	'apc'      => array
+	(
+		'driver'             => 'apc',
+		'default_expire'     => 3600,
+	),
+	'wincache' => array
+	(
+		'driver'             => 'wincache',
+		'default_expire'     => 3600,
+	),
+	'sqlite'   => array
+	(
+		'driver'             => 'sqlite',
+		'default_expire'     => 3600,
+		'database'           => APPPATH.'cache/kohana-cache.sql3',
+		'schema'             => 'CREATE TABLE caches(id VARCHAR(127) PRIMARY KEY, tags VARCHAR(255), expiration INTEGER, cache TEXT)',
+	),
+	'eaccelerator'           => array
+	(
+		'driver'             => 'eaccelerator',
+	),
+	'xcache'   => array
+	(
+		'driver'             => 'xcache',
+		'default_expire'     => 3600,
+	),
+	'file'    => array
+	(
+		'driver'             => 'file',
+		'cache_dir'          => APPPATH.'cache',
+		'default_expire'     => 3600,
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/config/userguide.php b/includes/kohana/modules/cache/config/userguide.php
new file mode 100644
index 0000000..524afc4
--- /dev/null
+++ b/includes/kohana/modules/cache/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'cache' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Cache',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Common interface for caching engines.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/guide/cache.usage.md b/includes/kohana/modules/cache/guide/cache.usage.md
new file mode 100644
index 0000000..8a8239b
--- /dev/null
+++ b/includes/kohana/modules/cache/guide/cache.usage.md
@@ -0,0 +1,219 @@
+# Kohana Cache usage
+
+[Kohana_Cache] provides a simple interface allowing getting, setting and deleting of cached values. Two interfaces included in _Kohana Cache_ additionally provide _tagging_ and _garbage collection_ where they are supported by the respective drivers.
+
+## Getting a new cache instance
+
+Creating a new _Kohana Cache_ instance is simple, however it must be done using the [Cache::instance] method, rather than the traditional `new` constructor.
+
+     // Create a new instance of cache using the default group
+     $cache = Cache::instance();
+
+The default group will use whatever is set to [Cache::$default] and must have a corresponding [configuration](cache.config) definition for that group.
+
+To create a cache instance using a group other than the _default_, simply provide the group name as an argument.
+
+     // Create a new instance of the memcache group
+     $memcache = Cache::instance('memcache');
+
+If there is a cache instance already instantiated then you can get it directly from the class member.
+
+ [!!] Beware that this can cause issues if you do not test for the instance before trying to access it.
+
+     // Check for the existance of the cache driver
+     if (isset(Cache::$instances['memcache']))
+     {
+          // Get the existing cache instance directly (faster)
+          $memcache = Cache::$instances['memcache'];
+     }
+     else
+     {
+          // Get the cache driver instance (slower)
+          $memcache = Cache::instance('memcache');
+     }
+
+## Setting and getting variables to and from cache
+
+The cache library supports scalar and object values, utilising object serialization where required (or not supported by the caching engine). This means that the majority or objects can be cached without any modification.
+
+ [!!] Serialisation does not work with resource handles, such as filesystem, curl or socket resources.
+
+### Setting a value to cache
+
+Setting a value to cache using the [Cache::set] method can be done in one of two ways; either using the Cache instance interface, which is good for atomic operations; or getting an instance and using that for multiple operations.
+
+The first example demonstrates how to quickly load and set a value to the default cache instance.
+
+     // Create a cachable object
+     $object = new stdClass;
+
+     // Set a property
+     $object->foo = 'bar';
+
+     // Cache the object using default group (quick interface) with default time (3600 seconds)
+     Cache::instance()->set('foo', $object);
+
+If multiple cache operations are required, it is best to assign an instance of Cache to a variable and use that as below.
+
+     // Set the object using a defined group for a defined time period (30 seconds)
+     $memcache = Cache::instance('memcache');
+     $memcache->set('foo', $object, 30);
+
+#### Setting a value with tags
+
+Certain cache drivers support setting values with tags. To set a value to cache with tags using the following interface.
+
+     // Get a cache instance that supports tags
+     $memcache = Cache::instance('memcachetag');
+
+     // Test for tagging interface
+     if ($memcache instanceof Kohana_Cache_Tagging)
+     {
+          // Set a value with some tags for 30 seconds
+          $memcache->set('foo', $object, 30, array('snafu', 'stfu', 'fubar'));
+     }
+     // Otherwise set without tags
+     else
+     {
+          // Set a value for 30 seconds
+          $memcache->set('foo', $object, 30);
+     }
+
+It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Kohana_Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
+
+### Getting a value from cache
+
+Getting variables back from cache is achieved using the [Cache::get] method using a single key to identify the cache entry.
+
+     // Retrieve a value from cache (quickly)
+     $object = Cache::instance()->get('foo');
+
+In cases where the requested key is not available or the entry has expired, a default value will be returned (__NULL__ by default). It is possible to define the default value as the key is requested.
+
+     // If the cache key is available (with default value set to FALSE)
+     if ($object = Cache::instance()->get('foo', FALSE))
+     {
+          // Do something
+     }
+     else
+     {
+          // Do something else
+     }
+
+#### Getting values from cache using tags
+
+It is possible to retrieve values from cache grouped by tag, using the [Cache::find] method with drivers that support tagging.
+
+ [!!] The __Memcachetag__ driver does not support the `Cache::find($tag)` interface and will throw an exception.
+
+     // Get an instance of cache
+     $cache = Cache::instance('memcachetag');
+
+     // Wrap in a try/catch statement to gracefully handle memcachetag
+     try
+     {
+          // Find values based on tag
+          return $cache->find('snafu');
+     }
+     catch (Kohana_Cache_Exception $e)
+     {
+          // Handle gracefully
+          return FALSE;
+     }
+
+### Deleting values from cache
+
+Deleting variables is very similar to the getting and setting methods already described. Deleting operations are split into three categories:
+
+ - __Delete value by key__. Deletes a cached value by the associated key.
+ - __Delete all values__. Deletes all caches values stored in the cache instance.
+ - __Delete values by tag__. Deletes all values that have the supplied tag. This is only supported by Memcached-Tag and Sqlite.
+
+#### Delete value by key
+
+To delete a specific value by its associated key:
+
+     // If the cache entry for 'foo' is deleted
+     if (Cache::instance()->delete('foo'))
+     {
+          // Cache entry successfully deleted, do something
+     }
+
+By default a `TRUE` value will be returned. However a `FALSE` value will be returned in instances where the key did not exist in the cache.
+
+#### Delete all values
+
+To delete all values in a specific instance:
+
+     // If all cache items where deleted successfully
+     if (Cache::instance()->delete_all())
+     {
+           // Do something
+     }
+
+It is also possible to delete all cache items in every instance:
+
+     // For each cache instance
+     foreach (Cache::$instances as $group => $instance)
+     {
+          if ($instance->delete_all())
+          {
+               var_dump('instance : '.$group.' has been flushed!');
+          }
+     }
+
+#### Delete values by tag
+
+Some of the caching drivers support deleting by tag. This will remove all the cached values that are associated with a specific tag. Below is an example of how to robustly handle deletion by tag.
+
+     // Get cache instance
+     $cache = Cache::instance();
+
+     // Check for tagging interface
+     if ($cache instanceof Kohana_Cache_Tagging)
+     {
+           // Delete all entries by the tag 'snafu'
+           $cache->delete_tag('snafu');
+     }
+
+#### Garbage Collection
+
+Garbage Collection (GC) is the cleaning of expired cache entries. For the most part, caching engines will take care of garbage collection internally. However a few of the file based systems do not handle this task and in these circumstances it would be prudent to garbage collect at a predetermined frequency. If no garbage collection is executed, the resource storing the cache entries will eventually fill and become unusable.
+
+When not automated, garbage collection is the responsibility of the developer. It is prudent to have a GC probability value that dictates how likely the garbage collection routing will be run. An example of such a system is demonstrated below.
+
+     // Get a cache instance
+     $cache_file = Cache::instance('file');
+
+     // Set a GC probability of 10%
+     $gc = 10;
+
+     // If the GC probability is a hit
+     if (rand(0,99) <= $gc and $cache_file instanceof Kohana_Cache_GarbageCollect)
+     {
+          // Garbage Collect
+          $cache_file->garbage_collect();
+     }
+
+# Interfaces
+
+Kohana Cache comes with two interfaces that are implemented where the drivers support them:
+
+ - __[Kohana_Cache_Tagging] for tagging support on cache entries__
+    - [Cache_MemcacheTag]
+    - [Cache_Sqlite]
+ - __[Kohana_Cache_GarbageCollect] for garbage collection with drivers without native support__
+    - [Cache_File]
+    - [Cache_Sqlite]
+
+When using interface specific caching features, ensure that code checks for the required interface before using the methods supplied. The following example checks whether the garbage collection interface is available before calling the `garbage_collect` method.
+
+    // Create a cache instance
+    $cache = Cache::instance();
+
+    // Test for Garbage Collection
+    if ($cache instanceof Kohana_Cache_GarbageCollect)
+    {
+         // Collect garbage
+         $cache->garbage_collect();
+    }
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/guide/cache/config.md b/includes/kohana/modules/cache/guide/cache/config.md
new file mode 100644
index 0000000..a6d428f
--- /dev/null
+++ b/includes/kohana/modules/cache/guide/cache/config.md
@@ -0,0 +1,168 @@
+# Kohana Cache configuration
+
+Kohana Cache uses configuration groups to create cache instances. A configuration group can
+use any supported driver, with successive groups using multiple instances of the same driver type.
+
+The default cache group is loaded based on the `Cache::$default` setting. It is set to the `file` driver as standard, however this can be changed within the `/application/boostrap.php` file.
+
+     // Change the default cache driver to memcache
+     Cache::$default = 'memcache';
+
+     // Load the memcache cache driver using default setting
+     $memcache = Cache::instance();
+
+## Group settings
+
+Below are the default cache configuration groups for each supported driver. Add to- or override these settings
+within the `application/config/cache.php` file.
+
+Name           | Required | Description
+-------------- | -------- | ---------------------------------------------------------------
+driver         | __YES__  | (_string_) The driver type to use
+default_expire | __NO__   | (_string_) The driver type to use
+
+
+	'file'  => array
+	(
+		'driver'             => 'file',
+		'cache_dir'          => APPPATH.'cache/.kohana_cache',
+		'default_expire'     => 3600,
+	),
+
+## Memcache & Memcached-tag settings
+
+Name           | Required | Description
+-------------- | -------- | ---------------------------------------------------------------
+driver         | __YES__  | (_string_) The driver type to use
+servers        | __YES__  | (_array_) Associative array of server details, must include a __host__ key. (see _Memcache server configuration_ below)
+compression    | __NO__   | (_boolean_) Use data compression when caching
+
+### Memcache server configuration
+
+Name             | Required | Description
+---------------- | -------- | ---------------------------------------------------------------
+host             | __YES__  | (_string_) The host of the memcache server, i.e. __localhost__; or __127.0.0.1__; or __memcache.domain.tld__
+port             | __NO__   | (_integer_) Point to the port where memcached is listening for connections. Set this parameter to 0 when using UNIX domain sockets.  Default __11211__
+persistent       | __NO__   | (_boolean_) Controls the use of a persistent connection. Default __TRUE__
+weight           | __NO__   | (_integer_) Number of buckets to create for this server which in turn control its probability of it being selected. The probability is relative to the total weight of all servers. Default __1__
+timeout          | __NO__   | (_integer_) Value in seconds which will be used for connecting to the daemon. Think twice before changing the default value of 1 second - you can lose all the advantages of caching if your connection is too slow. Default __1__
+retry_interval   | __NO__   | (_integer_) Controls how often a failed server will be retried, the default value is 15 seconds. Setting this parameter to -1 disables automatic retry. Default __15__
+status           | __NO__   | (_boolean_) Controls if the server should be flagged as online. Default __TRUE__
+failure_callback | __NO__   | (_[callback](http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback)_) Allows the user to specify a callback function to run upon encountering an error. The callback is run before failover is attempted. The function takes two parameters, the hostname and port of the failed server. Default __NULL__
+
+	'memcache' => array
+	(
+		'driver'             => 'memcache',
+		'default_expire'     => 3600,
+		'compression'        => FALSE,              // Use Zlib compression 
+		                                            (can cause issues with integers)
+		'servers'            => array
+		(
+			array
+			(
+				'host'             => 'localhost',  // Memcache Server
+				'port'             => 11211,        // Memcache port number
+				'persistent'       => FALSE,        // Persistent connection
+			),
+		),
+	),
+	'memcachetag' => array
+	(
+		'driver'             => 'memcachetag',
+		'default_expire'     => 3600,
+		'compression'        => FALSE,              // Use Zlib compression 
+		                                            (can cause issues with integers)
+		'servers'            => array
+		(
+			array
+			(
+				'host'             => 'localhost',  // Memcache Server
+				'port'             => 11211,        // Memcache port number
+				'persistent'       => FALSE,        // Persistent connection
+			),
+		),
+	),
+
+## APC settings
+
+	'apc'      => array
+	(
+		'driver'             => 'apc',
+		'default_expire'     => 3600,
+	),
+
+## SQLite settings
+
+	'sqlite'   => array
+	(
+		'driver'             => 'sqlite',
+		'default_expire'     => 3600,
+		'database'           => APPPATH.'cache/kohana-cache.sql3',
+		'schema'             => 'CREATE TABLE caches(id VARCHAR(127) PRIMARY KEY, 
+		                                  tags VARCHAR(255), expiration INTEGER, cache TEXT)',
+	),
+
+## Eaccelerator settings
+
+	'eaccelerator' array
+	(
+		'driver'             => 'eaccelerator',
+	),
+
+## Xcache settings
+
+	'xcache'   => array
+	(
+		'driver'             => 'xcache',
+		'default_expire'     => 3600,
+	),
+
+## File settings
+
+	'file'    => array
+	(
+		'driver'             => 'file',
+		'cache_dir'          => 'cache/.kohana_cache',
+		'default_expire'     => 3600,
+	)
+
+## Override existing configuration group
+
+The following example demonstrates how to override an existing configuration setting, using the config file in `/application/config/cache.php`.
+
+	<?php defined('SYSPATH') or die('No direct script access.');
+	return array
+	(
+		// Override the default configuration
+		'memcache'   => array
+		(
+			'driver'         => 'memcache',  // Use Memcached as the default driver
+			'default_expire' => 8000,        // Overide default expiry
+			'servers'        => array
+			(
+				// Add a new server
+				array
+				(
+					'host'       => 'cache.domain.tld',
+					'port'       => 11211,
+					'persistent' => FALSE
+				)
+			),
+			'compression'    => FALSE
+		)
+	);
+
+## Add new configuration group
+
+The following example demonstrates how to add a new configuration setting, using the config file in `/application/config/cache.php`.
+
+	<?php defined('SYSPATH') or die('No direct script access.');
+	return array
+	(
+		// Override the default configuration
+		'fastkv'   => array
+		(
+			'driver'         => 'apc',  // Use Memcached as the default driver
+			'default_expire' => 1000,   // Overide default expiry
+		)
+	);
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/guide/cache/examples.md b/includes/kohana/modules/cache/guide/cache/examples.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/cache/guide/cache/index.md b/includes/kohana/modules/cache/guide/cache/index.md
new file mode 100644
index 0000000..b93b11d
--- /dev/null
+++ b/includes/kohana/modules/cache/guide/cache/index.md
@@ -0,0 +1,59 @@
+# About Kohana Cache
+
+[Kohana_Cache] provides a common interface to a variety of caching engines. [Kohana_Cache_Tagging] is
+supported where available natively to the cache system. Kohana Cache supports multiple 
+instances of cache engines through a grouped singleton pattern.
+
+## Supported cache engines
+
+ *  APC ([Cache_Apc])
+ *  eAccelerator ([Cache_Eaccelerator])
+ *  File ([Cache_File])
+ *  Memcached ([Cache_Memcache])
+ *  Memcached-tags ([Cache_Memcachetag])
+ *  SQLite ([Cache_Sqlite])
+ *  Xcache ([Cache_Xcache])
+
+## Introduction to caching
+
+Caching should be implemented with consideration. Generally, caching the result of resources
+is faster than reprocessing them. Choosing what, how and when to cache is vital. [PHP APC](http://php.net/manual/en/book.apc.php) is one of the fastest caching systems available, closely followed by [Memcached](http://memcached.org/). [SQLite](http://www.sqlite.org/) and File caching are two of the slowest cache methods, however usually faster than reprocessing
+a complex set of instructions.
+
+Caching engines that use memory are considerably faster than file based alternatives. But
+memory is limited whereas disk space is plentiful. If caching large datasets, such as large database result sets, it is best to use file caching.
+
+ [!!] Cache drivers require the relevant PHP extensions to be installed. APC, eAccelerator, Memecached and Xcache all require non-standard PHP extensions.
+
+## What the Kohana Cache module does (and does not do)
+
+This module provides a simple abstracted interface to a wide selection of popular PHP cache engines. The caching API provides the basic caching methods implemented across all solutions, memory, network or disk based. Basic key / value storing is supported by all drivers, with additional tagging and garbage collection support where implemented or required.
+
+_Kohana Cache_ does not provide HTTP style caching for clients (web browsers) and/or proxies (_Varnish_, _Squid_). There are other Kohana modules that provide this functionality.
+
+## Choosing a cache provider
+
+Getting and setting values to cache is very simple when using the _Kohana Cache_ interface. The hardest choice is choosing which cache engine to use. When choosing a caching engine, the following criteria must be considered:
+
+ 1. __Does the cache need to be distributed?__
+    This is an important consideration as it will severely limit the options available to solutions such as Memcache when a distributed solution is required.
+ 2. __Does the cache need to be fast?__
+    In almost all cases retrieving data from a cache is faster than execution. However generally memory based caching is considerably faster than disk based caching (see table below).
+ 3. __How much cache is required?__
+    Cache is not endless, and memory based caches are subject to a considerably more limited storage resource.
+
+Driver           | Storage      | Speed     | Tags     | Distributed | Automatic Garbage Collection | Notes
+---------------- | ------------ | --------- | -------- | ----------- | ---------------------------- | -----------------------
+APC              | __Memory__   | Excellent | No       | No          | Yes | Widely available PHP opcode caching solution, improves php execution performance
+eAccelerator     | __Memory__   | Excellent | No       | No          | Yes | Limited support and no longer developed. Included for legacy systems
+File             | __Disk__     | Poor      | No       | No          | No  | Marginally faster than execution
+Memcache (tag)   | __Memory__   | Good      | No (yes) | Yes         | Yes | Generally fast distributed solution, but has a speed hit due to variable network latency
+Sqlite           | __Disk__     | Poor      | Yes      | No          | No  | Marginally faster than execution
+Xcache           | __Memory__   | Excellent | Yes      | No          | Yes | Very fast memory solution and alternative to APC
+
+It is possible to have hybrid cache solutions that use a combination of the engines above in different contexts. This is supported with _Kohana Cache_ as well.
+
+## Minimum requirements
+
+ *  Kohana 3.0.4
+ *  PHP 5.2.4 or greater
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/guide/cache/menu.md b/includes/kohana/modules/cache/guide/cache/menu.md
new file mode 100644
index 0000000..5218558
--- /dev/null
+++ b/includes/kohana/modules/cache/guide/cache/menu.md
@@ -0,0 +1,3 @@
+## [Cache]()
+- [Configuration](config)
+- [Usage](usage)
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/guide/cache/usage.md b/includes/kohana/modules/cache/guide/cache/usage.md
new file mode 100644
index 0000000..8a8239b
--- /dev/null
+++ b/includes/kohana/modules/cache/guide/cache/usage.md
@@ -0,0 +1,219 @@
+# Kohana Cache usage
+
+[Kohana_Cache] provides a simple interface allowing getting, setting and deleting of cached values. Two interfaces included in _Kohana Cache_ additionally provide _tagging_ and _garbage collection_ where they are supported by the respective drivers.
+
+## Getting a new cache instance
+
+Creating a new _Kohana Cache_ instance is simple, however it must be done using the [Cache::instance] method, rather than the traditional `new` constructor.
+
+     // Create a new instance of cache using the default group
+     $cache = Cache::instance();
+
+The default group will use whatever is set to [Cache::$default] and must have a corresponding [configuration](cache.config) definition for that group.
+
+To create a cache instance using a group other than the _default_, simply provide the group name as an argument.
+
+     // Create a new instance of the memcache group
+     $memcache = Cache::instance('memcache');
+
+If there is a cache instance already instantiated then you can get it directly from the class member.
+
+ [!!] Beware that this can cause issues if you do not test for the instance before trying to access it.
+
+     // Check for the existance of the cache driver
+     if (isset(Cache::$instances['memcache']))
+     {
+          // Get the existing cache instance directly (faster)
+          $memcache = Cache::$instances['memcache'];
+     }
+     else
+     {
+          // Get the cache driver instance (slower)
+          $memcache = Cache::instance('memcache');
+     }
+
+## Setting and getting variables to and from cache
+
+The cache library supports scalar and object values, utilising object serialization where required (or not supported by the caching engine). This means that the majority or objects can be cached without any modification.
+
+ [!!] Serialisation does not work with resource handles, such as filesystem, curl or socket resources.
+
+### Setting a value to cache
+
+Setting a value to cache using the [Cache::set] method can be done in one of two ways; either using the Cache instance interface, which is good for atomic operations; or getting an instance and using that for multiple operations.
+
+The first example demonstrates how to quickly load and set a value to the default cache instance.
+
+     // Create a cachable object
+     $object = new stdClass;
+
+     // Set a property
+     $object->foo = 'bar';
+
+     // Cache the object using default group (quick interface) with default time (3600 seconds)
+     Cache::instance()->set('foo', $object);
+
+If multiple cache operations are required, it is best to assign an instance of Cache to a variable and use that as below.
+
+     // Set the object using a defined group for a defined time period (30 seconds)
+     $memcache = Cache::instance('memcache');
+     $memcache->set('foo', $object, 30);
+
+#### Setting a value with tags
+
+Certain cache drivers support setting values with tags. To set a value to cache with tags using the following interface.
+
+     // Get a cache instance that supports tags
+     $memcache = Cache::instance('memcachetag');
+
+     // Test for tagging interface
+     if ($memcache instanceof Kohana_Cache_Tagging)
+     {
+          // Set a value with some tags for 30 seconds
+          $memcache->set('foo', $object, 30, array('snafu', 'stfu', 'fubar'));
+     }
+     // Otherwise set without tags
+     else
+     {
+          // Set a value for 30 seconds
+          $memcache->set('foo', $object, 30);
+     }
+
+It is possible to implement custom tagging solutions onto existing or new cache drivers by implementing the [Kohana_Cache_Tagging] interface. Kohana_Cache only applies the interface to drivers that support tagging natively as standard.
+
+### Getting a value from cache
+
+Getting variables back from cache is achieved using the [Cache::get] method using a single key to identify the cache entry.
+
+     // Retrieve a value from cache (quickly)
+     $object = Cache::instance()->get('foo');
+
+In cases where the requested key is not available or the entry has expired, a default value will be returned (__NULL__ by default). It is possible to define the default value as the key is requested.
+
+     // If the cache key is available (with default value set to FALSE)
+     if ($object = Cache::instance()->get('foo', FALSE))
+     {
+          // Do something
+     }
+     else
+     {
+          // Do something else
+     }
+
+#### Getting values from cache using tags
+
+It is possible to retrieve values from cache grouped by tag, using the [Cache::find] method with drivers that support tagging.
+
+ [!!] The __Memcachetag__ driver does not support the `Cache::find($tag)` interface and will throw an exception.
+
+     // Get an instance of cache
+     $cache = Cache::instance('memcachetag');
+
+     // Wrap in a try/catch statement to gracefully handle memcachetag
+     try
+     {
+          // Find values based on tag
+          return $cache->find('snafu');
+     }
+     catch (Kohana_Cache_Exception $e)
+     {
+          // Handle gracefully
+          return FALSE;
+     }
+
+### Deleting values from cache
+
+Deleting variables is very similar to the getting and setting methods already described. Deleting operations are split into three categories:
+
+ - __Delete value by key__. Deletes a cached value by the associated key.
+ - __Delete all values__. Deletes all caches values stored in the cache instance.
+ - __Delete values by tag__. Deletes all values that have the supplied tag. This is only supported by Memcached-Tag and Sqlite.
+
+#### Delete value by key
+
+To delete a specific value by its associated key:
+
+     // If the cache entry for 'foo' is deleted
+     if (Cache::instance()->delete('foo'))
+     {
+          // Cache entry successfully deleted, do something
+     }
+
+By default a `TRUE` value will be returned. However a `FALSE` value will be returned in instances where the key did not exist in the cache.
+
+#### Delete all values
+
+To delete all values in a specific instance:
+
+     // If all cache items where deleted successfully
+     if (Cache::instance()->delete_all())
+     {
+           // Do something
+     }
+
+It is also possible to delete all cache items in every instance:
+
+     // For each cache instance
+     foreach (Cache::$instances as $group => $instance)
+     {
+          if ($instance->delete_all())
+          {
+               var_dump('instance : '.$group.' has been flushed!');
+          }
+     }
+
+#### Delete values by tag
+
+Some of the caching drivers support deleting by tag. This will remove all the cached values that are associated with a specific tag. Below is an example of how to robustly handle deletion by tag.
+
+     // Get cache instance
+     $cache = Cache::instance();
+
+     // Check for tagging interface
+     if ($cache instanceof Kohana_Cache_Tagging)
+     {
+           // Delete all entries by the tag 'snafu'
+           $cache->delete_tag('snafu');
+     }
+
+#### Garbage Collection
+
+Garbage Collection (GC) is the cleaning of expired cache entries. For the most part, caching engines will take care of garbage collection internally. However a few of the file based systems do not handle this task and in these circumstances it would be prudent to garbage collect at a predetermined frequency. If no garbage collection is executed, the resource storing the cache entries will eventually fill and become unusable.
+
+When not automated, garbage collection is the responsibility of the developer. It is prudent to have a GC probability value that dictates how likely the garbage collection routing will be run. An example of such a system is demonstrated below.
+
+     // Get a cache instance
+     $cache_file = Cache::instance('file');
+
+     // Set a GC probability of 10%
+     $gc = 10;
+
+     // If the GC probability is a hit
+     if (rand(0,99) <= $gc and $cache_file instanceof Kohana_Cache_GarbageCollect)
+     {
+          // Garbage Collect
+          $cache_file->garbage_collect();
+     }
+
+# Interfaces
+
+Kohana Cache comes with two interfaces that are implemented where the drivers support them:
+
+ - __[Kohana_Cache_Tagging] for tagging support on cache entries__
+    - [Cache_MemcacheTag]
+    - [Cache_Sqlite]
+ - __[Kohana_Cache_GarbageCollect] for garbage collection with drivers without native support__
+    - [Cache_File]
+    - [Cache_Sqlite]
+
+When using interface specific caching features, ensure that code checks for the required interface before using the methods supplied. The following example checks whether the garbage collection interface is available before calling the `garbage_collect` method.
+
+    // Create a cache instance
+    $cache = Cache::instance();
+
+    // Test for Garbage Collection
+    if ($cache instanceof Kohana_Cache_GarbageCollect)
+    {
+         // Collect garbage
+         $cache->garbage_collect();
+    }
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/tests/cache/KohanaCacheTest.php b/includes/kohana/modules/cache/tests/cache/KohanaCacheTest.php
new file mode 100644
index 0000000..229e7d3
--- /dev/null
+++ b/includes/kohana/modules/cache/tests/cache/KohanaCacheTest.php
@@ -0,0 +1,91 @@
+<?php
+
+class KohanaCacheTest extends PHPUnit_Framework_TestCase {
+
+	static protected $test_instance;
+
+	public function setUp()
+	{
+		self::$test_instance = Cache::instance('file');
+		self::$test_instance->delete_all();
+
+		self::$test_instance->set('testGet1', 'foo', 3600);
+	}
+
+	public function tearDown()
+	{
+		self::$test_instance->delete_all();
+		self::$test_instance = NULL;
+	}
+
+	/**
+	 * Tests the cache static instance method
+	 */
+	public function testInstance()
+	{
+		$file_instance  = Cache::instance('file');
+		$file_instance2 = Cache::instance('file');
+
+		// Try and load a Cache instance
+		$this->assertType('Kohana_Cache', Cache::instance());
+		$this->assertType('Kohana_Cache_File', $file_instance);
+
+		// Test instances are only initialised once
+		$this->assertTrue(spl_object_hash($file_instance) == spl_object_hash($file_instance2));
+
+		// Test the publically accessible Cache instance store
+		$this->assertTrue(spl_object_hash(Cache::$instances['file']) == spl_object_hash($file_instance));
+
+		// Get the constructor method
+		$constructorMethod = new ReflectionMethod($file_instance, '__construct');
+
+		// Test the constructor for hidden visibility
+		$this->assertTrue($constructorMethod->isProtected(), '__construct is does not have protected visibility');
+	}
+
+	public function testGet()
+	{
+		// Try and get a non property
+		$this->assertNull(self::$test_instance->get('testGet0'));
+
+		// Try and get a non property with default return value
+		$this->assertEquals('bar', self::$test_instance->get('testGet0', 'bar'));
+
+		// Try and get a real cached property
+		$this->assertEquals('foo', self::$test_instance->get('testGet1'));
+	}
+
+	public function testSet()
+	{
+		$value = 'foobar';
+		$value2 = 'snafu';
+
+		// Set a new property
+		$this->assertTrue(self::$test_instance->set('testSet1', $value));
+
+		// Test the property exists
+		$this->assertEquals(self::$test_instance->get('testSet1'), $value);
+
+		// Test short set
+		$this->assertTrue(self::$test_instance->set('testSet2', $value2, 3));
+
+		// Test the property exists
+		$this->assertEquals(self::$test_instance->get('testSet2'), $value2);
+
+		// Allow test2 to expire
+		sleep(4);
+
+		// Test the property has expired
+		$this->assertNull(self::$test_instance->get('testSet2'));
+	}
+
+	public function testDelete()
+	{
+		
+	}
+
+	public function testDeleteAll()
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/cache/tests/phpunit.xml b/includes/kohana/modules/cache/tests/phpunit.xml
new file mode 100644
index 0000000..5e3b9c7
--- /dev/null
+++ b/includes/kohana/modules/cache/tests/phpunit.xml
@@ -0,0 +1,16 @@
+<!--
+	This is an example phpunit.xml file to get you started
+	Copy it to a directory, update the relative paths and rename to phpunit.xml
+	Then to run tests cd into it's directory and just run
+		phpunit
+	(it'll automatically use any phpunit.xml file in the current directory)
+
+	Any options you specify when calling phpunit will override the ones in here
+-->
+<phpunit colors="true" bootstrap="../../../articles/public/index.php">
+	<testsuites>
+		<testsuite name="Kohana Cache Tests">
+			<directory suffix=".php">cache/</directory>
+		</testsuite>
+	</testsuites>
+</phpunit>
diff --git a/includes/kohana/modules/codebench/classes/bench/arrcallback.php b/includes/kohana/modules/codebench/classes/bench/arrcallback.php
new file mode 100644
index 0000000..698a6b8
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/arrcallback.php
@@ -0,0 +1,57 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_ArrCallback extends Codebench {
+
+	public $description =
+		'Parsing <em>command[param,param]</em> strings in <code>Arr::callback()</code>:
+		 http://github.com/shadowhand/kohana/commit/c3aaae849164bf92a486e29e736a265b350cb4da#L0R127';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		// Valid callback strings
+		'foo',
+		'foo::bar',
+		'foo[apple,orange]',
+		'foo::bar[apple,orange]',
+		'[apple,orange]', // no command, only params
+		'foo[[apple],[orange]]', // params with brackets inside
+
+		// Invalid callback strings
+		'foo[apple,orange', // no closing bracket
+	);
+
+	public function bench_shadowhand($subject)
+	{
+		// The original regex we're trying to optimize
+		if (preg_match('/([^\[]*+)\[(.*)\]/', $subject, $match))
+			return $match;
+	}
+
+	public function bench_geert_regex_1($subject)
+	{
+		// Added ^ and $ around the whole pattern
+		if (preg_match('/^([^\[]*+)\[(.*)\]$/', $subject, $matches))
+			return $matches;
+	}
+
+	public function bench_geert_regex_2($subject)
+	{
+		// A rather experimental approach using \K which requires PCRE 7.2 ~ PHP 5.2.4
+		// Note: $matches[0] = params, $matches[1] = command
+		if (preg_match('/^([^\[]*+)\[\K.*(?=\]$)/', $subject, $matches))
+			return $matches;
+	}
+
+	public function bench_geert_str($subject)
+	{
+		// A native string function approach which beats all the regexes
+		if (strpos($subject, '[') !== FALSE AND substr($subject, -1) === ']')
+			return explode('[', substr($subject, 0, -1), 2);
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/autolinkemails.php b/includes/kohana/modules/codebench/classes/bench/autolinkemails.php
new file mode 100644
index 0000000..46e7a15
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/autolinkemails.php
@@ -0,0 +1,70 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_AutoLinkEmails extends Codebench {
+
+	public $description =
+		'Fixing <a href="http://dev.kohanaphp.com/issues/2772">#2772</a>, and comparing some possibilities.';
+
+	public $loops = 1000;
+
+	public $subjects = array
+	(
+		'<ul>
+		    <li>voorzitter@xxxx.com</li>
+		    <li>vicevoorzitter@xxxx.com</li>
+		</ul>',
+	);
+
+	// The original function, with str_replace replaced by preg_replace. Looks clean.
+	public function bench_match_all_loop($subject)
+	{
+		if (preg_match_all('~\b(?<!href="mailto:|">|58;)(?!\.)[-+_a-z0-9.]++(?<!\.)@(?![-.])[-a-z0-9.]+(?<!\.)\.[a-z]{2,6}\b~i', $subject, $matches))
+		{
+			foreach ($matches[0] as $match)
+			{
+				$subject = preg_replace('!\b'.preg_quote($match).'\b!', HTML::mailto($match), $subject);
+			}
+		}
+
+		return $subject;
+	}
+
+	// The "e" stands for "eval", hmm... Ugly and slow because it needs to reinterpret the PHP code upon each match.
+	public function bench_replace_e($subject)
+	{
+		return preg_replace(
+			'~\b(?<!href="mailto:|">|58;)(?!\.)[-+_a-z0-9.]++(?<!\.)@(?![-.])[-a-z0-9.]+(?<!\.)\.[a-z]{2,6}\b~ie',
+			'HTML::mailto("$0")', // Yuck!
+			$subject
+		);
+	}
+
+	// This one should be quite okay, it just requires an otherwise useless single-purpose callback.
+	public function bench_replace_callback_external($subject)
+	{
+		return preg_replace_callback(
+			'~\b(?<!href="mailto:|">|58;)(?!\.)[-+_a-z0-9.]++(?<!\.)@(?![-.])[-a-z0-9.]+(?<!\.)\.[a-z]{2,6}\b~i',
+			array($this, '_callback_external'),
+			$subject
+		);
+	}
+	protected function _callback_external($matches)
+	{
+		return HTML::mailto($matches[0]);
+	}
+
+	// This one clearly is the ugliest, the slowest and consumes a lot of memory!
+	public function bench_replace_callback_internal($subject)
+	{
+		return preg_replace_callback(
+			'~\b(?<!href="mailto:|">|58;)(?!\.)[-+_a-z0-9.]++(?<!\.)@(?![-.])[-a-z0-9.]+(?<!\.)\.[a-z]{2,6}\b~i',
+			create_function('$matches', 'return HTML::mailto($matches[0]);'), // Yuck!
+			$subject
+		);
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/datespan.php b/includes/kohana/modules/codebench/classes/bench/datespan.php
new file mode 100644
index 0000000..ff35479
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/datespan.php
@@ -0,0 +1,186 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Woody Gilk <woody.gilk@kohanaphp.com>
+ */
+class Bench_DateSpan extends Codebench {
+
+	public $description =
+		'Optimization for <code>Date::span()</code>.';
+
+	public $loops = 1000;
+
+	public $subjects = array();
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->subjects = array(
+			time(),
+			time() - Date::MONTH,
+			time() - Date::YEAR,
+			time() - Date::YEAR * 10,
+		);
+	}
+
+	// Original method
+	public static function bench_span_original($remote, $local = NULL, $output = 'years,months,weeks,days,hours,minutes,seconds')
+	{
+		// Array with the output formats
+		$output = preg_split('/[^a-z]+/', strtolower( (string) $output));
+
+		// Invalid output
+		if (empty($output))
+			return FALSE;
+
+		// Make the output values into keys
+		extract(array_flip($output), EXTR_SKIP);
+
+		if ($local === NULL)
+		{
+			// Calculate the span from the current time
+			$local = time();
+		}
+
+		// Calculate timespan (seconds)
+		$timespan = abs($remote - $local);
+
+		if (isset($years))
+		{
+			$timespan -= Date::YEAR * ($years = (int) floor($timespan / Date::YEAR));
+		}
+
+		if (isset($months))
+		{
+			$timespan -= Date::MONTH * ($months = (int) floor($timespan / Date::MONTH));
+		}
+
+		if (isset($weeks))
+		{
+			$timespan -= Date::WEEK * ($weeks = (int) floor($timespan / Date::WEEK));
+		}
+
+		if (isset($days))
+		{
+			$timespan -= Date::DAY * ($days = (int) floor($timespan / Date::DAY));
+		}
+
+		if (isset($hours))
+		{
+			$timespan -= Date::HOUR * ($hours = (int) floor($timespan / Date::HOUR));
+		}
+
+		if (isset($minutes))
+		{
+			$timespan -= Date::MINUTE * ($minutes = (int) floor($timespan / Date::MINUTE));
+		}
+
+		// Seconds ago, 1
+		if (isset($seconds))
+		{
+			$seconds = $timespan;
+		}
+
+		// Remove the variables that cannot be accessed
+		unset($timespan, $remote, $local);
+
+		// Deny access to these variables
+		$deny = array_flip(array('deny', 'key', 'difference', 'output'));
+
+		// Return the difference
+		$difference = array();
+		foreach ($output as $key)
+		{
+			if (isset($$key) AND ! isset($deny[$key]))
+			{
+				// Add requested key to the output
+				$difference[$key] = $$key;
+			}
+		}
+
+		// Invalid output formats string
+		if (empty($difference))
+			return FALSE;
+
+		// If only one output format was asked, don't put it in an array
+		if (count($difference) === 1)
+			return current($difference);
+
+		// Return array
+		return $difference;
+	}
+
+	// Using an array for the output
+	public static function bench_span_use_array($remote, $local = NULL, $output = 'years,months,weeks,days,hours,minutes,seconds')
+	{
+		// Array with the output formats
+		$output = preg_split('/[^a-z]+/', strtolower( (string) $output));
+
+		// Invalid output
+		if (empty($output))
+			return FALSE;
+
+		// Convert the list of outputs to an associative array
+		$output = array_combine($output, array_fill(0, count($output), 0));
+
+		// Make the output values into keys
+		extract(array_flip($output), EXTR_SKIP);
+
+		if ($local === NULL)
+		{
+			// Calculate the span from the current time
+			$local = time();
+		}
+
+		// Calculate timespan (seconds)
+		$timespan = abs($remote - $local);
+
+		if (isset($output['years']))
+		{
+			$timespan -= Date::YEAR * ($output['years'] = (int) floor($timespan / Date::YEAR));
+		}
+
+		if (isset($output['months']))
+		{
+			$timespan -= Date::MONTH * ($output['months'] = (int) floor($timespan / Date::MONTH));
+		}
+
+		if (isset($output['weeks']))
+		{
+			$timespan -= Date::WEEK * ($output['weeks'] = (int) floor($timespan / Date::WEEK));
+		}
+
+		if (isset($output['days']))
+		{
+			$timespan -= Date::DAY * ($output['days'] = (int) floor($timespan / Date::DAY));
+		}
+
+		if (isset($output['hours']))
+		{
+			$timespan -= Date::HOUR * ($output['hours'] = (int) floor($timespan / Date::HOUR));
+		}
+
+		if (isset($output['minutes']))
+		{
+			$timespan -= Date::MINUTE * ($output['minutes'] = (int) floor($timespan / Date::MINUTE));
+		}
+
+		// Seconds ago, 1
+		if (isset($output['seconds']))
+		{
+			$output['seconds'] = $timespan;
+		}
+
+		if (count($output) === 1)
+		{
+			// Only a single output was requested, return it
+			return array_pop($output);
+		}
+
+		// Return array
+		return $output;
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/explodelimit.php b/includes/kohana/modules/codebench/classes/bench/explodelimit.php
new file mode 100644
index 0000000..4bf2acc
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/explodelimit.php
@@ -0,0 +1,34 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_ExplodeLimit extends Codebench {
+
+	public $description =
+		'Having a look at the effect of adding a limit to the <a href="http://php.net/explode">explode</a> function.<br />
+		 http://stackoverflow.com/questions/1308149/how-to-get-a-part-of-url-between-4th-and-5th-slashes';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		'http://example.com/articles/123a/view',
+		'http://example.com/articles/123a/view/x/x/x/x/x',
+		'http://example.com/articles/123a/view/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x/x',
+	);
+
+	public function bench_explode_without_limit($subject)
+	{
+		$parts = explode('/', $subject);
+		return $parts[4];
+	}
+
+	public function bench_explode_with_limit($subject)
+	{
+		$parts = explode('/', $subject, 6);
+		return $parts[4];
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/gruberurl.php b/includes/kohana/modules/codebench/classes/bench/gruberurl.php
new file mode 100644
index 0000000..af23975
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/gruberurl.php
@@ -0,0 +1,61 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_GruberURL extends Codebench {
+
+	public $description =
+		'Optimization for http://daringfireball.net/2009/11/liberal_regex_for_matching_urls';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		'http://foo.com/blah_blah',
+		'http://foo.com/blah_blah/',
+		'(Something like http://foo.com/blah_blah)',
+		'http://foo.com/blah_blah_(wikipedia)',
+		'(Something like http://foo.com/blah_blah_(wikipedia))',
+		'http://foo.com/blah_blah.',
+		'http://foo.com/blah_blah/.',
+		'<http://foo.com/blah_blah>',
+		'<http://foo.com/blah_blah/>',
+		'http://foo.com/blah_blah,',
+		'http://www.example.com/wpstyle/?p=364.',
+		'http://✪df.ws/e7l',
+		'rdar://1234',
+		'rdar:/1234',
+		'x-yojimbo-item://6303E4C1-xxxx-45A6-AB9D-3A908F59AE0E',
+		'message://%3c330e7f8409726r6a4ba78dkf1fd71420c1bf6ff@mail.gmail.com%3e',
+		'http://➡.ws/䨹',
+		'www.➡.ws/䨹',
+		'<tag>http://example.com</tag>',
+		'Just a www.example.com link.',
+		// To test the use of possessive quatifiers:
+		'httpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp',
+	);
+
+	public function bench_daringfireball($subject)
+	{
+		// Original regex by John Gruber
+		preg_match('~\b(([\w-]+://?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/)))~', $subject, $matches);
+		return (empty($matches)) ? FALSE : $matches[0];
+	}
+
+	public function bench_daringfireball_v2($subject)
+	{
+		// Removed outer capturing parentheses, made another pair non-capturing
+		preg_match('~\b(?:[\w-]+://?|www[.])[^\s()<>]+(?:\([\w\d]+\)|(?:[^[:punct:]\s]|/))~', $subject, $matches);
+		return (empty($matches)) ? FALSE : $matches[0];
+	}
+
+	public function bench_daringfireball_v3($subject)
+	{
+		// Made quantifiers possessive where possible
+		preg_match('~\b(?:[\w-]++://?+|www[.])[^\s()<>]+(?:\([\w\d]++\)|(?:[^[:punct:]\s]|/))~', $subject, $matches);
+		return (empty($matches)) ? FALSE : $matches[0];
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/ltrimdigits.php b/includes/kohana/modules/codebench/classes/bench/ltrimdigits.php
new file mode 100644
index 0000000..71ead49
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/ltrimdigits.php
@@ -0,0 +1,28 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_LtrimDigits extends Codebench {
+
+	public $description = 'Chopping off leading digits: regex vs ltrim.';
+
+	public $loops = 100000;
+
+	public $subjects = array
+	(
+		'123digits',
+		'no-digits',
+	);
+
+	public function bench_regex($subject)
+	{
+		return preg_replace('/^\d+/', '', $subject);
+	}
+
+	public function bench_ltrim($subject)
+	{
+		return ltrim($subject, '0..9');
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/mddobaseurl.php b/includes/kohana/modules/codebench/classes/bench/mddobaseurl.php
new file mode 100644
index 0000000..1ad2a1b
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/mddobaseurl.php
@@ -0,0 +1,66 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_MDDoBaseURL extends Codebench {
+
+	public $description =
+		'Optimization for the <code>doBaseURL()</code> method of <code>Kohana_Kodoc_Markdown</code>
+		 for the Kohana Userguide.';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		// Valid matches
+		'[filesystem](about.filesystem)',
+		'[filesystem](about.filesystem "Optional title")',
+		'[same page link](#id)',
+		'[object oriented](http://wikipedia.org/wiki/Object-Oriented_Programming)',
+
+		// Invalid matches
+		'![this is image syntax](about.filesystem)',
+		'[filesystem](about.filesystem',
+	);
+
+	public function bench_original($subject)
+	{
+		// The original regex contained a bug, which is fixed here for benchmarking purposes.
+		// At the very start of the regex, (?!!) has been replace by (?<!!)
+		return preg_replace_callback('~(?<!!)\[(.+?)\]\(([^#]\S*(?:\s*".+?")?)\)~', array($this, '_add_base_url_original'), $subject);
+	}
+	public function _add_base_url_original($matches)
+	{
+		if ($matches[2] AND strpos($matches[2], '://') === FALSE)
+		{
+			// Add the base url to the link URL
+			$matches[2] = 'http://BASE/'.$matches[2];
+		}
+
+		// Recreate the link
+		return "[{$matches[1]}]({$matches[2]})";
+	}
+
+	public function bench_optimized_callback($subject)
+	{
+		return preg_replace_callback('~(?<!!)\[(.+?)\]\((?!\w++://)([^#]\S*(?:\s*+".+?")?)\)~', array($this, '_add_base_url_optimized'), $subject);
+	}
+	public function _add_base_url_optimized($matches)
+	{
+		// Add the base url to the link URL
+		$matches[2] = 'http://BASE/'.$matches[2];
+
+		// Recreate the link
+		return "[{$matches[1]}]({$matches[2]})";
+	}
+
+	public function bench_callback_gone($subject)
+	{
+		// All the optimized callback was doing now, is prepend some text to the URL.
+		// We don't need a callback for that, and that should be clearly faster.
+		return preg_replace('~(?<!!)(\[.+?\]\()(?!\w++://)([^#]\S*(?:\s*+".+?")?\))~', '$1http://BASE/$2', $subject);
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/mddoimageurl.php b/includes/kohana/modules/codebench/classes/bench/mddoimageurl.php
new file mode 100644
index 0000000..32393c5
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/mddoimageurl.php
@@ -0,0 +1,66 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_MDDoImageURL extends Codebench {
+
+	public $description =
+		'Optimization for the <code>doImageURL()</code> method of <code>Kohana_Kodoc_Markdown</code>
+		 for the Kohana Userguide.';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		// Valid matches
+		'![Alt text](http://img.skitch.com/20091019-rud5mmqbf776jwua6hx9nm1n.png)',
+		'![Alt text](https://img.skitch.com/20091019-rud5mmqbf776jwua6hx9nm1n.png)',
+		'![Alt text](otherprotocol://image.png "Optional title")',
+		'![Alt text](img/install.png "Optional title")',
+		'![Alt text containing [square] brackets](img/install.png)',
+		'![Empty src]()',
+
+		// Invalid matches
+		'![Alt text](img/install.png                 "No closing parenthesis"',
+	);
+
+	public function bench_original($subject)
+	{
+		return preg_replace_callback('~!\[(.+?)\]\((\S*(?:\s*".+?")?)\)~', array($this, '_add_image_url_original'), $subject);
+	}
+	protected function _add_image_url_original($matches)
+	{
+		if ($matches[2] AND strpos($matches[2], '://') === FALSE)
+		{
+			// Add the base url to the link URL
+			$matches[2] = 'http://BASE/'.$matches[2];
+		}
+
+		// Recreate the link
+		return "![{$matches[1]}]({$matches[2]})";
+	}
+
+	public function bench_optimized_callback($subject)
+	{
+		// Moved the check for "://" to the regex, simplifying the callback function
+		return preg_replace_callback('~!\[(.+?)\]\((?!\w++://)(\S*(?:\s*+".+?")?)\)~', array($this, '_add_image_url_optimized'), $subject);
+	}
+	protected function _add_image_url_optimized($matches)
+	{
+		// Add the base url to the link URL
+		$matches[2] = 'http://BASE/'.$matches[2];
+
+		// Recreate the link
+		return "![{$matches[1]}]({$matches[2]})";
+	}
+
+	public function bench_callback_gone($subject)
+	{
+		// All the optimized callback was doing now, is prepend some text to the URL.
+		// We don't need a callback for that, and that should be clearly faster.
+		return preg_replace('~(!\[.+?\]\()(?!\w++://)(\S*(?:\s*+".+?")?\))~', '$1http://BASE/$2', $subject);
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/mddoincludeviews.php b/includes/kohana/modules/codebench/classes/bench/mddoincludeviews.php
new file mode 100644
index 0000000..9cac3d6
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/mddoincludeviews.php
@@ -0,0 +1,50 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_MDDoIncludeViews extends Codebench {
+
+	public $description =
+		'Optimization for the <code>doIncludeViews()</code> method of <code>Kohana_Kodoc_Markdown</code>
+		 for the Kohana Userguide.';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		// Valid matches
+		'{{one}} two {{three}}',
+		'{{userguide/examples/hello_world_error}}',
+
+		// Invalid matches
+		'{}',
+		'{{}}',
+		'{{userguide/examples/hello_world_error}',
+		'{{userguide/examples/hello_world_error }}',
+		'{{userguide/examples/{{hello_world_error }}',
+	);
+
+	public function bench_original($subject)
+	{
+		preg_match_all('/{{(\S+?)}}/m', $subject, $matches, PREG_SET_ORDER);
+		return $matches;
+	}
+
+	public function bench_possessive($subject)
+	{
+		// Using a possessive character class
+		// Removed useless /m modifier
+		preg_match_all('/{{([^\s{}]++)}}/', $subject, $matches, PREG_SET_ORDER);
+		return $matches;
+	}
+
+	public function bench_lookaround($subject)
+	{
+		// Using lookaround to move $mathes[1] into $matches[0]
+		preg_match_all('/(?<={{)[^\s{}]++(?=}})/', $subject, $matches, PREG_SET_ORDER);
+		return $matches;
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/stripnullbytes.php b/includes/kohana/modules/codebench/classes/bench/stripnullbytes.php
new file mode 100644
index 0000000..4d28853
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/stripnullbytes.php
@@ -0,0 +1,37 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_StripNullBytes extends Codebench {
+
+	public $description =
+		'String replacement comparisons related to <a href="http://dev.kohanaphp.com/issues/2676">#2676</a>.';
+
+	public $loops = 1000;
+
+	public $subjects = array
+	(
+		"\0",
+		"\0\0\0\0\0\0\0\0\0\0",
+		"bla\0bla\0bla\0bla\0bla\0bla\0bla\0bla\0bla\0bla",
+		"blablablablablablablablablablablablablablablabla",
+	);
+
+	public function bench_str_replace($subject)
+	{
+		return str_replace("\0", '', $subject);
+	}
+
+	public function bench_strtr($subject)
+	{
+		return strtr($subject, array("\0" => ''));
+	}
+
+	public function bench_preg_replace($subject)
+	{
+		return preg_replace('~\0+~', '', $subject);
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/transliterate.php b/includes/kohana/modules/codebench/classes/bench/transliterate.php
new file mode 100644
index 0000000..aff8693
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/transliterate.php
@@ -0,0 +1,65 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_Transliterate extends Codebench {
+
+	public $description =
+		'Inspired by:
+		 http://forum.kohanaframework.org/comments.php?DiscussionID=6113';
+
+	public $loops = 10;
+
+	public $subjects = array
+	(
+		// ASCII
+		'a', 'b', 'c', 'd', '1', '2', '3',
+
+		// Non-ASCII
+		'à', 'ô', 'ď', 'ḟ', 'ë', 'š', 'ơ',
+		'ß', 'ă', 'ř', 'ț', 'ň', 'ā', 'ķ',
+		'ŝ', 'ỳ', 'ņ', 'ĺ', 'ħ', 'ṗ', 'ó',
+		'ú', 'ě', 'é', 'ç', 'ẁ', 'ċ', 'õ',
+		'ṡ', 'ø', 'ģ', 'ŧ', 'ș', 'ė', 'ĉ',
+		'ś', 'î', 'ű', 'ć', 'ę', 'ŵ', 'ṫ',
+		'ū', 'č', 'ö', 'è', 'ŷ', 'ą', 'ł',
+		'ų', 'ů', 'ş', 'ğ', 'ļ', 'ƒ', 'ž',
+		'ẃ', 'ḃ', 'å', 'ì', 'ï', 'ḋ', 'ť',
+		'ŗ', 'ä', 'í', 'ŕ', 'ê', 'ü', 'ò',
+		'ē', 'ñ', 'ń', 'ĥ', 'ĝ', 'đ', 'ĵ',
+		'ÿ', 'ũ', 'ŭ', 'ư', 'ţ', 'ý', 'ő',
+		'â', 'ľ', 'ẅ', 'ż', 'ī', 'ã', 'ġ',
+		'ṁ', 'ō', 'ĩ', 'ù', 'į', 'ź', 'á',
+		'û', 'þ', 'ð', 'æ', 'µ', 'ĕ', 'ı',
+		'À', 'Ô', 'Ď', 'Ḟ', 'Ë', 'Š', 'Ơ',
+		'Ă', 'Ř', 'Ț', 'Ň', 'Ā', 'Ķ', 'Ĕ',
+		'Ŝ', 'Ỳ', 'Ņ', 'Ĺ', 'Ħ', 'Ṗ', 'Ó',
+		'Ú', 'Ě', 'É', 'Ç', 'Ẁ', 'Ċ', 'Õ',
+		'Ṡ', 'Ø', 'Ģ', 'Ŧ', 'Ș', 'Ė', 'Ĉ',
+		'Ś', 'Î', 'Ű', 'Ć', 'Ę', 'Ŵ', 'Ṫ',
+		'Ū', 'Č', 'Ö', 'È', 'Ŷ', 'Ą', 'Ł',
+		'Ų', 'Ů', 'Ş', 'Ğ', 'Ļ', 'Ƒ', 'Ž',
+		'Ẃ', 'Ḃ', 'Å', 'Ì', 'Ï', 'Ḋ', 'Ť',
+		'Ŗ', 'Ä', 'Í', 'Ŕ', 'Ê', 'Ü', 'Ò',
+		'Ē', 'Ñ', 'Ń', 'Ĥ', 'Ĝ', 'Đ', 'Ĵ',
+		'Ÿ', 'Ũ', 'Ŭ', 'Ư', 'Ţ', 'Ý', 'Ő',
+		'Â', 'Ľ', 'Ẅ', 'Ż', 'Ī', 'Ã', 'Ġ',
+		'Ṁ', 'Ō', 'Ĩ', 'Ù', 'Į', 'Ź', 'Á',
+		'Û', 'Þ', 'Ð', 'Æ', 'İ',
+	);
+
+	public function bench_utf8($subject)
+	{
+		return UTF8::transliterate_to_ascii($subject);
+	}
+
+	public function bench_iconv($subject)
+	{
+		// Note: need to suppress errors on iconv because some chars trigger the following notice:
+		// "Detected an illegal character in input string"
+		return preg_replace('~[^-a-z0-9]+~i', '', @iconv('UTF-8', 'ASCII//TRANSLIT', $subject));
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/urlsite.php b/includes/kohana/modules/codebench/classes/bench/urlsite.php
new file mode 100644
index 0000000..0db347d
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/urlsite.php
@@ -0,0 +1,123 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_URLSite extends Codebench {
+
+	public $description = 'http://dev.kohanaframework.org/issues/3110';
+
+	public $loops = 1000;
+
+	public $subjects = array
+	(
+		'',
+		'news',
+		'news/',
+		'/news/',
+		'news/page/5',
+		'news/page:5',
+		'http://example.com/',
+		'http://example.com/hello',
+		'http://example.com:80/',
+		'http://user:pass@example.com/',
+	);
+
+	public function __construct()
+	{
+		foreach ($this->subjects as $subject)
+		{
+			// Automatically create URIs with query string and/or fragment part appended
+			$this->subjects[] = $subject.'?query=string';
+			$this->subjects[] = $subject.'#fragment';
+			$this->subjects[] = $subject.'?query=string#fragment';
+		}
+
+		parent::__construct();
+	}
+
+	public function bench_original($uri)
+	{
+		// Get the path from the URI
+		$path = trim(parse_url($uri, PHP_URL_PATH), '/');
+
+		if ($query = parse_url($uri, PHP_URL_QUERY))
+		{
+			$query = '?'.$query;
+		}
+
+		if ($fragment = parse_url($uri, PHP_URL_FRAGMENT))
+		{
+			$fragment = '#'.$fragment;
+		}
+
+		return $path.$query.$fragment;
+	}
+
+	public function bench_explode($uri)
+	{
+		// Chop off possible scheme, host, port, user and pass parts
+		$path = preg_replace('~^[-a-z0-9+.]++://[^/]++/?~', '', trim($uri, '/'));
+
+		$fragment = '';
+		$explode = explode('#', $path, 2);
+		if (isset($explode[1]))
+		{
+			$path = $explode[0];
+			$fragment = '#'.$explode[1];
+		}
+
+		$query = '';
+		$explode = explode('?', $path, 2);
+		if (isset($explode[1]))
+		{
+			$path = $explode[0];
+			$query = '?'.$explode[1];
+		}
+
+		return $path.$query.$fragment;
+	}
+
+	public function bench_regex($uri)
+	{
+		preg_match('~^(?:[-a-z0-9+.]++://[^/]++/?)?([^?#]++)?(\?[^#]*+)?(#.*)?~', trim($uri, '/'), $matches);
+		$path = Arr::get($matches, 1, '');
+		$query = Arr::get($matches, 2, '');
+		$fragment = Arr::get($matches, 3, '');
+
+		return $path.$query.$fragment;
+	}
+
+	public function bench_regex_without_arrget($uri)
+	{
+		preg_match('~^(?:[-a-z0-9+.]++://[^/]++/?)?([^?#]++)?(\?[^#]*+)?(#.*)?~', trim($uri, '/'), $matches);
+		$path = isset($matches[1]) ? $matches[1] : '';
+		$query = isset($matches[2]) ? $matches[2] : '';
+		$fragment = isset($matches[3]) ? $matches[3] : '';
+
+		return $path.$query.$fragment;
+	}
+
+	// And then I thought, why do all the work of extracting the query and fragment parts and then reappending them?
+	// Just leaving them alone should be fine, right? As a bonus we get a very nice speed boost.
+	public function bench_less_is_more($uri)
+	{
+		// Chop off possible scheme, host, port, user and pass parts
+		$path = preg_replace('~^[-a-z0-9+.]++://[^/]++/?~', '', trim($uri, '/'));
+
+		return $path;
+	}
+
+	public function bench_less_is_more_with_strpos_optimization($uri)
+	{
+		if (strpos($uri, '://') !== FALSE)
+		{
+			// Chop off possible scheme, host, port, user and pass parts
+			$uri = preg_replace('~^[-a-z0-9+.]++://[^/]++/?~', '', trim($uri, '/'));
+		}
+
+		return $uri;
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/userfuncarray.php b/includes/kohana/modules/codebench/classes/bench/userfuncarray.php
new file mode 100644
index 0000000..f53d0c6
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/userfuncarray.php
@@ -0,0 +1,58 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Woody Gilk <woody.gilk@kohanaphp.com>
+ */
+class Bench_UserFuncArray extends Codebench {
+
+	public $description =
+		'Testing the speed difference of using <code>call_user_func_array</code>
+		 compared to counting args and doing manual calls.';
+
+	public $loops = 100000;
+
+	public $subjects = array
+	(
+		// Argument sets
+		array(),
+		array('one'),
+		array('one', 'two'),
+		array('one', 'two', 'three'),
+	);
+
+	public function bench_count_args($args)
+	{
+		$name = 'callme';
+		switch (count($args))
+		{
+			case 1:
+				$this->$name($args[0]);
+			break;
+			case 2:
+				$this->$name($args[0], $args[1]);
+			break;
+			case 3:
+				$this->$name($args[0], $args[1], $args[2]);
+			break;
+			case 4:
+				$this->$name($args[0], $args[1], $args[2], $args[3]);
+			break;
+			default:
+				call_user_func_array(array($this, $name), $args);
+			break;
+		}
+	}
+
+	public function bench_direct_call($args)
+	{
+		$name = 'callme';
+		call_user_func_array(array($this, $name), $args);
+	}
+
+	protected function callme()
+	{
+		return count(func_get_args());
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/validcolor.php b/includes/kohana/modules/codebench/classes/bench/validcolor.php
new file mode 100644
index 0000000..8d04608
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/validcolor.php
@@ -0,0 +1,116 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_ValidColor extends Codebench {
+
+	public $description =
+		'Optimization for <code>Validate::color()</code>.
+		 See: http://forum.kohanaphp.com/comments.php?DiscussionID=2192.
+
+		 Note that the methods with an <em>_invalid</em> suffix contain flawed regexes and should be
+		 completely discarded. I left them in here for educational purposes, and to remind myself
+		 to think harder and test more thoroughly. It can\'t be that I only found out so late in
+		 the game. For the regex explanation have a look at the forum topic mentioned earlier.';
+
+	public $loops = 10000;
+
+	public $subjects = array
+	(
+		// Valid colors
+		'aaA',
+		'123',
+		'000000',
+		'#123456',
+		'#abcdef',
+
+		// Invalid colors
+		'ggg',
+		'1234',
+		'#1234567',
+		"#000\n",
+		'}§è!çà%$z',
+	);
+
+	// Note that I added the D modifier to corey's regexes. We need to match exactly
+	// the same if we want the benchmarks to be of any value.
+	public function bench_corey_regex_1_invalid($subject)
+	{
+		return (bool) preg_match('/^#?([0-9a-f]{1,2}){3}$/iD', $subject);
+	}
+
+	public function bench_corey_regex_2($subject)
+	{
+		return (bool) preg_match('/^#?([0-9a-f]){3}(([0-9a-f]){3})?$/iD', $subject);
+	}
+
+	// Optimized corey_regex_1
+	// Using non-capturing parentheses and a possessive interval
+	public function bench_geert_regex_1a_invalid($subject)
+	{
+		return (bool) preg_match('/^#?(?:[0-9a-f]{1,2}+){3}$/iD', $subject);
+	}
+
+	// Optimized corey_regex_2
+	// Removed useless parentheses, made the remaining ones non-capturing
+	public function bench_geert_regex_2a($subject)
+	{
+		return (bool) preg_match('/^#?[0-9a-f]{3}(?:[0-9a-f]{3})?$/iD', $subject);
+	}
+
+	// Optimized geert_regex_1a
+	// Possessive "#"
+	public function bench_geert_regex_1b_invalid($subject)
+	{
+		return (bool) preg_match('/^#?+(?:[0-9a-f]{1,2}+){3}$/iD', $subject);
+	}
+
+	// Optimized geert_regex_2a
+	// Possessive "#"
+	public function bench_geert_regex_2b($subject)
+	{
+		return (bool) preg_match('/^#?+[0-9a-f]{3}(?:[0-9a-f]{3})?$/iD', $subject);
+	}
+
+	// Using \z instead of $
+	public function bench_salathe_regex_1($subject)
+	{
+		return (bool) preg_match('/^#?+[0-9a-f]{3}(?:[0-9a-f]{3})?\z/i', $subject);
+	}
+
+	// Using \A instead of ^
+	public function bench_salathe_regex_2($subject)
+	{
+		return (bool) preg_match('/\A#?+[0-9a-f]{3}(?:[0-9a-f]{3})?\z/i', $subject);
+	}
+
+	// A solution without regex
+	public function bench_geert_str($subject)
+	{
+		if ($subject[0] === '#')
+		{
+			$subject = substr($subject, 1);
+		}
+
+		$strlen = strlen($subject);
+		return (($strlen === 3 OR $strlen === 6) AND ctype_xdigit($subject));
+	}
+
+	// An ugly, but fast, solution without regex
+	public function bench_salathe_str($subject)
+	{
+		if ($subject[0] === '#')
+		{
+			$subject = substr($subject, 1);
+		}
+
+		// TRUE if:
+		// 1. $subject is 6 or 3 chars long
+		// 2. $subject contains only hexadecimal digits
+		return (((isset($subject[5]) AND ! isset($subject[6])) OR
+			(isset($subject[2]) AND ! isset($subject[3])))
+			AND ctype_xdigit($subject));
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/bench/validurl.php b/includes/kohana/modules/codebench/classes/bench/validurl.php
new file mode 100644
index 0000000..3c88675
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/bench/validurl.php
@@ -0,0 +1,105 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * @package    Kohana/Codebench
+ * @category   Tests
+ * @author     Geert De Deckere <geert@idoe.be>
+ */
+class Bench_ValidURL extends Codebench {
+
+	public $description =
+		'filter_var vs regex:
+		 http://dev.kohanaframework.org/issues/2847';
+
+	public $loops = 1000;
+
+	public $subjects = array
+	(
+		// Valid
+		'http://google.com',
+		'http://google.com/',
+		'http://google.com/?q=abc',
+		'http://google.com/#hash',
+		'http://localhost',
+		'http://hello-world.pl',
+		'http://hello--world.pl',
+		'http://h.e.l.l.0.pl',
+		'http://server.tld/get/info',
+		'http://127.0.0.1',
+		'http://127.0.0.1:80',
+		'http://user@127.0.0.1',
+		'http://user:pass@127.0.0.1',
+		'ftp://my.server.com',
+		'rss+xml://rss.example.com',
+
+		// Invalid
+		'http://google.2com',
+		'http://google.com?q=abc',
+		'http://google.com#hash',
+		'http://hello-.pl',
+		'http://hel.-lo.world.pl',
+		'http://ww£.google.com',
+		'http://127.0.0.1234',
+		'http://127.0.0.1.1',
+		'http://user:@127.0.0.1',
+		"http://finalnewline.com\n",
+	);
+
+	public function bench_filter_var($url)
+	{
+		return (bool) filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED);
+	}
+
+	public function bench_regex($url)
+	{
+		// Based on http://www.apps.ietf.org/rfc/rfc1738.html#sec-5
+		if ( ! preg_match(
+			'~^
+
+			# scheme
+			[-a-z0-9+.]++://
+
+			# username:password (optional)
+			(?:
+				    [-a-z0-9$_.+!*\'(),;?&=%]++   # username
+				(?::[-a-z0-9$_.+!*\'(),;?&=%]++)? # password (optional)
+				@
+			)?
+
+			(?:
+				# ip address
+				\d{1,3}+(?:\.\d{1,3}+){3}+
+
+				| # or
+
+				# hostname (captured)
+				(
+					     (?!-)[-a-z0-9]{1,63}+(?<!-)
+					(?:\.(?!-)[-a-z0-9]{1,63}+(?<!-)){0,126}+
+				)
+			)
+
+			# port (optional)
+			(?::\d{1,5}+)?
+
+			# path (optional)
+			(?:/.*)?
+
+			$~iDx', $url, $matches))
+			return FALSE;
+
+		// We matched an IP address
+		if ( ! isset($matches[1]))
+			return TRUE;
+
+		// Check maximum length of the whole hostname
+		// http://en.wikipedia.org/wiki/Domain_name#cite_note-0
+		if (strlen($matches[1]) > 253)
+			return FALSE;
+
+		// An extra check for the top level domain
+		// It must start with a letter
+		$tld = ltrim(substr($matches[1], (int) strrpos($matches[1], '.')), '.');
+		return ctype_alpha($tld[0]);
+	}
+
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/codebench.php b/includes/kohana/modules/codebench/classes/codebench.php
new file mode 100644
index 0000000..0f4c55c
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/codebench.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Codebench extends Kohana_Codebench {}
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/classes/controller/codebench.php b/includes/kohana/modules/codebench/classes/controller/codebench.php
new file mode 100644
index 0000000..cdd9a70
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/controller/codebench.php
@@ -0,0 +1,34 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Codebench — A benchmarking module.
+ *
+ * @package    Kohana/Codebench
+ * @category   Controllers
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Controller_Codebench extends Kohana_Controller_Template {
+
+	// The codebench view
+	public $template = 'codebench';
+
+	public function action_index($class)
+	{
+		// Convert submitted class name to URI segment
+		if (isset($_POST['class']))
+		{
+			$this->request->redirect('codebench/'.trim($_POST['class']));
+		}
+
+		// Pass the class name on to the view
+		$this->template->class = (string) $class;
+
+		// Try to load the class, then run it
+		if (Kohana::auto_load($class) === TRUE)
+		{
+			$codebench = new $class;
+			$this->template->codebench = $codebench->run();
+		}
+	}
+}
diff --git a/includes/kohana/modules/codebench/classes/kohana/codebench.php b/includes/kohana/modules/codebench/classes/kohana/codebench.php
new file mode 100644
index 0000000..68601bd
--- /dev/null
+++ b/includes/kohana/modules/codebench/classes/kohana/codebench.php
@@ -0,0 +1,217 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Codebench — A benchmarking module.
+ *
+ * @package    Kohana/Codebench
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+abstract class Kohana_Codebench {
+
+	/**
+	 * @var  string  Some optional explanatory comments about the benchmark file.
+	 *               HTML allowed. URLs will be converted to links automatically.
+	 */
+	public $description = '';
+
+	/**
+	 * @var  integer  How many times to execute each method per subject.
+	 */
+	public $loops = 1000;
+
+	/**
+	 * @var  array  The subjects to supply iteratively to your benchmark methods.
+	 */
+	public $subjects = array();
+
+	/**
+	 * @var  array  Grade letters with their maximum scores. Used to color the graphs.
+	 */
+	public $grades = array
+	(
+		125 => 'A',
+		150 => 'B',
+		200 => 'C',
+		300 => 'D',
+		500 => 'E',
+		'default' => 'F',
+	);
+
+	/**
+	 * Constructor.
+	 *
+	 * @return  void
+	 */
+	public function __construct()
+	{
+		// Set the maximum execution time
+		set_time_limit(Kohana::config('codebench')->max_execution_time);
+	}
+
+	/**
+	 * Runs Codebench on the extending class.
+	 *
+	 * @return  array  benchmark output
+	 */
+	public function run()
+	{
+		// Array of all methods to loop over
+		$methods = array_filter(get_class_methods($this), array($this, '_method_filter'));
+
+		// Make sure the benchmark runs at least once,
+		// also if no subject data has been provided.
+		if (empty($this->subjects))
+		{
+			$this->subjects = array('NULL' => NULL);
+		}
+
+		// Initialize benchmark output
+		$codebench = array
+		(
+			'class'       => get_class($this),
+			'description' => $this->description,
+			'loops'       => array
+			(
+				'base'    => (int) $this->loops,
+				'total'   => (int) $this->loops * count($this->subjects) * count($methods),
+			),
+			'subjects'    => $this->subjects,
+			'benchmarks'  => array(),
+		);
+
+		// Benchmark each method
+		foreach ($methods as $method)
+		{
+			// Initialize benchmark output for this method
+			$codebench['benchmarks'][$method] = array('time' => 0, 'memory' => 0);
+
+			// Using Reflection because simply calling $this->$method($subject) in the loop below
+			// results in buggy benchmark times correlating to the length of the method name.
+			$reflection = new ReflectionMethod(get_class($this), $method);
+
+			// Benchmark each subject on each method
+			foreach ($this->subjects as $subject_key => $subject)
+			{
+				// Prerun each method/subject combo before the actual benchmark loop.
+				// This way relatively expensive initial processes won't be benchmarked, e.g. autoloading.
+				// At the same time we capture the return here so we don't have to do that in the loop anymore.
+				$return = $reflection->invoke($this, $subject);
+
+				// Start the timer for one subject
+				$token = Profiler::start('codebench', $method.$subject_key);
+
+				// The heavy work
+				for ($i = 0; $i < $this->loops; ++$i)
+				{
+					$reflection->invoke($this, $subject);
+				}
+
+				// Stop and read the timer
+				$benchmark = Profiler::total($token);
+
+				// Benchmark output specific to the current method and subject
+				$codebench['benchmarks'][$method]['subjects'][$subject_key] = array
+				(
+					'return' => $return,
+					'time'   => $benchmark[0],
+					'memory' => $benchmark[1],
+				);
+
+				// Update method totals
+				$codebench['benchmarks'][$method]['time']   += $benchmark[0];
+				$codebench['benchmarks'][$method]['memory'] += $benchmark[1];
+			}
+		}
+
+		// Initialize the fastest and slowest benchmarks for both methods and subjects, time and memory,
+		// these values will be overwritten using min() and max() later on.
+		// The 999999999 values look like a hack, I know, but they work,
+		// unless your method runs for more than 31 years or consumes over 1GB of memory.
+		$fastest_method = $fastest_subject = array('time' => 999999999, 'memory' => 999999999); 
+		$slowest_method = $slowest_subject = array('time' => 0, 'memory' => 0);
+
+		// Find the fastest and slowest benchmarks, needed for the percentage calculations
+		foreach ($methods as $method)
+		{
+			// Update the fastest and slowest method benchmarks
+			$fastest_method['time']   = min($fastest_method['time'],   $codebench['benchmarks'][$method]['time']);
+			$fastest_method['memory'] = min($fastest_method['memory'], $codebench['benchmarks'][$method]['memory']);
+			$slowest_method['time']   = max($slowest_method['time'],   $codebench['benchmarks'][$method]['time']);
+			$slowest_method['memory'] = max($slowest_method['memory'], $codebench['benchmarks'][$method]['memory']);
+
+			foreach ($this->subjects as $subject_key => $subject)
+			{
+				// Update the fastest and slowest subject benchmarks
+				$fastest_subject['time']   = min($fastest_subject['time'],   $codebench['benchmarks'][$method]['subjects'][$subject_key]['time']);
+				$fastest_subject['memory'] = min($fastest_subject['memory'], $codebench['benchmarks'][$method]['subjects'][$subject_key]['memory']);
+				$slowest_subject['time']   = max($slowest_subject['time'],   $codebench['benchmarks'][$method]['subjects'][$subject_key]['time']);
+				$slowest_subject['memory'] = max($slowest_subject['memory'], $codebench['benchmarks'][$method]['subjects'][$subject_key]['memory']);
+			}
+		}
+
+		// Percentage calculations for methods
+		foreach ($codebench['benchmarks'] as & $method)
+		{
+			// Calculate percentage difference relative to fastest and slowest methods
+			$method['percent']['fastest']['time']   = (empty($fastest_method['time']))   ? 0 : ($method['time']   / $fastest_method['time']   * 100);
+			$method['percent']['fastest']['memory'] = (empty($fastest_method['memory'])) ? 0 : ($method['memory'] / $fastest_method['memory'] * 100);
+			$method['percent']['slowest']['time']   = (empty($slowest_method['time']))   ? 0 : ($method['time']   / $slowest_method['time']   * 100);
+			$method['percent']['slowest']['memory'] = (empty($slowest_method['memory'])) ? 0 : ($method['memory'] / $slowest_method['memory'] * 100);
+
+			// Assign a grade for time and memory to each method
+			$method['grade']['time']   = $this->_grade($method['percent']['fastest']['time']);
+			$method['grade']['memory'] = $this->_grade($method['percent']['fastest']['memory']);
+
+			// Percentage calculations for subjects
+			foreach ($method['subjects'] as & $subject)
+			{
+				// Calculate percentage difference relative to fastest and slowest subjects for this method
+				$subject['percent']['fastest']['time']   = (empty($fastest_subject['time']))   ? 0 : ($subject['time']   / $fastest_subject['time']   * 100);
+				$subject['percent']['fastest']['memory'] = (empty($fastest_subject['memory'])) ? 0 : ($subject['memory'] / $fastest_subject['memory'] * 100);
+				$subject['percent']['slowest']['time']   = (empty($slowest_subject['time']))   ? 0 : ($subject['time']   / $slowest_subject['time']   * 100);
+				$subject['percent']['slowest']['memory'] = (empty($slowest_subject['memory'])) ? 0 : ($subject['memory'] / $slowest_subject['memory'] * 100);
+
+				// Assign a grade letter for time and memory to each subject
+				$subject['grade']['time']   = $this->_grade($subject['percent']['fastest']['time']);
+				$subject['grade']['memory'] = $this->_grade($subject['percent']['fastest']['memory']);
+			}
+		}
+
+		return $codebench;
+	}
+
+	/**
+	 * Callback for array_filter().
+	 * Filters out all methods not to benchmark.
+	 *
+	 * @param   string   method name
+	 * @return  boolean
+	 */
+	protected function _method_filter($method)
+	{
+		// Only benchmark methods with the "bench" prefix
+		return (substr($method, 0, 5) === 'bench');
+	}
+
+	/**
+	 * Returns the applicable grade letter for a score.
+	 *
+	 * @param   integer|double  score
+	 * @return  string  grade letter
+	 */
+	protected function _grade($score)
+	{
+		foreach ($this->grades as $max => $grade)
+		{
+			if ($max === 'default')
+				continue;
+
+			if ($score <= $max)
+				return $grade;
+		}
+
+		return $this->grades['default'];
+	}
+}
diff --git a/includes/kohana/modules/codebench/config/codebench.php b/includes/kohana/modules/codebench/config/codebench.php
new file mode 100644
index 0000000..590186d
--- /dev/null
+++ b/includes/kohana/modules/codebench/config/codebench.php
@@ -0,0 +1,16 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+return array(
+
+	/**
+	 * The maximum execution time, in seconds. If set to zero, no time limit is imposed.
+	 * Note: http://php.net/manual/en/function.set-time-limit.php#84563
+	 */
+	'max_execution_time' => 0,
+
+	/**
+	 * Expand all benchmark details by default.
+	 */
+	'expand_all' => FALSE,
+
+);
diff --git a/includes/kohana/modules/codebench/config/userguide.php b/includes/kohana/modules/codebench/config/userguide.php
new file mode 100644
index 0000000..f9e6a14
--- /dev/null
+++ b/includes/kohana/modules/codebench/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'codebench' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Codebench',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Code benchmarking tool.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/guide/codebench/index.md b/includes/kohana/modules/codebench/guide/codebench/index.md
new file mode 100644
index 0000000..78b6f21
--- /dev/null
+++ b/includes/kohana/modules/codebench/guide/codebench/index.md
@@ -0,0 +1,76 @@
+# Using Codebench
+
+[!!] The contents of this page are taken (with some minor changes) from <http://www.geertdedeckere.be/article/introducing-codebench> and are copyright Geert De Deckere.
+
+For a long time I have been using a quick-and-dirty `benchmark.php` file to optimize bits of PHP code, many times regex-related stuff. The file contained not much more than a [gettimeofday](http://php.net/gettimeofday) function wrapped around a `for` loop. It worked, albeit not very efficiently. Something more solid was needed. I set out to create a far more usable piece of software to aid in the everlasting quest to squeeze every millisecond out of those regular expressions.
+
+## Codebench Goals
+
+### Benchmark multiple regular expressions at once
+
+Being able to compare the speed of an arbitrary amount of regular expressions would be tremendously useful. In case you are wondering—yes, I had been writing down benchmark times for each regex, uncommenting them one by one. You get the idea. Those days should be gone forever now.
+
+### Benchmark multiple subjects at once
+
+What gets overlooked too often when testing and optimizing regular expressions is the fact that speed can vastly differ depending on the subjects, also known as input or target strings. Just because your regular expression matches, say, a valid email address quickly, does not necessarily mean it will quickly realize when an invalid email is provided. I plan to write a follow-up article with hands-on regex examples to demonstrate this point. Anyway, Codebench allows you to create an array of subjects which will be passed to each benchmark.
+
+### Make it flexible enough to work for all PCRE functions
+
+Initially I named the module “Regexbench”. I quickly realized, though, it would be flexible enough to benchmark all kinds of PHP code, hence the change to “Codebench”. While tools specifically built to help profiling PCRE functions, like [preg_match](http://php.net/preg_match) or [preg_replace](http://php.net/preg_replace), definitely have their use, more flexibility was needed here. You should be able to compare all kinds of constructions like combinations of PCRE functions and native PHP string functions.
+
+### Create clean and portable benchmark cases
+
+Throwing valuable benchmark data away every time I needed to optimize another regular expression had to stop. A clean file containing the complete set of all regex variations to compare, together with the set of subjects to test them against, would be more than welcome. Moreover, it would be easy to exchange benchmark cases with others.
+
+### Visualize the benchmarks
+
+Obviously providing a visual representation of the benchmark results, via simple graphs, would make interpreting them easier. Having not to think about Internet Explorer for once, made writing CSS a whole lot more easy and fun. It resulted in some fine graphs which are fully resizable.
+
+Below are two screenshots of Codebench in action. `Valid_Color` is a class made for benchmarking different ways to validate hexadecimal HTML color values, e.g. `#FFF`. If you are interested in the story behind the actual regular expressions, take a look at [this topic in the Kohana forums](http://forum.kohanaphp.com/comments.php?DiscussionID=2192).
+
+![Benchmarking several ways to validate HTML color values](codebench_screenshot1.png)
+**Benchmarking seven ways to validate HTML color values**
+
+![Collapsable results per subject for each method](codebench_screenshot2.png)
+**Collapsable results per subject for each method**
+
+## Working with Codebench
+
+Codebench is included in Kohana 3, but if you need you [can download it](http://github.com/kohana/codebench/) from GitHub. Be sure Codebench is activated in your `application/bootstrap.php`.
+
+Creating your own benchmarks is just a matter of creating a class that extends the Codebench class.  The class should go in `classes/bench` and the class name should have the `Bench_` prefix.  Put the code parts you want to compare into separate methods. Be sure to prefix those methods with `bench_`, other methods will not be benchmarked. Glance at the files in `modules/codebench/classes/bench/` for more examples.
+
+Here is another short example with some extra explanations.
+	
+	// classes/bench/ltrimdigits.php
+	class Bench_LtrimDigits extends Codebench {
+	
+		// Some optional explanatory comments about the benchmark file.
+		// HTML allowed. URLs will be converted to links automatically.
+		public $description = 'Chopping off leading digits: regex vs ltrim.';
+	
+		// How many times to execute each method per subject.
+		// Total loops = loops * number of methods * number of subjects
+		public $loops = 100000;
+	
+		// The subjects to supply iteratively to your benchmark methods.
+		public $subjects = array
+		(
+			'123digits',
+			'no-digits',
+		);
+	
+		public function bench_regex($subject)
+		{
+			return preg_replace('/^\d+/', '', $subject);
+		}
+	
+		public function bench_ltrim($subject)
+		{
+			return ltrim($subject, '0..9');
+		}
+	}
+	
+	
+
+And the winner is… [ltrim](http://php.net/ltrim). Happy benchmarking!
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/guide/codebench/menu.md b/includes/kohana/modules/codebench/guide/codebench/menu.md
new file mode 100644
index 0000000..c73a19a
--- /dev/null
+++ b/includes/kohana/modules/codebench/guide/codebench/menu.md
@@ -0,0 +1 @@
+## [Codebench]()
\ No newline at end of file
diff --git a/includes/kohana/modules/codebench/init.php b/includes/kohana/modules/codebench/init.php
new file mode 100644
index 0000000..866cc34
--- /dev/null
+++ b/includes/kohana/modules/codebench/init.php
@@ -0,0 +1,8 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// Catch-all route for Codebench classes to run
+Route::set('codebench', 'codebench(/<class>)')
+	->defaults(array(
+		'controller' => 'codebench',
+		'action' => 'index',
+		'class' => NULL));
diff --git a/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot1.png b/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot1.png
new file mode 100644
index 0000000..d1cfcfb
Binary files /dev/null and b/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot1.png differ
diff --git a/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot2.png b/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot2.png
new file mode 100644
index 0000000..85bf560
Binary files /dev/null and b/includes/kohana/modules/codebench/media/guide/codebench/codebench_screenshot2.png differ
diff --git a/includes/kohana/modules/codebench/views/codebench.php b/includes/kohana/modules/codebench/views/codebench.php
new file mode 100644
index 0000000..7b6ef2a
--- /dev/null
+++ b/includes/kohana/modules/codebench/views/codebench.php
@@ -0,0 +1,260 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Codebench — A benchmarking module.
+ *
+ * @package    Kohana/Codebench
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+?>
+<!DOCTYPE html>
+
+<html lang="en">
+<head>
+
+	<meta charset="utf-8" />
+	<title><?php if ($class !== ''): ?>
+			<?php echo $class, ' · ' ?>
+		<?php endif; ?>Codebench</title>
+
+	<style>
+		/* General styles*/
+		body { position:relative; margin:1em 2em; font:12px monaco,monospace; }
+		h1 { font-size:24px; letter-spacing:-0.05em; }
+		h2 { font-size:18px; letter-spacing:-0.1em; }
+		input, code { font:inherit; }
+		code { background:#e5e5e5; }
+		caption { display:none; }
+
+		/* Form */
+		#runner { margin-bottom:2em; }
+		#runner input[type="text"] { letter-spacing:-0.05em; }
+
+		/* Expand/Collapse all */
+		#toggle_all { position:absolute; top:0; right:0; margin:0; padding:0 4px; background:#000; font-size:18px; color:#fff; cursor:pointer; -moz-border-radius:2px; -webkit-border-radius:2px; }
+
+		/* Benchmark main graphs */
+		#bench { margin:2em 0; padding:0; list-style:none; }
+		#bench > li { margin:6px 0; }
+		#bench h2 { position:relative; margin:0; padding:2px; background:#ccc; border:1px solid #999; cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; }
+		#bench h2 > span { display:block; min-width:1px; height:33px; background:#fff; -moz-border-radius:2px; -webkit-border-radius:2px; }
+		#bench h2 .method { position:absolute; top:6px; left:8px; text-shadow:0 -1px 0 rgba(255,255,255,0.6); }
+		#bench h2 .method:before { content:'▸ '; }
+		#bench h2 .percent { position:absolute; top:6px; right:6px; padding:0 4px; background:#000; color:#fff; font-weight:normal; letter-spacing:0; -moz-border-radius:2px; -webkit-border-radius:2px; }
+		#bench h2:hover .method { left:10px; }
+		#bench h2.expanded { margin:12px 0 0; -moz-border-radius-bottomleft:0; -moz-border-radius-bottomright:0; -webkit-border-bottom-left-radius:0; -webkit-border-bottom-right-radius:0; }
+		#bench h2.expanded .method:before { content:'▾ '; }
+
+		/* Colorization of the bars */
+		#bench .grade-A { background:#3f0; }
+		#bench .grade-B { background:#fc0; }
+		#bench .grade-C { background:#f90; }
+		#bench .grade-D { background:#f60; }
+		#bench .grade-E { background:#f30; }
+		#bench .grade-F { background:#f00; }
+
+		/* Benchmark details */
+		#bench > li > div { display:none; margin:0 0 12px; padding:0 0 2px; background:#eee; border:1px solid #999; border-top:0; -moz-border-radius-bottomleft:3px; -moz-border-radius-bottomright:3px; -webkit-border-bottom-left-radius:3px; -webkit-border-bottom-right-radius:3px; }
+		#bench > li > div table { width:100%; background:#eee; border-collapse:collapse; }
+		#bench > li > div th { padding:6px; background:#ddd url(data:image/gif;base64,R0lGODlhAQASALMAAMfHx8TExM7Oztvb29jY2NbW1tPT09DQ0MrKygAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAABABIAAAQNMAQAEBLiHGNKIcQwRAA7) repeat-x 0 1px; text-align:left; }
+		#bench > li > div td { padding:6px; border-top:1px solid #ccc; vertical-align:top; }
+		#bench .numeric { padding-left:18px; text-align:right; }
+		#bench .numeric span { position:relative; display:block; height:16px; }
+		#bench .numeric span span { position:absolute; top:0; right:0; min-width:1px; background:#ccc; -moz-border-radius:2px; -webkit-border-radius:2px; }
+		#bench .numeric span span span { top:0; right:0; background:none; }
+		#bench tbody tr:hover { background:#fff; }
+		#bench tbody tr.highlight { background:#ffc; }
+
+		/* Footer */
+		#footer { margin-top:2em; padding-top:1em; border-top:1px solid #ccc; color:#999; }
+		#footer a { color:inherit; }
+
+		/* Misc text styles */
+		.alert { padding:0 0.5em; background:#900; font-weight:normal; color:#fff; -moz-border-radius:3px; -webkit-border-radius:3px; }
+		.quiet { color:#999; }
+		.help { cursor:help; }
+	</style>
+
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+	<script>
+		$(document).ready(function() {
+			// Insert "Toggle All" button
+			var expand_all_text   = '▸ Expand all';
+			var collapse_all_text = '▾ Collapse all';
+			$('#bench').before('<p id="toggle_all">'+expand_all_text+'</p>');
+
+			// Cache these selection operations
+			var $runner       = $('#runner');
+			var $toggle_all   = $('#toggle_all');
+			var $bench_titles = $('#bench > li > h2');
+			var $bench_rows   = $('#bench > li > div > table > tbody > tr');
+
+			// Runner form
+			$(':input:first', $runner).focus();
+			$runner.submit(function() {
+				$(':submit', this).attr('value', 'Running…').attr('disabled', 'disabled');
+				$('.alert', this).remove();
+			});
+
+			// Toggle details for all benchmarks
+			$('#toggle_all').click(function() {
+				if ($(this).data('expanded')) {
+					$(this).data('expanded', false);
+					$(this).text(expand_all_text);
+					$bench_titles.removeClass('expanded').siblings().hide();
+				}
+				else {
+					$(this).data('expanded', true);
+					$(this).text(collapse_all_text);
+					$bench_titles.addClass('expanded').siblings().show();
+				}
+			});
+
+			<?php if (Kohana::config('codebench')->expand_all) { ?>
+				// Expand all benchmark details by default
+				$toggle_all.click();
+			<?php } ?>
+
+			// Toggle details for a single benchmark
+			$bench_titles.click(function() {
+				$(this).toggleClass('expanded').siblings().toggle();
+
+				// Counts of bench titles
+				var total_bench_titles    = $bench_titles.length;
+				var expanded_bench_titles = $bench_titles.filter('.expanded').length;
+
+				// If no benchmark details are expanded, change "Collapse all" to "Expand all"
+				if (expanded_bench_titles == 0 && $toggle_all.data('expanded')) {
+					$toggle_all.click();
+				}
+				// If all benchmark details are expanded, change "Expand all" to "Collapse all"
+				else if (expanded_bench_titles == total_bench_titles && ! $toggle_all.data('expanded')) {
+					$toggle_all.click();
+				}
+			});
+
+			// Highlight clicked rows
+			$bench_rows.click(function() {
+				$(this).toggleClass('highlight');
+			// Highlight doubleclicked rows globally
+			}).dblclick(function() {
+				var nth_row = $(this).parent().children().index(this) + 1;
+				if ($(this).hasClass('highlight')) {
+					$bench_rows.filter(':nth-child('+nth_row+')').removeClass('highlight');
+				}
+				else {
+					$bench_rows.filter(':nth-child('+nth_row+')').addClass('highlight');
+				}
+			});
+		});
+	</script>
+
+</head>
+<body>
+
+	<!--[if IE]><p class="alert">This page is not meant to be viewed in Internet Explorer. Get a better browser.</p><![endif]-->
+
+	<form id="runner" method="post" action="<?php echo URL::site('codebench') ?>">
+		<h1>
+			<input name="class" type="text" value="<?php echo ($class !== '') ? $class : 'Bench_' ?>" size="25" title="Name of the Codebench library to run" />
+			<input type="submit" value="Run" />
+			<?php if ( ! empty($class)) { ?>
+				<?php if (empty($codebench)) { ?>
+					<strong class="alert">Library not found</strong>
+				<?php } elseif (empty($codebench['benchmarks'])) { ?>
+					<strong class="alert">No methods found to benchmark</strong>
+				<?php } ?>
+			<?php } ?>
+		</h1>
+	</form>
+
+	<?php if ( ! empty($codebench)) { ?>
+
+		<?php if (empty($codebench['benchmarks'])) { ?>
+
+			<p>
+				<strong>
+					Remember to prefix the methods you want to benchmark with “bench”.<br />
+					You might also want to overwrite <code>Codebench->method_filter()</code>.
+				</strong>
+			</p>
+
+		<?php } else { ?>
+
+			<ul id="bench">
+			<?php foreach ($codebench['benchmarks'] as $method => $benchmark) { ?>
+				<li>
+
+					<h2 title="<?php printf('%01.6f', $benchmark['time']) ?>s">
+						<span class="grade-<?php echo $benchmark['grade']['time'] ?>" style="width:<?php echo $benchmark['percent']['slowest']['time'] ?>%">
+							<span class="method"><?php echo $method ?></span>
+							<span class="percent">+<?php echo (int) $benchmark['percent']['fastest']['time'] ?>%</span>
+						</span>
+					</h2>
+
+					<div>
+						<table>
+							<caption>Benchmarks per subject for <?php echo $method ?></caption>
+							<thead>
+								<tr>
+									<th style="width:50%">subject → return</th>
+									<th class="numeric" style="width:25%" title="Total method memory"><?php echo Text::bytes($benchmark['memory'], 'MB', '%01.6f%s') ?></th>
+									<th class="numeric" style="width:25%" title="Total method time"><?php printf('%01.6f', $benchmark['time']) ?>s</th>
+								</tr>
+							</thead>
+							<tbody>
+
+							<?php foreach ($benchmark['subjects'] as $subject_key => $subject) { ?>
+								<tr>
+									<td>
+										<strong class="help" title="(<?php echo gettype($codebench['subjects'][$subject_key]) ?>) <?php echo HTML::chars(var_export($codebench['subjects'][$subject_key], TRUE)) ?>">
+											[<?php echo HTML::chars($subject_key) ?>] →
+										</strong>
+										<span class="quiet">(<?php echo gettype($subject['return']) ?>)</span>
+										<?php echo HTML::chars(var_export($subject['return'], TRUE)) ?>
+									</td>
+									<td class="numeric">
+										<span title="+<?php echo (int) $subject['percent']['fastest']['memory'] ?>% memory">
+											<span style="width:<?php echo $subject['percent']['slowest']['memory'] ?>%">
+												<span><?php echo Text::bytes($subject['memory'], 'MB', '%01.6f%s') ?></span>
+											</span>
+										</span>
+									</td>
+									<td class="numeric">
+										<span title="+<?php echo (int) $subject['percent']['fastest']['time'] ?>% time">
+											<span style="width:<?php echo $subject['percent']['slowest']['time'] ?>%">
+												<span><?php printf('%01.6f', $subject['time']) ?>s</span>
+											</span>
+										</span>
+									</td>
+								</tr>
+							<?php } ?>
+
+							</tbody>
+						</table>
+					</div>
+
+				</li>
+			<?php } ?>
+			</ul>
+
+		<?php } ?>
+
+		<?php if ( ! empty($codebench['description'])) { ?>
+			<?php echo Text::auto_p(Text::auto_link($codebench['description']), FALSE) ?>
+		<?php } ?>
+
+		<?php // echo '<h2>Raw output:</h2>', Kohana::debug($codebench) ?>
+
+	<?php } ?>
+
+	<p id="footer">
+		Page executed in <strong><?php echo round(microtime(TRUE) - KOHANA_START_TIME, 2) ?>&nbsp;s</strong>
+		using <strong><?php echo Text::widont(Text::bytes(memory_get_usage(), 'MB')) ?></strong> of memory.<br />
+		<a href="http://github.com/kohana/codebench">Codebench</a>, a <a href="http://kohanaframework.org/">Kohana</a> module
+		by <a href="http://www.geertdedeckere.be/article/introducing-codebench">Geert De Deckere</a>.
+	</p>
+
+</body>
+</html>
diff --git a/includes/kohana/modules/database/classes/config/database.php b/includes/kohana/modules/database/classes/config/database.php
new file mode 100644
index 0000000..776a801
--- /dev/null
+++ b/includes/kohana/modules/database/classes/config/database.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Config_Database extends Kohana_Config_Database {}
diff --git a/includes/kohana/modules/database/classes/database.php b/includes/kohana/modules/database/classes/database.php
new file mode 100644
index 0000000..810f9ed
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Database extends Kohana_Database {}
diff --git a/includes/kohana/modules/database/classes/database/exception.php b/includes/kohana/modules/database/classes/database/exception.php
new file mode 100644
index 0000000..055bca5
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/exception.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Exception extends Kohana_Database_Exception {}
diff --git a/includes/kohana/modules/database/classes/database/expression.php b/includes/kohana/modules/database/classes/database/expression.php
new file mode 100644
index 0000000..aaf09a6
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/expression.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Expression extends Kohana_Database_Expression {}
diff --git a/includes/kohana/modules/database/classes/database/mysql.php b/includes/kohana/modules/database/classes/database/mysql.php
new file mode 100644
index 0000000..1b45358
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/mysql.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_MySQL extends Kohana_Database_MySQL {}
diff --git a/includes/kohana/modules/database/classes/database/mysql/result.php b/includes/kohana/modules/database/classes/database/mysql/result.php
new file mode 100644
index 0000000..7280270
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/mysql/result.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_MySQL_Result extends Kohana_Database_MySQL_Result {}
diff --git a/includes/kohana/modules/database/classes/database/pdo.php b/includes/kohana/modules/database/classes/database/pdo.php
new file mode 100644
index 0000000..f16140c
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/pdo.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_PDO extends Kohana_Database_PDO {}
diff --git a/includes/kohana/modules/database/classes/database/query.php b/includes/kohana/modules/database/classes/database/query.php
new file mode 100644
index 0000000..764f9b8
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query extends Kohana_Database_Query {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder.php b/includes/kohana/modules/database/classes/database/query/builder.php
new file mode 100644
index 0000000..c4e512e
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Database_Query_Builder extends Kohana_Database_Query_Builder {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/delete.php b/includes/kohana/modules/database/classes/database/query/builder/delete.php
new file mode 100644
index 0000000..a643385
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/delete.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query_Builder_Delete extends Kohana_Database_Query_Builder_Delete {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/insert.php b/includes/kohana/modules/database/classes/database/query/builder/insert.php
new file mode 100644
index 0000000..5d8a59b
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/insert.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query_Builder_Insert extends Kohana_Database_Query_Builder_Insert {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/join.php b/includes/kohana/modules/database/classes/database/query/builder/join.php
new file mode 100644
index 0000000..3850e00
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/join.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query_Builder_Join extends Kohana_Database_Query_Builder_Join {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/select.php b/includes/kohana/modules/database/classes/database/query/builder/select.php
new file mode 100644
index 0000000..24d1ac9
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/select.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query_Builder_Select extends Kohana_Database_Query_Builder_Select {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/update.php b/includes/kohana/modules/database/classes/database/query/builder/update.php
new file mode 100644
index 0000000..b3684d5
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/update.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Query_Builder_Update extends Kohana_Database_Query_Builder_Update {}
diff --git a/includes/kohana/modules/database/classes/database/query/builder/where.php b/includes/kohana/modules/database/classes/database/query/builder/where.php
new file mode 100644
index 0000000..f41c51c
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/query/builder/where.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Database_Query_Builder_Where extends Kohana_Database_Query_Builder_Where {}
diff --git a/includes/kohana/modules/database/classes/database/result.php b/includes/kohana/modules/database/classes/database/result.php
new file mode 100644
index 0000000..8136420
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/result.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Database_Result extends Kohana_Database_Result {}
diff --git a/includes/kohana/modules/database/classes/database/result/cached.php b/includes/kohana/modules/database/classes/database/result/cached.php
new file mode 100644
index 0000000..ada16bc
--- /dev/null
+++ b/includes/kohana/modules/database/classes/database/result/cached.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Database_Result_Cached extends Kohana_Database_Result_Cached {}
diff --git a/includes/kohana/modules/database/classes/db.php b/includes/kohana/modules/database/classes/db.php
new file mode 100644
index 0000000..a4130f6
--- /dev/null
+++ b/includes/kohana/modules/database/classes/db.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class DB extends Kohana_DB {}
diff --git a/includes/kohana/modules/database/classes/kohana/config/database.php b/includes/kohana/modules/database/classes/kohana/config/database.php
new file mode 100644
index 0000000..d188cbf
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/config/database.php
@@ -0,0 +1,97 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database-based configuration loader.
+ *
+ * Schema for configuration table:
+ *
+ *     group_name    varchar(128)
+ *     config_key    varchar(128)
+ *     config_value  text
+ *     primary key   (group_name, config_key)
+ *
+ * @package    Kohana/Database
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Config_Database extends Config_Reader {
+
+	protected $_database_instance = 'default';
+
+	protected $_database_table = 'config';
+
+	public function __construct(array $config = NULL)
+	{
+		if (isset($config['instance']))
+		{
+			$this->_database_instance = $config['instance'];
+		}
+
+		if (isset($config['table']))
+		{
+			$this->_database_table = $config['table'];
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Query the configuration table for all values for this group and
+	 * unserialize each of the values.
+	 *
+	 * @param   string  group name
+	 * @param   array   configuration array
+	 * @return  $this   clone of the current object
+	 */
+	public function load($group, array $config = NULL)
+	{
+		if ($config === NULL AND $group !== 'database')
+		{
+			// Load all of the configuration values for this group
+			$query = DB::select('config_key', 'config_value')
+				->from($this->_database_table)
+				->where('group_name', '=', $group)
+				->execute($this->_database_instance);
+
+			if (count($query) > 0)
+			{
+				// Unserialize the configuration values
+				$config = array_map('unserialize', $query->as_array('config_key', 'config_value'));
+			}
+		}
+
+		return parent::load($group, $config);
+	}
+
+	/**
+	 * Overload setting offsets to insert or update the database values as
+	 * changes occur.
+	 *
+	 * @param   string   array key
+	 * @param   mixed    new value
+	 * @return  mixed
+	 */
+	public function offsetSet($key, $value)
+	{
+		if ( ! $this->offsetExists($key))
+		{
+			// Insert a new value
+			DB::insert($this->_database_table, array('group_name', 'config_key', 'config_value'))
+				->values(array($this->_configuration_group, $key, serialize($value)))
+				->execute($this->_database_instance);
+		}
+		elseif ($this->offsetGet($key) !== $value)
+		{
+			// Update the value
+			DB::update($this->_database_table)
+				->value('config_value', serialize($value))
+				->where('group_name', '=', $this->_configuration_group)
+				->where('config_key', '=', $key)
+				->execute($this->_database_instance);
+		}
+
+		return parent::offsetSet($key, $value);
+	}
+
+} // End Kohana_Config_Database
diff --git a/includes/kohana/modules/database/classes/kohana/database.php b/includes/kohana/modules/database/classes/kohana/database.php
new file mode 100644
index 0000000..d84420a
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database.php
@@ -0,0 +1,699 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database connection wrapper/helper.
+ *
+ * You may get a database instance using `Database::instance('name')` where
+ * name is the [config](database/config) group. 
+ *
+ * This class provides connection instance management via Database Drivers, as
+ * well as quoting, escaping and other related functions. Querys are done using
+ * [Database_Query] and [Database_Query_Builder] objects, which can be easily
+ * created using the [DB] helper class.
+ *
+ * @package    Kohana/Database
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2010 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_Database {
+
+	// Query types
+	const SELECT =  1;
+	const INSERT =  2;
+	const UPDATE =  3;
+	const DELETE =  4;
+
+	/**
+	 * @var  string  default instance name
+	 */
+	public static $default = 'default';
+
+	/**
+	 * @var  array  Database instances
+	 */
+	public static $instances = array();
+
+	/**
+	 * Get a singleton Database instance. If configuration is not specified,
+	 * it will be loaded from the database configuration file using the same
+	 * group as the name.
+	 *
+	 *     // Load the default database
+	 *     $db = Database::instance();
+	 *
+	 *     // Create a custom configured instance
+	 *     $db = Database::instance('custom', $config);
+	 *
+	 * @param   string   instance name
+	 * @param   array    configuration parameters
+	 * @return  Database
+	 */
+	public static function instance($name = NULL, array $config = NULL)
+	{
+		if ($name === NULL)
+		{
+			// Use the default instance name
+			$name = Database::$default;
+		}
+
+		if ( ! isset(Database::$instances[$name]))
+		{
+			if ($config === NULL)
+			{
+				// Load the configuration for this database
+				$config = Kohana::config('database')->$name;
+			}
+
+			if ( ! isset($config['type']))
+			{
+				throw new Kohana_Exception('Database type not defined in :name configuration',
+					array(':name' => $name));
+			}
+
+			// Set the driver class name
+			$driver = 'Database_'.ucfirst($config['type']);
+
+			// Create the database connection instance
+			new $driver($name, $config);
+		}
+
+		return Database::$instances[$name];
+	}
+
+	/**
+	 * @var  string  the last query executed
+	 */
+	public $last_query;
+
+	// Character that is used to quote identifiers
+	protected $_identifier = '"';
+
+	// Instance name
+	protected $_instance;
+
+	// Raw server connection
+	protected $_connection;
+
+	// Configuration array
+	protected $_config;
+
+	/**
+	 * Stores the database configuration locally and name the instance.
+	 *
+	 * [!!] This method cannot be accessed directly, you must use [Database::instance].
+	 *
+	 * @return  void
+	 */
+	protected function __construct($name, array $config)
+	{
+		// Set the instance name
+		$this->_instance = $name;
+
+		// Store the config locally
+		$this->_config = $config;
+
+		// Store the database instance
+		Database::$instances[$name] = $this;
+	}
+
+	/**
+	 * Disconnect from the database when the object is destroyed.
+	 *
+	 *     // Destroy the database instance
+	 *     unset(Database::instances[(string) $db], $db);
+	 *
+	 * [!!] Calling `unset($db)` is not enough to destroy the database, as it
+	 * will still be stored in `Database::$instances`.
+	 *
+	 * @return  void
+	 */
+	final public function __destruct()
+	{
+		$this->disconnect();
+	}
+
+	/**
+	 * Returns the database instance name.
+	 *
+	 *     echo (string) $db;
+	 *
+	 * @return  string
+	 */
+	final public function __toString()
+	{
+		return $this->_instance;
+	}
+
+	/**
+	 * Connect to the database. This is called automatically when the first
+	 * query is executed.
+	 *
+	 *     $db->connect();
+	 *
+	 * @throws  Database_Exception
+	 * @return  void
+	 */
+	abstract public function connect();
+
+	/**
+	 * Disconnect from the database. This is called automatically by [Database::__destruct].
+	 * Clears the database instance from [Database::$instances].
+	 *
+	 *     $db->disconnect();
+	 *
+	 * @return  boolean
+	 */
+	public function disconnect()
+	{
+		unset(Database::$instances[$this->_instance]);
+
+		return TRUE;
+	}
+
+	/**
+	 * Set the connection character set. This is called automatically by [Database::connect].
+	 *
+	 *     $db->set_charset('utf8');
+	 *
+	 * @throws  Database_Exception
+	 * @param   string   character set name
+	 * @return  void
+	 */
+	abstract public function set_charset($charset);
+
+	/**
+	 * Perform an SQL query of the given type.
+	 *
+	 *     // Make a SELECT query and use objects for results
+	 *     $db->query(Database::SELECT, 'SELECT * FROM groups', TRUE);
+	 *
+	 *     // Make a SELECT query and use "Model_User" for the results
+	 *     $db->query(Database::SELECT, 'SELECT * FROM users LIMIT 1', 'Model_User');
+	 *
+	 * @param   integer  Database::SELECT, Database::INSERT, etc
+	 * @param   string   SQL query
+	 * @param   mixed    result object class string, TRUE for stdClass, FALSE for assoc array
+	 * @param   array    object construct parameters for result class
+	 * @return  object   Database_Result for SELECT queries
+	 * @return  array    list (insert id, row count) for INSERT queries
+	 * @return  integer  number of affected rows for all other queries
+	 */
+	abstract public function query($type, $sql, $as_object = FALSE, array $params = NULL);
+
+	/**
+	 * Start a SQL transaction
+	 *
+	 *     // Start the transactions
+	 *     $db->begin();
+	 *
+	 *     try {
+	 *          DB::insert('users')->values($user1)...
+	 *          DB::insert('users')->values($user2)...
+	 *          // Insert successful commit the changes
+	 *          $db->commit();
+	 *     }
+	 *     catch (Database_Exception $e)
+	 *     {
+	 *          // Insert failed. Rolling back changes...
+	 *          $db->rollback();
+	 *      }
+	 *
+	 * @param string transaction mode
+	 * @return  boolean
+	 */
+	abstract public function begin($mode = NULL);
+
+	/**
+	 * Commit the current transaction
+	 *
+	 *     // Commit the database changes
+	 *     $db->commit();
+	 *
+	 * @return  boolean
+	 */
+	abstract public function commit();
+
+	/**
+	 * Abort the current transaction
+	 *
+	 *     // Undo the changes
+	 *     $db->rollback();
+	 *
+	 * @return  boolean
+	 */
+	abstract public function rollback();
+
+	/**
+	 * Count the number of records in a table.
+	 *
+	 *     // Get the total number of records in the "users" table
+	 *     $count = $db->count_records('users');
+	 *
+	 * @param   mixed    table name string or array(query, alias)
+	 * @return  integer
+	 */
+	public function count_records($table)
+	{
+		// Quote the table name
+		$table = $this->quote_table($table);
+
+		return $this->query(Database::SELECT, 'SELECT COUNT(*) AS total_row_count FROM '.$table, FALSE)
+			->get('total_row_count');
+	}
+
+	/**
+	 * Returns a normalized array describing the SQL data type
+	 *
+	 *     $db->datatype('char');
+	 *
+	 * @param   string  SQL data type
+	 * @return  array
+	 */
+	public function datatype($type)
+	{
+		static $types = array
+		(
+			// SQL-92
+			'bit'                           => array('type' => 'string', 'exact' => TRUE),
+			'bit varying'                   => array('type' => 'string'),
+			'char'                          => array('type' => 'string', 'exact' => TRUE),
+			'char varying'                  => array('type' => 'string'),
+			'character'                     => array('type' => 'string', 'exact' => TRUE),
+			'character varying'             => array('type' => 'string'),
+			'date'                          => array('type' => 'string'),
+			'dec'                           => array('type' => 'float', 'exact' => TRUE),
+			'decimal'                       => array('type' => 'float', 'exact' => TRUE),
+			'double precision'              => array('type' => 'float'),
+			'float'                         => array('type' => 'float'),
+			'int'                           => array('type' => 'int', 'min' => '-2147483648', 'max' => '2147483647'),
+			'integer'                       => array('type' => 'int', 'min' => '-2147483648', 'max' => '2147483647'),
+			'interval'                      => array('type' => 'string'),
+			'national char'                 => array('type' => 'string', 'exact' => TRUE),
+			'national char varying'         => array('type' => 'string'),
+			'national character'            => array('type' => 'string', 'exact' => TRUE),
+			'national character varying'    => array('type' => 'string'),
+			'nchar'                         => array('type' => 'string', 'exact' => TRUE),
+			'nchar varying'                 => array('type' => 'string'),
+			'numeric'                       => array('type' => 'float', 'exact' => TRUE),
+			'real'                          => array('type' => 'float'),
+			'smallint'                      => array('type' => 'int', 'min' => '-32768', 'max' => '32767'),
+			'time'                          => array('type' => 'string'),
+			'time with time zone'           => array('type' => 'string'),
+			'timestamp'                     => array('type' => 'string'),
+			'timestamp with time zone'      => array('type' => 'string'),
+			'varchar'                       => array('type' => 'string'),
+
+			// SQL:1999
+			'binary large object'               => array('type' => 'string', 'binary' => TRUE),
+			'blob'                              => array('type' => 'string', 'binary' => TRUE),
+			'boolean'                           => array('type' => 'bool'),
+			'char large object'                 => array('type' => 'string'),
+			'character large object'            => array('type' => 'string'),
+			'clob'                              => array('type' => 'string'),
+			'national character large object'   => array('type' => 'string'),
+			'nchar large object'                => array('type' => 'string'),
+			'nclob'                             => array('type' => 'string'),
+			'time without time zone'            => array('type' => 'string'),
+			'timestamp without time zone'       => array('type' => 'string'),
+
+			// SQL:2003
+			'bigint'    => array('type' => 'int', 'min' => '-9223372036854775808', 'max' => '9223372036854775807'),
+
+			// SQL:2008
+			'binary'            => array('type' => 'string', 'binary' => TRUE, 'exact' => TRUE),
+			'binary varying'    => array('type' => 'string', 'binary' => TRUE),
+			'varbinary'         => array('type' => 'string', 'binary' => TRUE),
+		);
+
+		if (isset($types[$type]))
+			return $types[$type];
+
+		return array();
+	}
+
+	/**
+	 * List all of the tables in the database. Optionally, a LIKE string can
+	 * be used to search for specific tables.
+	 *
+	 *     // Get all tables in the current database
+	 *     $tables = $db->list_tables();
+	 *
+	 *     // Get all user-related tables
+	 *     $tables = $db->list_tables('user%');
+	 *
+	 * @param   string   table to search for
+	 * @return  array
+	 */
+	abstract public function list_tables($like = NULL);
+
+	/**
+	 * Lists all of the columns in a table. Optionally, a LIKE string can be
+	 * used to search for specific fields.
+	 *
+	 *     // Get all columns from the "users" table
+	 *     $columns = $db->list_columns('users');
+	 *
+	 *     // Get all name-related columns
+	 *     $columns = $db->list_columns('users', '%name%');
+	 *
+	 *     // Get the columns from a table that doesn't use the table prefix
+	 *     $columns = $db->list_columns('users', NULL, FALSE);
+	 *
+	 * @param   string  table to get columns from
+	 * @param   string  column to search for
+	 * @param   boolean whether to add the table prefix automatically or not
+	 * @return  array
+	 */
+	abstract public function list_columns($table, $like = NULL, $add_prefix = TRUE);
+
+	/**
+	 * Extracts the text between parentheses, if any.
+	 *
+	 *     // Returns: array('CHAR', '6')
+	 *     list($type, $length) = $db->_parse_type('CHAR(6)');
+	 *
+	 * @param   string
+	 * @return  array   list containing the type and length, if any
+	 */
+	protected function _parse_type($type)
+	{
+		if (($open = strpos($type, '(')) === FALSE)
+		{
+			// No length specified
+			return array($type, NULL);
+		}
+
+		// Closing parenthesis
+		$close = strpos($type, ')', $open);
+
+		// Length without parentheses
+		$length = substr($type, $open + 1, $close - 1 - $open);
+
+		// Type without the length
+		$type = substr($type, 0, $open).substr($type, $close + 1);
+
+		return array($type, $length);
+	}
+
+	/**
+	 * Return the table prefix defined in the current configuration.
+	 *
+	 *     $prefix = $db->table_prefix();
+	 *
+	 * @return  string
+	 */
+	public function table_prefix()
+	{
+		return $this->_config['table_prefix'];
+	}
+
+	/**
+	 * Quote a value for an SQL query.
+	 *
+	 *     $db->quote(NULL);   // 'NULL'
+	 *     $db->quote(10);     // 10
+	 *     $db->quote('fred'); // 'fred'
+	 *
+	 * Objects passed to this function will be converted to strings.
+	 * [Database_Expression] objects will use the value of the expression.
+	 * [Database_Query] objects will be compiled and converted to a sub-query.
+	 * All other objects will be converted using the `__toString` method.
+	 *
+	 * @param   mixed   any value to quote
+	 * @return  string
+	 * @uses    Database::escape
+	 */
+	public function quote($value)
+	{
+		if ($value === NULL)
+		{
+			return 'NULL';
+		}
+		elseif ($value === TRUE)
+		{
+			return "'1'";
+		}
+		elseif ($value === FALSE)
+		{
+			return "'0'";
+		}
+		elseif (is_object($value))
+		{
+			if ($value instanceof Database_Query)
+			{
+				// Create a sub-query
+				return '('.$value->compile($this).')';
+			}
+			elseif ($value instanceof Database_Expression)
+			{
+				// Use a raw expression
+				return $value->value();
+			}
+			else
+			{
+				// Convert the object to a string
+				return $this->quote( (string) $value);
+			}
+		}
+		elseif (is_array($value))
+		{
+			return '('.implode(', ', array_map(array($this, __FUNCTION__), $value)).')';
+		}
+		elseif (is_int($value))
+		{
+			return (int) $value;
+		}
+		elseif (is_float($value))
+		{
+			// Convert to non-locale aware float to prevent possible commas
+			return sprintf('%F', $value);
+		}
+
+		return $this->escape($value);
+	}
+
+	/**
+	 * Quote a database column name and add the table prefix if needed.
+	 *
+	 *     $column = $db->quote_column($column);
+	 *
+	 * You can also use SQL methods within identifiers.
+	 *
+	 *     // The value of "column" will be quoted
+	 *     $column = $db->quote_column('COUNT("column")');
+	 *
+	 * @param   mixed   column name or array(column, alias)
+	 * @return  string
+	 * @uses    Database::quote_identifier
+	 * @uses    Database::table_prefix
+	 */
+	public function quote_column($column)
+	{
+		if (is_array($column))
+		{
+			list($column, $alias) = $column;
+		}
+
+		if ($column instanceof Database_Query)
+		{
+			// Create a sub-query
+			$column = '('.$column->compile($this).')';
+		}
+		elseif ($column instanceof Database_Expression)
+		{
+			// Use a raw expression
+			$column = $column->value();
+		}
+		else
+		{
+			// Convert to a string
+			$column = (string) $column;
+
+			if ($column === '*')
+			{
+				return $column;
+			}
+			elseif (strpos($column, '"') !== FALSE)
+			{
+				// Quote the column in FUNC("column") identifiers
+				$column = preg_replace('/"(.+?)"/e', '$this->quote_column("$1")', $column);
+			}
+			elseif (strpos($column, '.') !== FALSE)
+			{
+				$parts = explode('.', $column);
+
+				if ($prefix = $this->table_prefix())
+				{
+					// Get the offset of the table name, 2nd-to-last part
+					$offset = count($parts) - 2;
+
+					// Add the table prefix to the table name
+					$parts[$offset] = $prefix.$parts[$offset];
+				}
+
+				foreach ($parts as & $part)
+				{
+					if ($part !== '*')
+					{
+						// Quote each of the parts
+						$part = $this->_identifier.$part.$this->_identifier;
+					}
+				}
+
+				$column = implode('.', $parts);
+			}
+			else
+			{
+				$column = $this->_identifier.$column.$this->_identifier;
+			}
+		}
+
+		if (isset($alias))
+		{
+			$column .= ' AS '.$this->_identifier.$alias.$this->_identifier;
+		}
+
+		return $column;
+	}
+
+	/**
+	 * Quote a database table name and adds the table prefix if needed.
+	 *
+	 *     $table = $db->quote_table($table);
+	 *
+	 * @param   mixed   table name or array(table, alias)
+	 * @return  string
+	 * @uses    Database::quote_identifier
+	 * @uses    Database::table_prefix
+	 */
+	public function quote_table($table)
+	{
+		if (is_array($table))
+		{
+			list($table, $alias) = $table;
+		}
+
+		if ($table instanceof Database_Query)
+		{
+			// Create a sub-query
+			$table = '('.$table->compile($this).')';
+		}
+		elseif ($table instanceof Database_Expression)
+		{
+			// Use a raw expression
+			$table = $table->value();
+		}
+		else
+		{
+			// Convert to a string
+			$table = (string) $table;
+
+			if (strpos($table, '.') !== FALSE)
+			{
+				$parts = explode('.', $table);
+
+				if ($prefix = $this->table_prefix())
+				{
+					// Get the offset of the table name, last part
+					$offset = count($parts) - 1;
+
+					// Add the table prefix to the table name
+					$parts[$offset] = $prefix.$parts[$offset];
+				}
+
+				foreach ($parts as & $part)
+				{
+					// Quote each of the parts
+					$part = $this->_identifier.$part.$this->_identifier;
+				}
+
+				$table = implode('.', $parts);
+			}
+			else
+			{
+				// Add the table prefix
+				$table = $this->_identifier.$this->table_prefix().$table.$this->_identifier;
+			}
+		}
+
+		if (isset($alias))
+		{
+			// Attach table prefix to alias
+			$table .= ' AS '.$this->_identifier.$this->table_prefix().$alias.$this->_identifier;
+		}
+
+		return $table;
+	}
+
+	/**
+	 * Quote a database identifier
+	 *
+	 * Objects passed to this function will be converted to strings.
+	 * [Database_Expression] objects will use the value of the expression.
+	 * [Database_Query] objects will be compiled and converted to a sub-query.
+	 * All other objects will be converted using the `__toString` method.
+	 *
+	 * @param   mixed   any identifier
+	 * @return  string
+	 */
+	public function quote_identifier($value)
+	{
+		if (is_array($value))
+		{
+			list($value, $alias) = $value;
+		}
+
+		if ($value instanceof Database_Query)
+		{
+			// Create a sub-query
+			$value = '('.$value->compile($this).')';
+		}
+		elseif ($value instanceof Database_Expression)
+		{
+			// Use a raw expression
+			$value = $value->value();
+		}
+		else
+		{
+			// Convert to a string
+			$value = (string) $value;
+
+			if (strpos($value, '.') !== FALSE)
+			{
+				$parts = explode('.', $value);
+
+				foreach ($parts as & $part)
+				{
+					// Quote each of the parts
+					$part = $this->_identifier.$part.$this->_identifier;
+				}
+
+				$value = implode('.', $parts);
+			}
+			else
+			{
+				$value = $this->_identifier.$value.$this->_identifier;
+			}
+		}
+
+		if (isset($alias))
+		{
+			$value .= ' AS '.$this->_identifier.$alias.$this->_identifier;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Sanitize a string by escaping characters that could cause an SQL
+	 * injection attack.
+	 *
+	 *     $value = $db->escape('any string');
+	 *
+	 * @param   string   value to quote
+	 * @return  string
+	 */
+	abstract public function escape($value);
+
+} // End Database_Connection
diff --git a/includes/kohana/modules/database/classes/kohana/database/exception.php b/includes/kohana/modules/database/classes/kohana/database/exception.php
new file mode 100644
index 0000000..ea2630e
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/exception.php
@@ -0,0 +1,11 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database exceptions.
+ *
+ * @package    Kohana/Database
+ * @category   Exceptions
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Exception extends Kohana_Exception {}
diff --git a/includes/kohana/modules/database/classes/kohana/database/expression.php b/includes/kohana/modules/database/classes/kohana/database/expression.php
new file mode 100644
index 0000000..90b8100
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/expression.php
@@ -0,0 +1,62 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database expressions can be used to add unescaped SQL fragments to a
+ * [Database_Query_Builder] object.
+ *
+ * For example, you can use an expression to generate a column alias:
+ *
+ *     // SELECT CONCAT(first_name, last_name) AS full_name
+ *     $query = DB::select(array(DB::expr('CONCAT(first_name, last_name)'), 'full_name')));
+ *
+ * More examples are available on the [Query Builder](database/query/builder#database-expressions) page
+ * 
+ * @package    Kohana/Database
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Expression {
+
+	// Raw expression string
+	protected $_value;
+
+	/**
+	 * Sets the expression string.
+	 *
+	 *     $expression = new Database_Expression('COUNT(users.id)');
+	 *
+	 * @return  void
+	 */
+	public function __construct($value)
+	{
+		// Set the expression string
+		$this->_value = $value;
+	}
+
+	/**
+	 * Get the expression value as a string.
+	 *
+	 *     $sql = $expression->value();
+	 *
+	 * @return  string
+	 */
+	public function value()
+	{
+		return (string) $this->_value;
+	}
+
+	/**
+	 * Return the value of the expression as a string.
+	 *
+	 *     echo $expression;
+	 *
+	 * @return  string
+	 * @uses    Database_Expression::value
+	 */
+	public function __toString()
+	{
+		return $this->value();
+	}
+
+} // End Database_Expression
diff --git a/includes/kohana/modules/database/classes/kohana/database/mysql.php b/includes/kohana/modules/database/classes/kohana/database/mysql.php
new file mode 100644
index 0000000..4fdbf01
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/mysql.php
@@ -0,0 +1,432 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * MySQL database connection.
+ *
+ * @package    Kohana/Database
+ * @category   Drivers
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_MySQL extends Database {
+
+	// Database in use by each connection
+	protected static $_current_databases = array();
+
+	// Use SET NAMES to set the character set
+	protected static $_set_names;
+
+	// Identifier for this connection within the PHP driver
+	protected $_connection_id;
+
+	// MySQL uses a backtick for identifiers
+	protected $_identifier = '`';
+
+	public function connect()
+	{
+		if ($this->_connection)
+			return;
+
+		if (Database_MySQL::$_set_names === NULL)
+		{
+			// Determine if we can use mysql_set_charset(), which is only
+			// available on PHP 5.2.3+ when compiled against MySQL 5.0+
+			Database_MySQL::$_set_names = ! function_exists('mysql_set_charset');
+		}
+
+		// Extract the connection parameters, adding required variabels
+		extract($this->_config['connection'] + array(
+			'database'   => '',
+			'hostname'   => '',
+			'username'   => '',
+			'password'   => '',
+			'persistent' => FALSE,
+		));
+
+		// Prevent this information from showing up in traces
+		unset($this->_config['connection']['username'], $this->_config['connection']['password']);
+
+		try
+		{
+			if ($persistent)
+			{
+				// Create a persistent connection
+				$this->_connection = mysql_pconnect($hostname, $username, $password);
+			}
+			else
+			{
+				// Create a connection and force it to be a new link
+				$this->_connection = mysql_connect($hostname, $username, $password, TRUE);
+			}
+		}
+		catch (ErrorException $e)
+		{
+			// No connection exists
+			$this->_connection = NULL;
+
+			throw new Database_Exception(':error',
+				array(':error' => mysql_error()),
+				mysql_errno());
+		}
+
+		// \xFF is a better delimiter, but the PHP driver uses underscore
+		$this->_connection_id = sha1($hostname.'_'.$username.'_'.$password);
+
+		$this->_select_db($database);
+
+		if ( ! empty($this->_config['charset']))
+		{
+			// Set the character set
+			$this->set_charset($this->_config['charset']);
+		}
+	}
+
+	/**
+	 * Select the database
+	 *
+	 * @param   string  Database
+	 * @return  void
+	 */
+	protected function _select_db($database)
+	{
+		if ( ! mysql_select_db($database, $this->_connection))
+		{
+			// Unable to select database
+			throw new Database_Exception(':error',
+				array(':error' => mysql_error($this->_connection)),
+				mysql_errno($this->_connection));
+		}
+
+		Database_MySQL::$_current_databases[$this->_connection_id] = $database;
+	}
+
+	public function disconnect()
+	{
+		try
+		{
+			// Database is assumed disconnected
+			$status = TRUE;
+
+			if (is_resource($this->_connection))
+			{
+				if ($status = mysql_close($this->_connection))
+				{
+					// Clear the connection
+					$this->_connection = NULL;
+
+					// Clear the instance
+					parent::disconnect();
+				}
+			}
+		}
+		catch (Exception $e)
+		{
+			// Database is probably not disconnected
+			$status = ! is_resource($this->_connection);
+		}
+
+		return $status;
+	}
+
+	public function set_charset($charset)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		if (Database_MySQL::$_set_names === TRUE)
+		{
+			// PHP is compiled against MySQL 4.x
+			$status = (bool) mysql_query('SET NAMES '.$this->quote($charset), $this->_connection);
+		}
+		else
+		{
+			// PHP is compiled against MySQL 5.x
+			$status = mysql_set_charset($charset, $this->_connection);
+		}
+
+		if ($status === FALSE)
+		{
+			throw new Database_Exception(':error',
+				array(':error' => mysql_error($this->_connection)),
+				mysql_errno($this->_connection));
+		}
+	}
+
+	public function query($type, $sql, $as_object = FALSE, array $params = NULL)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		if ( ! empty($this->_config['profiling']))
+		{
+			// Benchmark this query for the current instance
+			$benchmark = Profiler::start("Database ({$this->_instance})", $sql);
+		}
+
+		if ( ! empty($this->_config['connection']['persistent']) AND $this->_config['connection']['database'] !== Database_MySQL::$_current_databases[$this->_connection_id])
+		{
+			// Select database on persistent connections
+			$this->_select_db($this->_config['connection']['database']);
+		}
+
+		// Execute the query
+		if (($result = mysql_query($sql, $this->_connection)) === FALSE)
+		{
+			if (isset($benchmark))
+			{
+				// This benchmark is worthless
+				Profiler::delete($benchmark);
+			}
+
+			throw new Database_Exception(':error [ :query ]',
+				array(':error' => mysql_error($this->_connection), ':query' => $sql),
+				mysql_errno($this->_connection));
+		}
+
+		if (isset($benchmark))
+		{
+			Profiler::stop($benchmark);
+		}
+
+		// Set the last query
+		$this->last_query = $sql;
+
+		if ($type === Database::SELECT)
+		{
+			// Return an iterator of results
+			return new Database_MySQL_Result($result, $sql, $as_object, $params);
+		}
+		elseif ($type === Database::INSERT)
+		{
+			// Return a list of insert id and rows created
+			return array(
+				mysql_insert_id($this->_connection),
+				mysql_affected_rows($this->_connection),
+			);
+		}
+		else
+		{
+			// Return the number of rows affected
+			return mysql_affected_rows($this->_connection);
+		}
+	}
+
+	public function datatype($type)
+	{
+		static $types = array
+		(
+			'blob'                      => array('type' => 'string', 'binary' => TRUE, 'character_maximum_length' => '65535'),
+			'bool'                      => array('type' => 'bool'),
+			'bigint unsigned'           => array('type' => 'int', 'min' => '0', 'max' => '18446744073709551615'),
+			'datetime'                  => array('type' => 'string'),
+			'decimal unsigned'          => array('type' => 'float', 'exact' => TRUE, 'min' => '0'),
+			'double'                    => array('type' => 'float'),
+			'double precision unsigned' => array('type' => 'float', 'min' => '0'),
+			'double unsigned'           => array('type' => 'float', 'min' => '0'),
+			'enum'                      => array('type' => 'string'),
+			'fixed'                     => array('type' => 'float', 'exact' => TRUE),
+			'fixed unsigned'            => array('type' => 'float', 'exact' => TRUE, 'min' => '0'),
+			'float unsigned'            => array('type' => 'float', 'min' => '0'),
+			'int unsigned'              => array('type' => 'int', 'min' => '0', 'max' => '4294967295'),
+			'integer unsigned'          => array('type' => 'int', 'min' => '0', 'max' => '4294967295'),
+			'longblob'                  => array('type' => 'string', 'binary' => TRUE, 'character_maximum_length' => '4294967295'),
+			'longtext'                  => array('type' => 'string', 'character_maximum_length' => '4294967295'),
+			'mediumblob'                => array('type' => 'string', 'binary' => TRUE, 'character_maximum_length' => '16777215'),
+			'mediumint'                 => array('type' => 'int', 'min' => '-8388608', 'max' => '8388607'),
+			'mediumint unsigned'        => array('type' => 'int', 'min' => '0', 'max' => '16777215'),
+			'mediumtext'                => array('type' => 'string', 'character_maximum_length' => '16777215'),
+			'national varchar'          => array('type' => 'string'),
+			'numeric unsigned'          => array('type' => 'float', 'exact' => TRUE, 'min' => '0'),
+			'nvarchar'                  => array('type' => 'string'),
+			'point'                     => array('type' => 'string', 'binary' => TRUE),
+			'real unsigned'             => array('type' => 'float', 'min' => '0'),
+			'set'                       => array('type' => 'string'),
+			'smallint unsigned'         => array('type' => 'int', 'min' => '0', 'max' => '65535'),
+			'text'                      => array('type' => 'string', 'character_maximum_length' => '65535'),
+			'tinyblob'                  => array('type' => 'string', 'binary' => TRUE, 'character_maximum_length' => '255'),
+			'tinyint'                   => array('type' => 'int', 'min' => '-128', 'max' => '127'),
+			'tinyint unsigned'          => array('type' => 'int', 'min' => '0', 'max' => '255'),
+			'tinytext'                  => array('type' => 'string', 'character_maximum_length' => '255'),
+			'year'                      => array('type' => 'string'),
+		);
+
+		$type = str_replace(' zerofill', '', $type);
+
+		if (isset($types[$type]))
+			return $types[$type];
+
+		return parent::datatype($type);
+	}
+
+	/**
+	 * Start a SQL transaction
+	 *
+	 * @link http://dev.mysql.com/doc/refman/5.0/en/set-transaction.html
+	 *
+	 * @param string Isolation level
+	 * @return boolean
+	 */
+	public function begin($mode = NULL)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		if ($mode AND ! mysql_query("SET TRANSACTION ISOLATION LEVEL $mode", $this->_connection))
+		{
+			throw new Database_Exception(':error',
+				array(':error' => mysql_error($this->_connection)),
+				mysql_errno($this->_connection));
+		}
+
+		return (bool) mysql_query('START TRANSACTION', $this->_connection);
+	}
+
+	/**
+	 * Commit a SQL transaction
+	 *
+	 * @param string Isolation level
+	 * @return boolean
+	 */
+	public function commit()
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return (bool) mysql_query('COMMIT', $this->_connection);
+	}
+
+	/**
+	 * Rollback a SQL transaction
+	 *
+	 * @param string Isolation level
+	 * @return boolean
+	 */
+	public function rollback()
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return (bool) mysql_query('ROLLBACK', $this->_connection);
+	}
+
+	public function list_tables($like = NULL)
+	{
+		if (is_string($like))
+		{
+			// Search for table names
+			$result = $this->query(Database::SELECT, 'SHOW TABLES LIKE '.$this->quote($like), FALSE);
+		}
+		else
+		{
+			// Find all table names
+			$result = $this->query(Database::SELECT, 'SHOW TABLES', FALSE);
+		}
+
+		$tables = array();
+		foreach ($result as $row)
+		{
+			$tables[] = reset($row);
+		}
+
+		return $tables;
+	}
+
+	public function list_columns($table, $like = NULL, $add_prefix = TRUE)
+	{
+		// Quote the table name
+		$table = ($add_prefix === TRUE) ? $this->quote_table($table) : $table;
+
+		if (is_string($like))
+		{
+			// Search for column names
+			$result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table.' LIKE '.$this->quote($like), FALSE);
+		}
+		else
+		{
+			// Find all column names
+			$result = $this->query(Database::SELECT, 'SHOW FULL COLUMNS FROM '.$table, FALSE);
+		}
+
+		$count = 0;
+		$columns = array();
+		foreach ($result as $row)
+		{
+			list($type, $length) = $this->_parse_type($row['Type']);
+
+			$column = $this->datatype($type);
+
+			$column['column_name']      = $row['Field'];
+			$column['column_default']   = $row['Default'];
+			$column['data_type']        = $type;
+			$column['is_nullable']      = ($row['Null'] == 'YES');
+			$column['ordinal_position'] = ++$count;
+
+			switch ($column['type'])
+			{
+				case 'float':
+					if (isset($length))
+					{
+						list($column['numeric_precision'], $column['numeric_scale']) = explode(',', $length);
+					}
+				break;
+				case 'int':
+					if (isset($length))
+					{
+						// MySQL attribute
+						$column['display'] = $length;
+					}
+				break;
+				case 'string':
+					switch ($column['data_type'])
+					{
+						case 'binary':
+						case 'varbinary':
+							$column['character_maximum_length'] = $length;
+						break;
+						case 'char':
+						case 'varchar':
+							$column['character_maximum_length'] = $length;
+						case 'text':
+						case 'tinytext':
+						case 'mediumtext':
+						case 'longtext':
+							$column['collation_name'] = $row['Collation'];
+						break;
+						case 'enum':
+						case 'set':
+							$column['collation_name'] = $row['Collation'];
+							$column['options'] = explode('\',\'', substr($length, 1, -1));
+						break;
+					}
+				break;
+			}
+
+			// MySQL attributes
+			$column['comment']      = $row['Comment'];
+			$column['extra']        = $row['Extra'];
+			$column['key']          = $row['Key'];
+			$column['privileges']   = $row['Privileges'];
+
+			$columns[$row['Field']] = $column;
+		}
+
+		return $columns;
+	}
+
+	public function escape($value)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		if (($value = mysql_real_escape_string( (string) $value, $this->_connection)) === FALSE)
+		{
+			throw new Database_Exception(':error',
+				array(':error' => mysql_error($this->_connection)),
+				mysql_errno($this->_connection));
+		}
+
+		// SQL standard is to use single-quotes for all values
+		return "'$value'";
+	}
+
+} // End Database_MySQL
diff --git a/includes/kohana/modules/database/classes/kohana/database/mysql/result.php b/includes/kohana/modules/database/classes/kohana/database/mysql/result.php
new file mode 100644
index 0000000..bbfa66e
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/mysql/result.php
@@ -0,0 +1,71 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * MySQL database result.   See [Results](/database/results) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query/Result
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_MySQL_Result extends Database_Result {
+
+	protected $_internal_row = 0;
+
+	public function __construct($result, $sql, $as_object = FALSE, array $params = NULL)
+	{
+		parent::__construct($result, $sql, $as_object, $params);
+
+		// Find the number of rows in the result
+		$this->_total_rows = mysql_num_rows($result);
+	}
+
+	public function __destruct()
+	{
+		if (is_resource($this->_result))
+		{
+			mysql_free_result($this->_result);
+		}
+	}
+
+	public function seek($offset)
+	{
+		if ($this->offsetExists($offset) AND mysql_data_seek($this->_result, $offset))
+		{
+			// Set the current row to the offset
+			$this->_current_row = $this->_internal_row = $offset;
+
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	public function current()
+	{
+		if ($this->_current_row !== $this->_internal_row AND ! $this->seek($this->_current_row))
+			return NULL;
+
+		// Increment internal row for optimization assuming rows are fetched in order
+		$this->_internal_row++;
+
+		if ($this->_as_object === TRUE)
+		{
+			// Return an stdClass
+			return mysql_fetch_object($this->_result);
+		}
+		elseif (is_string($this->_as_object))
+		{
+			// Return an object of given class name
+			return mysql_fetch_object($this->_result, $this->_as_object, $this->_object_params);
+		}
+		else
+		{
+			// Return an array of the row
+			return mysql_fetch_assoc($this->_result);
+		}
+	}
+
+} // End Database_MySQL_Result_Select
diff --git a/includes/kohana/modules/database/classes/kohana/database/pdo.php b/includes/kohana/modules/database/classes/kohana/database/pdo.php
new file mode 100644
index 0000000..4f631b6
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/pdo.php
@@ -0,0 +1,208 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * PDO database connection.
+ *
+ * @package    Kohana/Database
+ * @category   Drivers
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_PDO extends Database {
+
+	// PDO uses no quoting for identifiers
+	protected $_identifier = '';
+
+	protected function __construct($name, array $config)
+	{
+		parent::__construct($name, $config);
+
+		if (isset($this->_config['identifier']))
+		{
+			// Allow the identifier to be overloaded per-connection
+			$this->_identifier = (string) $this->_config['identifier'];
+		}
+	}
+
+	public function connect()
+	{
+		if ($this->_connection)
+			return;
+
+		// Extract the connection parameters, adding required variabels
+		extract($this->_config['connection'] + array(
+			'dsn'        => '',
+			'username'   => NULL,
+			'password'   => NULL,
+			'persistent' => FALSE,
+		));
+
+		// Clear the connection parameters for security
+		unset($this->_config['connection']);
+
+		// Force PDO to use exceptions for all errors
+		$attrs = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION);
+
+		if ( ! empty($persistent))
+		{
+			// Make the connection persistent
+			$attrs[PDO::ATTR_PERSISTENT] = TRUE;
+		}
+
+		try
+		{
+			// Create a new PDO connection
+			$this->_connection = new PDO($dsn, $username, $password, $attrs);
+		}
+		catch (PDOException $e)
+		{
+			throw new Database_Exception(':error',
+				array(':error' => $e->getMessage()),
+				$e->getCode());
+		}
+
+		if ( ! empty($this->_config['charset']))
+		{
+			// Set the character set
+			$this->set_charset($this->_config['charset']);
+		}
+	}
+
+	public function disconnect()
+	{
+		// Destroy the PDO object
+		$this->_connection = NULL;
+
+		return parent::disconnect();
+	}
+
+	public function set_charset($charset)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		// Execute a raw SET NAMES query
+		$this->_connection->exec('SET NAMES '.$this->quote($charset));
+	}
+
+	public function query($type, $sql, $as_object = FALSE, array $params = NULL)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		if ( ! empty($this->_config['profiling']))
+		{
+			// Benchmark this query for the current instance
+			$benchmark = Profiler::start("Database ({$this->_instance})", $sql);
+		}
+
+		try
+		{
+			$result = $this->_connection->query($sql);
+		}
+		catch (Exception $e)
+		{
+			if (isset($benchmark))
+			{
+				// This benchmark is worthless
+				Profiler::delete($benchmark);
+			}
+
+			// Convert the exception in a database exception
+			throw new Database_Exception(':error [ :query ]',
+				array(
+					':error' => $e->getMessage(),
+					':query' => $sql
+				),
+				$e->getCode());
+		}
+
+		if (isset($benchmark))
+		{
+			Profiler::stop($benchmark);
+		}
+
+		// Set the last query
+		$this->last_query = $sql;
+
+		if ($type === Database::SELECT)
+		{
+			// Convert the result into an array, as PDOStatement::rowCount is not reliable
+			if ($as_object === FALSE)
+			{
+				$result->setFetchMode(PDO::FETCH_ASSOC);
+			}
+			elseif (is_string($as_object))
+			{
+				$result->setFetchMode(PDO::FETCH_CLASS, $as_object, $params);
+			}
+			else
+			{
+				$result->setFetchMode(PDO::FETCH_CLASS, 'stdClass');
+			}
+
+			$result = $result->fetchAll();
+
+			// Return an iterator of results
+			return new Database_Result_Cached($result, $sql, $as_object, $params);
+		}
+		elseif ($type === Database::INSERT)
+		{
+			// Return a list of insert id and rows created
+			return array(
+				$this->_connection->lastInsertId(),
+				$result->rowCount(),
+			);
+		}
+		else
+		{
+			// Return the number of rows affected
+			return $result->rowCount();
+		}
+	}
+
+	public function begin($mode = NULL)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return $this->_connection->beginTransaction();
+	}
+
+	public function commit()
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return $this->_connection->commit();
+	}
+
+	public function rollback()
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return $this->_connection->rollBack();
+	}
+
+	public function list_tables($like = NULL)
+	{
+		throw new Kohana_Exception('Database method :method is not supported by :class',
+			array(':method' => __FUNCTION__, ':class' => __CLASS__));
+	}
+
+	public function list_columns($table, $like = NULL, $add_prefix = TRUE)
+	{
+		throw new Kohana_Exception('Database method :method is not supported by :class',
+			array(':method' => __FUNCTION__, ':class' => __CLASS__));
+	}
+
+	public function escape($value)
+	{
+		// Make sure the database is connected
+		$this->_connection or $this->connect();
+
+		return $this->_connection->quote($value);
+	}
+
+} // End Database_PDO
diff --git a/includes/kohana/modules/database/classes/kohana/database/query.php b/includes/kohana/modules/database/classes/kohana/database/query.php
new file mode 100644
index 0000000..f08f3c1
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query.php
@@ -0,0 +1,236 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query wrapper.  See [Prepared Statements](database/query/prepared) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query {
+
+	// Query type
+	protected $_type;
+
+	// Cache lifetime
+	protected $_lifetime = NULL;
+
+	// SQL statement
+	protected $_sql;
+
+	// Quoted query parameters
+	protected $_parameters = array();
+
+	// Return results as associative arrays or objects
+	protected $_as_object = FALSE;
+
+	// Parameters for __construct when using object results
+	protected $_object_params = array();
+
+	/**
+	 * Creates a new SQL query of the specified type.
+	 *
+	 * @param   integer  query type: Database::SELECT, Database::INSERT, etc
+	 * @param   string   query string
+	 * @return  void
+	 */
+	public function __construct($type, $sql)
+	{
+		$this->_type = $type;
+		$this->_sql = $sql;
+	}
+
+	/**
+	 * Return the SQL query string.
+	 *
+	 * @return  string
+	 */
+	final public function __toString()
+	{
+		try
+		{
+			// Return the SQL string
+			return $this->compile(Database::instance());
+		}
+		catch (Exception $e)
+		{
+			return Kohana_Exception::text($e);
+		}
+	}
+
+	/**
+	 * Get the type of the query.
+	 *
+	 * @return  integer
+	 */
+	public function type()
+	{
+		return $this->_type;
+	}
+
+	/**
+	 * Enables the query to be cached for a specified amount of time.
+	 *
+	 * @param   integer  number of seconds to cache
+	 * @return  $this
+	 * @uses    Kohana::$cache_life
+	 */
+	public function cached($lifetime = NULL)
+	{
+		if ($lifetime === NULL)
+		{
+			// Use the global setting
+			$lifetime = Kohana::$cache_life;
+		}
+
+		$this->_lifetime = $lifetime;
+
+		return $this;
+	}
+
+	/**
+	 * Returns results as associative arrays
+	 *
+	 * @return  $this
+	 */
+	public function as_assoc()
+	{
+		$this->_as_object = FALSE;
+
+		$this->_object_params = array();
+
+		return $this;
+	}
+
+	/**
+	 * Returns results as objects
+	 *
+	 * @param   string  classname or TRUE for stdClass
+	 * @return  $this
+	 */
+	public function as_object($class = TRUE, array $params = NULL)
+	{
+		$this->_as_object = $class;
+
+		if ($params)
+		{
+			// Add object parameters
+			$this->_object_params = $params;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the value of a parameter in the query.
+	 *
+	 * @param   string   parameter key to replace
+	 * @param   mixed    value to use
+	 * @return  $this
+	 */
+	public function param($param, $value)
+	{
+		// Add or overload a new parameter
+		$this->_parameters[$param] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Bind a variable to a parameter in the query.
+	 *
+	 * @param   string  parameter key to replace
+	 * @param   mixed   variable to use
+	 * @return  $this
+	 */
+	public function bind($param, & $var)
+	{
+		// Bind a value to a variable
+		$this->_parameters[$param] =& $var;
+
+		return $this;
+	}
+
+	/**
+	 * Add multiple parameters to the query.
+	 *
+	 * @param   array  list of parameters
+	 * @return  $this
+	 */
+	public function parameters(array $params)
+	{
+		// Merge the new parameters in
+		$this->_parameters = $params + $this->_parameters;
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL query and return it. Replaces any parameters with their
+	 * given values.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		// Import the SQL locally
+		$sql = $this->_sql;
+
+		if ( ! empty($this->_parameters))
+		{
+			// Quote all of the values
+			$values = array_map(array($db, 'quote'), $this->_parameters);
+
+			// Replace the values in the SQL
+			$sql = strtr($sql, $values);
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Execute the current query on the given database.
+	 *
+	 * @param   mixed    Database instance or name of instance
+	 * @return  object   Database_Result for SELECT queries
+	 * @return  mixed    the insert id for INSERT queries
+	 * @return  integer  number of affected rows for all other queries
+	 */
+	public function execute($db = NULL)
+	{
+		if ( ! is_object($db))
+		{
+			// Get the database instance
+			$db = Database::instance($db);
+		}
+
+		// Compile the SQL query
+		$sql = $this->compile($db);
+
+		if ($this->_lifetime !== NULL AND $this->_type === Database::SELECT)
+		{
+			// Set the cache key based on the database instance name and SQL
+			$cache_key = 'Database::query("'.$db.'", "'.$sql.'")';
+
+			if (! is_null($result = Kohana::cache($cache_key, NULL, $this->_lifetime)))
+			{
+				// Return a cached result
+				return new Database_Result_Cached($result, $sql, $this->_as_object, $this->_object_params);
+			}
+		}
+
+		// Execute the query
+		$result = $db->query($this->_type, $sql, $this->_as_object, $this->_object_params);
+
+		if (isset($cache_key))
+		{
+			// Cache the result array
+			Kohana::cache($cache_key, $result->as_array(), $this->_lifetime);
+		}
+
+		return $result;
+	}
+
+} // End Database_Query
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder.php b/includes/kohana/modules/database/classes/kohana/database/query/builder.php
new file mode 100644
index 0000000..8d36e79
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder.php
@@ -0,0 +1,209 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_Database_Query_Builder extends Database_Query {
+
+	/**
+	 * Compiles an array of JOIN statements into an SQL partial.
+	 *
+	 * @param   object  Database instance
+	 * @param   array   join statements
+	 * @return  string
+	 */
+	protected function _compile_join(Database $db, array $joins)
+	{
+		$statements = array();
+
+		foreach ($joins as $join)
+		{
+			// Compile each of the join statements
+			$statements[] = $join->compile($db);
+		}
+
+		return implode(' ', $statements);
+	}
+
+	/**
+	 * Compiles an array of conditions into an SQL partial. Used for WHERE
+	 * and HAVING.
+	 *
+	 * @param   object  Database instance
+	 * @param   array   condition statements
+	 * @return  string
+	 */
+	protected function _compile_conditions(Database $db, array $conditions)
+	{
+		$last_condition = NULL;
+
+		$sql = '';
+		foreach ($conditions as $group)
+		{
+			// Process groups of conditions
+			foreach ($group as $logic => $condition)
+			{
+				if ($condition === '(')
+				{
+					if ( ! empty($sql) AND $last_condition !== '(')
+					{
+						// Include logic operator
+						$sql .= ' '.$logic.' ';
+					}
+
+					$sql .= '(';
+				}
+				elseif ($condition === ')')
+				{
+					$sql .= ')';
+				}
+				else
+				{
+					if ( ! empty($sql) AND $last_condition !== '(')
+					{
+						// Add the logic operator
+						$sql .= ' '.$logic.' ';
+					}
+
+					// Split the condition
+					list($column, $op, $value) = $condition;
+
+					if ($value === NULL)
+					{
+						if ($op === '=')
+						{
+							// Convert "val = NULL" to "val IS NULL"
+							$op = 'IS';
+						}
+						elseif ($op === '!=')
+						{
+							// Convert "val != NULL" to "valu IS NOT NULL"
+							$op = 'IS NOT';
+						}
+					}
+
+					// Database operators are always uppercase
+					$op = strtoupper($op);
+
+					if ($op === 'BETWEEN' AND is_array($value))
+					{
+						// BETWEEN always has exactly two arguments
+						list($min, $max) = $value;
+
+						if ((is_string($min) AND array_key_exists($min, $this->_parameters)) === FALSE)
+						{
+							// Quote the value, it is not a parameter
+							$min = $db->quote($min);
+						}
+
+						if ((is_string($max) AND array_key_exists($max, $this->_parameters)) === FALSE)
+						{
+							// Quote the value, it is not a parameter
+							$max = $db->quote($max);
+						}
+
+						// Quote the min and max value
+						$value = $min.' AND '.$max;
+					}
+					elseif ($op === 'IN' AND is_array($value))
+					{
+						$value = $db->quote($value);
+					}
+					elseif ((is_string($value) AND array_key_exists($value, $this->_parameters)) === FALSE)
+					{
+						// Quote the value, it is not a parameter
+						$value = $db->quote($value);
+					}
+
+					if ($column)
+					{
+						// Apply proper quoting to the column
+						$column = $db->quote_column($column);
+					}
+
+					// Append the statement to the query
+					$sql .= trim($column.' '.$op.' '.$value);
+				}
+
+				$last_condition = $condition;
+			}
+		}
+
+		return $sql;
+	}
+
+	/**
+	 * Compiles an array of set values into an SQL partial. Used for UPDATE.
+	 *
+	 * @param   object  Database instance
+	 * @param   array   updated values
+	 * @return  string
+	 */
+	protected function _compile_set(Database $db, array $values)
+	{
+		$set = array();
+		foreach ($values as $group)
+		{
+			// Split the set
+			list ($column, $value) = $group;
+
+			// Quote the column name
+			$column = $db->quote_column($column);
+
+			if ((is_string($value) AND array_key_exists($value, $this->_parameters)) === FALSE)
+			{
+				// Quote the value, it is not a parameter
+				$value = $db->quote($value);
+			}
+
+			$set[$column] = $column.' = '.$value;
+		}
+
+		return implode(', ', $set);
+	}
+
+	/**
+	 * Compiles an array of ORDER BY statements into an SQL partial.
+	 *
+	 * @param   object  Database instance
+	 * @param   array   sorting columns
+	 * @return  string
+	 */
+	protected function _compile_order_by(Database $db, array $columns)
+	{
+		$sort = array();
+		foreach ($columns as $group)
+		{
+			list ($column, $direction) = $group;
+
+			if ($direction)
+			{
+				// Make the direction uppercase
+				$direction = strtoupper($direction);
+			}
+
+			if ($column)
+			{
+				// Quote the column, if it has a value
+				$column = $db->quote_column($column);
+			}
+
+			$sort[] = trim($column.' '.$direction);
+		}
+
+		return 'ORDER BY '.implode(', ', $sort);
+	}
+
+	/**
+	 * Reset the current builder status.
+	 *
+	 * @return  $this
+	 */
+	abstract public function reset();
+
+} // End Database_Query_Builder
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/delete.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/delete.php
new file mode 100644
index 0000000..b7dec29
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/delete.php
@@ -0,0 +1,93 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for DELETE statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query_Builder_Delete extends Database_Query_Builder_Where {
+
+	// DELETE FROM ...
+	protected $_table;
+
+	/**
+	 * Set the table for a delete.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @return  void
+	 */
+	public function __construct($table = NULL)
+	{
+		if ($table)
+		{
+			// Set the inital table name
+			$this->_table = $table;
+		}
+
+		// Start the query with no SQL
+		return parent::__construct(Database::DELETE, '');
+	}
+
+	/**
+	 * Sets the table to delete from.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @return  $this
+	 */
+	public function table($table)
+	{
+		$this->_table = $table;
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL query and return it.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		// Start a deletion query
+		$query = 'DELETE FROM '.$db->quote_table($this->_table);
+
+		if ( ! empty($this->_where))
+		{
+			// Add deletion conditions
+			$query .= ' WHERE '.$this->_compile_conditions($db, $this->_where);
+		}
+
+		if ( ! empty($this->_order_by))
+		{
+			// Add sorting
+			$query .= ' '.$this->_compile_order_by($db, $this->_order_by);
+		}
+
+		if ($this->_limit !== NULL)
+		{
+			// Add limiting
+			$query .= ' LIMIT '.$this->_limit;
+		}
+
+		$this->_sql = $query;
+
+		return parent::compile($db);
+	}
+
+	public function reset()
+	{
+		$this->_table = NULL;
+		$this->_where = array();
+
+		$this->_parameters = array();
+
+		$this->_sql = NULL;
+
+		return $this;
+	}
+
+} // End Database_Query_Builder_Delete
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/insert.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/insert.php
new file mode 100644
index 0000000..525fbfe
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/insert.php
@@ -0,0 +1,175 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for INSERT statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query_Builder_Insert extends Database_Query_Builder {
+
+	// INSERT INTO ...
+	protected $_table;
+
+	// (...)
+	protected $_columns = array();
+
+	// VALUES (...)
+	protected $_values = array();
+
+	/**
+	 * Set the table and columns for an insert.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @param   array  column names
+	 * @return  void
+	 */
+	public function __construct($table = NULL, array $columns = NULL)
+	{
+		if ($table)
+		{
+			// Set the inital table name
+			$this->_table = $table;
+		}
+
+		if ($columns)
+		{
+			// Set the column names
+			$this->_columns = $columns;
+		}
+
+		// Start the query with no SQL
+		return parent::__construct(Database::INSERT, '');
+	}
+
+	/**
+	 * Sets the table to insert into.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @return  $this
+	 */
+	public function table($table)
+	{
+		$this->_table = $table;
+
+		return $this;
+	}
+
+	/**
+	 * Set the columns that will be inserted.
+	 *
+	 * @param   array  column names
+	 * @return  $this
+	 */
+	public function columns(array $columns)
+	{
+		$this->_columns = $columns;
+
+		return $this;
+	}
+
+	/**
+	 * Adds or overwrites values. Multiple value sets can be added.
+	 *
+	 * @param   array   values list
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function values(array $values)
+	{
+		if ( ! is_array($this->_values))
+		{
+			throw new Kohana_Exception('INSERT INTO ... SELECT statements cannot be combined with INSERT INTO ... VALUES');
+		}
+
+		// Get all of the passed values
+		$values = func_get_args();
+
+		$this->_values = array_merge($this->_values, $values);
+
+		return $this;
+	}
+
+	/**
+	 * Use a sub-query to for the inserted values.
+	 *
+	 * @param   object  Database_Query of SELECT type
+	 * @return  $this
+	 */
+	public function select(Database_Query $query)
+	{
+		if ($query->type() !== Database::SELECT)
+		{
+			throw new Kohana_Exception('Only SELECT queries can be combined with INSERT queries');
+		}
+
+		$this->_values = $query;
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL query and return it.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		// Start an insertion query
+		$query = 'INSERT INTO '.$db->quote_table($this->_table);
+
+		// Add the column names
+		$query .= ' ('.implode(', ', array_map(array($db, 'quote_column'), $this->_columns)).') ';
+
+		if (is_array($this->_values))
+		{
+			// Callback for quoting values
+			$quote = array($db, 'quote');
+
+			$groups = array();
+			foreach ($this->_values as $group)
+			{
+				foreach ($group as $offset => $value)
+				{
+					if ((is_string($value) AND array_key_exists($value, $this->_parameters)) === FALSE)
+					{
+						// Quote the value, it is not a parameter
+						$group[$offset] = $db->quote($value);
+					}
+				}
+
+				$groups[] = '('.implode(', ', $group).')';
+			}
+
+			// Add the values
+			$query .= 'VALUES '.implode(', ', $groups);
+		}
+		else
+		{
+			// Add the sub-query
+			$query .= (string) $this->_values;
+		}
+
+		$this->_sql = $query;
+
+		return parent::compile($db);;
+	}
+
+	public function reset()
+	{
+		$this->_table = NULL;
+
+		$this->_columns =
+		$this->_values  = array();
+
+		$this->_parameters = array();
+
+		$this->_sql = NULL;
+
+		return $this;
+	}
+
+} // End Database_Query_Builder_Insert
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/join.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/join.php
new file mode 100644
index 0000000..03448c7
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/join.php
@@ -0,0 +1,144 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for JOIN statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query_Builder_Join extends Database_Query_Builder {
+
+	// Type of JOIN
+	protected $_type;
+
+	// JOIN ...
+	protected $_table;
+
+	// ON ...
+	protected $_on = array();
+
+	// USING ...
+	protected $_using = array();
+
+	/**
+	 * Creates a new JOIN statement for a table. Optionally, the type of JOIN
+	 * can be specified as the second parameter.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  type of JOIN: INNER, RIGHT, LEFT, etc
+	 * @return  void
+	 */
+	public function __construct($table, $type = NULL)
+	{
+		// Set the table to JOIN on
+		$this->_table = $table;
+
+		if ($type !== NULL)
+		{
+			// Set the JOIN type
+			$this->_type = (string) $type;
+		}
+	}
+
+	/**
+	 * Adds a new condition for joining.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @return  $this
+	 */
+	public function on($c1, $op, $c2)
+	{
+		if ( ! empty($this->_using))
+		{
+			throw new Kohana_Exception('JOIN ... ON ... cannot be combined with JOIN ... USING ...');
+		}
+
+		$this->_on[] = array($c1, $op, $c2);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a new condition for joining.
+	 *
+	 * @param   string  column name
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function using($columns)
+	{
+		if ( ! empty($this->_on))
+		{
+			throw new Kohana_Exception('JOIN ... ON ... cannot be combined with JOIN ... USING ...');
+		}
+
+		$columns = func_get_args();
+
+		$this->_using = array_merge($this->_using, $columns);
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL partial for a JOIN statement and return it.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		if ($this->_type)
+		{
+			$sql = strtoupper($this->_type).' JOIN';
+		}
+		else
+		{
+			$sql = 'JOIN';
+		}
+
+		// Quote the table name that is being joined
+		$sql .= ' '.$db->quote_table($this->_table);
+
+		if ( ! empty($this->_using))
+		{
+			// Quote and concat the columns
+			$sql .= ' USING ('.implode(', ', array_map(array($db, 'quote_column'), $this->_using)).')';
+		}
+		else
+		{
+			$conditions = array();
+			foreach ($this->_on as $condition)
+			{
+				// Split the condition
+				list($c1, $op, $c2) = $condition;
+
+				if ($op)
+				{
+					// Make the operator uppercase and spaced
+					$op = ' '.strtoupper($op);
+				}
+
+				// Quote each of the columns used for the condition
+				$conditions[] = $db->quote_column($c1).$op.' '.$db->quote_column($c2);
+			}
+
+			// Concat the conditions "... AND ..."
+			$sql .= ' ON ('.implode(' AND ', $conditions).')';
+		}
+
+		return $sql;
+	}
+
+	public function reset()
+	{
+		$this->_type =
+		$this->_table = NULL;
+
+		$this->_on = array();
+	}
+
+} // End Database_Query_Builder_Join
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/select.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/select.php
new file mode 100644
index 0000000..4c45624
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/select.php
@@ -0,0 +1,445 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for SELECT statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query_Builder_Select extends Database_Query_Builder_Where {
+
+	// SELECT ...
+	protected $_select = array();
+
+	// DISTINCT
+	protected $_distinct = FALSE;
+
+	// FROM ...
+	protected $_from = array();
+
+	// JOIN ...
+	protected $_join = array();
+
+	// GROUP BY ...
+	protected $_group_by = array();
+
+	// HAVING ...
+	protected $_having = array();
+
+	// OFFSET ...
+	protected $_offset = NULL;
+
+    // UNION ...
+    protected $_union = array();
+
+	// The last JOIN statement created
+	protected $_last_join;
+
+	/**
+	 * Sets the initial columns to select from.
+	 *
+	 * @param   array  column list
+	 * @return  void
+	 */
+	public function __construct(array $columns = NULL)
+	{
+		if ( ! empty($columns))
+		{
+			// Set the initial columns
+			$this->_select = $columns;
+		}
+
+		// Start the query with no actual SQL statement
+		parent::__construct(Database::SELECT, '');
+	}
+
+	/**
+	 * Enables or disables selecting only unique columns using "SELECT DISTINCT"
+	 *
+	 * @param   boolean  enable or disable distinct columns
+	 * @return  $this
+	 */
+	public function distinct($value)
+	{
+		$this->_distinct = (bool) $value;
+
+		return $this;
+	}
+
+	/**
+	 * Choose the columns to select from.
+	 *
+	 * @param   mixed  column name or array($column, $alias) or object
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function select($columns = NULL)
+	{
+		$columns = func_get_args();
+
+		$this->_select = array_merge($this->_select, $columns);
+
+		return $this;
+	}
+
+	/**
+	 * Choose the columns to select from, using an array.
+	 *
+	 * @param   array  list of column names or aliases
+	 * @return  $this
+	 */
+	public function select_array(array $columns)
+	{
+		$this->_select = array_merge($this->_select, $columns);
+
+		return $this;
+	}
+
+	/**
+	 * Choose the tables to select "FROM ..."
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function from($tables)
+	{
+		$tables = func_get_args();
+
+		$this->_from = array_merge($this->_from, $tables);
+
+		return $this;
+	}
+
+	/**
+	 * Adds addition tables to "JOIN ...".
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  join type (LEFT, RIGHT, INNER, etc)
+	 * @return  $this
+	 */
+	public function join($table, $type = NULL)
+	{
+		$this->_join[] = $this->_last_join = new Database_Query_Builder_Join($table, $type);
+
+		return $this;
+	}
+
+	/**
+	 * Adds "ON ..." conditions for the last created JOIN statement.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @return  $this
+	 */
+	public function on($c1, $op, $c2)
+	{
+		$this->_last_join->on($c1, $op, $c2);
+
+		return $this;
+	}
+
+	/**
+	 * Adds "USING ..." conditions for the last created JOIN statement.
+	 *
+	 * @param   string  column name
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function using($columns)
+	{
+		$columns = func_get_args();
+
+		call_user_func_array(array($this->_last_join, 'using'), $columns);
+
+		return $this;
+	}
+
+	/**
+	 * Creates a "GROUP BY ..." filter.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function group_by($columns)
+	{
+		$columns = func_get_args();
+
+		$this->_group_by = array_merge($this->_group_by, $columns);
+
+		return $this;
+	}
+
+	/**
+	 * Alias of and_having()
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function having($column, $op, $value = NULL)
+	{
+		return $this->and_having($column, $op, $value);
+	}
+
+	/**
+	 * Creates a new "AND HAVING" condition for the query.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function and_having($column, $op, $value = NULL)
+	{
+		$this->_having[] = array('AND' => array($column, $op, $value));
+
+		return $this;
+	}
+
+	/**
+	 * Creates a new "OR HAVING" condition for the query.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function or_having($column, $op, $value = NULL)
+	{
+		$this->_having[] = array('OR' => array($column, $op, $value));
+
+		return $this;
+	}
+
+	/**
+	 * Alias of and_having_open()
+	 *
+	 * @return  $this
+	 */
+	public function having_open()
+	{
+		return $this->and_having_open();
+	}
+
+	/**
+	 * Opens a new "AND HAVING (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function and_having_open()
+	{
+		$this->_having[] = array('AND' => '(');
+
+		return $this;
+	}
+
+	/**
+	 * Opens a new "OR HAVING (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function or_having_open()
+	{
+		$this->_having[] = array('OR' => '(');
+
+		return $this;
+	}
+
+	/**
+	 * Closes an open "AND HAVING (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function having_close()
+	{
+		return $this->and_having_close();
+	}
+
+	/**
+	 * Closes an open "AND HAVING (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function and_having_close()
+	{
+		$this->_having[] = array('AND' => ')');
+
+		return $this;
+	}
+
+	/**
+	 * Closes an open "OR HAVING (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function or_having_close()
+	{
+		$this->_having[] = array('OR' => ')');
+
+		return $this;
+	}
+
+	/**
+	 * Adds an other UNION clause.
+	 * 
+	 * @param mixed $select if string, it must be the name of a table. Else
+	 *  must be an instance of Database_Query_Builder_Select
+	 * @param boolean $all decides if it's an UNION or UNION ALL clause
+	 * @return $this
+	 */
+	public function union($select, $all = TRUE)
+	{
+		if (is_string($select))
+		{
+			$select = DB::select()->from($select);
+		}
+		if ( ! $select instanceof Database_Query_Builder_Select)
+			throw new Kohana_Exception('first parameter must be a string or an instance of Database_Query_Builder_Select');
+		$this->_union []= array('select' => $select, 'all' => $all);
+		return $this;
+	}	
+
+	/**
+	 * Start returning results after "OFFSET ..."
+	 *
+	 * @param   integer   starting result number
+	 * @return  $this
+	 */
+	public function offset($number)
+	{
+		$this->_offset = (int) $number;
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL query and return it.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		// Callback to quote columns
+		$quote_column = array($db, 'quote_column');
+
+		// Callback to quote tables
+		$quote_table = array($db, 'quote_table');
+
+		// Start a selection query
+		$query = 'SELECT ';
+
+		if ($this->_distinct === TRUE)
+		{
+			// Select only unique results
+			$query .= 'DISTINCT ';
+		}
+
+		if (empty($this->_select))
+		{
+			// Select all columns
+			$query .= '*';
+		}
+		else
+		{
+			// Select all columns
+			$query .= implode(', ', array_unique(array_map($quote_column, $this->_select)));
+		}
+
+		if ( ! empty($this->_from))
+		{
+			// Set tables to select from
+			$query .= ' FROM '.implode(', ', array_unique(array_map($quote_table, $this->_from)));
+		}
+
+		if ( ! empty($this->_join))
+		{
+			// Add tables to join
+			$query .= ' '.$this->_compile_join($db, $this->_join);
+		}
+
+		if ( ! empty($this->_where))
+		{
+			// Add selection conditions
+			$query .= ' WHERE '.$this->_compile_conditions($db, $this->_where);
+		}
+
+		if ( ! empty($this->_group_by))
+		{
+			// Add sorting
+			$query .= ' GROUP BY '.implode(', ', array_map($quote_column, $this->_group_by));
+		}
+
+		if ( ! empty($this->_having))
+		{
+			// Add filtering conditions
+			$query .= ' HAVING '.$this->_compile_conditions($db, $this->_having);
+		}
+
+		if ( ! empty($this->_order_by))
+		{
+			// Add sorting
+			$query .= ' '.$this->_compile_order_by($db, $this->_order_by);
+		}
+
+		if ($this->_limit !== NULL)
+		{
+			// Add limiting
+			$query .= ' LIMIT '.$this->_limit;
+		}
+
+		if ($this->_offset !== NULL)
+		{
+			// Add offsets
+			$query .= ' OFFSET '.$this->_offset;
+		}
+		
+		if ( ! empty($this->_union))
+		{
+			foreach ($this->_union as $u) {
+				$query .= ' UNION ';
+				if ($u['all'] === TRUE)
+				{
+					$query .= 'ALL ';
+				}
+				$query .= $u['select']->compile($db);
+			}
+		}
+
+		$this->_sql = $query;
+
+		return parent::compile($db);
+	}
+
+	public function reset()
+	{
+		$this->_select   =
+		$this->_from     =
+		$this->_join     =
+		$this->_where    =
+		$this->_group_by =
+		$this->_having   =
+		$this->_order_by =
+		$this->_union = array();
+
+		$this->_distinct = FALSE;
+
+		$this->_limit     =
+		$this->_offset    =
+		$this->_last_join = NULL;
+
+		$this->_parameters = array();
+
+		$this->_sql = NULL;
+
+		return $this;
+	}
+
+} // End Database_Query_Select
+
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/update.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/update.php
new file mode 100644
index 0000000..4658e6a
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/update.php
@@ -0,0 +1,134 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for UPDATE statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Query_Builder_Update extends Database_Query_Builder_Where {
+
+	// UPDATE ...
+	protected $_table;
+
+	// SET ...
+	protected $_set = array();
+
+	/**
+	 * Set the table for a update.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @return  void
+	 */
+	public function __construct($table = NULL)
+	{
+		if ($table)
+		{
+			// Set the inital table name
+			$this->_table = $table;
+		}
+
+		// Start the query with no SQL
+		return parent::__construct(Database::UPDATE, '');
+	}
+
+	/**
+	 * Sets the table to update.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @return  $this
+	 */
+	public function table($table)
+	{
+		$this->_table = $table;
+
+		return $this;
+	}
+
+	/**
+	 * Set the values to update with an associative array.
+	 *
+	 * @param   array   associative (column => value) list
+	 * @return  $this
+	 */
+	public function set(array $pairs)
+	{
+		foreach ($pairs as $column => $value)
+		{
+			$this->_set[] = array($column, $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the value of a single column.
+	 *
+	 * @param   mixed  table name or array($table, $alias) or object
+	 * @param   mixed  column value
+	 * @return  $this
+	 */
+	public function value($column, $value)
+	{
+		$this->_set[] = array($column, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Compile the SQL query and return it.
+	 *
+	 * @param   object  Database instance
+	 * @return  string
+	 */
+	public function compile(Database $db)
+	{
+		// Start an update query
+		$query = 'UPDATE '.$db->quote_table($this->_table);
+
+		// Add the columns to update
+		$query .= ' SET '.$this->_compile_set($db, $this->_set);
+
+		if ( ! empty($this->_where))
+		{
+			// Add selection conditions
+			$query .= ' WHERE '.$this->_compile_conditions($db, $this->_where);
+		}
+
+		if ( ! empty($this->_order_by))
+		{
+			// Add sorting
+			$query .= ' '.$this->_compile_order_by($db, $this->_order_by);
+		}
+
+		if ($this->_limit !== NULL)
+		{
+			// Add limiting
+			$query .= ' LIMIT '.$this->_limit;
+		}
+
+		$this->_sql = $query;
+
+		return parent::compile($db);
+	}
+
+	public function reset()
+	{
+		$this->_table = NULL;
+
+		$this->_set   =
+		$this->_where = array();
+
+		$this->_limit = NULL;
+
+		$this->_parameters = array();
+
+		$this->_sql = NULL;
+
+		return $this;
+	}
+
+
+} // End Database_Query_Builder_Update
diff --git a/includes/kohana/modules/database/classes/kohana/database/query/builder/where.php b/includes/kohana/modules/database/classes/kohana/database/query/builder/where.php
new file mode 100644
index 0000000..aeece75
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/query/builder/where.php
@@ -0,0 +1,160 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database query builder for WHERE statements. See [Query Builder](/database/query/builder) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_Database_Query_Builder_Where extends Database_Query_Builder {
+
+	// WHERE ...
+	protected $_where = array();
+
+	// ORDER BY ...
+	protected $_order_by = array();
+
+	// LIMIT ...
+	protected $_limit = NULL;
+
+	/**
+	 * Alias of and_where()
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function where($column, $op, $value)
+	{
+		return $this->and_where($column, $op, $value);
+	}
+
+	/**
+	 * Creates a new "AND WHERE" condition for the query.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function and_where($column, $op, $value)
+	{
+		$this->_where[] = array('AND' => array($column, $op, $value));
+
+		return $this;
+	}
+
+	/**
+	 * Creates a new "OR WHERE" condition for the query.
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  logic operator
+	 * @param   mixed   column value
+	 * @return  $this
+	 */
+	public function or_where($column, $op, $value)
+	{
+		$this->_where[] = array('OR' => array($column, $op, $value));
+
+		return $this;
+	}
+
+	/**
+	 * Alias of and_where_open()
+	 *
+	 * @return  $this
+	 */
+	public function where_open()
+	{
+		return $this->and_where_open();
+	}
+
+	/**
+	 * Opens a new "AND WHERE (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function and_where_open()
+	{
+		$this->_where[] = array('AND' => '(');
+
+		return $this;
+	}
+
+	/**
+	 * Opens a new "OR WHERE (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function or_where_open()
+	{
+		$this->_where[] = array('OR' => '(');
+
+		return $this;
+	}
+
+	/**
+	 * Closes an open "AND WHERE (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function where_close()
+	{
+		return $this->and_where_close();
+	}
+
+	/**
+	 * Closes an open "AND WHERE (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function and_where_close()
+	{
+		$this->_where[] = array('AND' => ')');
+
+		return $this;
+	}
+
+	/**
+	 * Closes an open "OR WHERE (...)" grouping.
+	 *
+	 * @return  $this
+	 */
+	public function or_where_close()
+	{
+		$this->_where[] = array('OR' => ')');
+
+		return $this;
+	}
+
+	/**
+	 * Applies sorting with "ORDER BY ..."
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   string  direction of sorting
+	 * @return  $this
+	 */
+	public function order_by($column, $direction = NULL)
+	{
+		$this->_order_by[] = array($column, $direction);
+
+		return $this;
+	}
+
+	/**
+	 * Return up to "LIMIT ..." results
+	 *
+	 * @param   integer  maximum results to return
+	 * @return  $this
+	 */
+	public function limit($number)
+	{
+		$this->_limit = (int) $number;
+
+		return $this;
+	}
+
+} // End Database_Query_Builder_Where
diff --git a/includes/kohana/modules/database/classes/kohana/database/result.php b/includes/kohana/modules/database/classes/kohana/database/result.php
new file mode 100644
index 0000000..6ddd458
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/result.php
@@ -0,0 +1,331 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database result wrapper.  See [Results](/database/results) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query/Result
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_Database_Result implements Countable, Iterator, SeekableIterator, ArrayAccess {
+
+	// Executed SQL for this result
+	protected $_query;
+
+	// Raw result resource
+	protected $_result;
+
+	// Total number of rows and current row
+	protected $_total_rows  = 0;
+	protected $_current_row = 0;
+
+	// Return rows as an object or associative array
+	protected $_as_object;
+
+	// Parameters for __construct when using object results
+	protected $_object_params = NULL;
+
+	/**
+	 * Sets the total number of rows and stores the result locally.
+	 *
+	 * @param   mixed   query result
+	 * @param   string  SQL query
+	 * @return  void
+	 */
+	public function __construct($result, $sql, $as_object = FALSE, array $params = NULL)
+	{
+		// Store the result locally
+		$this->_result = $result;
+
+		// Store the SQL locally
+		$this->_query = $sql;
+
+		if (is_object($as_object))
+		{
+			// Get the object class name
+			$as_object = get_class($as_object);
+		}
+
+		// Results as objects or associative arrays
+		$this->_as_object = $as_object;
+
+		if ($params)
+		{
+			// Object constructor params
+			$this->_object_params = $params;
+		}
+	}
+
+	/**
+	 * Result destruction cleans up all open result sets.
+	 *
+	 * @return  void
+	 */
+	abstract public function __destruct();
+
+	/**
+	 * Get a cached database result from the current result iterator.
+	 *
+	 *     $cachable = serialize($result->cached());
+	 *
+	 * @return  Database_Result_Cached
+	 * @since   3.0.5
+	 */
+	public function cached()
+	{
+		return new Database_Result_Cached($this->as_array(), $this->_query, $this->_as_object);
+	}
+
+	/**
+	 * Return all of the rows in the result as an array.
+	 *
+	 *     // Indexed array of all rows
+	 *     $rows = $result->as_array();
+	 *
+	 *     // Associative array of rows by "id"
+	 *     $rows = $result->as_array('id');
+	 *
+	 *     // Associative array of rows, "id" => "name"
+	 *     $rows = $result->as_array('id', 'name');
+	 *
+	 * @param   string  column for associative keys
+	 * @param   string  column for values
+	 * @return  array
+	 */
+	public function as_array($key = NULL, $value = NULL)
+	{
+		$results = array();
+
+		if ($key === NULL AND $value === NULL)
+		{
+			// Indexed rows
+
+			foreach ($this as $row)
+			{
+				$results[] = $row;
+			}
+		}
+		elseif ($key === NULL)
+		{
+			// Indexed columns
+
+			if ($this->_as_object)
+			{
+				foreach ($this as $row)
+				{
+					$results[] = $row->$value;
+				}
+			}
+			else
+			{
+				foreach ($this as $row)
+				{
+					$results[] = $row[$value];
+				}
+			}
+		}
+		elseif ($value === NULL)
+		{
+			// Associative rows
+
+			if ($this->_as_object)
+			{
+				foreach ($this as $row)
+				{
+					$results[$row->$key] = $row;
+				}
+			}
+			else
+			{
+				foreach ($this as $row)
+				{
+					$results[$row[$key]] = $row;
+				}
+			}
+		}
+		else
+		{
+			// Associative columns
+
+			if ($this->_as_object)
+			{
+				foreach ($this as $row)
+				{
+					$results[$row->$key] = $row->$value;
+				}
+			}
+			else
+			{
+				foreach ($this as $row)
+				{
+					$results[$row[$key]] = $row[$value];
+				}
+			}
+		}
+
+		$this->rewind();
+
+		return $results;
+	}
+
+	/**
+	 * Return the named column from the current row.
+	 *
+	 *     // Get the "id" value
+	 *     $id = $result->get('id');
+	 *
+	 * @param   string  column to get
+	 * @param   mixed   default value if the column does not exist
+	 * @return  mixed
+	 */
+	public function get($name, $default = NULL)
+	{
+		$row = $this->current();
+
+		if ($this->_as_object)
+		{
+			if (isset($row->$name))
+				return $row->$name;
+		}
+		else
+		{
+			if (isset($row[$name]))
+				return $row[$name];
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Implements [Countable::count], returns the total number of rows.
+	 *
+	 *     echo count($result);
+	 *
+	 * @return  integer
+	 */
+	public function count()
+	{
+		return $this->_total_rows;
+	}
+
+	/**
+	 * Implements [ArrayAccess::offsetExists], determines if row exists.
+	 *
+	 *     if (isset($result[10]))
+	 *     {
+	 *         // Row 10 exists
+	 *     }
+	 *
+	 * @return  boolean
+	 */
+	public function offsetExists($offset)
+	{
+		return ($offset >= 0 AND $offset < $this->_total_rows);
+	}
+
+	/**
+	 * Implements [ArrayAccess::offsetGet], gets a given row.
+	 *
+	 *     $row = $result[10];
+	 *
+	 * @return  mixed
+	 */
+	public function offsetGet($offset)
+	{
+		if ( ! $this->seek($offset))
+			return NULL;
+
+		return $this->current();
+	}
+
+	/**
+	 * Implements [ArrayAccess::offsetSet], throws an error.
+	 *
+	 * [!!] You cannot modify a database result.
+	 *
+	 * @return  void
+	 * @throws  Kohana_Exception
+	 */
+	final public function offsetSet($offset, $value)
+	{
+		throw new Kohana_Exception('Database results are read-only');
+	}
+
+	/**
+	 * Implements [ArrayAccess::offsetUnset], throws an error.
+	 *
+	 * [!!] You cannot modify a database result.
+	 *
+	 * @return  void
+	 * @throws  Kohana_Exception
+	 */
+	final public function offsetUnset($offset)
+	{
+		throw new Kohana_Exception('Database results are read-only');
+	}
+
+	/**
+	 * Implements [Iterator::key], returns the current row number.
+	 *
+	 *     echo key($result);
+	 *
+	 * @return  integer
+	 */
+	public function key()
+	{
+		return $this->_current_row;
+	}
+
+	/**
+	 * Implements [Iterator::next], moves to the next row.
+	 *
+	 *     next($result);
+	 *
+	 * @return  $this
+	 */
+	public function next()
+	{
+		++$this->_current_row;
+		return $this;
+	}
+
+	/**
+	 * Implements [Iterator::prev], moves to the previous row.
+	 *
+	 *     prev($result);
+	 *
+	 * @return  $this
+	 */
+	public function prev()
+	{
+		--$this->_current_row;
+		return $this;
+	}
+
+	/**
+	 * Implements [Iterator::rewind], sets the current row to zero.
+	 *
+	 *     rewind($result);
+	 *
+	 * @return  $this
+	 */
+	public function rewind()
+	{
+		$this->_current_row = 0;
+		return $this;
+	}
+
+	/**
+	 * Implements [Iterator::valid], checks if the current row exists.
+	 *
+	 * [!!] This method is only used internally.
+	 *
+	 * @return  boolean
+	 */
+	public function valid()
+	{
+		return $this->offsetExists($this->_current_row);
+	}
+
+} // End Database_Result
diff --git a/includes/kohana/modules/database/classes/kohana/database/result/cached.php b/includes/kohana/modules/database/classes/kohana/database/result/cached.php
new file mode 100644
index 0000000..ee8659a
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/database/result/cached.php
@@ -0,0 +1,51 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Object used for caching the results of select queries.  See [Results](/database/results#select-cached) for usage and examples.
+ *
+ * @package    Kohana/Database
+ * @category   Query/Result
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Database_Result_Cached extends Database_Result {
+
+	public function __construct(array $result, $sql, $as_object = NULL)
+	{
+		parent::__construct($result, $sql, $as_object);
+
+		// Find the number of rows in the result
+		$this->_total_rows = count($result);
+	}
+
+	public function __destruct()
+	{
+		// Cached results do not use resources
+	}
+
+	public function cached()
+	{
+		return $this;
+	}
+
+	public function seek($offset)
+	{
+		if ($this->offsetExists($offset))
+		{
+			$this->_current_row = $offset;
+
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	public function current()
+	{
+		// Return an array of the row
+		return $this->valid() ? $this->_result[$this->_current_row] : NULL;
+	}
+
+} // End Database_Result_Cached
diff --git a/includes/kohana/modules/database/classes/kohana/db.php b/includes/kohana/modules/database/classes/kohana/db.php
new file mode 100644
index 0000000..b6e513f
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/db.php
@@ -0,0 +1,139 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Provides a shortcut to get Database related objects for [making queries](../database/query).
+ *
+ * Shortcut     | Returned Object
+ * -------------|---------------
+ * [`DB::query()`](#query)   | [Database_Query]
+ * [`DB::insert()`](#insert) | [Database_Query_Builder_Insert]
+ * [`DB::select()`](#select),<br />[`DB::select_array()`](#select_array) | [Database_Query_Builder_Select]
+ * [`DB::update()`](#update) | [Database_Query_Builder_Update]
+ * [`DB::delete()`](#delete) | [Database_Query_Builder_Delete]
+ * [`DB::expr()`](#expr)     | [Database_Expression]
+ *
+ * You pass the same parameters to these functions as you pass to the objects they return.
+ *
+ * @package    Kohana/Database
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_DB {
+
+	/**
+	 * Create a new [Database_Query] of the given type.
+	 *
+	 *     // Create a new SELECT query
+	 *     $query = DB::query(Database::SELECT, 'SELECT * FROM users');
+	 *
+	 *     // Create a new DELETE query
+	 *     $query = DB::query(Database::DELETE, 'DELETE FROM users WHERE id = 5');
+	 *
+	 * Specifying the type changes the returned result. When using
+	 * `Database::SELECT`, a [Database_Query_Result] will be returned.
+	 * `Database::INSERT` queries will return the insert id and number of rows.
+	 * For all other queries, the number of affected rows is returned.
+	 *
+	 * @param   integer  type: Database::SELECT, Database::UPDATE, etc
+	 * @param   string   SQL statement
+	 * @return  Database_Query
+	 */
+	public static function query($type, $sql)
+	{
+		return new Database_Query($type, $sql);
+	}
+
+	/**
+	 * Create a new [Database_Query_Builder_Select]. Each argument will be
+	 * treated as a column. To generate a `foo AS bar` alias, use an array.
+	 *
+	 *     // SELECT id, username
+	 *     $query = DB::select('id', 'username');
+	 *
+	 *     // SELECT id AS user_id
+	 *     $query = DB::select(array('id', 'user_id'));
+	 *
+	 * @param   mixed   column name or array($column, $alias) or object
+	 * @param   ...
+	 * @return  Database_Query_Builder_Select
+	 */
+	public static function select($columns = NULL)
+	{
+		return new Database_Query_Builder_Select(func_get_args());
+	}
+
+	/**
+	 * Create a new [Database_Query_Builder_Select] from an array of columns.
+	 *
+	 *     // SELECT id, username
+	 *     $query = DB::select_array(array('id', 'username'));
+	 *
+	 * @param   array   columns to select
+	 * @return  Database_Query_Builder_Select
+	 */
+	public static function select_array(array $columns = NULL)
+	{
+		return new Database_Query_Builder_Select($columns);
+	}
+
+	/**
+	 * Create a new [Database_Query_Builder_Insert].
+	 *
+	 *     // INSERT INTO users (id, username)
+	 *     $query = DB::insert('users', array('id', 'username'));
+	 *
+	 * @param   string  table to insert into
+	 * @param   array   list of column names or array($column, $alias) or object
+	 * @return  Database_Query_Builder_Insert
+	 */
+	public static function insert($table = NULL, array $columns = NULL)
+	{
+		return new Database_Query_Builder_Insert($table, $columns);
+	}
+
+	/**
+	 * Create a new [Database_Query_Builder_Update].
+	 *
+	 *     // UPDATE users
+	 *     $query = DB::update('users');
+	 *
+	 * @param   string  table to update
+	 * @return  Database_Query_Builder_Update
+	 */
+	public static function update($table = NULL)
+	{
+		return new Database_Query_Builder_Update($table);
+	}
+
+	/**
+	 * Create a new [Database_Query_Builder_Delete].
+	 *
+	 *     // DELETE FROM users
+	 *     $query = DB::delete('users');
+	 *
+	 * @param   string  table to delete from
+	 * @return  Database_Query_Builder_Delete
+	 */
+	public static function delete($table = NULL)
+	{
+		return new Database_Query_Builder_Delete($table);
+	}
+
+	/**
+	 * Create a new [Database_Expression] which is not escaped. An expression
+	 * is the only way to use SQL functions within query builders.
+	 *
+	 *     $expression = DB::expr('COUNT(users.id)');
+	 *     $query = DB::update('users')->set(array('login_count' => DB::expr('login_count + 1')))->where('id', '=', $id);
+	 *     $users = ORM::factory('user')->where(DB::expr("BINARY `hash`"), '=', $hash)->find();
+	 *
+	 * @param   string  expression
+	 * @return  Database_Expression
+	 */
+	public static function expr($string)
+	{
+		return new Database_Expression($string);
+	}
+
+} // End DB
diff --git a/includes/kohana/modules/database/classes/kohana/model/database.php b/includes/kohana/modules/database/classes/kohana/model/database.php
new file mode 100644
index 0000000..d5bc0e3
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/model/database.php
@@ -0,0 +1,58 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database Model base class.
+ *
+ * @package    Kohana/Database
+ * @category   Models
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Model_Database extends Model {
+
+	/**
+	 * Create a new model instance. A [Database] instance or configuration
+	 * group name can be passed to the model. If no database is defined, the
+	 * "default" database group will be used.
+	 *
+	 *     $model = Model::factory($name);
+	 *
+	 * @param   string   model name
+	 * @param   mixed    Database instance object or string
+	 * @return  Model
+	 */
+	public static function factory($name, $db = NULL)
+	{
+		// Add the model prefix
+		$class = 'Model_'.$name;
+
+		return new $class($db);
+	}
+
+	// Database instance
+	protected $_db = 'default';
+
+	/**
+	 * Loads the database.
+	 *
+	 *     $model = new Foo_Model($db);
+	 *
+	 * @param   mixed  Database instance object or string
+	 * @return  void
+	 */
+	public function __construct($db = NULL)
+	{
+		if ($db !== NULL)
+		{
+			// Set the database instance name
+			$this->_db = $db;
+		}
+
+		if (is_string($this->_db))
+		{
+			// Load the database
+			$this->_db = Database::instance($this->_db);
+		}
+	}
+
+} // End Model
diff --git a/includes/kohana/modules/database/classes/kohana/session/database.php b/includes/kohana/modules/database/classes/kohana/session/database.php
new file mode 100644
index 0000000..1a381cd
--- /dev/null
+++ b/includes/kohana/modules/database/classes/kohana/session/database.php
@@ -0,0 +1,229 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Database-based session class.
+ *
+ * Sample schema:
+ *
+ *     CREATE TABLE  `sessions` (
+ *         `session_id` VARCHAR( 24 ) NOT NULL,
+ *         `last_active` INT UNSIGNED NOT NULL,
+ *         `contents` TEXT NOT NULL,
+ *         PRIMARY KEY ( `session_id` ),
+ *         INDEX ( `last_active` )
+ *     ) ENGINE = MYISAM ;
+ *
+ * @package    Kohana/Database
+ * @category   Session
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Session_Database extends Session {
+
+	// Database instance
+	protected $_db;
+
+	// Database table name
+	protected $_table = 'sessions';
+
+	// Database column names
+	protected $_columns = array(
+		'session_id'  => 'session_id',
+		'last_active' => 'last_active',
+		'contents'    => 'contents'
+	);
+
+	// Garbage collection requests
+	protected $_gc = 500;
+
+	// The current session id
+	protected $_session_id;
+
+	// The old session id
+	protected $_update_id;
+
+	public function __construct(array $config = NULL, $id = NULL)
+	{
+		if ( ! isset($config['group']))
+		{
+			// Use the default group
+			$config['group'] = 'default';
+		}
+
+		// Load the database
+		$this->_db = Database::instance($config['group']);
+
+		if (isset($config['table']))
+		{
+			// Set the table name
+			$this->_table = (string) $config['table'];
+		}
+
+		if (isset($config['gc']))
+		{
+			// Set the gc chance
+			$this->_gc = (int) $config['gc'];
+		}
+
+		if (isset($config['columns']))
+		{
+			// Overload column names
+			$this->_columns = $config['columns'];
+		}
+
+		parent::__construct($config, $id);
+
+		if (mt_rand(0, $this->_gc) === $this->_gc)
+		{
+			// Run garbage collection
+			// This will average out to run once every X requests
+			$this->_gc();
+		}
+	}
+
+	public function id()
+	{
+		return $this->_session_id;
+	}
+
+	protected function _read($id = NULL)
+	{
+		if ($id OR $id = Cookie::get($this->_name))
+		{
+			$result = DB::select(array($this->_columns['contents'], 'contents'))
+				->from($this->_table)
+				->where($this->_columns['session_id'], '=', ':id')
+				->limit(1)
+				->param(':id', $id)
+				->execute($this->_db);
+
+			if ($result->count())
+			{
+				// Set the current session id
+				$this->_session_id = $this->_update_id = $id;
+
+				// Return the contents
+				return $result->get('contents');
+			}
+		}
+
+		// Create a new session id
+		$this->_regenerate();
+
+		return NULL;
+	}
+
+	protected function _regenerate()
+	{
+		// Create the query to find an ID
+		$query = DB::select($this->_columns['session_id'])
+			->from($this->_table)
+			->where($this->_columns['session_id'], '=', ':id')
+			->limit(1)
+			->bind(':id', $id);
+
+		do
+		{
+			// Create a new session id
+			$id = str_replace('.', '-', uniqid(NULL, TRUE));
+
+			// Get the the id from the database
+			$result = $query->execute($this->_db);
+		}
+		while ($result->count());
+
+		return $this->_session_id = $id;
+	}
+
+	protected function _write()
+	{
+		if ($this->_update_id === NULL)
+		{
+			// Insert a new row
+			$query = DB::insert($this->_table, $this->_columns)
+				->values(array(':new_id', ':active', ':contents'));
+		}
+		else
+		{
+			// Update the row
+			$query = DB::update($this->_table)
+				->value($this->_columns['last_active'], ':active')
+				->value($this->_columns['contents'], ':contents')
+				->where($this->_columns['session_id'], '=', ':old_id');
+
+			if ($this->_update_id !== $this->_session_id)
+			{
+				// Also update the session id
+				$query->value($this->_columns['session_id'], ':new_id');
+			}
+		}
+
+		$query
+			->param(':new_id',   $this->_session_id)
+			->param(':old_id',   $this->_update_id)
+			->param(':active',   $this->_data['last_active'])
+			->param(':contents', $this->__toString());
+
+		// Execute the query
+		$query->execute($this->_db);
+
+		// The update and the session id are now the same
+		$this->_update_id = $this->_session_id;
+
+		// Update the cookie with the new session id
+		Cookie::set($this->_name, $this->_session_id, $this->_lifetime);
+
+		return TRUE;
+	}
+
+	protected function _destroy()
+	{
+		if ($this->_update_id === NULL)
+		{
+			// Session has not been created yet
+			return TRUE;
+		}
+
+		// Delete the current session
+		$query = DB::delete($this->_table)
+			->where($this->_columns['session_id'], '=', ':id')
+			->param(':id', $this->_update_id);
+
+		try
+		{
+			// Execute the query
+			$query->execute($this->_db);
+
+			// Delete the cookie
+			Cookie::delete($this->_name);
+		}
+		catch (Exception $e)
+		{
+			// An error occurred, the session has not been deleted
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	protected function _gc()
+	{
+		if ($this->_lifetime)
+		{
+			// Expire sessions when their lifetime is up
+			$expires = $this->_lifetime;
+		}
+		else
+		{
+			// Expire sessions after one month
+			$expires = Date::MONTH;
+		}
+
+		// Delete all sessions that have expired
+		DB::delete($this->_table)
+			->where($this->_columns['last_active'], '<', ':time')
+			->param(':time', time() - $expires)
+			->execute($this->_db);
+	}
+
+} // End Session_Database
diff --git a/includes/kohana/modules/database/classes/model/database.php b/includes/kohana/modules/database/classes/model/database.php
new file mode 100644
index 0000000..e26ea12
--- /dev/null
+++ b/includes/kohana/modules/database/classes/model/database.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Model_Database extends Kohana_Model_Database {}
diff --git a/includes/kohana/modules/database/classes/session/database.php b/includes/kohana/modules/database/classes/session/database.php
new file mode 100644
index 0000000..1e75223
--- /dev/null
+++ b/includes/kohana/modules/database/classes/session/database.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Session_Database extends Kohana_Session_Database {}
diff --git a/includes/kohana/modules/database/config/database.php b/includes/kohana/modules/database/config/database.php
new file mode 100644
index 0000000..69cb827
--- /dev/null
+++ b/includes/kohana/modules/database/config/database.php
@@ -0,0 +1,57 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+return array
+(
+	'default' => array
+	(
+		'type'       => 'mysql',
+		'connection' => array(
+			/**
+			 * The following options are available for MySQL:
+			 *
+			 * string   hostname     server hostname, or socket
+			 * string   database     database name
+			 * string   username     database username
+			 * string   password     database password
+			 * boolean  persistent   use persistent connections?
+			 *
+			 * Ports and sockets may be appended to the hostname.
+			 */
+			'hostname'   => 'localhost',
+			'database'   => 'kohana',
+			'username'   => FALSE,
+			'password'   => FALSE,
+			'persistent' => FALSE,
+		),
+		'table_prefix' => '',
+		'charset'      => 'utf8',
+		'caching'      => FALSE,
+		'profiling'    => TRUE,
+	),
+	'alternate' => array(
+		'type'       => 'pdo',
+		'connection' => array(
+			/**
+			 * The following options are available for PDO:
+			 *
+			 * string   dsn         Data Source Name
+			 * string   username    database username
+			 * string   password    database password
+			 * boolean  persistent  use persistent connections?
+			 */
+			'dsn'        => 'mysql:host=localhost;dbname=kohana',
+			'username'   => 'root',
+			'password'   => 'r00tdb',
+			'persistent' => FALSE,
+		),
+		/**
+		 * The following extra options are available for PDO:
+		 *
+		 * string   identifier  set the escaping identifier
+		 */
+		'table_prefix' => '',
+		'charset'      => 'utf8',
+		'caching'      => FALSE,
+		'profiling'    => TRUE,
+	),
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/database/config/session.php b/includes/kohana/modules/database/config/session.php
new file mode 100644
index 0000000..a4229c7
--- /dev/null
+++ b/includes/kohana/modules/database/config/session.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	'database' => array(
+		/**
+		 * Database settings for session storage.
+		 *
+		 * string   group  configuation group name
+		 * string   table  session table name
+		 * integer  gc     number of requests before gc is invoked
+		 * columns  array  custom column names
+		 */
+		'group'   => 'default',
+		'table'   => 'sessions',
+		'gc'      => 500,
+		'columns' => array(
+			/**
+			 * session_id:  session identifier
+			 * last_active: timestamp of the last activity
+			 * contents:    serialized session data
+			 */
+			'session_id'  => 'session_id',
+			'last_active' => 'last_active',
+			'contents'    => 'contents'
+		),
+	),
+);
diff --git a/includes/kohana/modules/database/config/userguide.php b/includes/kohana/modules/database/config/userguide.php
new file mode 100644
index 0000000..36b79a0
--- /dev/null
+++ b/includes/kohana/modules/database/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'database' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Database',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Database agnostic querying and result management.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/config.md b/includes/kohana/modules/database/guide/database/config.md
new file mode 100644
index 0000000..6879c0a
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/config.md
@@ -0,0 +1,118 @@
+# Configuration
+
+The default config file is located in `MODPATH/database/config/database.php`.  You should copy this file to `APPPATH/config/database.php` and make changes there, in keeping with the [cascading filesystem](../kohana/files).
+
+The database configuration file contains an array of configuration groups. The structure of each database configuration group, called an "instance", looks like this:
+
+    string INSTANCE_NAME => array(
+        'type'         => string DATABASE_TYPE,
+        'connection'   => array CONNECTION_ARRAY,
+        'table_prefix' => string TABLE_PREFIX,
+        'charset'      => string CHARACTER_SET,
+        'profiling'    => boolean QUERY_PROFILING,
+    ),
+	
+Understanding each of these settings is important.
+
+INSTANCE_NAME
+:  Connections can be named anything you want, but you should always have at least one connection called "default".
+
+DATABASE_TYPE
+:  One of the installed database drivers. Kohana comes with "mysql" and "pdo" drivers.  Drivers must extend the Database class.
+
+CONNECTION_ARRAY
+:  Specific driver options for connecting to your database. (Driver options are explained [below](#connection-settings).)
+
+TABLE_PREFIX
+:  Prefix that will be added to all table names by the [query builder](#query_building). Prepared statements will **not** use the table prefix.
+
+QUERY_PROFILING
+:  Enables [profiling](../kohana/profiling) of database queries.  This is useful for seeing how many queries each page is using, and which are taking the longest.  You must enable the profiler the view these stats.
+
+## Example
+
+The example file below shows 2 MySQL connections, one local and one remote.
+
+    return array
+    (
+        'default' => array
+        (
+            'type'       => 'mysql',
+            'connection' => array(
+                'hostname'   => 'localhost',
+                'username'   => 'dbuser',
+                'password'   => 'mypassword',
+                'persistent' => FALSE,
+                'database'   => 'my_db_name',
+            ),
+            'table_prefix' => '',
+            'charset'      => 'utf8',
+            'profiling'    => TRUE,
+        ),
+        'remote' => array(
+            'type'       => 'mysql',
+            'connection' => array(
+                'hostname'   => '55.55.55.55',
+                'username'   => 'remote_user',
+                'password'   => 'mypassword',
+                'persistent' => FALSE,
+                'database'   => 'my_remote_db_name',
+            ),
+            'table_prefix' => '',
+            'charset'      => 'utf8',
+            'profiling'    => TRUE,
+        ),
+    );
+
+## Connections and Instances
+
+Each configuration group is referred to as a database instance. Each instance can be accessed by calling [Database::instance].  If you don't provide a parameter, the default instance is used.
+
+	// This would connect to the database defined as 'default'
+    $default = Database::instance();
+	
+	// This would connect to the database defined as 'remote'
+    $remote  = Database::instance('remote');
+
+To disconnect the database, simply destroy the object:
+
+    unset($default)
+	
+	// Or
+	
+	unset(Database::$instances['default']);
+
+If you want to disconnect all of the database instances at once:
+
+    Database::$instances = array();
+
+## Connection Settings
+
+Every database driver has different connection settings.
+
+### MySQL
+
+A [MySQL database](http://www.php.net/manual/en/book.mysql.php) can accept the following options in the `connection` array:
+
+Type      | Option     |  Description               | Default value
+----------|------------|----------------------------| -------------------------
+`string`  | hostname   | Hostname of the database   | `localhost`
+`integer` | port       | Port number                | `NULL`
+`string`  | socket     | UNIX socket                | `NULL`
+`string`  | username   | Database username          | `NULL`
+`string`  | password   | Database password          | `NULL`
+`boolean` | persistent | Persistent connections     | `FALSE`
+`string`  | database   | Database name              | `kohana`
+
+### PDO
+
+A [PDO database](http://php.net/manual/en/book.pdo.php) can accept these options in the `connection` array:
+
+Type      | Option     |  Description               | Default value
+----------|------------|----------------------------| -------------------------
+`string`  | dsn        | PDO data source identifier | `localhost`
+`string`  | username   | Database username          | `NULL`
+`string`  | password   | Database password          | `NULL`
+`boolean` | persistent | Persistent connections     | `FALSE`
+
+[!!] If you are using PDO and are not sure what to use for the `dsn` option, review [PDO::__construct](http://php.net/pdo.construct).
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/examples.md b/includes/kohana/modules/database/guide/database/examples.md
new file mode 100644
index 0000000..4849823
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/examples.md
@@ -0,0 +1,52 @@
+# Examples
+
+Here are some "real world" examples of using the database library to construct your queries and use the results.
+
+## Examples of Prepared Statements
+
+TODO: 4-6 examples of prepared statements of varying complexity, including a good bind() example.
+
+## Pagination and search/filter
+
+In this example, we loop through an array of whitelisted input fields and for each allowed non-empty value we add it to the search query. We make a clone of the query and then execute that query to count the total number of results. The count is then passed to the [Pagination](../pagination) class to determine the search offset. The last few lines search with Pagination's items_per_page and offset values to return a page of results based on the current page the user is on.
+
+	$query = DB::select()->from('users');
+	
+	//only search for these fields
+	$form_inputs = array('first_name', 'last_name', 'email');
+	foreach ($form_inputs as $name) 
+	{
+		$value = Arr::get($_GET, $name, FALSE);
+		if ($value !== FALSE AND $value != '')
+		{
+			$query->where($name, 'like', '%'.$value.'%');
+		}
+	}
+	
+	//copy the query & execute it
+	$pagination_query = clone $query;
+	$count = $pagination_query->select('COUNT("*") AS mycount')->execute()->get('mycount');
+	
+	//pass the total item count to Pagination
+	$config = Kohana::config('pagination');
+	$pagination = Pagination::factory(array(
+		'total_items' => $count,
+		'current_page'   => array('source' => 'route', 'key' => 'page'), 
+		'items_per_page' => 20,
+		'view'           => 'pagination/pretty',
+		'auto_hide'      => TRUE,
+	));
+	$page_links = $pagination->render();
+	
+	//search for results starting at the offset calculated by the Pagination class
+	$query->order_by('last_name', 'asc')
+		->order_by('first_name', 'asc')
+		->limit($pagination->items_per_page)
+		->offset($pagination->offset);
+	$results = $query->execute()->as_array();
+
+## Having
+
+TODO: example goes here
+
+[!!]  We could use more examples on this page. 
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/index.md b/includes/kohana/modules/database/guide/database/index.md
new file mode 100644
index 0000000..162651d
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/index.md
@@ -0,0 +1,17 @@
+# Database 
+
+Kohana 3.0 comes with a robust module for working with databases. By default, the database module supports drivers for [MySQL](http://php.net/mysql) and [PDO](http://php.net/pdo), but new drivers can be made for other database servers.
+
+The database module is included with the Kohana 3.0 install, but needs to be enabled before you can use it. To enable, open your `application/bootstrap.php` file and modify the call to [Kohana::modules] by including the database module like so:
+
+    Kohana::modules(array(
+        ...
+        'database' => MODPATH.'database',
+        ...
+    ));
+
+Next, you will then need to [configure](config) the database module to connect to your database.
+
+Once that is done then you can make [queries](query) and use the [results](results).
+
+The database module also provides a [config driver](../api/Kohana_Config_Database) (for storing [configuration](../kohana/files/config) in the database) and a [session driver](Session_Database).
diff --git a/includes/kohana/modules/database/guide/database/menu.md b/includes/kohana/modules/database/guide/database/menu.md
new file mode 100644
index 0000000..e3f2c7a
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/menu.md
@@ -0,0 +1,7 @@
+## [Database]()
+- [Configuration](config)
+- [Querying](query)
+   - [Prepared Statements](query/prepared)
+   - [Query Builder](query/builder)
+- [Results](results)
+- [Examples](examples)
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/query.md b/includes/kohana/modules/database/guide/database/query.md
new file mode 100644
index 0000000..2e9bd41
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/query.md
@@ -0,0 +1,5 @@
+# Making Queries
+
+There are two different ways to make queries. The simplest way to make a query is to use [Database_Query], via [DB::query], to manually create queries. These queries are called [prepared statements](query/prepared) and allow you to set query parameters which are automatically escaped. The second way to make a query is by building the query using method calls. This is done using the [query builder](query/builder).
+
+[!!] All queries are run using the `execute` method, which accepts a [Database] object or instance name. See [Database_Query::execute] for more information.
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/query/builder.md b/includes/kohana/modules/database/guide/database/query/builder.md
new file mode 100644
index 0000000..ec11b1a
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/query/builder.md
@@ -0,0 +1,253 @@
+# Query Builder
+
+Creating queries dynamically using objects and methods allows queries to be written very quickly in an agnostic way. Query building also adds identifier (table and column name) quoting, as well as value quoting.
+
+[!!] At this time, it is not possible to combine query building with prepared statements.
+
+## Select
+
+Each type of database query is represented by a different class, each with their own methods. For instance, to create a SELECT query, we use [DB::select] which is a shortcut to return a new [Database_Query_Builder_Select] object:
+
+    $query = DB::select();
+
+Query Builder methods return a reference to itself so that method chaining may be used. Select queries ussually require a table and they are referenced using the `from()` method. The `from()` method takes one parameter which can be the table name (string), an array of two strings (table name and alias), or an object (See Subqueries in the Advanced Queries section below). 
+
+    $query = DB::select()->from('users');
+
+Limiting the results of queries is done using the `where()`, `and_where()` and `or_where()` methods. These methods take three parameters: a column, an operator, and a value. 
+
+    $query = DB::select()->from('users')->where('username', '=', 'john');
+
+Multiple `where()` methods may be used to string together multiple clauses connected by the boolean operator in the method's prefix. The `where()` method is a wrapper that just calls `and_where()`. 
+
+    $query = DB::select()->from('users')->where('username', '=', 'john')->or_where('username', '=', 'jane');
+	
+You can use any operator you want.  Examples include `IN`, `BETWEEN`, `>`, `=<`, `!=`, etc.  Use an array for operators that require more than one value.
+
+	$query = DB::select()->from('users')->where('logins', '<=', 1);
+	
+	$query = DB::select()->from('users')->where('logins', '>', 50);
+	
+	$query = DB::select()->from('users')->where('username', 'IN', array('john','mark','matt'));
+	
+	$query = DB::select()->from('users')->where('joindate', 'BETWEEN', array($then, $now));
+
+By default, [DB::select] will select all columns (`SELECT * ...`), but you can also specify which columns you want returned by passing parameters to [DB::select]:
+
+    $query = DB::select('username', 'password')->from('users')->where('username', '=', 'john');
+
+Now take a minute to look at what this method chain is doing. First, we create a new selection object using the [DB::select] method. Next, we set table(s) using the `from()` method. Last, we search for a specific records using the `where()` method. We can display the SQL that will be executed by casting the query to a string:
+
+    echo Kohana::debug((string) $query);
+    // Should display:
+    // SELECT `username`, `password` FROM `users` WHERE `username` = 'john'
+
+Notice how the column and table names are automatically escaped, as well as the values? This is one of the key benefits of using the query builder.
+
+### Select - AS (column aliases)
+
+It is also possible to create `AS` aliases when selecting, by passing an array as each parameter to [DB::select]:
+
+    $query = DB::select(array('username', 'u'), array('password', 'p'))->from('users');
+
+This query would generate the following SQL:
+
+    SELECT `username` AS `u`, `password` AS `p` FROM `users`
+
+### Select - DISTINCT
+
+Unique column values may be turned on or off (default) by passing TRUE or FALSE, respectively, to the `distinct()` method.
+
+    $query = DB::select('username')->distinct(TRUE)->from('posts');
+
+This query would generate the following SQL:
+
+    SELECT DISTINCT `username` FROM `posts`
+
+### Select - LIMIT & OFFSET
+
+When querying large sets of data, it is often better to limit the results and page through the data one chunk at a time. This is done using the `limit()` and `offset()` methods.
+
+    $query = DB::select()->from(`posts`)->limit(10)->offset(30);
+
+This query would generate the following SQL:
+
+    SELECT * FROM `posts` LIMIT 10 OFFSET 30
+
+### Select - ORDER BY
+
+Often you will want the results in a particular order and rather than sorting the results, it's better to have the results returned to you in the correct order. You can do this by using the order_by() method. It takes the column name and an optional direction string as the parameters. Multiple `order_by()` methods can be used to add additional sorting capability.
+
+    $query = DB::select()->from(`posts`)->order_by(`published`, `DESC`);
+
+This query would generate the following SQL:
+
+    SELECT * FROM `posts` ORDER BY `published` DESC
+
+[!!] For a complete list of methods available while building a select query see [Database_Query_Builder_Select].
+
+## Insert
+
+To create records into the database, use [DB::insert] to create an INSERT query, using `values()` to pass in the data:
+
+    $query = DB::insert('users', array('username', 'password'))->values(array('fred', 'p@5sW0Rd'));
+
+This query would generate the following SQL:
+
+    INSERT INTO `users` (`username`, `password`) VALUES ('fred', 'p@5sW0Rd')
+
+[!!] For a complete list of methods available while building an insert query see [Database_Query_Builder_Insert].
+
+## Update
+
+To modify an existing record, use [DB::update] to create an UPDATE query:
+
+    $query = DB::update('users')->set(array('username' => 'jane'))->where('username', '=', 'john');
+
+This query would generate the following SQL:
+
+    UPDATE `users` SET `username` = 'jane' WHERE `username` = 'john'
+
+[!!] For a complete list of methods available while building an update query see [Database_Query_Builder_Update].
+
+## Delete
+
+To remove an existing record, use [DB::delete] to create a DELETE query:
+
+    $query = DB::delete('users')->where('username', 'IN', array('john', 'jane'));
+
+This query would generate the following SQL:
+
+    DELETE FROM `users` WHERE `username` IN ('john', 'jane')
+
+[!!] For a complete list of methods available while building a delete query see [Database_Query_Builder_Delete].
+
+## Advanced Queries
+
+### Joins
+
+Multiple tables can be joined using the `join()` and `on()` methods. The `join()` method takes two parameters. The first is either a table name, an array containing the table and alias, or an object (subquery or expression). The second parameter is the join type: LEFT, RIGHT, INNER, etc.
+
+The `on()` method sets the conditions for the previous `join()` method and is very similar to the `where()` method in that it takes three parameters; left column (name or object), an operator, and the right column (name or object). Multiple `on()` methods may be used to supply multiple conditions and they will be appended with an 'AND' operator. 
+
+    // This query will find all the posts related to "smith" with JOIN
+    $query = DB::select('authors.name', 'posts.content')->from('authors')->join('posts')->on('authors.id', '=', 'posts.author_id')->where('authors.name', '=', 'smith');
+
+This query would generate the following SQL:
+
+    SELECT `authors`.`name`, `posts`.`content` FROM `authors` JOIN `posts` ON (`authors`.`id` = `posts`.`author_id`) WHERE `authors`.`name` = 'smith'
+
+If you want to do a LEFT, RIGHT or INNER JOIN you would do it like this `join('colum_name', 'type_of_join')`:
+
+    // This query will find all the posts related to "smith" with LEFT JOIN
+    $query = DB::select()->from('authors')->join('posts', 'LEFT')->on('authors.id', '=', 'posts.author_id')->where('authors.name', '=', 'smith');
+
+This query would generate the following SQL:
+
+    SELECT `authors`.`name`, `posts`.`content` FROM `authors` LEFT JOIN `posts` ON (`authors`.`id` = `posts`.`author_id`) WHERE `authors`.`name` = 'smith'
+
+[!!] When joining multiple tables with similar column names, it's best to prefix the columns with the table name or table alias to avoid errors. Ambiguous column names should also be aliased so that they can be referenced easier.
+
+### Database Functions
+
+Eventually you will probably run into a situation where you need to call `COUNT` or some other database function within your query. The query builder supports these functions in two ways. The first is by using quotes within aliases:
+
+    $query = DB::select(array('COUNT("username")', 'total_users'))->from('users');
+
+This looks almost exactly the same as a standard `AS` alias, but note how the column name is wrapped in double quotes. Any time a double-quoted value appears inside of a column name, **only** the part inside the double quotes will be escaped. This query would generate the following SQL:
+
+    SELECT COUNT(`username`) AS `total_users` FROM `users`
+
+[!!] When building complex queries and you need to get a count of the total rows that will be returned, build the expression with an empty column list first. Then clone the query and add the COUNT function to one copy and the columns list to the other. This will cut down on the total lines of code and make updating the query easier.
+
+    $query = DB::select()->from('users')
+        ->join('posts')->on('posts.username', '=', 'users.username')
+        ->where('users.active', '=', TRUE)
+        ->where('posts.created', '>=', $yesterday);
+    
+    $total = clone $query;
+    $total->select(array('COUNT( DISTINCT "username")', 'unique_users'));
+    $query->select('posts.username')->distinct();
+
+### Aggregate Functions
+
+Aggregate functions like `COUNT()`, `SUM()`, `AVG()`, etc. will most likely be used with the `group_by()` and possibly the `having()` methods in order to group and filter the results on a set of columns.
+
+    $query = DB::select('username', array('COUNT("id")', 'total_posts')
+        ->from('posts')->group_by('username')->having('total_posts', '>=', 10);
+
+This will generate the following query:
+
+    SELECT `username`, COUNT(`id`) AS `total_posts` FROM `posts` GROUP BY `username` HAVING `total_posts` >= 10
+
+### Subqueries
+
+Query Builder objects can be passed as parameters to many of the methods to create subqueries. Let's take the previous example query and pass it to a new query.
+
+    $sub = DB::select('username', array('COUNT("id")', 'total_posts')
+        ->from('posts')->group_by('username')->having('total_posts', '>=', 10);
+    
+    $query = DB::select('profiles.*', 'posts.total_posts')->from('profiles')
+        ->join(array($sub, 'posts'), 'INNER')->on('profiles.username', '=', 'posts.username');
+
+This will generate the following query:
+
+    SELECT `profiles`.*, `posts`.`total_posts` FROM `profiles` INNER JOIN
+    ( SELECT `username`, COUNT(`id`) AS `total_posts` FROM `posts` GROUP BY `username` HAVING `total_posts` >= 10 ) AS posts
+    ON `profiles`.`username` = `posts`.`username`
+
+Insert queries can also use a select query for the input values
+
+    $sub = DB::select('username', array('COUNT("id")', 'total_posts')
+        ->from('posts')->group_by('username')->having('total_posts', '>=', 10);
+    
+    $query = DB::insert('post_totals', array('username', 'posts'))->select($sub);
+
+This will generate the following query:
+
+    INSERT INTO `post_totals` (`username`, `posts`) 
+    SELECT `username`, COUNT(`id`) AS `total_posts` FROM `posts` GROUP BY `username` HAVING `total_posts` >= 10 
+
+### Boolean Operators and Nested Clauses 
+
+Multiple Where and Having clauses are added to the query with Boolean operators connecting each expression. The default operator for both methods is AND which is the same as the and_ prefixed method. The OR operator can be specified by prefixing the methods with or_. Where and Having clauses can be nested or grouped by post fixing either method with _open and then followed by a method with a _close. 
+
+    $query = DB::select()->from('users')
+        ->where_open()
+            ->or_where('id', 'IN', $expired)
+            ->and_where_open()
+                ->where('last_login', '<=', $last_month)
+                ->or_where('last_login', 'IS', NULL)
+            ->and_where_close()
+        ->where_close()
+        ->and_where('removed','IS', NULL);
+
+This will generate the following query:
+
+    SELECT * FROM `users` WHERE ( `id` IN (1, 2, 3, 5) OR ( `last_login` <= 1276020805 OR `last_login` IS NULL ) ) AND `removed` IS NULL 
+
+### Database Expressions
+
+There are cases were you need a complex expression or other database functions, which you don't want the Query Builder to try and escape. In these cases, you will need to use a database expression created with [DB::expr].  **A database expression is taken as direct input and no escaping is performed.**
+
+    $query = DB::update('users')->set(array('login_count' => DB::expr('login_count + 1')))->where('id', '=', $id);
+
+This will generate the following query, assuming `$id = 45`:
+
+    UPDATE `users` SET `login_count` = `login_count` + 1 WHERE `id` = 45
+
+Another example to calculate the distance of two geographical points:
+
+    $query = DB::select(array(DB::expr('degrees(acos(sin(radians('.$lat.')) * sin(radians(`latitude`)) + cos(radians('.$lat.')) * cos(radians(`latitude`)) * cos(radians(abs('.$lng.' - `longitude`))))) * 69.172'), 'distance'))->from('locations');
+
+[!!] You must validate or escape any user input inside of DB::expr as it will obviously not be escaped it for you.
+
+## Executing
+
+Once you are done building, you can execute the query using `execute()` and use [the results](results).
+
+    $result = $query->execute();
+
+To use a different database [config group](config) pass either the name or the config object to `execute()`.
+
+	$result = $query->execute('config_name')
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/query/prepared.md b/includes/kohana/modules/database/guide/database/query/prepared.md
new file mode 100644
index 0000000..53611b6
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/query/prepared.md
@@ -0,0 +1,67 @@
+# Prepared Statements
+
+Using prepared statements allows you to write SQL queries manually while still escaping the query values automatically to prevent [SQL injection](http://wikipedia.org/wiki/SQL_Injection). Creating a query is simple:
+
+    $query = DB::query(Database::SELECT, 'SELECT * FROM users WHERE username = :user');
+
+The [DB::query] method is just a shortcut that creates a new [Database_Query] class for us, to allow method chaining. The query contains a `:user` parameter, which we will get to in a second.
+
+The first parameter of [DB::query] is the type of query.  It should be `Database::SELECT`, `Database::INSERT`, `Database::UPDATE`, or `Database::DELETE`.  This is done for compatibility reasons for drivers, and to easily determine what `execute()` should return.
+
+The second parameter is the query itself.  Rather than trying to concatenate your query and variables together, you should make use of [Database_Query::param].  This will make your queries much easier to mantain, and will escape the values to prevent [SQL injection](http://wikipedia.org/wiki/SQL_Injection). 
+
+## Parameters
+
+Our example query earlier contains a `:user` parameter, which we can assign to a value using [Database_Query::param] like so:
+
+    $query->param(':user', 'john');
+
+[!!] Parameter names can be any unique string, as they are replaced using [strtr](http://php.net/strtr). It is highly recommended to **not** use dollars signs as parameter names to prevent confusion.  Colons are commonly used.
+
+You can also update the `:user` parameter by calling [Database_Query::param] again:
+
+    $query->param(':user', $_GET['search']);
+
+If you want to set multiple parameters at once, you can use [Database_Query::parameters].
+	
+	$query = DB::query(Database::SELECT, 'SELECT * FROM users WHERE username = :user AND status = :status');
+
+	$query->parameters(array(
+		':user' => 'john',
+		':status' => 'active',
+	));
+
+It is also possible to bind a parameter to a variable, using a [variable reference]((http://php.net/language.references.whatdo)). This can be extremely useful when running the same query many times:
+
+    $query = DB::query(Database::INSERT, 'INSERT INTO users (username, password) VALUES (:user, :pass)')
+        ->bind(':user', $username)
+        ->bind(':pass', $password);
+
+    foreach ($new_users as $username => $password)
+    {
+        $query->execute();
+    }
+
+In the above example, the variables `$username` and `$password` are changed for every loop of the `foreach` statement. When the parameter changes, it effectively changes the `:user` and `:pass` query parameters. Careful parameter binding can save a lot of code when it is used properly.
+
+The only difference between `param()` and `bind()` is that `bind()` passes the variable by reference rather than by assignment (copied), so future changes to the variable can be "seen" by the query. 
+
+[!!] Although all parameters are escaped to prevent SQL injection, it is still a good idea to validate/sanitize your input.
+
+## Display the raw query
+
+If you want to display the SQL that will be executed, simply cast the object to a string:
+
+    echo Kohana::debug((string) $query);
+    // Should display:
+    // SELECT * FROM users WHERE username = 'john'
+
+## Executing
+
+Once you have assigned something to each of the parameters, you can execute the query using `execute()` and use [the results](results).
+
+    $result = $query->execute();
+
+To use a different database [config group](config) pass either the name or the config object to `execute()`.
+
+	$result = $query->execute('config_name')
\ No newline at end of file
diff --git a/includes/kohana/modules/database/guide/database/results.md b/includes/kohana/modules/database/guide/database/results.md
new file mode 100644
index 0000000..653aacc
--- /dev/null
+++ b/includes/kohana/modules/database/guide/database/results.md
@@ -0,0 +1,105 @@
+# Results
+
+## Execute
+
+Once you have a query object built, either through a prepared statement or through the builder, you must then `execute()` the query and retrieve the results. Depending on the query type used, the results returned will vary. 
+
+## Select
+
+[DB::select] will return a [Database_Result] object which you can then iterate over. This example shows how you can iterate through the [Database_Result] using a foreach.
+
+	$results = DB::select()->from('users')->where('verified', '=', 0)->execute();
+	foreach($results as $user)
+	{
+		// Send reminder email to $user['email']
+		echo $user['email']." needs to verify his/her account\n";
+	}
+
+### Select - `as_object()` and `as_assoc()`
+
+When iterating over a result set, the default type will be an associative array with the column names or aliases as the keys. As an option, before calling `execute()`, you can specify to return the result rows as an object by using the `as_object()` method. The `as_object()` method takes one parameter, the name of the class of your choice, but will default to TRUE which uses the `stdClass`. Here is the example again using `stdClass`.
+
+	$results = DB::select()->from('users')->where('verified', '=', 0)->as_object()->execute();
+	foreach($results as $user)
+	{
+		// Send reminder email to $user->email
+		echo $user->email." needs to verify his/her account\n";
+	}
+
+[!!] The method `as_assoc()` will remove the object name and return the results set back to an associative array. Since this is the default, this method is seldom required.
+
+### Select - `as_array()`
+
+Sometimes you will require the results as a pure array rather than as an object. The `Database_Result` method `as_array()` will return an array of all rows. 
+
+	$results = DB::select('id', 'email')->from('users')->execute();
+	$users = $results->as_array();
+	foreach($users as $user)
+	{
+		echo 'User ID: '.$user['id'];
+		echo 'User Email: '.$user['email'];
+	}
+
+It also accepts two parameters that can be very helpful: `$key` and `$value`. When passing a value to `$key` you will index the resulting array by the column specified.
+
+	$results = DB::select('id', 'email')->from('users')->execute();
+	$users = $results->as_array('id');
+	foreach($users as $id => $user)
+	{
+		echo 'User ID: '.$id;
+		echo 'User Email: '.$user['email'];
+	}
+
+The second parameter, `$value`, will reference the column specified and return that value rather than the whole row.  This is particularly useful when making `<select>` dropdowns.
+
+	$results = DB::select('id', 'name')->from('users')->execute();
+	$users = $results->as_array('id','name');
+	// Show a dropdown with all users in it.
+	echo Form::select('author', $users)
+
+To return a non-associative array, leave `$key` as NULL and just pass a `$value`.
+
+	$results = DB::select('email')->from('users')->execute();
+	$users = $results->as_array(NULL, 'email');
+	foreach($users as $email)
+	{
+		echo 'User Email: '.$email;
+	}
+
+### Select - `get()`
+
+Sometime you only want a single value from a query. The `get()` method returns the value of the named column from the current row. The second parameter, `$default`, is used to supply a default value when the result is NULL.
+
+	$total_users = DB::select(array('COUNT("username")', 'total_users'))->from('users')->execute()->get('total_users', 0);
+
+### Select - `cached()`
+
+The mysql database driver returns a `Database_Result` that works with a MySQL Resource data type. Since this resource lives outside of PHP environment, it can't be serialized which means it also can't be cached. To get around this the `Database_Result` object has the `cached()` method that returns a `Database_Result_Cached` object of the result set. The `Database_Result_Cached` can be serialized and cached, but can take up more memory. 
+
+[!!] NOTE: Currently, the PDO diver always returns a class of `Database_Result_Cached`, so `cached()` just returns itself.
+
+The `cached()` function doesn't actually do any caching, it simply returns the result in a way that can be serialized and cached.  You will need to use the [Cache Module](../cache) or some other caching method.
+
+### Select - `count()`
+
+The `Database_Result` object implements the `Countable` Interface. The method `count()` returns the total row count in the result set. 
+
+[!!] NOTE: This is the count of the current result set, not a count of how many records are in the database. This is important to point out especially when using `limit()` and `offset()` in your query.
+
+[!!] For a complete list of methods available when working with a result set see [Database_Result].
+
+## Insert
+
+[DB::insert] returns an array of two values: the last insert id and the number of affected rows.
+	
+	$insert = DB::insert('tools')
+		->columns(array('name', 'model', 'description'))
+		->values(array('Skil 3400 10" Table Saw', '3400', 'Powerful 15 amp motor; weighs just 54-pounds'));
+		
+	list($insert_id, $affected_rows) = $insert->execute();
+
+## Update & Delete
+
+[DB::update] and [DB::delete] both return the number of affected rows as an integer.
+
+	$rows_deleted = DB::delete('tools')->where('model', 'like', '3400')->execute();
diff --git a/includes/kohana/modules/email/README.markdown b/includes/kohana/modules/email/README.markdown
new file mode 100644
index 0000000..c205338
--- /dev/null
+++ b/includes/kohana/modules/email/README.markdown
@@ -0,0 +1,39 @@
+Email Module For Kohana 3.0
+=================================
+
+This is a direct port of the email helper from Kohana 2.3.3 source code.
+
+It has been updated to work with SwiftMailer 4 and includes the libs dir from the 4.0.4 distribution.
+
+Usage should be exactly as with old helper.
+
+Methods defined:
+
+### Email::connect($config = NULL)
+
+Creates SwiftMailer object. $config is an array of configuration values and defaults to using the config file 'email'.
+
+Note: PopBeforeSmtp is not supported in this release as I didn't know what was required to set it up.
+It IS supported in Swiftmailer through the Swift_Plugins_PopBeforeSmtpPlugin plugin class. This can be used manually if required.
+If anyone can modify and test the connect() methd with this functionality I'll add it but I can't find documentation about how it used to work (i.e. is expected to work) so I have left it out for now.
+
+### Email::send($to, $from, $subject, $message, $html = false)
+
+$to can be any of the following:
+
+*  a single string email address e.g. "test@example.com"
+*  an array specifying an email address and a name e.g. array('test@example.com', 'John Doe')
+*  an array of recipients in either above format, keyed by type e.g. array('to' => 'test@example.com', 'cc' => array('test2@example.com', 'Jane Doe'), 'bcc' => 'another@example.com')
+
+$from can be either a string email or array of email and name as above
+
+More complex email (multipart, attachments, batch mailing etc.) must be done using the native Swift_Mailer classes. The Swift Mailer autoloader is included by connect() so you can use and class in the Swift library without worrying about including files.
+
+The Swift_Mailer object setup by connect is returned by it so if you need to access it manually use:
+
+        $mailer = Email::connect();
+
+        // Create complex Swift_Message object stored in $message
+
+        $mailer->send($message);
+
diff --git a/includes/kohana/modules/email/classes/email.php b/includes/kohana/modules/email/classes/email.php
new file mode 100644
index 0000000..3b2d6f0
--- /dev/null
+++ b/includes/kohana/modules/email/classes/email.php
@@ -0,0 +1,145 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+/**
+ * Email module
+ *
+ * Ported from Kohana 2.2.3 Core to Kohana 3.0 module
+ * 
+ * Updated to use Swiftmailer 4.0.4
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Email {
+
+	// SwiftMailer instance
+	protected static $mail;
+
+	/**
+	 * Creates a SwiftMailer instance.
+	 *
+	 * @param   string  DSN connection string
+	 * @return  object  Swift object
+	 */
+	public static function connect($config = NULL)
+	{
+		if ( ! class_exists('Swift_Mailer', FALSE))
+		{
+			// Load SwiftMailer
+			require Kohana::find_file('vendor', 'swift/swift_required');
+		}
+
+		// Load default configuration
+		($config === NULL) and $config = Kohana::config('email');
+		
+		switch ($config['driver'])
+		{
+			case 'smtp':
+				// Set port
+				$port = empty($config['options']['port']) ? 25 : (int) $config['options']['port'];
+				
+				// Create SMTP Transport
+				$transport = Swift_SmtpTransport::newInstance($config['options']['hostname'], $port);
+
+				if ( ! empty($config['options']['encryption']))
+				{
+					// Set encryption
+					$transport->setEncryption($config['options']['encryption']);
+				}
+				
+				// Do authentication, if part of the DSN
+				empty($config['options']['username']) or $transport->setUsername($config['options']['username']);
+				empty($config['options']['password']) or $transport->setPassword($config['options']['password']);
+
+				// Set the timeout to 5 seconds
+				$transport->setTimeout(empty($config['options']['timeout']) ? 5 : (int) $config['options']['timeout']);
+			break;
+			case 'sendmail':
+				// Create a sendmail connection
+				$transport = Swift_SendmailTransport::newInstance(empty($config['options']) ? "/usr/sbin/sendmail -bs" : $config['options']);
+
+			break;
+			default:
+				// Use the native connection
+				$transport = Swift_MailTransport::newInstance($config['options']);
+			break;
+		}
+
+		// Create the SwiftMailer instance
+		return Email::$mail = Swift_Mailer::newInstance($transport);
+	}
+
+	/**
+	 * Send an email message.
+	 *
+	 * @param   string|array  recipient email (and name), or an array of To, Cc, Bcc names
+	 * @param   string|array  sender email (and name)
+	 * @param   string        message subject
+	 * @param   string        message body
+	 * @param   boolean       send email as HTML
+	 * @return  integer       number of emails sent
+	 */
+	public static function send($to, $from, $subject, $message, $html = FALSE)
+	{
+		// Connect to SwiftMailer
+		(Email::$mail === NULL) and email::connect();
+
+		// Determine the message type
+		$html = ($html === TRUE) ? 'text/html' : 'text/plain';
+
+		// Create the message
+		$message = Swift_Message::newInstance($subject, $message, $html, 'utf-8');
+
+		if (is_string($to))
+		{
+			// Single recipient
+			$message->setTo($to);
+		}
+		elseif (is_array($to))
+		{
+			if (isset($to[0]) AND isset($to[1]))
+			{
+				// Create To: address set
+				$to = array('to' => $to);
+			}
+
+			foreach ($to as $method => $set)
+			{
+				if ( ! in_array($method, array('to', 'cc', 'bcc')))
+				{
+					// Use To: by default
+					$method = 'to';
+				}
+
+				// Create method name
+				$method = 'add'.ucfirst($method);
+
+				if (is_array($set))
+				{
+					// Add a recipient with name
+					$message->$method($set[0], $set[1]);
+				}
+				else
+				{
+					// Add a recipient without name
+					$message->$method($set);
+				}
+			}
+		}
+
+		if (is_string($from))
+		{
+			// From without a name
+			$message->setFrom($from);
+		}
+		elseif (is_array($from))
+		{
+			// From with a name
+			$message->setFrom($from[0], $from[1]);
+		}
+
+		return Email::$mail->send($message);
+	}
+
+} // End email
\ No newline at end of file
diff --git a/includes/kohana/modules/email/config/email.php b/includes/kohana/modules/email/config/email.php
new file mode 100644
index 0000000..1dfad96
--- /dev/null
+++ b/includes/kohana/modules/email/config/email.php
@@ -0,0 +1,29 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+return array(
+	/**
+	 * SwiftMailer driver, used with the email module.
+	 *
+	 * Valid drivers are: native, sendmail, smtp
+	 */
+	'driver' => 'native',
+	
+	/**
+	 * To use secure connections with SMTP, set "port" to 465 instead of 25.
+	 * To enable TLS, set "encryption" to "tls".
+	 * 
+	 * Note for SMTP, 'auth' key no longer exists as it did in 2.3.x helper
+	 * Simply specifying a username and password is enough for all normal auth methods
+	 * as they are autodeteccted in Swiftmailer 4
+	 * 
+	 * PopB4Smtp is not supported in this module as I had no way to test it but 
+	 * SwiftMailer 4 does have a PopBeforeSMTP plugin so it shouldn't be hard to implement
+	 * 
+	 * Encryption can be one of 'ssl' or 'tls' (both require non-default PHP extensions
+	 *
+	 * Driver options:
+	 * @param   null    native: no options
+	 * @param   string  sendmail: executable path, with -bs or equivalent attached
+	 * @param   array   smtp: hostname, (username), (password), (port), (encryption)
+	 */
+	'options' => NULL
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/CHANGES b/includes/kohana/modules/email/vendor/swift/CHANGES
new file mode 100644
index 0000000..86fdb11
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/CHANGES
@@ -0,0 +1,61 @@
+Changelog for Swift Mailer, since Version 4.x
+---------------------------------------------
+
+09 March 2009: 4.0.0
+--------------------
+
+ * Complete rewrite of Version 3.x with lots of breaking changes at the interface
+   level, but for the best in the long run.
+ * Changed Connections to Transports
+ * Made sending more robust (less error prone)
+ * Simplified Swift_Message interface (removed need for separate RecipientList)
+ * Improved Plugin API (better event management)
+ * Changed all MIME generated content to be full RFC 2822 (and friends) compliant
+
+11 March 2009: 4.0.1
+--------------------
+
+  * Fixed regression with cache clearing logic in setBody(), setEncoder() and
+    setCharset()
+
+13 March 2009: 4.0.2
+--------------------
+
+  * Added addTo(), addCc() etc methods.
+  * Allowed setTo(), setCc() etc to accept a $name parameters.
+  * Patched a bug in MailTransport where failed recipients were not being merged.
+  * Added Swift::VERSION constant
+  * Allowed custom autoloaders to be used
+
+20 March 2009: 4.0.3
+--------------------
+
+  * Fixed Bug where base64 encoded content could exceed 76 chars per line
+  * Allowed Decorator plugin to accept a custom Replacements object
+
+12 August 2009: 4.0.4
+--------------------
+
+  * Bugfixes for operating under safe mode and using the MailTransport
+  * Compatibility for PHP 5.3
+  * Optimizations for addTo(), addCc() etc operations
+  * Bugfix for double-escaping issue in batch sending
+
+27 September 2009: 4.0.5
+------------------------
+
+  * Fixed a warning (#78)
+  * Clarified license and updated the file headers accordingly
+  * Added __toString() methods where toString() methods already exists
+  * Removed constants (SWIFT_LIB_DIRECTORY, SWIFT_MAP_DIRECTORY, SWIFT_CLASS_DIRECTORY)
+  * Simplified autoloading
+  * Added a setAuthMode() method to AuthHandler (#54)
+
+20 January 2010: 4.0.6
+----------------------
+
+  * added a PEAR package and a script to generate PEAR packages
+  * fixed Swift_Transport_TransportException for SMTP connection not thrown (#109)
+  * fixed Message-IDs are not updated properly (#118)
+
+-- End of Changes --
diff --git a/includes/kohana/modules/email/vendor/swift/LICENSE b/includes/kohana/modules/email/vendor/swift/LICENSE
new file mode 100644
index 0000000..fc8a5de
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/LICENSE
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  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 that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU 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 as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/includes/kohana/modules/email/vendor/swift/README b/includes/kohana/modules/email/vendor/swift/README
new file mode 100644
index 0000000..794d832
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/README
@@ -0,0 +1,30 @@
+Swift Mailer, by Chris Corbyn
+-----------------------------
+
+Swift Mailer is a component based mailing solution for PHP 5.
+It is released under the LGPL license.
+
+Homepage:      http://swiftmailer.org
+Documentation: http://swiftmailer.org/docs
+Mailing List:  http://groups.google.com/group/swiftmailer
+Bugs:          http://swiftmailer.lighthouseapp.com/
+Repository:    http://github.com/swiftmailer/swiftmailer
+
+Swift Mailer is highly object-oriented by design and lends itself
+to use in complex web application with a great deal of flexibility.
+
+For full details on usage, see the documentation.
+
+IMPORTANT: Users upgrading from version 3.x or earlier absolutely
+           MUST read the documentation.  In short, the API is considerably
+           different so your old code won't "just work".
+
+If you'd like to make a donation, we are working on a system where
+donations are taken on a per-feature-request basis via the website
+with target amounts for each feature. In the meantime however you
+may donate directly to the author via PayPal:
+
+  PayPal: chris@w3style.co.uk
+
+Donations are certainly voluntary, but seriously, you donors are
+complete legends and drive this project! :)
diff --git a/includes/kohana/modules/email/vendor/swift/VERSION b/includes/kohana/modules/email/vendor/swift/VERSION
new file mode 100644
index 0000000..2064f10
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/VERSION
@@ -0,0 +1 @@
+Swift-4.0.6
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift.php b/includes/kohana/modules/email/vendor/swift/classes/Swift.php
new file mode 100644
index 0000000..77abbbf
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * General utility class in Swift Mailer, not to be instantiated.
+ * 
+ * @package Swift
+ * 
+ * @author Chris Corbyn
+ */
+abstract class Swift
+{
+  
+  /** Swift Mailer Version number generated during dist release process */
+  const VERSION = '4.0.6';
+  
+  /**
+   * Internal autoloader for spl_autoload_register().
+   * 
+   * @param string $class
+   */
+  public static function autoload($class)
+  {
+    //Don't interfere with other autoloaders
+    if (0 !== strpos($class, 'Swift'))
+    {
+      return false;
+    }
+
+    $path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php';
+
+    if (!file_exists($path))
+    {
+      return false;
+    }
+
+    require_once $path;
+  }
+  
+  /**
+   * Configure autoloading using Swift Mailer.
+   * 
+   * This is designed to play nicely with other autoloaders.
+   */
+  public static function registerAutoload()
+  {
+    spl_autoload_register(array('Swift', 'autoload'));
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php
new file mode 100644
index 0000000..d3779bf
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Attachment.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Attachment.php';
+//@require 'Swift/ByteStream/FileByteStream.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Attachment class for attaching files to a {@link Swift_Mime_Message}.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Attachment extends Swift_Mime_Attachment
+{
+  
+  /**
+   * Create a new Attachment.
+   * Details may be optionally provided to the constructor.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   */
+  public function __construct($data = null, $filename = null,
+    $contentType = null)
+  {
+    call_user_func_array(
+      array($this, 'Swift_Mime_Attachment::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('mime.attachment')
+      );
+    
+    $this->setBody($data);
+    $this->setFilename($filename);
+    if ($contentType)
+    {
+      $this->setContentType($contentType);
+    }
+  }
+  
+  /**
+   * Create a new Attachment.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   * @return Swift_Mime_Attachment
+   */
+  public static function newInstance($data = null, $filename = null,
+    $contentType = null)
+  {
+    return new self($data, $filename, $contentType);
+  }
+  
+  /**
+   * Create a new Attachment from a filesystem path.
+   * @param string $path
+   * @param string $contentType optional
+   * @return Swift_Mime_Attachment
+   */
+  public static function fromPath($path, $contentType = null)
+  {
+    return self::newInstance()->setFile(
+      new Swift_ByteStream_FileByteStream($path),
+      $contentType
+      );
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php
new file mode 100644
index 0000000..71bc3f1
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -0,0 +1,178 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/Filterable.php';
+//@require 'Swift/StreamFilter.php';
+
+/**
+ * Provides the base functionality for an InputStream supporting filters.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+abstract class Swift_ByteStream_AbstractFilterableInputStream
+  implements Swift_InputByteStream, Swift_Filterable
+{
+  
+  /** Write sequence */
+  private $_sequence = 0;
+  
+  /** StreamFilters */
+  private $_filters = array();
+  
+  /** A buffer for writing */
+  private $_writeBuffer = '';
+  
+  /** Bound streams */
+  private $_mirrors = array();
+  
+  /**
+   * Commit the given bytes to the storage medium immediately.
+   * @param string $bytes
+   * @access protected
+   */
+  abstract protected function _commit($bytes);
+  
+  /**
+   * Flush any buffers/content with immediate effect.
+   * @access protected
+   */
+  abstract protected function _flush();
+  
+  /**
+   * Add a StreamFilter to this InputByteStream.
+   * @param Swift_StreamFilter $filter
+   * @param string $key
+   */
+  public function addFilter(Swift_StreamFilter $filter, $key)
+  {
+    $this->_filters[$key] = $filter;
+  }
+  
+  /**
+   * Remove an already present StreamFilter based on its $key.
+   * @param string $key
+   */
+  public function removeFilter($key)
+  {
+    unset($this->_filters[$key]);
+  }
+  
+  /**
+   * Writes $bytes to the end of the stream.
+   * @param string $bytes
+   * @throws Swift_IoException
+   */
+  public function write($bytes)
+  {
+    $this->_writeBuffer .= $bytes;
+    foreach ($this->_filters as $filter)
+    {
+      if ($filter->shouldBuffer($this->_writeBuffer))
+      {
+        return;
+      }
+    }
+    $this->_doWrite($this->_writeBuffer);
+    return ++$this->_sequence;
+  }
+  
+  /**
+   * For any bytes that are currently buffered inside the stream, force them
+   * off the buffer.
+   * 
+   * @throws Swift_IoException
+   */
+  public function commit()
+  {
+    $this->_doWrite($this->_writeBuffer);
+  }
+  
+  /**
+   * Attach $is to this stream.
+   * The stream acts as an observer, receiving all data that is written.
+   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function bind(Swift_InputByteStream $is)
+  {
+    $this->_mirrors[] = $is;
+  }
+  
+  /**
+   * Remove an already bound stream.
+   * If $is is not bound, no errors will be raised.
+   * If the stream currently has any buffered data it will be written to $is
+   * before unbinding occurs.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function unbind(Swift_InputByteStream $is)
+  {
+    foreach ($this->_mirrors as $k => $stream)
+    {
+      if ($is === $stream)
+      {
+        if ($this->_writeBuffer !== '')
+        {
+          $stream->write($this->_filter($this->_writeBuffer));
+        }
+        unset($this->_mirrors[$k]);
+      }
+    }
+  }
+  
+  /**
+   * Flush the contents of the stream (empty it) and set the internal pointer
+   * to the beginning.
+   * @throws Swift_IoException
+   */
+  public function flushBuffers()
+  {
+    if ($this->_writeBuffer !== '')
+    {
+      $this->_doWrite($this->_writeBuffer);
+    }
+    $this->_flush();
+    
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->flushBuffers();
+    }
+  }
+  
+  // -- Private methods
+  
+  /** Run $bytes through all filters */
+  private function _filter($bytes)
+  {
+    foreach ($this->_filters as $filter)
+    {
+      $bytes = $filter->filter($bytes);
+    }
+    return $bytes;
+  }
+  
+  /** Just write the bytes to the stream */
+  private function _doWrite($bytes)
+  {
+    $this->_commit($this->_filter($bytes));
+    
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->write($bytes);
+    }
+    
+    $this->_writeBuffer = '';
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php
new file mode 100644
index 0000000..f918889
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/ArrayByteStream.php
@@ -0,0 +1,190 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Allows reading and writing of bytes to and from an array.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+class Swift_ByteStream_ArrayByteStream
+  implements Swift_InputByteStream, Swift_OutputByteStream
+{
+
+  /**
+   * The internal stack of bytes.
+   * @var string[]
+   * @access private
+   */
+  private $_array = array();
+
+  /**
+   * The size of the stack
+   * @var int
+   * @access private
+   */
+  private $_arraySize = 0;
+
+  /**
+   * The internal pointer offset.
+   * @var int
+   * @access private
+   */
+  private $_offset = 0;
+  
+  /** Bound streams */
+  private $_mirrors = array();
+  
+  /**
+   * Create a new ArrayByteStream.
+   * If $stack is given the stream will be populated with the bytes it contains.
+   * @param mixed $stack of bytes in string or array form, optional
+   */
+  public function __construct($stack = null)
+  {
+    if (is_array($stack))
+    {
+      $this->_array = $stack;
+      $this->_arraySize = count($stack);
+    }
+    elseif (is_string($stack))
+    {
+      $this->write($stack);
+    }
+    else
+    {
+      $this->_array = array();
+    }
+  }
+
+  /**
+   * Reads $length bytes from the stream into a string and moves the pointer
+   * through the stream by $length. If less bytes exist than are requested the
+   * remaining bytes are given instead. If no bytes are remaining at all, boolean
+   * false is returned.
+   * @param int $length
+   * @return string
+   */
+  public function read($length)
+  {
+    if ($this->_offset == $this->_arraySize)
+    {
+      return false;
+    }
+
+    // Don't use array slice
+    $end = $length + $this->_offset;
+    $end = $this->_arraySize<$end
+      ?$this->_arraySize
+      :$end;
+    $ret = '';
+    for (; $this->_offset < $end; ++$this->_offset)
+    {
+      $ret .= $this->_array[$this->_offset];
+    }
+    return $ret;
+  }
+
+  /**
+   * Writes $bytes to the end of the stream.
+   * @param string $bytes
+   */
+  public function write($bytes)
+  {
+    $to_add = str_split($bytes);
+    foreach ($to_add as $value)
+    {
+      $this->_array[] = $value;
+    }
+    $this->_arraySize = count($this->_array);
+    
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->write($bytes);
+    }
+  }
+  
+  /**
+   * Not used.
+   */
+  public function commit()
+  {
+  }
+  
+  /**
+   * Attach $is to this stream.
+   * The stream acts as an observer, receiving all data that is written.
+   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+   *
+   * @param Swift_InputByteStream $is
+   */
+  public function bind(Swift_InputByteStream $is)
+  {
+    $this->_mirrors[] = $is;
+  }
+  
+  /**
+   * Remove an already bound stream.
+   * If $is is not bound, no errors will be raised.
+   * If the stream currently has any buffered data it will be written to $is
+   * before unbinding occurs.
+   *
+   * @param Swift_InputByteStream $is
+   */
+  public function unbind(Swift_InputByteStream $is)
+  {
+    foreach ($this->_mirrors as $k => $stream)
+    {
+      if ($is === $stream)
+      {
+        unset($this->_mirrors[$k]);
+      }
+    }
+  }
+
+  /**
+   * Move the internal read pointer to $byteOffset in the stream.
+   * @param int $byteOffset
+   * @return boolean
+   */
+  public function setReadPointer($byteOffset)
+  {
+    if ($byteOffset > $this->_arraySize)
+    {
+      $byteOffset = $this->_arraySize;
+    }
+    elseif ($byteOffset < 0)
+    {
+      $byteOffset = 0;
+    }
+
+    $this->_offset = $byteOffset;
+  }
+
+  /**
+   * Flush the contents of the stream (empty it) and set the internal pointer
+   * to the beginning.
+   */
+  public function flushBuffers()
+  {
+    $this->_offset = 0;
+    $this->_array = array();
+    $this->_arraySize = 0;
+    
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->flushBuffers();
+    }
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php
new file mode 100644
index 0000000..14773c2
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ByteStream/FileByteStream.php
@@ -0,0 +1,177 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/ByteStream/AbstractFilterableInputStream.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/FileStream.php';
+//@require 'Swift/IoException.php';
+
+/**
+ * Allows reading and writing of bytes to and from a file.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+class Swift_ByteStream_FileByteStream
+  extends Swift_ByteStream_AbstractFilterableInputStream
+  implements Swift_FileStream
+{
+  
+  /** The internal pointer offset */
+  private $_offset = 0;
+  
+  /** The path to the file */
+  private $_path;
+  
+  /** The mode this file is opened in for writing */
+  private $_mode;
+  
+  /** A lazy-loaded resource handle for reading the file */
+  private $_reader;
+  
+  /** A lazy-loaded resource handle for writing the file */
+  private $_writer;
+  
+  /** If magic_quotes_runtime is on, this will be true */
+  private $_quotes = false;
+  
+  /**
+   * Create a new FileByteStream for $path.
+   * @param string $path
+   * @param string $writable if true
+   */
+  public function __construct($path, $writable = false)
+  {
+    $this->_path = $path;
+    $this->_mode = $writable ? 'w+b' : 'rb';
+    $this->_quotes = get_magic_quotes_runtime();
+  }
+  
+  /**
+   * Get the complete path to the file.
+   * @return string
+   */
+  public function getPath()
+  {
+    return $this->_path;
+  }
+  
+  /**
+   * Reads $length bytes from the stream into a string and moves the pointer
+   * through the stream by $length. If less bytes exist than are requested the
+   * remaining bytes are given instead. If no bytes are remaining at all, boolean
+   * false is returned.
+   * @param int $length
+   * @return string
+   * @throws Swift_IoException
+   */
+  public function read($length)
+  {
+    $fp = $this->_getReadHandle();
+    if (!feof($fp))
+    {
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(0);
+      }
+      $bytes = fread($fp, $length);
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(1);
+      }
+      $this->_offset = ftell($fp);
+      return $bytes;
+    }
+    else
+    {
+      return false;
+    }
+  }
+  
+  /**
+   * Move the internal read pointer to $byteOffset in the stream.
+   * @param int $byteOffset
+   * @return boolean
+   */
+  public function setReadPointer($byteOffset)
+  {
+    if (isset($this->_reader))
+    {
+      fseek($this->_reader, $byteOffset, SEEK_SET);
+    }
+    $this->_offset = $byteOffset;
+  }
+  
+  // -- Private methods
+  
+  /** Just write the bytes to the file */
+  protected function _commit($bytes)
+  {
+    fwrite($this->_getWriteHandle(), $bytes);
+    $this->_resetReadHandle();
+  }
+  
+  /** Not used */
+  protected function _flush()
+  {
+  }
+  
+  /** Get the resource for reading */
+  private function _getReadHandle()
+  {
+    if (!isset($this->_reader))
+    {
+      if (!$this->_reader = fopen($this->_path, 'rb'))
+      {
+        throw new Swift_IoException(
+          'Unable to open file for reading [' . $this->_path . ']'
+          );
+      }
+      fseek($this->_reader, $this->_offset, SEEK_SET);
+    }
+    return $this->_reader;
+  }
+  
+  /** Get the resource for writing */
+  private function _getWriteHandle()
+  {
+    if (!isset($this->_writer))
+    {
+      if (!$this->_writer = fopen($this->_path, $this->_mode))
+      {
+        throw new Swift_IoException(
+          'Unable to open file for writing [' . $this->_path . ']'
+          );
+      }
+    }
+    return $this->_writer;
+  }
+  
+  /** Force a reload of the resource for writing */
+  private function _resetWriteHandle()
+  {
+    if (isset($this->_writer))
+    {
+      fclose($this->_writer);
+      $this->_writer = null;
+    }
+  }
+  
+  /** Force a reload of the resource for reading */
+  private function _resetReadHandle()
+  {
+    if (isset($this->_reader))
+    {
+      fclose($this->_reader);
+      $this->_reader = null;
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php
new file mode 100644
index 0000000..53d39ec
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Analyzes characters for a specific character set.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+interface Swift_CharacterReader
+{
+  const MAP_TYPE_INVALID = 0x01;
+  const MAP_TYPE_FIXED_LEN = 0x02;
+  const MAP_TYPE_POSITIONS = 0x03;
+  
+  /**
+   * Returns the complete charactermap
+   *
+   * @param string $string
+   * @param int $startOffset
+   * @param array $currentMap
+   * @param mixed $ignoredChars
+   * @return int
+   */
+  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
+  
+  /**
+   * Returns mapType
+   * @int mapType
+   */
+  public function getMapType();
+  
+  /**
+   * Returns an integer which specifies how many more bytes to read.
+   * A positive integer indicates the number of more bytes to fetch before invoking
+   * this method again.
+   * A value of zero means this is already a valid character.
+   * A value of -1 means this cannot possibly be a valid character.
+   * @param int[] $bytes
+   * @return int
+   */
+  public function validateByteSequence($bytes, $size);
+
+  /**
+   * Returns the number of bytes which should be read to start each character.
+   * For fixed width character sets this should be the number of
+   * octets-per-character. For multibyte character sets this will probably be 1.
+   * @return int
+   */
+  public function getInitialByteSize();
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php
new file mode 100644
index 0000000..26b13ff
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterReader.php';
+
+/**
+ * Provides fixed-width byte sizes for reading fixed-width character sets.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_CharacterReader_GenericFixedWidthReader
+  implements Swift_CharacterReader
+{
+   
+  /**
+   * The number of bytes in a single character.
+   * @var int
+   * @access private
+   */
+  private $_width;
+	
+  /**
+   * Creates a new GenericFixedWidthReader using $width bytes per character.
+   * @param int $width
+   */
+  public function __construct($width)
+  {
+    $this->_width = $width;
+  }
+
+  /**
+   * Returns the complete charactermap
+   *
+   * @param string $string
+   * @param int $startOffset
+   * @param array $currentMap
+   * @param mixed $ignoredChars
+   * @return $int
+   */
+  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+  {
+  	$strlen = strlen($string);
+  	// % and / are CPU intensive, so, maybe find a better way
+  	$ignored = $strlen%$this->_width;
+  	$ignoredChars = substr($string, - $ignored);
+  	$currentMap = $this->_width;
+  	return ($strlen - $ignored)/$this->_width;
+  	
+  }
+  
+  /**
+   * Returns mapType
+   * @int mapType
+   */
+  public function getMapType()
+  {
+  	return self::MAP_TYPE_FIXED_LEN;
+  }
+
+  /**
+   * Returns an integer which specifies how many more bytes to read.
+   * A positive integer indicates the number of more bytes to fetch before invoking
+   * this method again.
+   * A value of zero means this is already a valid character.
+   * A value of -1 means this cannot possibly be a valid character.
+   * @param string $bytes
+   * @return int
+   */
+  public function validateByteSequence($bytes, $size)
+  {
+    $needed = $this->_width - $size;
+    return ($needed > -1)
+      ? $needed
+      : -1
+      ;
+  }
+
+  /**
+   * Returns the number of bytes which should be read to start each character.
+   * @return int
+   */
+  public function getInitialByteSize()
+  {
+    return $this->_width;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php
new file mode 100644
index 0000000..3e0228a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterReader.php';
+
+/**
+ * Analyzes US-ASCII characters.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_CharacterReader_UsAsciiReader
+  implements Swift_CharacterReader
+{
+  /**
+   * Returns the complete charactermap
+   *
+   * @param string $string
+   * @param int $startOffset
+   * @param string $ignoredChars
+   */
+  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+  {
+  	$strlen=strlen($string);
+  	$ignoredChars='';
+  	for( $i = 0; $i < $strlen; ++$i)
+  	{
+  	  if ($string[$i]>"\x07F")
+  	  { // Invalid char
+  	  	$currentMap[$i+$startOffset]=$string[$i];
+  	  }
+  	}
+  	return $strlen;
+  }
+  
+  /**
+   * Returns mapType
+   * @int mapType
+   */
+  public function getMapType()
+  {
+  	return self::MAP_TYPE_INVALID;
+  }
+ 
+  /**
+   * Returns an integer which specifies how many more bytes to read.
+   * A positive integer indicates the number of more bytes to fetch before invoking
+   * this method again.
+   * A value of zero means this is already a valid character.
+   * A value of -1 means this cannot possibly be a valid character.
+   * @param string $bytes
+   * @return int
+   */
+  public function validateByteSequence($bytes, $size)
+  {
+    $byte = reset($bytes);
+    if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F)
+    {
+      return 0;
+    }
+    else
+    {
+      return -1;
+    }
+  }
+
+  /**
+   * Returns the number of bytes which should be read to start each character.
+   * @return int
+   */
+  public function getInitialByteSize()
+  {
+    return 1;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php
new file mode 100644
index 0000000..54ea9a4
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReader/Utf8Reader.php
@@ -0,0 +1,183 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterReader.php';
+
+/**
+ * Analyzes UTF-8 characters.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_CharacterReader_Utf8Reader
+  implements Swift_CharacterReader
+{
+
+  /** Pre-computed for optimization */
+  private static $length_map=array(
+//N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x0N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x1N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x2N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x3N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x4N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x5N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x6N
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x7N
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0x8N
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0x9N
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0xAN
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0xBN
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, //0xCN
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, //0xDN
+    3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, //0xEN
+    4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0  //0xFN
+ );
+  private static $s_length_map=array(
+  "\x00"=>1, "\x01"=>1, "\x02"=>1, "\x03"=>1, "\x04"=>1, "\x05"=>1, "\x06"=>1, "\x07"=>1,
+  "\x08"=>1, "\x09"=>1, "\x0a"=>1, "\x0b"=>1, "\x0c"=>1, "\x0d"=>1, "\x0e"=>1, "\x0f"=>1,
+  "\x10"=>1, "\x11"=>1, "\x12"=>1, "\x13"=>1, "\x14"=>1, "\x15"=>1, "\x16"=>1, "\x17"=>1,
+  "\x18"=>1, "\x19"=>1, "\x1a"=>1, "\x1b"=>1, "\x1c"=>1, "\x1d"=>1, "\x1e"=>1, "\x1f"=>1,
+  "\x20"=>1, "\x21"=>1, "\x22"=>1, "\x23"=>1, "\x24"=>1, "\x25"=>1, "\x26"=>1, "\x27"=>1,
+  "\x28"=>1, "\x29"=>1, "\x2a"=>1, "\x2b"=>1, "\x2c"=>1, "\x2d"=>1, "\x2e"=>1, "\x2f"=>1,
+  "\x30"=>1, "\x31"=>1, "\x32"=>1, "\x33"=>1, "\x34"=>1, "\x35"=>1, "\x36"=>1, "\x37"=>1,
+  "\x38"=>1, "\x39"=>1, "\x3a"=>1, "\x3b"=>1, "\x3c"=>1, "\x3d"=>1, "\x3e"=>1, "\x3f"=>1,
+  "\x40"=>1, "\x41"=>1, "\x42"=>1, "\x43"=>1, "\x44"=>1, "\x45"=>1, "\x46"=>1, "\x47"=>1,
+  "\x48"=>1, "\x49"=>1, "\x4a"=>1, "\x4b"=>1, "\x4c"=>1, "\x4d"=>1, "\x4e"=>1, "\x4f"=>1,
+  "\x50"=>1, "\x51"=>1, "\x52"=>1, "\x53"=>1, "\x54"=>1, "\x55"=>1, "\x56"=>1, "\x57"=>1,
+  "\x58"=>1, "\x59"=>1, "\x5a"=>1, "\x5b"=>1, "\x5c"=>1, "\x5d"=>1, "\x5e"=>1, "\x5f"=>1,
+  "\x60"=>1, "\x61"=>1, "\x62"=>1, "\x63"=>1, "\x64"=>1, "\x65"=>1, "\x66"=>1, "\x67"=>1,
+  "\x68"=>1, "\x69"=>1, "\x6a"=>1, "\x6b"=>1, "\x6c"=>1, "\x6d"=>1, "\x6e"=>1, "\x6f"=>1,
+  "\x70"=>1, "\x71"=>1, "\x72"=>1, "\x73"=>1, "\x74"=>1, "\x75"=>1, "\x76"=>1, "\x77"=>1,
+  "\x78"=>1, "\x79"=>1, "\x7a"=>1, "\x7b"=>1, "\x7c"=>1, "\x7d"=>1, "\x7e"=>1, "\x7f"=>1,
+  "\x80"=>0, "\x81"=>0, "\x82"=>0, "\x83"=>0, "\x84"=>0, "\x85"=>0, "\x86"=>0, "\x87"=>0,
+  "\x88"=>0, "\x89"=>0, "\x8a"=>0, "\x8b"=>0, "\x8c"=>0, "\x8d"=>0, "\x8e"=>0, "\x8f"=>0,
+  "\x90"=>0, "\x91"=>0, "\x92"=>0, "\x93"=>0, "\x94"=>0, "\x95"=>0, "\x96"=>0, "\x97"=>0,
+  "\x98"=>0, "\x99"=>0, "\x9a"=>0, "\x9b"=>0, "\x9c"=>0, "\x9d"=>0, "\x9e"=>0, "\x9f"=>0,
+  "\xa0"=>0, "\xa1"=>0, "\xa2"=>0, "\xa3"=>0, "\xa4"=>0, "\xa5"=>0, "\xa6"=>0, "\xa7"=>0,
+  "\xa8"=>0, "\xa9"=>0, "\xaa"=>0, "\xab"=>0, "\xac"=>0, "\xad"=>0, "\xae"=>0, "\xaf"=>0,
+  "\xb0"=>0, "\xb1"=>0, "\xb2"=>0, "\xb3"=>0, "\xb4"=>0, "\xb5"=>0, "\xb6"=>0, "\xb7"=>0,
+  "\xb8"=>0, "\xb9"=>0, "\xba"=>0, "\xbb"=>0, "\xbc"=>0, "\xbd"=>0, "\xbe"=>0, "\xbf"=>0,
+  "\xc0"=>2, "\xc1"=>2, "\xc2"=>2, "\xc3"=>2, "\xc4"=>2, "\xc5"=>2, "\xc6"=>2, "\xc7"=>2,
+  "\xc8"=>2, "\xc9"=>2, "\xca"=>2, "\xcb"=>2, "\xcc"=>2, "\xcd"=>2, "\xce"=>2, "\xcf"=>2,
+  "\xd0"=>2, "\xd1"=>2, "\xd2"=>2, "\xd3"=>2, "\xd4"=>2, "\xd5"=>2, "\xd6"=>2, "\xd7"=>2,
+  "\xd8"=>2, "\xd9"=>2, "\xda"=>2, "\xdb"=>2, "\xdc"=>2, "\xdd"=>2, "\xde"=>2, "\xdf"=>2,
+  "\xe0"=>3, "\xe1"=>3, "\xe2"=>3, "\xe3"=>3, "\xe4"=>3, "\xe5"=>3, "\xe6"=>3, "\xe7"=>3,
+  "\xe8"=>3, "\xe9"=>3, "\xea"=>3, "\xeb"=>3, "\xec"=>3, "\xed"=>3, "\xee"=>3, "\xef"=>3,
+  "\xf0"=>4, "\xf1"=>4, "\xf2"=>4, "\xf3"=>4, "\xf4"=>4, "\xf5"=>4, "\xf6"=>4, "\xf7"=>4,
+  "\xf8"=>5, "\xf9"=>5, "\xfa"=>5, "\xfb"=>5, "\xfc"=>6, "\xfd"=>6, "\xfe"=>0, "\xff"=>0,
+ );
+
+  /**
+   * Returns the complete charactermap
+   *
+   * @param string $string
+   * @param int $startOffset
+   * @param array $currentMap
+   * @param mixed $ignoredChars
+   */
+  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+  {
+  	if (!isset($currentMap['i']) || !isset($currentMap['p']))
+  	{
+  	  $currentMap['p'] = $currentMap['i'] = array();
+   	}
+  	$strlen=strlen($string);
+  	$charPos=count($currentMap['p']);
+  	$foundChars=0;
+  	$invalid=false;
+  	for ($i=0; $i<$strlen; ++$i)
+  	{
+  	  $char=$string[$i];
+  	  $size=self::$s_length_map[$char];
+  	  if ($size==0)
+  	  {
+  	    /* char is invalid, we must wait for a resync */
+  	  	$invalid=true;
+  	  	continue;
+   	  }
+   	  else
+   	  {
+   	  	if ($invalid==true)
+   	  	{
+   	  	  /* We mark the chars as invalid and start a new char */
+   	  	  $currentMap['p'][$charPos+$foundChars]=$startOffset+$i;
+   	      $currentMap['i'][$charPos+$foundChars]=true;
+   	      ++$foundChars;
+   	      $invalid=false;
+   	  	}
+   	  	if (($i+$size) > $strlen){
+   	  		$ignoredChars=substr($string, $i);
+   	  		break;
+   	  	}
+   	  	for ($j=1; $j<$size; ++$j)
+   	  	{
+          $char=$string[$i+$j];
+          if ($char>"\x7F" && $char<"\xC0")
+          {
+            // Valid - continue parsing
+          }
+          else
+          {
+            /* char is invalid, we must wait for a resync */
+            $invalid=true;
+            continue 2;
+          }
+   	  	}
+   	  	/* Ok we got a complete char here */
+   	  	$lastChar=$currentMap['p'][$charPos+$foundChars]=$startOffset+$i+$size;
+   	  	$i+=$j-1;
+   	    ++$foundChars;
+   	  }
+  	}
+  	return $foundChars;
+  }
+  
+  /**
+   * Returns mapType
+   * @int mapType
+   */
+  public function getMapType()
+  {
+  	return self::MAP_TYPE_POSITIONS;
+  }
+ 
+  /**
+   * Returns an integer which specifies how many more bytes to read.
+   * A positive integer indicates the number of more bytes to fetch before invoking
+   * this method again.
+   * A value of zero means this is already a valid character.
+   * A value of -1 means this cannot possibly be a valid character.
+   * @param string $bytes
+   * @return int
+   */
+  public function validateByteSequence($bytes, $size)
+  {
+    if ($size<1){
+      return -1;
+    }
+    $needed = self::$length_map[$bytes[0]] - $size;
+    return ($needed > -1)
+      ? $needed
+      : -1
+      ;
+  }
+
+  /**
+   * Returns the number of bytes which should be read to start each character.
+   * @return int
+   */
+  public function getInitialByteSize()
+  {
+    return 1;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php
new file mode 100644
index 0000000..9e01de1
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterReader.php';
+
+/**
+ * A factory for creating CharacterReaders.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+interface Swift_CharacterReaderFactory
+{
+
+  /**
+   * Returns a CharacterReader suitable for the charset applied.
+   * @param string $charset
+   * @return Swift_CharacterReader
+   */
+  public function getReaderFor($charset);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
new file mode 100644
index 0000000..a6f9f94
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterReaderFactory.php';
+
+/**
+ * Standard factory for creating CharacterReaders.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
+  implements Swift_CharacterReaderFactory
+{
+
+  /**
+   * A map of charset patterns to their implementation classes.
+   * @var array
+   * @access private
+   */
+  private $_map = array();
+  
+  /**
+   * Factories which have already been loaded.
+   * @var Swift_CharacterReaderFactory[]
+   * @access private
+   */
+  private $_loaded = array();
+  
+  /**
+   * Creates a new CharacterReaderFactory.
+   */
+  public function __construct()
+  {
+    $prefix = 'Swift_CharacterReader_';
+    
+    $singleByte = array(
+      'class' => $prefix . 'GenericFixedWidthReader',
+      'constructor' => array(1)
+      );
+    
+    $doubleByte = array(
+      'class' => $prefix . 'GenericFixedWidthReader',
+      'constructor' => array(2)
+      );
+      
+    $fourBytes = array(
+      'class' => $prefix . 'GenericFixedWidthReader',
+      'constructor' => array(4)
+      );
+    
+    //Utf-8
+    $this->_map['utf-?8'] = array(
+      'class' => $prefix . 'Utf8Reader',
+      'constructor' => array()
+      );
+    
+    //7-8 bit charsets
+    $this->_map['(us-)?ascii'] = $singleByte;
+    $this->_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
+    $this->_map['windows-?125[0-9]'] = $singleByte;
+    $this->_map['cp-?[0-9]+'] = $singleByte;
+    $this->_map['ansi'] = $singleByte;
+    $this->_map['macintosh'] = $singleByte;
+    $this->_map['koi-?7'] = $singleByte;
+    $this->_map['koi-?8-?.+'] = $singleByte;
+    $this->_map['mik'] = $singleByte;
+    $this->_map['(cork|t1)'] = $singleByte;
+    $this->_map['v?iscii'] = $singleByte;
+    
+    //16 bits
+    $this->_map['(ucs-?2|utf-?16)'] = $doubleByte;
+    
+    //32 bits
+    $this->_map['(ucs-?4|utf-?32)'] = $fourBytes;
+    
+    //Fallback
+    $this->_map['.*'] = $singleByte;
+  }
+  
+  /**
+   * Returns a CharacterReader suitable for the charset applied.
+   * @param string $charset
+   * @return Swift_CharacterReader
+   */
+  public function getReaderFor($charset)
+  {
+    $charset = trim(strtolower($charset));
+    foreach ($this->_map as $pattern => $spec)
+    {
+      $re = '/^' . $pattern . '$/D';
+      if (preg_match($re, $charset))
+      {
+        if (!array_key_exists($pattern, $this->_loaded))
+        {
+          $reflector = new ReflectionClass($spec['class']);
+          if ($reflector->getConstructor())
+          {
+            $reader = $reflector->newInstanceArgs($spec['constructor']);
+          }
+          else
+          {
+            $reader = $reflector->newInstance();
+          }
+          $this->_loaded[$pattern] = $reader;
+        }
+        return $this->_loaded[$pattern];
+      }
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php
new file mode 100644
index 0000000..bf91528
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once dirname(__FILE__) . '/OutputByteStream.php';
+require_once dirname(__FILE__) . '/CharacterReaderFactory.php';
+
+
+/**
+ * An abstract means of reading and writing data in terms of characters as opposed
+ * to bytes.
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ * @package Swift
+ * @subpackage CharacterStream
+ * @author Chris Corbyn
+ */
+interface Swift_CharacterStream
+{
+
+  /**
+   * Set the character set used in this CharacterStream.
+   * @param string $charset
+   */
+  public function setCharacterSet($charset);
+  
+  /**
+   * Set the CharacterReaderFactory for multi charset support.
+   * @param Swift_CharacterReaderFactory $factory
+   */
+  public function setCharacterReaderFactory(
+    Swift_CharacterReaderFactory $factory);
+  
+  /**
+   * Overwrite this character stream using the byte sequence in the byte stream.
+   * @param Swift_OutputByteStream $os output stream to read from
+   */
+  public function importByteStream(Swift_OutputByteStream $os);
+  
+  /**
+   * Import a string a bytes into this CharacterStream, overwriting any existing
+   * data in the stream.
+   * @param string $string
+   */
+  public function importString($string);
+  
+  /**
+   * Read $length characters from the stream and move the internal pointer
+   * $length further into the stream.
+   * @param int $length
+   * @return string
+   */
+  public function read($length);
+  
+  /**
+   * Read $length characters from the stream and return a 1-dimensional array
+   * containing there octet values.
+   * @param int $length
+   * @return int[]
+   */
+  public function readBytes($length);
+  
+  /**
+   * Write $chars to the end of the stream.
+   * @param string $chars
+   */
+  public function write($chars);
+  
+  /**
+   * Move the internal pointer to $charOffset in the stream.
+   * @param int $charOffset
+   */
+  public function setPointer($charOffset);
+  
+  /**
+   * Empty the stream and reset the internal pointer.
+   */
+  public function flushContents();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php
new file mode 100644
index 0000000..9612365
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -0,0 +1,319 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/CharacterStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+
+/**
+ * A CharacterStream implementation which stores characters in an internal array.
+ * @package Swift
+ * @subpackage CharacterStream
+ * @author Chris Corbyn
+ */
+class Swift_CharacterStream_ArrayCharacterStream
+  implements Swift_CharacterStream
+{
+  
+  /** A map of byte values and their respective characters */
+  private static $_charMap;
+  
+  /** A map of characters and their derivative byte values */
+  private static $_byteMap;
+  
+  /** The char reader (lazy-loaded) for the current charset */
+  private $_charReader;
+
+  /** A factory for creatiing CharacterReader instances */
+  private $_charReaderFactory;
+
+  /** The character set this stream is using */
+  private $_charset;
+
+  /** Array of characters */
+  private $_array = array();
+
+  /** Size of the array of character */
+  private $_array_size = array();
+
+  /** The current character offset in the stream */
+  private $_offset = 0;
+
+  /**
+   * Create a new CharacterStream with the given $chars, if set.
+   * @param Swift_CharacterReaderFactory $factory for loading validators
+   * @param string $charset used in the stream
+   */
+  public function __construct(Swift_CharacterReaderFactory $factory,
+    $charset)
+  {
+    self::_initializeMaps();
+    $this->setCharacterReaderFactory($factory);
+    $this->setCharacterSet($charset);
+  }
+
+  /**
+   * Set the character set used in this CharacterStream.
+   * @param string $charset
+   */
+  public function setCharacterSet($charset)
+  {
+    $this->_charset = $charset;
+    $this->_charReader = null;
+  }
+
+  /**
+   * Set the CharacterReaderFactory for multi charset support.
+   * @param Swift_CharacterReaderFactory $factory
+   */
+  public function setCharacterReaderFactory(
+    Swift_CharacterReaderFactory $factory)
+  {
+    $this->_charReaderFactory = $factory;
+  }
+
+  /**
+   * Overwrite this character stream using the byte sequence in the byte stream.
+   * @param Swift_OutputByteStream $os output stream to read from
+   */
+  public function importByteStream(Swift_OutputByteStream $os)
+  {
+    if (!isset($this->_charReader))
+    {
+      $this->_charReader = $this->_charReaderFactory
+        ->getReaderFor($this->_charset);
+    }
+
+    $startLength = $this->_charReader->getInitialByteSize();
+    while (false !== $bytes = $os->read($startLength))
+    {
+      $c = array();
+      for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
+      {
+        $c[] = self::$_byteMap[$bytes[$i]];
+      }
+      $size = count($c);
+      $need = $this->_charReader
+        ->validateByteSequence($c, $size);
+      if ($need > 0 &&
+        false !== $bytes = $os->read($need))
+      {
+        for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
+        {
+          $c[] = self::$_byteMap[$bytes[$i]];
+        }
+      }
+      $this->_array[] = $c;
+      ++$this->_array_size;
+    }
+  }
+
+  /**
+   * Import a string a bytes into this CharacterStream, overwriting any existing
+   * data in the stream.
+   * @param string $string
+   */
+  public function importString($string)
+  {
+    $this->flushContents();
+    $this->write($string);
+  }
+
+  /**
+   * Read $length characters from the stream and move the internal pointer
+   * $length further into the stream.
+   * @param int $length
+   * @return string
+   */
+  public function read($length)
+  {
+    if ($this->_offset == $this->_array_size)
+    {
+      return false;
+    }
+
+    // Don't use array slice
+    $arrays = array();
+    $end = $length + $this->_offset;
+    for ($i = $this->_offset; $i < $end; ++$i)
+    {
+      if (!isset($this->_array[$i]))
+      {
+        break;
+      }
+      $arrays[] = $this->_array[$i];
+    }
+    $this->_offset += $i - $this->_offset; // Limit function calls
+    $chars = false;
+    foreach ($arrays as $array)
+    {
+      $chars .= implode('', array_map('chr', $array));
+    }
+    return $chars;
+  }
+
+  /**
+   * Read $length characters from the stream and return a 1-dimensional array
+   * containing there octet values.
+   * @param int $length
+   * @return int[]
+   */
+  public function readBytes($length)
+  {
+    if ($this->_offset == $this->_array_size)
+    {
+      return false;
+    }
+    $arrays = array();
+    $end = $length + $this->_offset;
+    for ($i = $this->_offset; $i < $end; ++$i)
+    {
+      if (!isset($this->_array[$i]))
+      {
+        break;
+      }
+      $arrays[] = $this->_array[$i];
+    }
+    $this->_offset += ($i - $this->_offset); // Limit function calls
+    return call_user_func_array('array_merge', $arrays);
+  }
+
+  /**
+   * Write $chars to the end of the stream.
+   * @param string $chars
+   */
+  public function write($chars)
+  {
+    if (!isset($this->_charReader))
+    {
+      $this->_charReader = $this->_charReaderFactory->getReaderFor(
+        $this->_charset);
+    }
+
+    $startLength = $this->_charReader->getInitialByteSize();
+
+    $fp = fopen('php://memory', 'w+b');
+    fwrite($fp, $chars);
+    unset($chars);
+    fseek($fp, 0, SEEK_SET);
+
+    $buffer = array(0);
+    $buf_pos = 1;
+    $buf_len = 1;
+    $has_datas = true;
+    do
+    {
+      $bytes = array();
+      // Buffer Filing
+      if ($buf_len - $buf_pos < $startLength)
+      {
+        $buf = array_splice($buffer, $buf_pos);
+        $new = $this->_reloadBuffer($fp, 100);
+        if ($new)
+        {
+          $buffer = array_merge($buf, $new);
+          $buf_len = count($buffer);
+          $buf_pos = 0;
+        }
+        else
+        {
+          $has_datas = false;
+        }
+      }
+      if ($buf_len - $buf_pos > 0)
+      {
+        $size = 0;
+        for ($i = 0; $i < $startLength && isset($buffer[$buf_pos]); ++$i)
+        {
+          ++$size;
+          $bytes[] = $buffer[$buf_pos++];
+        }
+        $need = $this->_charReader->validateByteSequence(
+          $bytes, $size);
+        if ($need > 0)
+        {
+          if ($buf_len - $buf_pos < $need)
+          {
+            $new = $this->_reloadBuffer($fp, $need);
+            
+            if ($new)
+            {
+              $buffer = array_merge($buffer, $new);
+              $buf_len = count($buffer);
+            }
+          }
+          for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i)
+          {
+            $bytes[] = $buffer[$buf_pos++];
+          }
+        }
+        $this->_array[] = $bytes;
+        ++$this->_array_size;
+      }
+    }
+    while ($has_datas);
+    
+    fclose($fp);
+  }
+
+  /**
+   * Move the internal pointer to $charOffset in the stream.
+   * @param int $charOffset
+   */
+  public function setPointer($charOffset)
+  {
+    if ($charOffset > $this->_array_size)
+    {
+      $charOffset = $this->_array_size;
+    }
+    elseif ($charOffset < 0)
+    {
+      $charOffset = 0;
+    }
+    $this->_offset = $charOffset;
+  }
+
+  /**
+   * Empty the stream and reset the internal pointer.
+   */
+  public function flushContents()
+  {
+    $this->_offset = 0;
+    $this->_array = array();
+    $this->_array_size = 0;
+  }
+  
+  private function _reloadBuffer($fp, $len)
+  {
+    if (!feof($fp) && ($bytes = fread($fp, $len)) !== false)
+    {
+      $buf = array();
+      for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
+      {
+        $buf[] = self::$_byteMap[$bytes[$i]];
+      }
+      return $buf;
+    }
+    return false;
+  }
+  
+  private static function _initializeMaps()
+  {
+    if (!isset(self::$_charMap))
+    {
+      self::$_charMap = array();
+      for ($byte = 0; $byte < 256; ++$byte)
+      {
+        self::$_charMap[$byte] = chr($byte);
+      }
+      self::$_byteMap = array_flip(self::$_charMap);
+    }
+  }
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php
new file mode 100644
index 0000000..f090aa7
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -0,0 +1,300 @@
+<?php
+
+/*
+ CharacterStream implementation using an array in Swift Mailer.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ */
+
+//@require 'Swift/CharacterStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+
+/**
+ * A CharacterStream implementation which stores characters in an internal array.
+ * @package Swift
+ * @subpackage CharacterStream
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+
+Class Swift_CharacterStream_NgCharacterStream
+  implements Swift_CharacterStream
+{
+
+  /**
+   * The char reader (lazy-loaded) for the current charset.
+   * @var Swift_CharacterReader
+   * @access private
+   */
+  private $_charReader;
+
+  /**
+   * A factory for creatiing CharacterReader instances.
+   * @var Swift_CharacterReaderFactory
+   * @access private
+   */
+  private $_charReaderFactory;
+
+  /**
+   * The character set this stream is using.
+   * @var string
+   * @access private
+   */
+  private $_charset;
+  
+  /**
+   * The datas stored as is
+   *
+   * @var string
+   */
+  private $_datas = "";
+  
+  /**
+   * Number of bytes in the stream
+   *
+   * @var int
+   */
+  private $_datasSize = 0;
+  
+  /**
+   * Map
+   *
+   * @var mixed
+   */
+  private $_map;
+  
+  /**
+   * Map Type
+   *
+   * @var int
+   */
+  private $_mapType = 0;
+  
+  /**
+   * Number of characters in the stream
+   *
+   * @var int
+   */
+  private $_charCount = 0;
+  
+  /**
+   * Position in the stream
+   *
+   * @var unknown_type
+   */
+  private $_currentPos = 0;
+  
+  /**
+   * The constructor
+   *
+   * @param Swift_CharacterReaderFactory $factory
+   * @param unknown_type $charset
+   */
+  public function __construct(Swift_CharacterReaderFactory $factory,
+    $charset)
+  {
+    $this->setCharacterReaderFactory($factory);
+    $this->setCharacterSet($charset);
+  }
+  
+  /* -- Changing parameters of the stream -- */
+
+  /**
+   * Set the character set used in this CharacterStream.
+   * @param string $charset
+   */
+  public function setCharacterSet($charset)
+  {
+    $this->_charset = $charset;
+    $this->_charReader = null;
+  	$this->_mapType = 0;
+  }
+
+  /**
+   * Set the CharacterReaderFactory for multi charset support.
+   * @param Swift_CharacterReaderFactory $factory
+   */
+  public function setCharacterReaderFactory(
+    Swift_CharacterReaderFactory $factory)
+  {
+    $this->_charReaderFactory = $factory;
+  }
+
+  /**
+   * @see Swift_CharacterStream::flushContents()
+   *
+   */
+  public function flushContents()
+  {
+  	$this->_datas = null;
+  	$this->_map = null;
+  	$this->_charCount = 0;
+  	$this->_currentPos = 0;
+  	$this->_datasSize = 0;
+  }
+  
+  /**
+   * @see Swift_CharacterStream::importByteStream()
+   *
+   * @param Swift_OutputByteStream $os
+   */
+  public function importByteStream(Swift_OutputByteStream $os)
+  {
+    $this->flushContents();
+    $blocks=512;
+    $os->setReadPointer(0);
+    while(false!==($read = $os->read($blocks)))
+      $this->write($read);
+  }
+  
+  /**
+   * @see Swift_CharacterStream::importString()
+   *
+   * @param string $string
+   */
+  public function importString($string)
+  {
+    $this->flushContents();
+    $this->write($string);
+  }
+  
+  /**
+   * @see Swift_CharacterStream::read()
+   *
+   * @param int $length
+   * @return string
+   */
+  public function read($length)
+  {
+  	if ($this->_currentPos>=$this->_charCount)
+  	{
+  	  return false;
+  	}
+  	$ret=false;
+  	$length = ($this->_currentPos+$length > $this->_charCount)
+  	  ? $this->_charCount - $this->_currentPos
+  	  : $length;
+  	  switch ($this->_mapType)
+  	{
+      case Swift_CharacterReader::MAP_TYPE_FIXED_LEN:
+        $len = $length*$this->_map;
+        $ret = substr($this->_datas,
+            $this->_currentPos * $this->_map,
+            $len);
+        $this->_currentPos += $length;
+        break;
+      
+      case Swift_CharacterReader::MAP_TYPE_INVALID:
+        $end = $this->_currentPos + $length;
+        $end = $end > $this->_charCount
+          ?$this->_charCount
+          :$end;
+        $ret = '';
+        for (; $this->_currentPos < $length; ++$this->_currentPos)
+        {
+          if (isset ($this->_map[$this->_currentPos]))
+          {
+            $ret .= '?';
+          }
+          else
+          {
+            $ret .= $this->_datas[$this->_currentPos];
+          }
+        }
+        break;
+      
+      case Swift_CharacterReader::MAP_TYPE_POSITIONS:
+        $end = $this->_currentPos + $length;
+        $end = $end > $this->_charCount
+          ?$this->_charCount
+          :$end;
+        $ret = '';
+        $start = 0;
+        if ($this->_currentPos>0)
+        {
+          $start = $this->_map['p'][$this->_currentPos-1];
+        }
+        $to = $start;
+        for (; $this->_currentPos < $end; ++$this->_currentPos)
+        {
+          if (isset($this->_map['i'][$this->_currentPos])) {
+          	$ret .= substr($this->_datas, $start, $to - $start).'?';
+          	$start = $this->_map['p'][$this->_currentPos];
+          } else {
+          	$to = $this->_map['p'][$this->_currentPos];
+          }
+        }
+        $ret .= substr($this->_datas, $start, $to - $start);
+        break;
+  	}
+  	return $ret;
+  }
+  
+  /**
+   * @see Swift_CharacterStream::readBytes()
+   *
+   * @param int $length
+   * @return int[]
+   */
+  public function readBytes($length)
+  {
+    $read=$this->read($length);
+  	if ($read!==false)
+  	{
+      $ret = array_map('ord', str_split($read, 1));
+      return $ret;
+  	}
+  	return false;
+  }
+  
+  /**
+   * @see Swift_CharacterStream::setPointer()
+   *
+   * @param int $charOffset
+   */
+  public function setPointer($charOffset)
+  {
+  	if ($this->_charCount<$charOffset){
+  		$charOffset=$this->_charCount;
+  	}
+  	$this->_currentPos = $charOffset;
+  }
+  
+  /**
+   * @see Swift_CharacterStream::write()
+   *
+   * @param string $chars
+   */
+  public function write($chars)
+  {
+  	if (!isset($this->_charReader))
+    {
+      $this->_charReader = $this->_charReaderFactory->getReaderFor(
+        $this->_charset);
+      $this->_map = array();
+      $this->_mapType = $this->_charReader->getMapType();
+    }
+  	$ignored='';
+  	$this->_datas .= $chars;
+    $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored);
+    if ($ignored!==false) {
+      $this->_datasSize=strlen($this->_datas)-strlen($ignored);
+    }
+    else
+    {
+      $this->_datasSize=strlen($this->_datas);
+    }
+  }
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php
new file mode 100644
index 0000000..b6ba554
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyContainer.php
@@ -0,0 +1,349 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/DependencyException.php';
+
+/**
+ * Dependency Injection container.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_DependencyContainer
+{
+  
+  /** Constant for literal value types */
+  const TYPE_VALUE = 0x0001;
+  
+  /** Constant for new instance types */
+  const TYPE_INSTANCE = 0x0010;
+  
+  /** Constant for shared instance types */
+  const TYPE_SHARED = 0x0100;
+  
+  /** Constant for aliases */
+  const TYPE_ALIAS = 0x1000;
+  
+  /** Singleton instance */
+  private static $_instance = null;
+  
+  /** The data container */
+  private $_store = array();
+  
+  /** The current endpoint in the data container */
+  private $_endPoint;
+  
+  /**
+   * Constructor should not be used.
+   * Use {@link getInstance()} instead.
+   */
+  public function __construct() { }
+  
+  /**
+   * Returns a singleton of the DependencyContainer.
+   * @return Swift_DependencyContainer
+   */
+  public static function getInstance()
+  {
+    if (!isset(self::$_instance))
+    {
+      self::$_instance = new self();
+    }
+    return self::$_instance;
+  }
+  
+  /**
+   * List the names of all items stored in the Container.
+   * @return array
+   */
+  public function listItems()
+  {
+    return array_keys($this->_store);
+  }
+  
+  /**
+   * Test if an item is registered in this container with the given name.
+   * @param string $itemName
+   * @return boolean
+   * @see register()
+   */
+  public function has($itemName)
+  {
+    return array_key_exists($itemName, $this->_store)
+      && isset($this->_store[$itemName]['lookupType']);
+  }
+  
+  /**
+   * Lookup the item with the given $itemName.
+   * @param string $itemName
+   * @return mixed
+   * @throws Swift_DependencyException If the dependency is not found
+   * @see register()
+   */
+  public function lookup($itemName)
+  {
+    if (!$this->has($itemName))
+    {
+      throw new Swift_DependencyException(
+        'Cannot lookup dependency "' . $itemName . '" since it is not registered.'
+        );
+    }
+    
+    switch ($this->_store[$itemName]['lookupType'])
+    {
+      case self::TYPE_ALIAS:
+        return $this->_createAlias($itemName);
+      case self::TYPE_VALUE:
+        return $this->_getValue($itemName);
+      case self::TYPE_INSTANCE:
+        return $this->_createNewInstance($itemName);
+      case self::TYPE_SHARED:
+        return $this->_createSharedInstance($itemName);
+    }
+  }
+  
+  /**
+   * Create an array of arguments passed to the constructor of $itemName.
+   * @param string $itemName
+   * @return array
+   */
+  public function createDependenciesFor($itemName)
+  {
+    $args = array();
+    if (isset($this->_store[$itemName]['args']))
+    {
+      $args = $this->_resolveArgs($this->_store[$itemName]['args']);
+    }
+    return $args;
+  }
+  
+  /**
+   * Register a new dependency with $itemName.
+   * This method returns the current DependencyContainer instance because it
+   * requires the use of the fluid interface to set the specific details for the
+   * dependency.
+   *
+   * @param string $itemName
+   * @return Swift_DependencyContainer
+   * @see asNewInstanceOf(), asSharedInstanceOf(), asValue()
+   */
+  public function register($itemName)
+  {
+    $this->_store[$itemName] = array();
+    $this->_endPoint =& $this->_store[$itemName];
+    return $this;
+  }
+  
+  /**
+   * Specify the previously registered item as a literal value.
+   * {@link register()} must be called before this will work.
+   *
+   * @param mixed $value
+   * @return Swift_DependencyContainer
+   */
+  public function asValue($value)
+  {
+    $endPoint =& $this->_getEndPoint();
+    $endPoint['lookupType'] = self::TYPE_VALUE;
+    $endPoint['value'] = $value;
+    return $this;
+  }
+  
+  /**
+   * Specify the previously registered item as an alias of another item.
+   * @param string $lookup
+   * @return Swift_DependencyContainer
+   */
+  public function asAliasOf($lookup)
+  {
+    $endPoint =& $this->_getEndPoint();
+    $endPoint['lookupType'] = self::TYPE_ALIAS;
+    $endPoint['ref'] = $lookup;
+    return $this;
+  }
+  
+  /**
+   * Specify the previously registered item as a new instance of $className.
+   * {@link register()} must be called before this will work.
+   * Any arguments can be set with {@link withDependencies()},
+   * {@link addConstructorValue()} or {@link addConstructorLookup()}.
+   *
+   * @param string $className
+   * @return Swift_DependencyContainer
+   * @see withDependencies(), addConstructorValue(), addConstructorLookup()
+   */
+  public function asNewInstanceOf($className)
+  {
+    $endPoint =& $this->_getEndPoint();
+    $endPoint['lookupType'] = self::TYPE_INSTANCE;
+    $endPoint['className'] = $className;
+    return $this;
+  }
+  
+  /**
+   * Specify the previously registered item as a shared instance of $className.
+   * {@link register()} must be called before this will work.
+   * @param string $className
+   * @return Swift_DependencyContainer
+   */
+  public function asSharedInstanceOf($className)
+  {
+    $endPoint =& $this->_getEndPoint();
+    $endPoint['lookupType'] = self::TYPE_SHARED;
+    $endPoint['className'] = $className;
+    return $this;
+  }
+  
+  /**
+   * Specify a list of injected dependencies for the previously registered item.
+   * This method takes an array of lookup names.
+   * 
+   * @param array $lookups
+   * @return Swift_DependencyContainer
+   * @see addConstructorValue(), addConstructorLookup()
+   */
+  public function withDependencies(array $lookups)
+  {
+    $endPoint =& $this->_getEndPoint();
+    $endPoint['args'] = array();
+    foreach ($lookups as $lookup)
+    {
+      $this->addConstructorLookup($lookup);
+    }
+    return $this;
+  }
+  
+  /**
+   * Specify a literal (non looked up) value for the constructor of the
+   * previously registered item.
+   * 
+   * @param mixed $value
+   * @return Swift_DependencyContainer
+   * @see withDependencies(), addConstructorLookup()
+   */
+  public function addConstructorValue($value)
+  {
+    $endPoint =& $this->_getEndPoint();
+    if (!isset($endPoint['args']))
+    {
+      $endPoint['args'] = array();
+    }
+    $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+    return $this;
+  }
+  
+  /**
+   * Specify a dependency lookup for the constructor of the previously
+   * registered item.
+   * 
+   * @param string $lookup
+   * @return Swift_DependencyContainer
+   * @see withDependencies(), addConstructorValue()
+   */
+  public function addConstructorLookup($lookup)
+  {
+    $endPoint =& $this->_getEndPoint();
+    if (!isset($this->_endPoint['args']))
+    {
+      $endPoint['args'] = array();
+    }
+    $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+    return $this;
+  }
+  
+  // -- Private methods
+  
+  /** Get the literal value with $itemName */
+  private function _getValue($itemName)
+  {
+    return $this->_store[$itemName]['value'];
+  }
+  
+  /** Resolve an alias to another item */
+  private function _createAlias($itemName)
+  {
+    return $this->lookup($this->_store[$itemName]['ref']);
+  }
+  
+  /** Create a fresh instance of $itemName */
+  private function _createNewInstance($itemName)
+  {
+    $reflector = new ReflectionClass($this->_store[$itemName]['className']);
+    if ($reflector->getConstructor())
+    {
+      return $reflector->newInstanceArgs(
+        $this->createDependenciesFor($itemName)
+        );
+    }
+    else
+    {
+      return $reflector->newInstance();
+    }
+  }
+  
+  /** Create and register a shared instance of $itemName */
+  private function _createSharedInstance($itemName)
+  {
+    if (!isset($this->_store[$itemName]['instance']))
+    {
+      $this->_store[$itemName]['instance'] = $this->_createNewInstance($itemName);
+    }
+    return $this->_store[$itemName]['instance'];
+  }
+  
+  /** Get the current endpoint in the store */
+  private function &_getEndPoint()
+  {
+    if (!isset($this->_endPoint))
+    {
+      throw new BadMethodCallException(
+        'Component must first be registered by calling register()'
+        );
+    }
+    return $this->_endPoint;
+  }
+  
+  /** Get an argument list with dependencies resolved */
+  private function _resolveArgs(array $args)
+  {
+    $resolved = array();
+    foreach ($args as $argDefinition)
+    {
+      switch ($argDefinition['type'])
+      {
+        case 'lookup':
+          $resolved[] = $this->_lookupRecursive($argDefinition['item']);
+          break;
+        case 'value':
+          $resolved[] = $argDefinition['item'];
+          break;
+      }
+    }
+    return $resolved;
+  }
+  
+  /** Resolve a single dependency with an collections */
+  private function _lookupRecursive($item)
+  {
+    if (is_array($item))
+    {
+      $collection = array();
+      foreach ($item as $k => $v)
+      {
+        $collection[$k] = $this->_lookupRecursive($v);
+      }
+      return $collection;
+    }
+    else
+    {
+      return $this->lookup($item);
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php
new file mode 100644
index 0000000..bb1681c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/DependencyException.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/SwiftException.php';
+
+/**
+ * DependencyException thrown when a requested dependeny is missing.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_DependencyException extends Swift_SwiftException
+{
+  
+  /**
+   * Create a new DependencyException with $message.
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php
new file mode 100644
index 0000000..34d096c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/EmbeddedFile.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Attachment.php';
+//@require 'Swift/DependencyContainer.php';
+//@require 'Swift/ByteStream/FileByteStream.php';
+
+/**
+ * An embedded file, in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
+{
+  
+  /**
+   * Create a new EmbeddedFile.
+   * Details may be optionally provided to the constructor.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   */
+  public function __construct($data = null, $filename = null,
+    $contentType = null)
+  {
+    call_user_func_array(
+      array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('mime.embeddedfile')
+      );
+    
+    $this->setBody($data);
+    $this->setFilename($filename);
+    if ($contentType)
+    {
+      $this->setContentType($contentType);
+    }
+  }
+  
+  /**
+   * Create a new EmbeddedFile.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   * @return Swift_Mime_EmbeddedFile
+   */
+  public static function newInstance($data = null, $filename = null,
+    $contentType = null)
+  {
+    return new self($data, $filename, $contentType);
+  }
+  
+  /**
+   * Create a new EmbeddedFile from a filesystem path.
+   * @param string $path
+   * @return Swift_Mime_EmbeddedFile
+   */
+  public static function fromPath($path)
+  {
+    return self::newInstance()->setFile(
+      new Swift_ByteStream_FileByteStream($path)
+      );
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php
new file mode 100644
index 0000000..32aa96a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/CharsetObserver.php';
+
+/**
+ * Interface for all Encoder schemes.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+interface Swift_Encoder extends Swift_Mime_CharsetObserver
+{
+  
+  /**
+   * Encode a given string to produce an encoded string.
+   * @param string $string
+   * @param int $firstLineOffset if first line needs to be shorter
+   * @param int $maxLineLength - 0 indicates the default length for this encoding
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php
new file mode 100644
index 0000000..09c71ba
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Base64Encoder.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Encoder.php';
+
+/**
+ * Handles Base 64 Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_Base64Encoder implements Swift_Encoder
+{
+  
+  /**
+   * Takes an unencoded string and produces a Base64 encoded string from it.
+   * Base64 encoded strings have a maximum line length of 76 characters.
+   * If the first line needs to be shorter, indicate the difference with
+   * $firstLineOffset.
+   * @param string $string to encode
+   * @param int $firstLineOffset
+   * @param int $maxLineLength, optional, 0 indicates the default of 76 bytes
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    if (0 >= $maxLineLength || 76 < $maxLineLength)
+    {
+      $maxLineLength = 76;
+    }
+    
+    $encodedString = base64_encode($string);
+    $firstLine = '';
+    
+    if (0 != $firstLineOffset)
+    {
+      $firstLine = substr(
+        $encodedString, 0, $maxLineLength - $firstLineOffset
+        ) . "\r\n";
+      $encodedString = substr(
+        $encodedString, $maxLineLength - $firstLineOffset
+        );
+    }
+    
+    return $firstLine . trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
+  }
+  
+  /**
+   * Does nothing.
+   */
+  public function charsetChanged($charset)
+  {
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php
new file mode 100644
index 0000000..6914f6c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/QpEncoder.php
@@ -0,0 +1,263 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Encoder.php';
+//@require 'Swift/CharacterStream.php';
+
+/**
+ * Handles Quoted Printable (QP) Encoding in Swift Mailer.
+ * Possibly the most accurate RFC 2045 QP implementation found in PHP.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_QpEncoder implements Swift_Encoder
+{
+
+  /**
+   * The CharacterStream used for reading characters (as opposed to bytes).
+   * @var Swift_CharacterStream
+   * @access protected
+   */
+  protected $_charStream;
+
+  /**
+   * A filter used if input should be canonicalized.
+   * @var Swift_StreamFilter
+   * @access protected
+   */
+  protected $_filter;
+
+  /**
+   * Pre-computed QP for HUGE optmization.
+   * @var string[]
+   * @access protected
+   */
+  protected static $_qpMap = array(
+    0   => '=00', 1   => '=01', 2   => '=02', 3   => '=03', 4   => '=04',
+    5   => '=05', 6   => '=06', 7   => '=07', 8   => '=08', 9   => '=09',
+    10  => '=0A', 11  => '=0B', 12  => '=0C', 13  => '=0D', 14  => '=0E',
+    15  => '=0F', 16  => '=10', 17  => '=11', 18  => '=12', 19  => '=13',
+    20  => '=14', 21  => '=15', 22  => '=16', 23  => '=17', 24  => '=18',
+    25  => '=19', 26  => '=1A', 27  => '=1B', 28  => '=1C', 29  => '=1D',
+    30  => '=1E', 31  => '=1F', 32  => '=20', 33  => '=21', 34  => '=22',
+    35  => '=23', 36  => '=24', 37  => '=25', 38  => '=26', 39  => '=27',
+    40  => '=28', 41  => '=29', 42  => '=2A', 43  => '=2B', 44  => '=2C',
+    45  => '=2D', 46  => '=2E', 47  => '=2F', 48  => '=30', 49  => '=31',
+    50  => '=32', 51  => '=33', 52  => '=34', 53  => '=35', 54  => '=36',
+    55  => '=37', 56  => '=38', 57  => '=39', 58  => '=3A', 59  => '=3B',
+    60  => '=3C', 61  => '=3D', 62  => '=3E', 63  => '=3F', 64  => '=40',
+    65  => '=41', 66  => '=42', 67  => '=43', 68  => '=44', 69  => '=45',
+    70  => '=46', 71  => '=47', 72  => '=48', 73  => '=49', 74  => '=4A',
+    75  => '=4B', 76  => '=4C', 77  => '=4D', 78  => '=4E', 79  => '=4F',
+    80  => '=50', 81  => '=51', 82  => '=52', 83  => '=53', 84  => '=54',
+    85  => '=55', 86  => '=56', 87  => '=57', 88  => '=58', 89  => '=59',
+    90  => '=5A', 91  => '=5B', 92  => '=5C', 93  => '=5D', 94  => '=5E',
+    95  => '=5F', 96  => '=60', 97  => '=61', 98  => '=62', 99  => '=63',
+    100 => '=64', 101 => '=65', 102 => '=66', 103 => '=67', 104 => '=68',
+    105 => '=69', 106 => '=6A', 107 => '=6B', 108 => '=6C', 109 => '=6D',
+    110 => '=6E', 111 => '=6F', 112 => '=70', 113 => '=71', 114 => '=72',
+    115 => '=73', 116 => '=74', 117 => '=75', 118 => '=76', 119 => '=77',
+    120 => '=78', 121 => '=79', 122 => '=7A', 123 => '=7B', 124 => '=7C',
+    125 => '=7D', 126 => '=7E', 127 => '=7F', 128 => '=80', 129 => '=81',
+    130 => '=82', 131 => '=83', 132 => '=84', 133 => '=85', 134 => '=86',
+    135 => '=87', 136 => '=88', 137 => '=89', 138 => '=8A', 139 => '=8B',
+    140 => '=8C', 141 => '=8D', 142 => '=8E', 143 => '=8F', 144 => '=90',
+    145 => '=91', 146 => '=92', 147 => '=93', 148 => '=94', 149 => '=95',
+    150 => '=96', 151 => '=97', 152 => '=98', 153 => '=99', 154 => '=9A',
+    155 => '=9B', 156 => '=9C', 157 => '=9D', 158 => '=9E', 159 => '=9F',
+    160 => '=A0', 161 => '=A1', 162 => '=A2', 163 => '=A3', 164 => '=A4',
+    165 => '=A5', 166 => '=A6', 167 => '=A7', 168 => '=A8', 169 => '=A9',
+    170 => '=AA', 171 => '=AB', 172 => '=AC', 173 => '=AD', 174 => '=AE',
+    175 => '=AF', 176 => '=B0', 177 => '=B1', 178 => '=B2', 179 => '=B3',
+    180 => '=B4', 181 => '=B5', 182 => '=B6', 183 => '=B7', 184 => '=B8',
+    185 => '=B9', 186 => '=BA', 187 => '=BB', 188 => '=BC', 189 => '=BD',
+    190 => '=BE', 191 => '=BF', 192 => '=C0', 193 => '=C1', 194 => '=C2',
+    195 => '=C3', 196 => '=C4', 197 => '=C5', 198 => '=C6', 199 => '=C7',
+    200 => '=C8', 201 => '=C9', 202 => '=CA', 203 => '=CB', 204 => '=CC',
+    205 => '=CD', 206 => '=CE', 207 => '=CF', 208 => '=D0', 209 => '=D1',
+    210 => '=D2', 211 => '=D3', 212 => '=D4', 213 => '=D5', 214 => '=D6',
+    215 => '=D7', 216 => '=D8', 217 => '=D9', 218 => '=DA', 219 => '=DB',
+    220 => '=DC', 221 => '=DD', 222 => '=DE', 223 => '=DF', 224 => '=E0',
+    225 => '=E1', 226 => '=E2', 227 => '=E3', 228 => '=E4', 229 => '=E5',
+    230 => '=E6', 231 => '=E7', 232 => '=E8', 233 => '=E9', 234 => '=EA',
+    235 => '=EB', 236 => '=EC', 237 => '=ED', 238 => '=EE', 239 => '=EF',
+    240 => '=F0', 241 => '=F1', 242 => '=F2', 243 => '=F3', 244 => '=F4',
+    245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
+    250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
+    255 => '=FF'
+    );
+
+  /**
+   * A map of non-encoded ascii characters.
+   * @var string[]
+   * @access protected
+   */
+  protected static $_safeMap = array();
+
+  /**
+   * Creates a new QpEncoder for the given CharacterStream.
+   * @param Swift_CharacterStream $charStream to use for reading characters
+   * @param Swift_StreamFilter $filter if input should be canonicalized
+   */
+  public function __construct(Swift_CharacterStream $charStream,
+    Swift_StreamFilter $filter = null)
+  {
+    $this->_charStream = $charStream;
+    if (empty(self::$_safeMap))
+    {
+      foreach (array_merge(
+        array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte)
+      {
+        self::$_safeMap[$byte] = chr($byte);
+      }
+    }
+    $this->_filter = $filter;
+  }
+
+  /**
+   * Takes an unencoded string and produces a QP encoded string from it.
+   * QP encoded strings have a maximum line length of 76 characters.
+   * If the first line needs to be shorter, indicate the difference with
+   * $firstLineOffset.
+   * @param string $string to encode
+   * @param int $firstLineOffset, optional
+   * @param int $maxLineLength, optional, 0 indicates the default of 76 chars
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    if ($maxLineLength > 76 || $maxLineLength <= 0)
+    {
+      $maxLineLength = 76;
+    }
+
+    $thisLineLength = $maxLineLength - $firstLineOffset;
+
+    $lines = array();
+    $lNo = 0;
+    $lines[$lNo] = '';
+    $currentLine =& $lines[$lNo++];
+    $size=$lineLen=0;
+
+    $this->_charStream->flushContents();
+    $this->_charStream->importString($string);
+
+    //Fetching more than 4 chars at one is slower, as is fetching fewer bytes
+    // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
+    // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
+    while (false !== $bytes = $this->_nextSequence())
+    {
+      //If we're filtering the input
+      if (isset($this->_filter))
+      {
+        //If we can't filter because we need more bytes
+        while ($this->_filter->shouldBuffer($bytes))
+        {
+          //Then collect bytes into the buffer
+          if (false === $moreBytes = $this->_nextSequence(1))
+          {
+            break;
+          }
+
+          foreach ($moreBytes as $b)
+          {
+            $bytes[] = $b;
+          }
+        }
+        //And filter them
+        $bytes = $this->_filter->filter($bytes);
+      }
+
+      $enc = $this->_encodeByteSequence($bytes, $size);
+      if ($currentLine && $lineLen+$size >= $thisLineLength)
+      {
+        $lines[$lNo] = '';
+        $currentLine =& $lines[$lNo++];
+        $thisLineLength = $maxLineLength;
+        $lineLen=0;
+      }
+      $lineLen+=$size;
+      $currentLine .= $enc;
+    }
+
+    return $this->_standardize(implode("=\r\n", $lines));
+  }
+
+  /**
+   * Updates the charset used.
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->_charStream->setCharacterSet($charset);
+  }
+
+  // -- Protected methods
+
+  /**
+   * Encode the given byte array into a verbatim QP form.
+   * @param int[] $bytes
+   * @return string
+   * @access protected
+   */
+  protected function _encodeByteSequence(array $bytes, &$size)
+  {
+    $ret = '';
+    $size=0;
+    foreach ($bytes as $b)
+    {
+      if (isset(self::$_safeMap[$b]))
+      {
+        $ret .= self::$_safeMap[$b];
+        ++$size;
+      }
+      else
+      {
+        $ret .= self::$_qpMap[$b];
+        $size+=3;
+      }
+    }
+    return $ret;
+  }
+
+  /**
+   * Get the next sequence of bytes to read from the char stream.
+   * @param int $size number of bytes to read
+   * @return int[]
+   * @access protected
+   */
+  protected function _nextSequence($size = 4)
+  {
+    return $this->_charStream->readBytes($size);
+  }
+
+  /**
+   * Make sure CRLF is correct and HT/SPACE are in valid places.
+   * @param string $string
+   * @return string
+   * @access protected
+   */
+  protected function _standardize($string)
+  {
+    $string = str_replace(array("\t=0D=0A", " =0D=0A", "=0D=0A"),
+      array("=09\r\n", "=20\r\n", "\r\n"), $string
+      );
+    switch ($end = ord(substr($string, -1)))
+    {
+      case 0x09:
+      case 0x20:
+        $string = substr_replace($string, self::$_qpMap[$end], -1);
+    }
+    return $string;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php
new file mode 100644
index 0000000..febc6ba
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Encoder.php';
+//@require 'Swift/CharacterStream.php';
+
+/**
+ * Handles RFC 2231 specified Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
+{
+  
+  /**
+   * A character stream to use when reading a string as characters instead of bytes.
+   * @var Swift_CharacterStream
+   * @access private
+   */
+  private $_charStream;
+  
+  /**
+   * Creates a new Rfc2231Encoder using the given character stream instance.
+   * @param Swift_CharacterStream
+   */
+  public function __construct(Swift_CharacterStream $charStream)
+  {
+    $this->_charStream = $charStream;
+  }
+  
+  /**
+   * Takes an unencoded string and produces a string encoded according to
+   * RFC 2231 from it.
+   * @param string $string to encode
+   * @param int $firstLineOffset
+   * @param int $maxLineLength, optional, 0 indicates the default of 75 bytes
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    $lines = array(); $lineCount = 0;
+    $lines[] = '';
+    $currentLine =& $lines[$lineCount++];
+    
+    if (0 >= $maxLineLength)
+    {
+      $maxLineLength = 75;
+    }
+    
+    $this->_charStream->flushContents();
+    $this->_charStream->importString($string);
+    
+    $thisLineLength = $maxLineLength - $firstLineOffset;
+    
+    while (false !== $char = $this->_charStream->read(4))
+    {
+      $encodedChar = rawurlencode($char);
+      if (0 != strlen($currentLine)
+        && strlen($currentLine . $encodedChar) > $thisLineLength)
+      {
+        $lines[] = '';
+        $currentLine =& $lines[$lineCount++];
+        $thisLineLength = $maxLineLength;
+      }
+      $currentLine .= $encodedChar;
+    }
+    
+    return implode("\r\n", $lines);
+  }
+  
+  /**
+   * Updates the charset used.
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->_charStream->setCharacterSet($charset);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php
new file mode 100644
index 0000000..1849a82
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Encoding.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Provides quick access to each encoding type.
+ * 
+ * @package Swift
+ * @subpackage Encoder
+ * @author Chris Corbyn
+ */
+class Swift_Encoding
+{
+  
+  /**
+   * Get the Encoder that provides 7-bit encoding.
+   * 
+   * @return Swift_Mime_ContentEncoder
+   */
+  public static function get7BitEncoding()
+  {
+    return self::_lookup('mime.7bitcontentencoder');
+  }
+  
+  /**
+   * Get the Encoder that provides 8-bit encoding.
+   * 
+   * @return Swift_Mime_ContentEncoder
+   */
+  public static function get8BitEncoding()
+  {
+    return self::_lookup('mime.8bitcontentencoder');
+  }
+  
+  /**
+   * Get the Encoder that provides Quoted-Printable (QP) encoding.
+   * 
+   * @return Swift_Mime_ContentEncoder
+   */
+  public static function getQpEncoding()
+  {
+    return self::_lookup('mime.qpcontentencoder');
+  }
+  
+  /**
+   * Get the Encoder that provides Base64 encoding.
+   * 
+   * @return Swift_Mime_ContentEncoder
+   */
+  public static function getBase64Encoding()
+  {
+    return self::_lookup('mime.base64contentencoder');
+  }
+  
+  // -- Private Static Methods
+  
+  private static function _lookup($key)
+  {
+    return Swift_DependencyContainer::getInstance()->lookup($key);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php
new file mode 100644
index 0000000..73eb585
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandEvent.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventObject.php';
+//@require 'Swift/Transport.php';
+
+/**
+ * Generated when a command is sent over an SMTP connection.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_CommandEvent extends Swift_Events_EventObject
+{
+  
+  /**
+   * The command sent to the server.
+   * @var string
+   */
+  private $_command;
+  
+  /**
+   * An array of codes which a successful response will contain.
+   * @var int[]
+   */
+  private $_successCodes = array();
+  
+  /**
+   * Create a new CommandEvent for $source with $command.
+   * @param Swift_Transport $source
+   * @param string $command
+   * @param array $successCodes
+   */
+  public function __construct(Swift_Transport $source,
+    $command, $successCodes = array())
+  {
+    parent::__construct($source);
+    $this->_command = $command;
+    $this->_successCodes = $successCodes;
+  }
+  
+  /**
+   * Get the command which was sent to the server.
+   * @return string
+   */
+  public function getCommand()
+  {
+    return $this->_command;
+  }
+  
+  /**
+   * Get the numeric response codes which indicate success for this command.
+   * @return int[]
+   */
+  public function getSuccessCodes()
+  {
+    return $this->_successCodes;
+  }
+  
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php
new file mode 100644
index 0000000..2fd7117
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/CommandListener.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/CommandEvent.php';
+
+/**
+ * Listens for Transports to send commands to the server.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_CommandListener extends Swift_Events_EventListener
+{
+  
+  /**
+   * Invoked immediately following a command being sent.
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function commandSent(Swift_Events_CommandEvent $evt);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php
new file mode 100644
index 0000000..c6726a7
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/Event.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The minimum interface for an Event.
+ * 
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_Event
+{
+  
+  /**
+   * Get the source object of this event.
+   * @return object
+   */
+  public function getSource();
+  
+  /**
+   * Prevent this Event from bubbling any further up the stack.
+   * @param boolean $cancel, optional
+   */
+  public function cancelBubble($cancel = true);
+  
+  /**
+   * Returns true if this Event will not bubble any further up the stack.
+   * @return boolean
+   */
+  public function bubbleCancelled();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php
new file mode 100644
index 0000000..aaf1211
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventDispatcher.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Event.php';
+
+/**
+ * Interface for the EventDispatcher which handles the event dispatching layer.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_EventDispatcher
+{
+  
+  /**
+   * Create a new SendEvent for $source and $message.
+   * @param Swift_Transport $source
+   * @param Swift_Mime_Message
+   * @return Swift_Events_SendEvent
+   */
+  public function createSendEvent(Swift_Transport $source,
+    Swift_Mime_Message $message);
+  
+  /**
+   * Create a new CommandEvent for $source and $command.
+   * @param Swift_Transport $source
+   * @param string $command That will be executed
+   * @param array $successCodes That are needed
+   * @return Swift_Events_CommandEvent
+   */
+  public function createCommandEvent(Swift_Transport $source,
+    $command, $successCodes = array());
+  
+  /**
+   * Create a new ResponseEvent for $source and $response.
+   * @param Swift_Transport $source
+   * @param string $response
+   * @param boolean $valid If the response is valid
+   * @return Swift_Events_ResponseEvent
+   */
+  public function createResponseEvent(Swift_Transport $source,
+    $response, $valid);
+  
+  /**
+   * Create a new TransportChangeEvent for $source.
+   * @param Swift_Transport $source
+   * @return Swift_Events_TransportChangeEvent
+   */
+  public function createTransportChangeEvent(Swift_Transport $source);
+  
+  /**
+   * Create a new TransportExceptionEvent for $source.
+   * @param Swift_Transport $source
+   * @param Swift_TransportException $ex
+   * @return Swift_Events_TransportExceptionEvent
+   */
+  public function createTransportExceptionEvent(Swift_Transport $source,
+    Swift_TransportException $ex);
+  
+  /**
+   * Bind an event listener to this dispatcher.
+   * @param Swift_Events_EventListener $listener
+   */
+  public function bindEventListener(Swift_Events_EventListener $listener);
+  
+  /**
+   * Dispatch the given Event to all suitable listeners.
+   * @param Swift_Events_EventObject $evt
+   * @param string $target method
+   */
+  public function dispatchEvent(Swift_Events_EventObject $evt, $target);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php
new file mode 100644
index 0000000..00fb799
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventListener.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An identity interface which all EventListeners must extend.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_EventListener
+{  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php
new file mode 100644
index 0000000..5d494fe
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/EventObject.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/Event.php';
+
+/**
+ * A base Event which all Event classes inherit from.
+ * 
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_EventObject implements Swift_Events_Event
+{
+  
+  /** The source of this Event */
+  private $_source;
+  
+  /** The state of this Event (should it bubble up the stack?) */
+  private $_bubbleCancelled = false;
+  
+  /**
+   * Create a new EventObject originating at $source.
+   * @param object $source
+   */
+  public function __construct($source)
+  {
+    $this->_source = $source;
+  }
+  
+  /**
+   * Get the source object of this event.
+   * @return object
+   */
+  public function getSource()
+  {
+    return $this->_source;
+  }
+  
+  /**
+   * Prevent this Event from bubbling any further up the stack.
+   * @param boolean $cancel, optional
+   */
+  public function cancelBubble($cancel = true)
+  {
+    $this->_bubbleCancelled = $cancel;
+  }
+  
+  /**
+   * Returns true if this Event will not bubble any further up the stack.
+   * @return boolean
+   */
+  public function bubbleCancelled()
+  {
+    return $this->_bubbleCancelled;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php
new file mode 100644
index 0000000..addf9e7
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseEvent.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventObject.php';
+
+/**
+ * Generated when a response is received on a SMTP connection.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_ResponseEvent extends Swift_Events_EventObject
+{
+  
+  /**
+   * The overall result.
+   * @var boolean
+   */
+  private $_valid;
+  
+  /**
+   * The response received from the server.
+   * @var string
+   */
+  private $_response;
+  
+  /**
+   * Create a new ResponseEvent for $source and $response.
+   * @param Swift_Transport $source
+   * @param string $response
+   * @param boolean $valid
+   */
+  public function __construct(Swift_Transport $source, $response, $valid = false)
+  {
+    parent::__construct($source);
+    $this->_response = $response;
+    $this->_valid = $valid;
+  }
+  
+  /**
+   * Get the response which was received from the server.
+   * @return string
+   */
+  public function getResponse()
+  {
+    return $this->_response;
+  }
+  
+  /**
+   * Get the success status of this Event.
+   * @return boolean
+   */
+  public function isValid()
+  {
+    return $this->_valid;
+  }
+  
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php
new file mode 100644
index 0000000..092385b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/ResponseListener.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/ResponseEvent.php';
+
+/**
+ * Listens for responses from a remote SMTP server.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_ResponseListener extends Swift_Events_EventListener
+{
+  
+  /**
+   * Invoked immediately following a response coming back.
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function responseReceived(Swift_Events_ResponseEvent $evt);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php
new file mode 100644
index 0000000..49a8351
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendEvent.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventObject.php';
+
+/**
+ * Generated when a message is being sent.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_SendEvent extends Swift_Events_EventObject
+{
+  
+  /** Sending has yet to occur */
+  const RESULT_PENDING = 0x0001;
+  
+  /** Sending was successful */
+  const RESULT_SUCCESS = 0x0010;
+  
+  /** Sending worked, but there were some failures */
+  const RESULT_TENTATIVE = 0x0100;
+  
+  /** Sending failed */
+  const RESULT_FAILED = 0x1000;
+  
+  /**
+   * The Message being sent.
+   * @var Swift_Mime_Message
+   */
+  private $_message;
+  
+  /**
+   * The Transport used in sending.
+   * @var Swift_Transport
+   */
+  private $_transport;
+  
+  /**
+   * Any recipients which failed after sending.
+   * @var string[]
+   */
+  private $failedRecipients = array();
+  
+  /**
+   * The overall result as a bitmask from the class constants.
+   * @var int
+   */
+  private $result;
+  
+  /**
+   * Create a new SendEvent for $source and $message.
+   * @param Swift_Transport $source
+   * @param Swift_Mime_Message $message
+   */
+  public function __construct(Swift_Transport $source,
+    Swift_Mime_Message $message)
+  {
+    parent::__construct($source);
+    $this->_message = $message;
+    $this->_result = self::RESULT_PENDING;
+  }
+  
+  /**
+   * Get the Transport used to send the Message.
+   * @return Swift_Transport
+   */
+  public function getTransport()
+  {
+    return $this->getSource();
+  }
+  
+  /**
+   * Get the Message being sent.
+   * @return Swift_Mime_Message
+   */
+  public function getMessage()
+  {
+    return $this->_message;
+  }
+  
+  /**
+   * Set the array of addresses that failed in sending.
+   * @param array $recipients
+   */
+  public function setFailedRecipients($recipients)
+  {
+    $this->_failedRecipients = $recipients;
+  }
+  
+  /**
+   * Get an recipient addresses which were not accepted for delivery.
+   * @return string[]
+   */
+  public function getFailedRecipients()
+  {
+    return $this->_failedRecipients;
+  }
+  
+  /**
+   * Set the result of sending.
+   * @return int
+   */
+  public function setResult($result)
+  {
+    $this->_result = $result;
+  }
+  
+  /**
+   * Get the result of this Event.
+   * The return value is a bitmask from
+   * {@link RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
+   * @return int
+   */
+  public function getResult()
+  {
+    return $this->_result;
+  }
+  
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php
new file mode 100644
index 0000000..a8f0cc3
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SendListener.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/SendEvent.php';
+
+/**
+ * Listens for Messages being sent from within the Transport system.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_SendListener extends Swift_Events_EventListener
+{
+  
+  /**
+   * Invoked immediately before the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt);
+  
+  /**
+   * Invoked immediately after the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php
new file mode 100644
index 0000000..3e6c0be
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/SimpleEventDispatcher.php
@@ -0,0 +1,175 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventDispatcher.php';
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/EventObject.php';
+//@require 'Swift/Events/CommandEvent.php';
+//@require 'Swift/Events/ResponseEvent.php';
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Events/TransportChangeEvent.php';
+//@require 'Swift/Events/TransportExceptionEvent.php';
+
+/**
+ * The EventDispatcher which handles the event dispatching layer.
+ * 
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
+{
+  
+  /** A map of event types to their associated listener types */
+  private $_eventMap = array();
+  
+  /** Event listeners bound to this dispatcher */
+  private $_listeners = array();
+  
+  /** Listeners queued to have an Event bubbled up the stack to them */
+  private $_bubbleQueue = array();
+  
+  /**
+   * Create a new EventDispatcher.
+   */
+  public function __construct()
+  {
+    $this->_eventMap = array(
+      'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
+      'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
+      'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
+      'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
+      'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener'
+      );
+  }
+  
+  /**
+   * Create a new SendEvent for $source and $message.
+   * 
+   * @param Swift_Transport $source
+   * @param Swift_Mime_Message
+   * @return Swift_Events_SendEvent
+   */
+  public function createSendEvent(Swift_Transport $source,
+    Swift_Mime_Message $message)
+  {
+    return new Swift_Events_SendEvent($source, $message);
+  }
+  
+  /**
+   * Create a new CommandEvent for $source and $command.
+   * 
+   * @param Swift_Transport $source
+   * @param string $command That will be executed
+   * @param array $successCodes That are needed
+   * @return Swift_Events_CommandEvent
+   */
+  public function createCommandEvent(Swift_Transport $source,
+    $command, $successCodes = array())
+  {
+    return new Swift_Events_CommandEvent($source, $command, $successCodes);
+  }
+  
+  /**
+   * Create a new ResponseEvent for $source and $response.
+   * 
+   * @param Swift_Transport $source
+   * @param string $response
+   * @param boolean $valid If the response is valid
+   * @return Swift_Events_ResponseEvent
+   */
+  public function createResponseEvent(Swift_Transport $source,
+    $response, $valid)
+  {
+    return new Swift_Events_ResponseEvent($source, $response, $valid);
+  }
+  
+  /**
+   * Create a new TransportChangeEvent for $source.
+   * 
+   * @param Swift_Transport $source
+   * @return Swift_Events_TransportChangeEvent
+   */
+  public function createTransportChangeEvent(Swift_Transport $source)
+  {
+    return new Swift_Events_TransportChangeEvent($source);
+  }
+  
+  /**
+   * Create a new TransportExceptionEvent for $source.
+   * 
+   * @param Swift_Transport $source
+   * @param Swift_TransportException $ex
+   * @return Swift_Events_TransportExceptionEvent
+   */
+  public function createTransportExceptionEvent(Swift_Transport $source,
+    Swift_TransportException $ex)
+  {
+    return new Swift_Events_TransportExceptionEvent($source, $ex);
+  }
+  
+  /**
+   * Bind an event listener to this dispatcher.
+   * 
+   * @param Swift_Events_EventListener $listener
+   */
+  public function bindEventListener(Swift_Events_EventListener $listener)
+  {
+    foreach ($this->_listeners as $l)
+    {
+      //Already loaded
+      if ($l === $listener)
+      {
+        return;
+      }
+    }
+    $this->_listeners[] = $listener;
+  }
+  
+  /**
+   * Dispatch the given Event to all suitable listeners.
+   * 
+   * @param Swift_Events_EventObject $evt
+   * @param string $target method
+   */
+  public function dispatchEvent(Swift_Events_EventObject $evt, $target)
+  {
+    $this->_prepareBubbleQueue($evt);
+    $this->_bubble($evt, $target);
+  }
+  
+  // -- Private methods
+  
+  /** Queue listeners on a stack ready for $evt to be bubbled up it */
+  private function _prepareBubbleQueue(Swift_Events_EventObject $evt)
+  {
+    $this->_bubbleQueue = array();
+    $evtClass = get_class($evt);
+    foreach ($this->_listeners as $listener)
+    {
+      if (array_key_exists($evtClass, $this->_eventMap)
+        && ($listener instanceof $this->_eventMap[$evtClass]))
+      {
+        $this->_bubbleQueue[] = $listener;
+      }
+    }
+  }
+  
+  /** Bubble $evt up the stack calling $target() on each listener */
+  private function _bubble(Swift_Events_EventObject $evt, $target)
+  {
+    if (!$evt->bubbleCancelled() && $listener = array_shift($this->_bubbleQueue))
+    {
+      $listener->$target($evt);
+      $this->_bubble($evt, $target);
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php
new file mode 100644
index 0000000..f069a4c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeEvent.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventObject.php';
+
+/**
+ * Generated when the state of a Transport is changed (i.e. stopped/started).
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_TransportChangeEvent extends Swift_Events_EventObject
+{
+  
+  /**
+   * Get the Transport.
+   * @return Swift_Transport
+   */
+  public function getTransport()
+  {
+    return $this->getSource();
+  }
+  
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php
new file mode 100644
index 0000000..ba729d0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportChangeListener.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/TransportChangeEvent.php';
+
+/**
+ * Listens for changes within the Transport system.
+ * 
+ * @package Swift
+ * @subpackage Events
+ * 
+ * @author Chris Corbyn
+ */
+interface Swift_Events_TransportChangeListener extends Swift_Events_EventListener
+{
+  
+  /**
+   * Invoked just before a Transport is started.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
+  
+  /**
+   * Invoked immediately after the Transport is started.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function transportStarted(Swift_Events_TransportChangeEvent $evt);
+  
+  /**
+   * Invoked just before a Transport is stopped.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
+  
+  /**
+   * Invoked immediately after the Transport is stopped.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function transportStopped(Swift_Events_TransportChangeEvent $evt);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php
new file mode 100644
index 0000000..a1bf7d2
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionEvent.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventObject.php';
+//@require 'Swift/TransportException.php';
+
+/**
+ * Generated when a TransportException is thrown from the Transport system.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
+{
+  
+  /**
+   * The Exception thrown.
+   * @var Swift_TransportException
+   */
+  private $_exception;
+  
+  /**
+   * Create a new TransportExceptionEvent for $transport.
+   * @param Swift_Transport $transport
+   * @param Swift_TransportException $ex
+   */
+  public function __construct(Swift_Transport $transport,
+    Swift_TransportException $ex)
+  {
+    parent::__construct($transport);
+    $this->_exception = $ex;
+  }
+  
+  /**
+   * Get the TransportException thrown.
+   * @return Swift_TransportException
+   */
+  public function getException()
+  {
+    return $this->_exception;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php
new file mode 100644
index 0000000..d6dce94
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Events/TransportExceptionListener.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/EventListener.php';
+//@require 'Swift/Events/TransportExceptionEvent.php';
+
+/**
+ * Listens for Exceptions thrown from within the Transport system.
+ * @package Swift
+ * @subpackage Events
+ * @author Chris Corbyn
+ */
+interface Swift_Events_TransportExceptionListener
+  extends Swift_Events_EventListener
+{
+  
+  /**
+   * Invoked as a TransportException is thrown in the Transport system.
+   * @param Swift_Events_TransportExceptionEvent $evt
+   */
+  public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php
new file mode 100644
index 0000000..6e6b7a8
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/FailoverTransport.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/FailoverTransport.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Contains a list of redundant Transports so when one fails, the next is used.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
+{
+  
+  /**
+   * Creates a new FailoverTransport with $transports.
+   * @param array $transports
+   */
+  public function __construct($transports = array())
+  {
+    call_user_func_array(
+      array($this, 'Swift_Transport_FailoverTransport::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('transport.failover')
+      );
+    
+    $this->setTransports($transports);
+  }
+  
+  /**
+   * Create a new FailoverTransport instance.
+   * @param string $transports
+   * @return Swift_FailoverTransport
+   */
+  public static function newInstance($transports = array())
+  {
+    return new self($transports);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php
new file mode 100644
index 0000000..a7f894d
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/FileStream.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * An OutputByteStream which specifically reads from a file.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+interface Swift_FileStream extends Swift_OutputByteStream
+{
+  
+  /**
+   * Get the complete path to the file.
+   * @return string
+   */
+  public function getPath();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php
new file mode 100644
index 0000000..c047967
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Filterable.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/StreamFilter.php';
+
+/**
+ * Allows StreamFilters to operate on a stream.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+interface Swift_Filterable
+{
+  
+  /**
+   * Add a new StreamFilter, referenced by $key.
+   * @param Swift_StreamFilter $filter
+   * @param string $key
+   */
+  public function addFilter(Swift_StreamFilter $filter, $key);
+  
+  /**
+   * Remove an existing filter using $key.
+   * @param string $key
+   */
+  public function removeFilter($key);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php
new file mode 100644
index 0000000..c161d7a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Image.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Image.php';
+//@require 'Swift/ByteStream/FileByteStream.php';
+
+/**
+ * An image, embedded in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Image extends Swift_EmbeddedFile
+{
+  
+  /**
+   * Create a new EmbeddedFile.
+   * Details may be optionally provided to the constructor.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   */
+  public function __construct($data = null, $filename = null,
+    $contentType = null)
+  {
+    parent::__construct($data, $filename, $contentType);
+  }
+  
+  /**
+   * Create a new Image.
+   * @param string|Swift_OutputByteStream $data
+   * @param string $filename
+   * @param string $contentType
+   * @return Swift_Mime_EmbeddedFile
+   */
+  public static function newInstance($data = null, $filename = null,
+    $contentType = null)
+  {
+    return new self($data, $filename, $contentType);
+  }
+  
+  /**
+   * Create a new Image from a filesystem path.
+   * @param string $path
+   * @return Swift_Mime_EmbeddedFile
+   */
+  public static function fromPath($path)
+  {
+    $image = self::newInstance()->setFile(
+      new Swift_ByteStream_FileByteStream($path)
+      );
+    return $image;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php
new file mode 100644
index 0000000..e8f45f4
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/InputByteStream.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract means of writing data.
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+interface Swift_InputByteStream
+{
+  
+  /**
+   * Writes $bytes to the end of the stream.
+   * 
+   * Writing may not happen immediately if the stream chooses to buffer.  If
+   * you want to write these bytes with immediate effect, call {@link commit()}
+   * after calling write().
+   * 
+   * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
+   * second, etc etc).
+   *
+   * @param string $bytes
+   * @return int
+   * @throws Swift_IoException
+   */
+  public function write($bytes);
+  
+  /**
+   * For any bytes that are currently buffered inside the stream, force them
+   * off the buffer.
+   * 
+   * @throws Swift_IoException
+   */
+  public function commit();
+  
+  /**
+   * Attach $is to this stream.
+   * The stream acts as an observer, receiving all data that is written.
+   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function bind(Swift_InputByteStream $is);
+  
+  /**
+   * Remove an already bound stream.
+   * If $is is not bound, no errors will be raised.
+   * If the stream currently has any buffered data it will be written to $is
+   * before unbinding occurs.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function unbind(Swift_InputByteStream $is);
+  
+  /**
+   * Flush the contents of the stream (empty it) and set the internal pointer
+   * to the beginning.
+   * @throws Swift_IoException
+   */
+  public function flushBuffers();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php
new file mode 100644
index 0000000..88a5b0d
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/IoException.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/SwiftException.php';
+
+/**
+ * I/O Exception class.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_IoException extends Swift_SwiftException
+{
+  
+  /**
+   * Create a new IoException with $message.
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php
new file mode 100644
index 0000000..b942663
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Provides a mechanism for storing data using two keys.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+interface Swift_KeyCache
+{
+  
+  /** Mode for replacing existing cached data */
+  const MODE_WRITE = 1;
+  
+  /** Mode for appending data to the end of existing cached data */
+  const MODE_APPEND = 2;
+  
+  /**
+   * Set a string into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param string $string
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function setString($nsKey, $itemKey, $string, $mode);
+  
+  /**
+   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_OutputByteStream $os
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
+    $mode);
+  
+  /**
+   * Provides a ByteStream which when written to, writes data to $itemKey.
+   * NOTE: The stream will always write in append mode.
+   * If the optional third parameter is passed all writes will go through $is.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_InputByteStream $is, optional
+   * @return Swift_InputByteStream
+   */
+  public function getInputByteStream($nsKey, $itemKey,
+    Swift_InputByteStream $is = null);
+  
+  /**
+   * Get data back out of the cache as a string.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return string
+   */
+  public function getString($nsKey, $itemKey);
+  
+  /**
+   * Get data back out of the cache as a ByteStream.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_InputByteStream $is to write the data to
+   */
+  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
+  
+  /**
+   * Check if the given $itemKey exists in the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return boolean
+   */
+  public function hasKey($nsKey, $itemKey);
+  
+  /**
+   * Clear data for $itemKey in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   * @param string $itemKey
+   */
+  public function clearKey($nsKey, $itemKey);
+  
+  /**
+   * Clear all data in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   */
+  public function clearAll($nsKey);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php
new file mode 100644
index 0000000..fe3b7c9
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -0,0 +1,209 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/KeyCache.php';
+//@require 'Swift/KeyCacheInputStream.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStrean.php';
+//@require 'Swift/SwiftException.php';
+
+/**
+ * A basic KeyCache backed by an array.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
+{
+  
+  /**
+   * Cache contents.
+   * @var array
+   * @access private
+   */
+  private $_contents = array();
+  
+  /**
+   * An InputStream for cloning.
+   * @var Swift_KeyCache_KeyCacheInputStream
+   * @access private
+   */
+  private $_stream;
+  
+  /**
+   * Create a new ArrayKeyCache with the given $stream for cloning to make
+   * InputByteStreams.
+   * @param Swift_KeyCache_KeyCacheInputStream $stream
+   */
+  public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
+  {
+    $this->_stream = $stream;
+  }
+  
+  /**
+   * Set a string into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param string $string
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function setString($nsKey, $itemKey, $string, $mode)
+  {
+    $this->_prepareCache($nsKey);
+    switch ($mode)
+    {
+      case self::MODE_WRITE:
+        $this->_contents[$nsKey][$itemKey] = $string;
+        break;
+      case self::MODE_APPEND:
+        if (!$this->hasKey($nsKey, $itemKey))
+        {
+          $this->_contents[$nsKey][$itemKey] = '';
+        }
+        $this->_contents[$nsKey][$itemKey] .= $string;
+        break;
+      default:
+        throw new Swift_SwiftException(
+          'Invalid mode [' . $mode . '] used to set nsKey='.
+          $nsKey . ', itemKey=' . $itemKey
+          );
+    }
+  }
+  
+  /**
+   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_OutputByteStream $os
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
+    $mode)
+  {
+    $this->_prepareCache($nsKey);
+    switch ($mode)
+    {
+      case self::MODE_WRITE:
+        $this->clearKey($nsKey, $itemKey);
+      case self::MODE_APPEND:
+        if (!$this->hasKey($nsKey, $itemKey))
+        {
+          $this->_contents[$nsKey][$itemKey] = '';
+        }
+        while (false !== $bytes = $os->read(8192))
+        {
+          $this->_contents[$nsKey][$itemKey] .= $bytes;
+        }
+        break;
+      default:
+        throw new Swift_SwiftException(
+          'Invalid mode [' . $mode . '] used to set nsKey='.
+          $nsKey . ', itemKey=' . $itemKey
+          );
+    }
+  }
+  
+  /**
+   * Provides a ByteStream which when written to, writes data to $itemKey.
+   * NOTE: The stream will always write in append mode.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return Swift_InputByteStream
+   */
+  public function getInputByteStream($nsKey, $itemKey,
+    Swift_InputByteStream $writeThrough = null)
+  {
+    $is = clone $this->_stream;
+    $is->setKeyCache($this);
+    $is->setNsKey($nsKey);
+    $is->setItemKey($itemKey);
+    if (isset($writeThrough))
+    {
+      $is->setWriteThroughStream($writeThrough);
+    }
+    return $is;
+  }
+  
+  /**
+   * Get data back out of the cache as a string.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return string
+   */
+  public function getString($nsKey, $itemKey)
+  {
+    $this->_prepareCache($nsKey);
+    if ($this->hasKey($nsKey, $itemKey))
+    {
+      return $this->_contents[$nsKey][$itemKey];
+    }
+  }
+  
+  /**
+   * Get data back out of the cache as a ByteStream.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_InputByteStream $is to write the data to
+   */
+  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+  {
+    $this->_prepareCache($nsKey);
+    $is->write($this->getString($nsKey, $itemKey));
+  }
+  
+  /**
+   * Check if the given $itemKey exists in the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return boolean
+   */
+  public function hasKey($nsKey, $itemKey)
+  {
+    $this->_prepareCache($nsKey);
+    return array_key_exists($itemKey, $this->_contents[$nsKey]);
+  }
+  
+  /**
+   * Clear data for $itemKey in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   * @param string $itemKey
+   */
+  public function clearKey($nsKey, $itemKey)
+  {
+    unset($this->_contents[$nsKey][$itemKey]);
+  }
+  
+  /**
+   * Clear all data in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   */
+  public function clearAll($nsKey)
+  {
+    unset($this->_contents[$nsKey]);
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Initialize the namespace of $nsKey if needed.
+   * @param string $nsKey
+   * @access private
+   */
+  private function _prepareCache($nsKey)
+  {
+    if (!array_key_exists($nsKey, $this->_contents))
+    {
+      $this->_contents[$nsKey] = array();
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php
new file mode 100644
index 0000000..599fd6c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/DiskKeyCache.php
@@ -0,0 +1,316 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/KeyCache.php';
+//@require 'Swift/KeyCacheInputStream.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStrean.php';
+//@require 'Swift/SwiftException.php';
+//@require 'Swift/IoException.php';
+
+/**
+ * A KeyCache which streams to and from disk.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
+{
+
+  /** Signal to place pointer at start of file */
+  const POSITION_START = 0;
+
+  /** Signal to place pointer at end of file */
+  const POSITION_END = 1;
+
+  /**
+   * An InputStream for cloning.
+   * @var Swift_KeyCache_KeyCacheInputStream
+   * @access private
+   */
+  private $_stream;
+
+  /**
+   * A path to write to.
+   * @var string
+   * @access private
+   */
+  private $_path;
+
+  /**
+   * Stored keys.
+   * @var array
+   * @access private
+   */
+  private $_keys = array();
+
+  /**
+   * Will be true if magic_quotes_runtime is turned on.
+   * @var boolean
+   * @access private
+   */
+  private $_quotes = false;
+
+  /**
+   * Create a new DiskKeyCache with the given $stream for cloning to make
+   * InputByteStreams, and the given $path to save to.
+   * @param Swift_KeyCache_KeyCacheInputStream $stream
+   * @param string $path to save to
+   */
+  public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
+  {
+    $this->_stream = $stream;
+    $this->_path = $path;
+    $this->_quotes = get_magic_quotes_runtime();
+  }
+
+  /**
+   * Set a string into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param string $string
+   * @param int $mode
+   * @throws Swift_IoException
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function setString($nsKey, $itemKey, $string, $mode)
+  {
+    $this->_prepareCache($nsKey);
+    switch ($mode)
+    {
+      case self::MODE_WRITE:
+        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+        break;
+      case self::MODE_APPEND:
+        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+        break;
+      default:
+        throw new Swift_SwiftException(
+          'Invalid mode [' . $mode . '] used to set nsKey='.
+          $nsKey . ', itemKey=' . $itemKey
+          );
+        break;
+    }
+    fwrite($fp, $string);
+  }
+
+  /**
+   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_OutputByteStream $os
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   * @throws Swift_IoException
+   */
+  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
+    $mode)
+  {
+    $this->_prepareCache($nsKey);
+    switch ($mode)
+    {
+      case self::MODE_WRITE:
+        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+        break;
+      case self::MODE_APPEND:
+        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+        break;
+      default:
+        throw new Swift_SwiftException(
+          'Invalid mode [' . $mode . '] used to set nsKey='.
+          $nsKey . ', itemKey=' . $itemKey
+          );
+        break;
+    }
+    while (false !== $bytes = $os->read(8192))
+    {
+      fwrite($fp, $bytes);
+    }
+  }
+
+  /**
+   * Provides a ByteStream which when written to, writes data to $itemKey.
+   * NOTE: The stream will always write in append mode.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return Swift_InputByteStream
+   */
+  public function getInputByteStream($nsKey, $itemKey,
+    Swift_InputByteStream $writeThrough = null)
+  {
+    $is = clone $this->_stream;
+    $is->setKeyCache($this);
+    $is->setNsKey($nsKey);
+    $is->setItemKey($itemKey);
+    if (isset($writeThrough))
+    {
+      $is->setWriteThroughStream($writeThrough);
+    }
+    return $is;
+  }
+
+  /**
+   * Get data back out of the cache as a string.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return string
+   * @throws Swift_IoException
+   */
+  public function getString($nsKey, $itemKey)
+  {
+    $this->_prepareCache($nsKey);
+    if ($this->hasKey($nsKey, $itemKey))
+    {
+      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(0);
+      }
+      $str = '';
+      while (!feof($fp) && false !== $bytes = fread($fp, 8192))
+      {
+        $str .= $bytes;
+      }
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(1);
+      }
+      return $str;
+    }
+  }
+
+  /**
+   * Get data back out of the cache as a ByteStream.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_InputByteStream $is to write the data to
+   */
+  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+  {
+    if ($this->hasKey($nsKey, $itemKey))
+    {
+      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(0);
+      }
+      while (!feof($fp) && false !== $bytes = fread($fp, 8192))
+      {
+        $is->write($bytes);
+      }
+      if ($this->_quotes)
+      {
+        set_magic_quotes_runtime(1);
+      }
+    }
+  }
+
+  /**
+   * Check if the given $itemKey exists in the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return boolean
+   */
+  public function hasKey($nsKey, $itemKey)
+  {
+    return is_file($this->_path . '/' . $nsKey . '/' . $itemKey);
+  }
+
+  /**
+   * Clear data for $itemKey in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   * @param string $itemKey
+   */
+  public function clearKey($nsKey, $itemKey)
+  {
+    if ($this->hasKey($nsKey, $itemKey))
+    {
+      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+      fclose($fp);
+      unlink($this->_path . '/' . $nsKey . '/' . $itemKey);
+    }
+    unset($this->_keys[$nsKey][$itemKey]);
+  }
+
+  /**
+   * Clear all data in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   */
+  public function clearAll($nsKey)
+  {
+    if (array_key_exists($nsKey, $this->_keys))
+    {
+      foreach ($this->_keys[$nsKey] as $itemKey=>$null)
+      {
+        $this->clearKey($nsKey, $itemKey);
+      }
+      rmdir($this->_path . '/' . $nsKey);
+      unset($this->_keys[$nsKey]);
+    }
+  }
+
+  // -- Private methods
+
+  /**
+   * Initialize the namespace of $nsKey if needed.
+   * @param string $nsKey
+   * @access private
+   */
+  private function _prepareCache($nsKey)
+  {
+    $cacheDir = $this->_path . '/' . $nsKey;
+    if (!is_dir($cacheDir))
+    {
+      if (!mkdir($cacheDir))
+      {
+        throw new Swift_IoException('Failed to create cache directory ' . $cacheDir);
+      }
+      $this->_keys[$nsKey] = array();
+    }
+  }
+
+  /**
+   * Get a file handle on the cache item.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param int $position
+   * @return resource
+   * @access private
+   */
+  private function _getHandle($nsKey, $itemKey, $position)
+  {
+    if (!isset($this->_keys[$nsKey]) || !array_key_exists($itemKey, $this->_keys[$nsKey]))
+    {
+      $fp = fopen($this->_path . '/' . $nsKey . '/' . $itemKey, 'w+b');
+      $this->_keys[$nsKey][$itemKey] = $fp;
+    }
+    if (self::POSITION_START == $position)
+    {
+      fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_SET);
+    }
+    else
+    {
+      fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_END);
+    }
+    return $this->_keys[$nsKey][$itemKey];
+  }
+
+  /**
+   * Destructor.
+   */
+  public function __destruct()
+  {
+    foreach ($this->_keys as $nsKey=>$null)
+    {
+      $this->clearAll($nsKey);
+    }
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php
new file mode 100644
index 0000000..a1f4440
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/KeyCache.php';
+//@require 'Swift/InputByteStream.php';
+
+/**
+ * Writes data to a KeyCache using a stream.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
+{
+  
+  /**
+   * Set the KeyCache to wrap.
+   * @param Swift_KeyCache $keyCache
+   */
+  public function setKeyCache(Swift_KeyCache $keyCache);
+  
+  /**
+   * Set the nsKey which will be written to.
+   * @param string $nsKey
+   */
+  public function setNsKey($nsKey);
+  
+  /**
+   * Set the itemKey which will be written to.
+   * @param string $itemKey
+   */
+  public function setItemKey($itemKey);
+  
+  /**
+   * Specify a stream to write through for each write().
+   * @param Swift_InputByteStream $is
+   */
+  public function setWriteThroughStream(Swift_InputByteStream $is);
+  
+  /**
+   * Any implementation should be cloneable, allowing the clone to access a
+   * separate $nsKey and $itemKey.
+   */
+  public function __clone();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php
new file mode 100644
index 0000000..2646522
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/NullKeyCache.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/KeyCache.php';
+//@require 'Swift/KeyCacheInputStream.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStrean.php';
+
+/**
+ * A null KeyCache that does not cache at all.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
+{
+  
+  /**
+   * Set a string into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param string $string
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function setString($nsKey, $itemKey, $string, $mode)
+  {
+  }
+  
+  /**
+   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_OutputByteStream $os
+   * @param int $mode
+   * @see MODE_WRITE, MODE_APPEND
+   */
+  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
+    $mode)
+  {
+  }
+  
+  /**
+   * Provides a ByteStream which when written to, writes data to $itemKey.
+   * NOTE: The stream will always write in append mode.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return Swift_InputByteStream
+   */
+  public function getInputByteStream($nsKey, $itemKey,
+    Swift_InputByteStream $writeThrough = null)
+  {
+  }
+  
+  /**
+   * Get data back out of the cache as a string.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return string
+   */
+  public function getString($nsKey, $itemKey)
+  {
+  }
+  
+  /**
+   * Get data back out of the cache as a ByteStream.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @param Swift_InputByteStream $is to write the data to
+   */
+  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+  {
+  }
+  
+  /**
+   * Check if the given $itemKey exists in the namespace $nsKey.
+   * @param string $nsKey
+   * @param string $itemKey
+   * @return boolean
+   */
+  public function hasKey($nsKey, $itemKey)
+  {
+    return false;
+  }
+  
+  /**
+   * Clear data for $itemKey in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   * @param string $itemKey
+   */
+  public function clearKey($nsKey, $itemKey)
+  {
+  }
+  
+  /**
+   * Clear all data in the namespace $nsKey if it exists.
+   * @param string $nsKey
+   */
+  public function clearAll($nsKey)
+  {
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
new file mode 100644
index 0000000..87cdced
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -0,0 +1,131 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/KeyCache.php';
+//@require 'Swift/KeyCacheInputStream.php';
+
+/**
+ * Writes data to a KeyCache using a stream.
+ * @package Swift
+ * @subpackage KeyCache
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_SimpleKeyCacheInputStream
+  implements Swift_KeyCache_KeyCacheInputStream
+{
+  
+  /** The KeyCache being written to */
+  private $_keyCache;
+  
+  /** The nsKey of the KeyCache being written to */
+  private $_nsKey;
+  
+  /** The itemKey of the KeyCache being written to */
+  private $_itemKey;
+  
+  /** A stream to write through on each write() */
+  private $_writeThrough = null;
+  
+  /**
+   * Set the KeyCache to wrap.
+   * @param Swift_KeyCache $keyCache
+   */
+  public function setKeyCache(Swift_KeyCache $keyCache)
+  {
+    $this->_keyCache = $keyCache;
+  }
+  
+  /**
+   * Specify a stream to write through for each write().
+   * @param Swift_InputByteStream $is
+   */
+  public function setWriteThroughStream(Swift_InputByteStream $is)
+  {
+    $this->_writeThrough = $is;
+  }
+  
+  /**
+   * Writes $bytes to the end of the stream.
+   * @param string $bytes
+   * @param Swift_InputByteStream $is, optional
+   */
+  public function write($bytes, Swift_InputByteStream $is = null)
+  {
+    $this->_keyCache->setString(
+      $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
+      );
+    if (isset($is))
+    {
+      $is->write($bytes);
+    }
+    if (isset($this->_writeThrough))
+    {
+      $this->_writeThrough->write($bytes);
+    }
+  }
+  
+  /**
+   * Not used.
+   */
+  public function commit()
+  {
+  }
+  
+  /**
+   * Not used.
+   */
+  public function bind(Swift_InputByteStream $is)
+  {
+  }
+  
+  /**
+   * Not used.
+   */
+  public function unbind(Swift_InputByteStream $is)
+  {
+  }
+  
+  /**
+   * Flush the contents of the stream (empty it) and set the internal pointer
+   * to the beginning.
+   */
+  public function flushBuffers()
+  {
+    $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
+  }
+  
+  /**
+   * Set the nsKey which will be written to.
+   * @param string $nsKey
+   */
+  public function setNsKey($nsKey)
+  {
+    $this->_nsKey = $nsKey;
+  }
+  
+  /**
+   * Set the itemKey which will be written to.
+   * @param string $itemKey
+   */
+  public function setItemKey($itemKey)
+  {
+    $this->_itemKey = $itemKey;
+  }
+  
+  /**
+   * Any implementation should be cloneable, allowing the clone to access a
+   * separate $nsKey and $itemKey.
+   */
+  public function __clone()
+  {
+    $this->_writeThrough = null;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php
new file mode 100644
index 0000000..14ae292
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/LoadBalancedTransport.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/LoadBalancedTransport.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Redudantly and rotationally uses several Transport implementations when sending.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
+{
+  
+  /**
+   * Creates a new LoadBalancedTransport with $transports.
+   * @param array $transports
+   */
+  public function __construct($transports = array())
+  {
+    call_user_func_array(
+      array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('transport.loadbalanced')
+      );
+    
+    $this->setTransports($transports);
+  }
+  
+  /**
+   * Create a new LoadBalancedTransport instance.
+   * @param string $transports
+   * @return Swift_LoadBalancedTransport
+   */
+  public static function newInstance($transports = array())
+  {
+    return new self($transports);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php
new file mode 100644
index 0000000..afe29c6
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/MailTransport.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/MailTransport.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Sends Messages using the mail() function.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_MailTransport extends Swift_Transport_MailTransport
+{
+  
+  /**
+   * Create a new MailTransport, optionally specifying $extraParams.
+   * @param string $extraParams
+   */
+  public function __construct($extraParams = '-f%s')
+  {
+    call_user_func_array(
+      array($this, 'Swift_Transport_MailTransport::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('transport.mail')
+      );
+    
+    $this->setExtraParams($extraParams);
+  }
+  
+  /**
+   * Create a new MailTransport instance.
+   * @param string $extraParams To be passed to mail()
+   * @return Swift_MailTransport
+   */
+  public static function newInstance($extraParams = '-f%s')
+  {
+    return new self($extraParams);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php
new file mode 100644
index 0000000..c92feb4
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport.php';
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Mailer/RecipientIterator.php';
+//@require 'Swift/Events/EventListener.php';
+
+/**
+ * Swift Mailer class.
+ * 
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_Mailer
+{
+  
+  /** The Transport used to send messages */
+  private $_transport;
+  
+  /**
+   * Create a new Mailer using $transport for delivery.
+   * 
+   * @param Swift_Transport $transport
+   */
+  public function __construct(Swift_Transport $transport)
+  {
+    $this->_transport = $transport;
+  }
+
+  /**
+   * Create a new Mailer instance.
+   * 
+   * @param Swift_Transport $transport
+   * @return Swift_Mailer
+   */
+  public static function newInstance(Swift_Transport $transport)
+  {
+    return new self($transport);
+  }
+  
+  /**
+   * Send the given Message like it would be sent in a mail client.
+   * 
+   * All recipients (with the exception of Bcc) will be able to see the other
+   * recipients this message was sent to.
+   * 
+   * If you need to send to each recipient without disclosing details about the
+   * other recipients see {@link batchSend()}.
+   * 
+   * Recipient/sender data will be retreived from the Message object.
+   * 
+   * The return value is the number of recipients who were accepted for
+   * delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param array &$failedRecipients, optional
+   * @return int
+   * @see batchSend()
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $failedRecipients = (array) $failedRecipients;
+    
+    if (!$this->_transport->isStarted())
+    {
+      $this->_transport->start();
+    }
+    
+    return $this->_transport->send($message, $failedRecipients);
+  }
+  
+  /**
+   * Send the given Message to all recipients individually.
+   * 
+   * This differs from {@link send()} in the way headers are presented to the
+   * recipient.  The only recipient in the "To:" field will be the individual
+   * recipient it was sent to.
+   * 
+   * If an iterator is provided, recipients will be read from the iterator
+   * one-by-one, otherwise recipient data will be retreived from the Message
+   * object.
+   * 
+   * Sender information is always read from the Message object.
+   * 
+   * The return value is the number of recipients who were accepted for
+   * delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param array &$failedRecipients, optional
+   * @param Swift_Mailer_RecipientIterator $it, optional
+   * @return int
+   * @see send()
+   */
+  public function batchSend(Swift_Mime_Message $message,
+    &$failedRecipients = null,
+    Swift_Mailer_RecipientIterator $it = null)
+  {
+    $failedRecipients = (array) $failedRecipients;
+    
+    $sent = 0;
+    $to = $message->getTo();
+    $cc = $message->getCc();
+    $bcc = $message->getBcc();
+    
+    if (!empty($cc))
+    {
+      $message->setCc(array());
+    }
+    if (!empty($bcc))
+    {
+      $message->setBcc(array());
+    }
+    
+    //Use an iterator if set
+    if (isset($it))
+    {
+      while ($it->hasNext())
+      {
+        $message->setTo($it->nextRecipient());
+        $sent += $this->send($message, $failedRecipients);
+      }
+    }
+    else
+    {
+      foreach ($to as $address => $name)
+      {
+        $message->setTo(array($address => $name));
+        $sent += $this->send($message, $failedRecipients);
+      }
+    }
+    
+    $message->setTo($to);
+    
+    if (!empty($cc))
+    {
+      $message->setCc($cc);
+    }
+    if (!empty($bcc))
+    {
+      $message->setBcc($bcc);
+    }
+    
+    return $sent;
+  }
+  
+  /**
+   * Register a plugin using a known unique key (e.g. myPlugin).
+   * 
+   * @param Swift_Events_EventListener $plugin
+   * @param string $key
+   */
+  public function registerPlugin(Swift_Events_EventListener $plugin)
+  {
+    $this->_transport->registerPlugin($plugin);
+  }
+  
+  /**
+   * The Transport used to send messages.
+   * @return Swift_Transport
+   */
+  public function getTransport()
+  {
+    return $this->_transport;
+  }
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php
new file mode 100644
index 0000000..65d60c1
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mailer/RecipientIterator.php';
+
+/**
+ * Wraps a standard PHP array in an interator.
+ * @package Swift
+ * @subpackage Mailer
+ * @author Chris Corbyn
+ */
+class Swift_Mailer_ArrayRecipientIterator
+  implements Swift_Mailer_RecipientIterator
+{
+  
+  /**
+   * The list of recipients.
+   * @var array
+   * @access private
+   */
+  private $_recipients = array();
+  
+  /**
+   * Create a new ArrayRecipientIterator from $recipients.
+   * @param array $recipients
+   */
+  public function __construct(array $recipients)
+  {
+    $this->_recipients = $recipients;
+  }
+  
+  /**
+   * Returns true only if there are more recipients to send to.
+   * @return boolean
+   */
+  public function hasNext()
+  {
+    return !empty($this->_recipients);
+  }
+  
+  /**
+   * Returns an array where the keys are the addresses of recipients and the
+   * values are the names.
+   * e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL)
+   * @return array
+   */
+  public function nextRecipient()
+  {
+    return array_splice($this->_recipients, 0, 1);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php
new file mode 100644
index 0000000..2713841
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mailer/RecipientIterator.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides an abstract way of specifying recipients for batch sending.
+ * @package Swift
+ * @subpackage Mailer
+ * @author Chris Corbyn
+ */
+interface Swift_Mailer_RecipientIterator
+{
+  
+  /**
+   * Returns true only if there are more recipients to send to.
+   * @return boolean
+   */
+  public function hasNext();
+  
+  /**
+   * Returns an array where the keys are the addresses of recipients and the
+   * values are the names.
+   * e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL)
+   * @return array
+   */
+  public function nextRecipient();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php
new file mode 100644
index 0000000..e8183ea
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Message.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/SimpleMessage.php';
+//@require 'Swift/MimePart.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * The Message class for building emails.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Message extends Swift_Mime_SimpleMessage
+{
+  
+  /**
+   * Create a new Message.
+   * Details may be optionally passed into the constructor.
+   * @param string $subject
+   * @param string $body
+   * @param string $contentType
+   * @param string $charset
+   */
+  public function __construct($subject = null, $body = null,
+    $contentType = null, $charset = null)
+  {
+    call_user_func_array(
+      array($this, 'Swift_Mime_SimpleMessage::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('mime.message')
+      );
+    
+    if (!isset($charset))
+    {
+      $charset = Swift_DependencyContainer::getInstance()
+        ->lookup('properties.charset');
+    }
+    $this->setSubject($subject);
+    $this->setBody($body);
+    $this->setCharset($charset);
+    if ($contentType)
+    {
+      $this->setContentType($contentType);
+    }
+  }
+  
+  /**
+   * Create a new Message.
+   * @param string $subject
+   * @param string $body
+   * @param string $contentType
+   * @param string $charset
+   * @return Swift_Mime_Message
+   */
+  public static function newInstance($subject = null, $body = null,
+    $contentType = null, $charset = null)
+  {
+    return new self($subject, $body, $contentType, $charset);
+  }
+  
+  /**
+   * Add a MimePart to this Message.
+   * @param string|Swift_OutputByteStream $body
+   * @param string $contentType
+   * @param string $charset
+   */
+  public function addPart($body, $contentType = null, $charset = null)
+  {
+    return $this->attach(Swift_MimePart::newInstance(
+      $body, $contentType, $charset
+      ));
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php
new file mode 100644
index 0000000..25ef68b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Attachment.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/SimpleMimeEntity.php';
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/Mime/HeaderSet.php';
+//@require 'Swift/FileStream.php';
+//@require 'Swift/KeyCache.php';
+
+/**
+ * An attachment, in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
+{
+  
+  /** Recognized MIME types */
+  private $_mimeTypes = array();
+  
+  /**
+   * Create a new Attachment with $headers, $encoder and $cache.
+   * @param Swift_Mime_HeaderSet $headers
+   * @param Swift_Mime_ContentEncoder $encoder
+   * @param Swift_KeyCache $cache
+   * @param array $mimeTypes optional
+   */
+  public function __construct(Swift_Mime_HeaderSet $headers,
+    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache,
+    $mimeTypes = array())
+  {
+    parent::__construct($headers, $encoder, $cache);
+    $this->setDisposition('attachment');
+    $this->setContentType('application/octet-stream');
+    $this->_mimeTypes = $mimeTypes;
+  }
+  
+  /**
+   * Get the nesting level used for this attachment.
+   * Always returns {@link LEVEL_MIXED}.
+   * @return int
+   */
+  public function getNestingLevel()
+  {
+    return self::LEVEL_MIXED;
+  }
+  
+  /**
+   * Get the Content-Disposition of this attachment.
+   * By default attachments have a disposition of "attachment".
+   * @return string
+   */
+  public function getDisposition()
+  {
+    return $this->_getHeaderFieldModel('Content-Disposition');
+  }
+  
+  /**
+   * Set the Content-Disposition of this attachment.
+   * @param string $disposition
+   */
+  public function setDisposition($disposition)
+  {
+    if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition))
+    {
+      $this->getHeaders()->addParameterizedHeader(
+        'Content-Disposition', $disposition
+        );
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the filename of this attachment when downloaded.
+   * @return string
+   */
+  public function getFilename()
+  {
+    return $this->_getHeaderParameter('Content-Disposition', 'filename');
+  }
+  
+  /**
+   * Set the filename of this attachment.
+   * @param string $filename
+   */
+  public function setFilename($filename)
+  {
+    $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
+    $this->_setHeaderParameter('Content-Type', 'name', $filename);
+    return $this;
+  }
+  
+  /**
+   * Get the file size of this attachment.
+   * @return int
+   */
+  public function getSize()
+  {
+    return $this->_getHeaderParameter('Content-Disposition', 'size');
+  }
+  
+  /**
+   * Set the file size of this attachment.
+   * @param int $size
+   */
+  public function setSize($size)
+  {
+    $this->_setHeaderParameter('Content-Disposition', 'size', $size);
+    return $this;
+  }
+  
+  /**
+   * Set the file that this attachment is for.
+   * @param Swift_FileStream $file
+   * @param string $contentType optional
+   */
+  public function setFile(Swift_FileStream $file, $contentType = null)
+  {
+    $this->setFilename(basename($file->getPath()));
+    $this->setBody($file, $contentType);
+    if (!isset($contentType))
+    {
+      $extension = strtolower(substr(
+        $file->getPath(), strrpos($file->getPath(), '.') + 1
+        ));
+      
+      if (array_key_exists($extension, $this->_mimeTypes))
+      {
+        $this->setContentType($this->_mimeTypes[$extension]);
+      }
+    }
+    return $this;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php
new file mode 100644
index 0000000..c26009f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/CharsetObserver.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Observes changes in an Mime entity's character set.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_CharsetObserver
+{
+  
+  /**
+   * Notify this observer that the entity's charset has changed.
+   * @param string $charset
+   */
+  public function charsetChanged($charset);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php
new file mode 100644
index 0000000..e1c99c5
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Encoder.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Interface for all Transfer Encoding schemes.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_ContentEncoder extends Swift_Encoder
+{
+  
+  /**
+   * Encode $in to $out.
+   * @param Swift_OutputByteStream $os to read from
+   * @param Swift_InputByteStream $is to write to
+   * @param int $firstLineOffset
+   * @param int $maxLineLength - 0 indicates the default length for this encoding
+   */
+  public function encodeByteStream(
+    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
+    $maxLineLength = 0);
+  
+  /**
+   * Get the MIME name of this content encoding scheme.
+   * @return string
+   */
+  public function getName();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
new file mode 100644
index 0000000..e89938e
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/Encoder/Base64Encoder.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Handles Base 64 Transfer Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_Base64ContentEncoder
+  extends Swift_Encoder_Base64Encoder
+  implements Swift_Mime_ContentEncoder
+{
+  
+  /**
+   * Encode stream $in to stream $out.
+   * @param Swift_OutputByteStream $in
+   * @param Swift_InputByteStream $out
+   * @param int $firstLineOffset
+   * @param int $maxLineLength, optional, 0 indicates the default of 76 bytes
+   */
+  public function encodeByteStream(
+    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    if (0 >= $maxLineLength || 76 < $maxLineLength)
+    {
+      $maxLineLength = 76;
+    }
+    
+    $remainder = 0;
+    
+    while (false !== $bytes = $os->read(8190))
+    {
+      $encoded = base64_encode($bytes);
+      $encodedTransformed = '';
+      $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
+      
+      while ($thisMaxLineLength < strlen($encoded))
+      {
+        $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength) . "\r\n";
+        $firstLineOffset = 0;
+        $encoded = substr($encoded, $thisMaxLineLength);
+        $thisMaxLineLength = $maxLineLength;
+        $remainder = 0;
+      }
+      
+      if (0 < $remainingLength = strlen($encoded))
+      {
+        $remainder += $remainingLength;
+        $encodedTransformed .= $encoded;
+        $encoded = null;
+      }
+      
+      $is->write($encodedTransformed);
+    }
+  }
+  
+  /**
+   * Get the name of this encoding scheme.
+   * Returns the string 'base64'.
+   * @return string
+   */
+  public function getName()
+  {
+    return 'base64';
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
new file mode 100644
index 0000000..4a725d8
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -0,0 +1,175 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_PlainContentEncoder
+  implements Swift_Mime_ContentEncoder
+{
+  
+  /**
+   * The name of this encoding scheme (probably 7bit or 8bit).
+   * @var string
+   * @access private
+   */
+  private $_name;
+  
+  /**
+   * True if canonical transformations should be done.
+   * @var boolean
+   * @access private
+   */
+  private $_canonical;
+  
+  /**
+   * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
+   * @param string $name
+   * @param boolean $canonical If canonicalization transformation should be done.
+   */
+  public function __construct($name, $canonical = false)
+  {
+    $this->_name = $name;
+    $this->_canonical = $canonical;
+  }
+  
+  /**
+   * Encode a given string to produce an encoded string.
+   * @param string $string
+   * @param int $firstLineOffset, ignored
+   * @param int $maxLineLength - 0 means no wrapping will occur
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    if ($this->_canonical)
+    {
+      $string = $this->_canonicalize($string);
+    }
+    return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
+  }
+  
+  /**
+   * Encode stream $in to stream $out.
+   * @param Swift_OutputByteStream $in
+   * @param Swift_InputByteStream $out
+   * @param int $firstLineOffset, ignored
+   * @param int $maxLineLength, optional, 0 means no wrapping will occur
+   */
+  public function encodeByteStream(
+    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    $leftOver = '';
+    while (false !== $bytes = $os->read(8192))
+    {
+      $toencode = $leftOver . $bytes;
+      if ($this->_canonical)
+      {
+        $toencode = $this->_canonicalize($toencode);
+      }
+      $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
+      $lastLinePos = strrpos($wrapped, "\r\n");
+      $leftOver = substr($wrapped, $lastLinePos);
+      $wrapped = substr($wrapped, 0, $lastLinePos);
+      
+      $is->write($wrapped);
+    }
+    if (strlen($leftOver))
+    {
+      $is->write($leftOver);
+    }
+  }
+  
+  /**
+   * Get the name of this encoding scheme.
+   * @return string
+   */
+  public function getName()
+  {
+    return $this->_name;
+  }
+  
+  /**
+   * Not used.
+   */
+  public function charsetChanged($charset)
+  {
+  }
+  
+  // -- Private methods
+  
+  /**
+   * A safer (but weaker) wordwrap for unicode.
+   * @param string $string
+   * @param int $length
+   * @param string $le
+   * @return string
+   * @access private
+   */
+  private function _safeWordwrap($string, $length = 75, $le = "\r\n")
+  {
+    if (0 >= $length)
+    {
+      return $string;
+    }
+    
+    $originalLines = explode($le, $string);
+    
+    $lines = array();
+    $lineCount = 0;
+    
+    foreach ($originalLines as $originalLine)
+    {
+      $lines[] = '';
+      $currentLine =& $lines[$lineCount++];
+      
+      //$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
+      $chunks = preg_split('/(?<=\s)/', $originalLine);
+      
+      foreach ($chunks as $chunk)
+      {
+        if (0 != strlen($currentLine)
+          && strlen($currentLine . $chunk) > $length)
+        {
+          $lines[] = '';
+          $currentLine =& $lines[$lineCount++];
+        }
+        $currentLine .= $chunk;
+      }
+    }
+    
+    return implode("\r\n", $lines);
+  }
+  
+  /**
+   * Canonicalize string input (fix CRLF).
+   * @param string $string
+   * @return string
+   * @access private
+   */
+  private function _canonicalize($string)
+  {
+    return str_replace(
+      array("\r\n", "\r", "\n"),
+      array("\n", "\n", "\r\n"),
+      $string
+      );
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
new file mode 100644
index 0000000..3beeb63
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/Encoder/QpEncoder.php';
+//@require 'Swift/InputByteStrean.php';
+//@require 'Swift/OutputByteStream.php';
+//@require 'Swift/CharacterStream.php';
+
+/**
+ * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
+  implements Swift_Mime_ContentEncoder
+{
+
+  /**
+   * Creates a new QpContentEncoder for the given CharacterStream.
+   * @param Swift_CharacterStream $charStream to use for reading characters
+   * @param Swift_StreamFilter $filter if canonicalization should occur
+   */
+  public function __construct(Swift_CharacterStream $charStream,
+    Swift_StreamFilter $filter = null)
+  {
+    parent::__construct($charStream, $filter);
+  }
+
+  /**
+   * Encode stream $in to stream $out.
+   * QP encoded strings have a maximum line length of 76 characters.
+   * If the first line needs to be shorter, indicate the difference with
+   * $firstLineOffset.
+   * @param Swift_OutputByteStream $os output stream
+   * @param Swift_InputByteStream $is input stream
+   * @param int $firstLineOffset
+   * @param int $maxLineLength
+   */
+  public function encodeByteStream(
+    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    if ($maxLineLength > 76 || $maxLineLength <= 0)
+    {
+      $maxLineLength = 76;
+    }
+
+    $thisLineLength = $maxLineLength - $firstLineOffset;
+
+    $this->_charStream->flushContents();
+    $this->_charStream->importByteStream($os);
+    
+    $currentLine = '';
+    $prepend = '';
+    $size=$lineLen=0;
+
+    while (false !== $bytes = $this->_nextSequence())
+    {
+      //If we're filtering the input
+      if (isset($this->_filter))
+      {
+        //If we can't filter because we need more bytes
+        while ($this->_filter->shouldBuffer($bytes))
+        {
+          //Then collect bytes into the buffer
+          if (false === $moreBytes = $this->_nextSequence(1))
+          {
+            break;
+          }
+
+          foreach ($moreBytes as $b)
+          {
+            $bytes[] = $b;
+          }
+        }
+        //And filter them
+        $bytes = $this->_filter->filter($bytes);
+      }
+
+      $enc = $this->_encodeByteSequence($bytes, $size);
+      if ($currentLine && $lineLen+$size >= $thisLineLength)
+      {
+        $is->write($prepend . $this->_standardize($currentLine));
+        $currentLine = '';
+        $prepend = "=\r\n";
+        $thisLineLength = $maxLineLength;
+        $lineLen=0;
+      }
+      $lineLen+=$size;
+      $currentLine .= $enc;
+    }
+    if (strlen($currentLine))
+    {
+      $is->write($prepend . $this->_standardize($currentLine));
+    }
+  }
+
+  /**
+   * Get the name of this encoding scheme.
+   * Returns the string 'quoted-printable'.
+   * @return string
+   */
+  public function getName()
+  {
+    return 'quoted-printable';
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php
new file mode 100644
index 0000000..983b78d
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EmbeddedFile.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Attachment.php';
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/KeyCache.php';
+//@require
+
+/**
+ * An embedded file, in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
+{
+  
+  /**
+   * Creates a new Attachment with $headers and $encoder.
+   * @param Swift_Mime_HeaderSet $headers
+   * @param Swift_Mime_ContentEncoder $encoder
+   * @param Swift_KeyCache $cache
+   * @param array $mimeTypes optional
+   */
+  public function __construct(Swift_Mime_HeaderSet $headers,
+    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache,
+    $mimeTypes = array())
+  {
+    parent::__construct($headers, $encoder, $cache, $mimeTypes);
+    $this->setDisposition('inline');
+    $this->setId($this->getId());
+  }
+  
+  /**
+   * Get the nesting level of this EmbeddedFile.
+   * Returns {@link LEVEL_RELATED}.
+   * @return int
+   */
+  public function getNestingLevel()
+  {
+    return self::LEVEL_RELATED;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php
new file mode 100644
index 0000000..50472db
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/EncodingObserver.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/ContentEncoder.php';
+
+/**
+ * Observes changes for a Mime entity's ContentEncoder.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_EncodingObserver
+{
+  
+  /**
+   * Notify this observer that the observed entity's ContentEncoder has changed.
+   * @param Swift_Mime_ContentEncoder $encoder
+   */
+  public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php
new file mode 100644
index 0000000..38fc40c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Header.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME Header.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_Header
+{
+  
+  /** Text headers */
+  const TYPE_TEXT = 2;
+  
+  /** Parameterized headers (text + params) */
+  const TYPE_PARAMETERIZED = 6;
+
+  /** Mailbox and address headers */
+  const TYPE_MAILBOX = 8;
+  
+  /** Date and time headers */
+  const TYPE_DATE = 16;
+  
+  /** Identification headers */
+  const TYPE_ID = 32;
+  
+  /** Address path headers */
+  const TYPE_PATH = 64;
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType();
+  
+  /**
+   * Set the model for the field body.
+   * The actual types needed will vary depending upon the type of Header.
+   * @param mixed $model
+   */
+  public function setFieldBodyModel($model);
+  
+  /**
+   * Set the charset used when rendering the Header.
+   * @param string $charset
+   */
+  public function setCharset($charset);
+  
+  /**
+   * Get the model for the field body.
+   * The return type depends on the specifics of the Header.
+   * @return mixed
+   */
+  public function getFieldBodyModel();
+  
+  /**
+   * Get the name of this header (e.g. Subject).
+   * The name is an identifier and as such will be immutable.
+   * @return string
+   */
+  public function getFieldName();
+  
+  /**
+   * Get the field body, prepared for folding into a final header value.
+   * @return string
+   */
+  public function getFieldBody();
+  
+  /**
+   * Get this Header rendered as a compliant string.
+   * @return string
+   */
+  public function toString();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php
new file mode 100644
index 0000000..cc70c5f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Encoder.php';
+
+/**
+ * Interface for all Header Encoding schemes.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_HeaderEncoder extends Swift_Encoder
+{
+  
+  /**
+   * Get the MIME name of this content encoding scheme.
+   * @return string
+   */
+  public function getName();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
new file mode 100644
index 0000000..feaba98
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once dirname(__FILE__) . '/../HeaderEncoder.php';
+require_once dirname(__FILE__) . '/../../Encoder/Base64Encoder.php';
+
+
+/**
+ * Handles Base64 (B) Header Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_HeaderEncoder_Base64HeaderEncoder
+  extends Swift_Encoder_Base64Encoder
+  implements Swift_Mime_HeaderEncoder
+{
+  
+  /**
+   * Get the name of this encoding scheme.
+   * Returns the string 'B'.
+   * @return string
+   */
+  public function getName()
+  {
+    return 'B';
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
new file mode 100644
index 0000000..d727da0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once dirname(__FILE__) . '/../HeaderEncoder.php';
+require_once dirname(__FILE__) . '/../../Encoder/QpEncoder.php';
+require_once dirname(__FILE__) . '/../../CharacterStream.php';
+
+/**
+ * Handles Quoted Printable (Q) Header Encoding in Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder
+  implements Swift_Mime_HeaderEncoder
+{
+
+  private static $_headerSafeMap = array();
+
+  /**
+   * Creates a new QpHeaderEncoder for the given CharacterStream.
+   * @param Swift_CharacterStream $charStream to use for reading characters
+   */
+  public function __construct(Swift_CharacterStream $charStream)
+  {
+    parent::__construct($charStream);
+    if (empty(self::$_headerSafeMap))
+    {
+      foreach (array_merge(
+        range(0x61, 0x7A), range(0x41, 0x5A),
+        range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+        ) as $byte)
+      {
+        self::$_headerSafeMap[$byte] = chr($byte);
+      }
+    }
+  }
+
+  /**
+   * Get the name of this encoding scheme.
+   * Returns the string 'Q'.
+   * @return string
+   */
+  public function getName()
+  {
+    return 'Q';
+  }
+
+  /**
+   * Takes an unencoded string and produces a Q encoded string from it.
+   * @param string $string to encode
+   * @param int $firstLineOffset, optional
+   * @param int $maxLineLength, optional, 0 indicates the default of 76 chars
+   * @return string
+   */
+  public function encodeString($string, $firstLineOffset = 0,
+    $maxLineLength = 0)
+  {
+    return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+      parent::encodeString($string, $firstLineOffset, $maxLineLength)
+      );
+  }
+
+  // -- Overridden points of extension
+
+  /**
+   * Encode the given byte array into a verbatim QP form.
+   * @param int[] $bytes
+   * @return string
+   * @access protected
+   */
+  protected function _encodeByteSequence(array $bytes, &$size)
+  {
+    $ret = '';
+    $size=0;
+    foreach ($bytes as $b)
+    {
+      if (isset(self::$_headerSafeMap[$b]))
+      {
+        $ret .= self::$_headerSafeMap[$b];
+        ++$size;
+      }
+      else
+      {
+        $ret .= self::$_qpMap[$b];
+        $size+=3;
+      }
+    }
+    return $ret;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php
new file mode 100644
index 0000000..83bb35a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderFactory.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/CharsetObserver.php';
+
+/**
+ * Creates MIME headers.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver
+{
+  
+  /**
+   * Create a new Mailbox Header with a list of $addresses.
+   * @param string $name
+   * @param array|string $addresses
+   * @return Swift_Mime_Header
+   */
+  public function createMailboxHeader($name, $addresses = null);
+  
+  /**
+   * Create a new Date header using $timestamp (UNIX time).
+   * @param string $name
+   * @param int $timestamp
+   * @return Swift_Mime_Header
+   */
+  public function createDateHeader($name, $timestamp = null);
+  
+  /**
+   * Create a new basic text header with $name and $value.
+   * @param string $name
+   * @param string $value
+   * @return Swift_Mime_Header
+   */
+  public function createTextHeader($name, $value = null);
+  
+  /**
+   * Create a new ParameterizedHeader with $name, $value and $params.
+   * @param string $name
+   * @param string $value
+   * @param array $params
+   * @return Swift_Mime_ParameterizedHeader
+   */
+  public function createParameterizedHeader($name, $value = null,
+    $params = array());
+  
+  /**
+   * Create a new ID header for Message-ID or Content-ID.
+   * @param string $name
+   * @param string|array $ids
+   * @return Swift_Mime_Header
+   */
+  public function createIdHeader($name, $ids = null);
+  
+  /**
+   * Create a new Path header with an address (path) in it.
+   * @param string $name
+   * @param string $path
+   * @return Swift_Mime_Header
+   */
+  public function createPathHeader($name, $path = null);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php
new file mode 100644
index 0000000..81e7a97
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/HeaderSet.php
@@ -0,0 +1,170 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/CharsetObserver.php';
+
+/**
+ * A collection of MIME headers.
+ * 
+ * @package Swift
+ * @subpackage Mime
+ * 
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
+{
+  
+  /**
+   * Add a new Mailbox Header with a list of $addresses.
+   * 
+   * @param string $name
+   * @param array|string $addresses
+   */
+  public function addMailboxHeader($name, $addresses = null);
+  
+  /**
+   * Add a new Date header using $timestamp (UNIX time).
+   * 
+   * @param string $name
+   * @param int $timestamp
+   */
+  public function addDateHeader($name, $timestamp = null);
+  
+  /**
+   * Add a new basic text header with $name and $value.
+   * 
+   * @param string $name
+   * @param string $value
+   */
+  public function addTextHeader($name, $value = null);
+  
+  /**
+   * Add a new ParameterizedHeader with $name, $value and $params.
+   * 
+   * @param string $name
+   * @param string $value
+   * @param array $params
+   */
+  public function addParameterizedHeader($name, $value = null,
+    $params = array());
+  
+  /**
+   * Add a new ID header for Message-ID or Content-ID.
+   * 
+   * @param string $name
+   * @param string|array $ids
+   */
+  public function addIdHeader($name, $ids = null);
+  
+  /**
+   * Add a new Path header with an address (path) in it.
+   * 
+   * @param string $name
+   * @param string $path
+   */
+  public function addPathHeader($name, $path = null);
+  
+  /**
+   * Returns true if at least one header with the given $name exists.
+   * 
+   * If multiple headers match, the actual one may be specified by $index.
+   * 
+   * @param string $name
+   * @param int $index
+   * 
+   * @return boolean
+   */
+  public function has($name, $index = 0);
+  
+  /**
+   * Set a header in the HeaderSet.
+   * 
+   * The header may be a previously fetched header via {@link get()} or it may
+   * be one that has been created separately.
+   * 
+   * If $index is specified, the header will be inserted into the set at this
+   * offset.
+   * 
+   * @param Swift_Mime_Header $header
+   * @param int $index
+   */
+  public function set(Swift_Mime_Header $header, $index = 0);
+  
+  /**
+   * Get the header with the given $name.
+   * If multiple headers match, the actual one may be specified by $index.
+   * Returns NULL if none present.
+   * 
+   * @param string $name
+   * @param int $index
+   * 
+   * @return Swift_Mime_Header
+   */
+  public function get($name, $index = 0);
+  
+  /**
+   * Get all headers with the given $name.
+   * 
+   * @param string $name
+   * 
+   * @return array
+   */
+  public function getAll($name = null);
+  
+  /**
+   * Remove the header with the given $name if it's set.
+   * 
+   * If multiple headers match, the actual one may be specified by $index.
+   * 
+   * @param string $name
+   * @param int $index
+   */
+  public function remove($name, $index = 0);
+  
+  /**
+   * Remove all headers with the given $name.
+   * 
+   * @param string $name
+   */
+  public function removeAll($name);
+  
+  /**
+   * Create a new instance of this HeaderSet.
+   * 
+   * @return Swift_Mime_HeaderSet
+   */
+  public function newInstance();
+  
+  /**
+   * Define a list of Header names as an array in the correct order.
+   * 
+   * These Headers will be output in the given order where present.
+   * 
+   * @param array $sequence
+   */
+  public function defineOrdering(array $sequence);
+  
+  /**
+   * Set a list of header names which must always be displayed when set.
+   * 
+   * Usually headers without a field value won't be output unless set here.
+   * 
+   * @param array $names
+   */
+  public function setAlwaysDisplayed(array $names);
+  
+  /**
+   * Returns a string with a representation of all headers.
+   * 
+   * @return string
+   */
+  public function toString();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php
new file mode 100644
index 0000000..c3049c2
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -0,0 +1,596 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Header.php';
+//@require 'Swift/Mime/HeaderEncoder.php';
+//@require 'Swift/RfcComplianceException.php';
+
+/**
+ * An abstract base MIME Header.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
+{
+  
+  /**
+   * Special characters used in the syntax which need to be escaped.
+   * @var string[]
+   * @access private
+   */
+  private $_specials = array();
+  
+  /**
+   * Tokens defined in RFC 2822 (and some related RFCs).
+   * @var string[]
+   * @access private
+   */
+  private $_grammar = array();
+  
+  /**
+   * The name of this Header.
+   * @var string
+   * @access private
+   */
+  private $_name;
+  
+  /**
+   * The Encoder used to encode this Header.
+   * @var Swift_Encoder
+   * @access private
+   */
+  private $_encoder;
+  
+  /**
+   * The maximum length of a line in the header.
+   * @var int
+   * @access private
+   */
+  private $_lineLength = 78;
+  
+  /**
+   * The language used in this Header.
+   * @var string
+   */
+  private $_lang;
+  
+  /**
+   * The character set of the text in this Header.
+   * @var string
+   * @access private
+   */
+  private $_charset = 'utf-8';
+  
+  /**
+   * The value of this Header, cached.
+   * @var string
+   * @access private
+   */
+  private $_cachedValue = null;
+  
+  /**
+   * Set the character set used in this Header.
+   * @param string $charset
+   */
+  public function setCharset($charset)
+  {
+    $this->clearCachedValueIf($charset != $this->_charset);
+    $this->_charset = $charset;
+    if (isset($this->_encoder))
+    {
+      $this->_encoder->charsetChanged($charset);
+    }
+  }
+  
+  /**
+   * Get the character set used in this Header.
+   * @return string
+   */
+  public function getCharset()
+  {
+    return $this->_charset;
+  }
+  
+  /**
+   * Set the language used in this Header.
+   * For example, for US English, 'en-us'.
+   * This can be unspecified.
+   * @param string $lang
+   */
+  public function setLanguage($lang)
+  {
+    $this->clearCachedValueIf($this->_lang != $lang);
+    $this->_lang = $lang;
+  }
+  
+  /**
+   * Get the language used in this Header.
+   * @return string
+   */
+  public function getLanguage()
+  {
+    return $this->_lang;
+  }
+  
+  /**
+   * Set the encoder used for encoding the header.
+   * @param Swift_Mime_HeaderEncoder $encoder
+   */
+  public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
+  {
+    $this->_encoder = $encoder;
+    $this->setCachedValue(null);
+  }
+  
+  /**
+   * Get the encoder used for encoding this Header.
+   * @return Swift_Mime_HeaderEncoder
+   */
+  public function getEncoder()
+  {
+    return $this->_encoder;
+  }
+  
+  /**
+   * Get the name of this header (e.g. charset).
+   * @return string
+   */
+  public function getFieldName()
+  {
+    return $this->_name;
+  }
+  
+  /**
+   * Set the maximum length of lines in the header (excluding EOL).
+   * @param int $lineLength
+   */
+  public function setMaxLineLength($lineLength)
+  {
+    $this->clearCachedValueIf($this->_lineLength != $lineLength);
+    $this->_lineLength = $lineLength;
+  }
+  
+  /**
+   * Get the maximum permitted length of lines in this Header.
+   * @return int
+   */
+  public function getMaxLineLength()
+  {
+    return $this->_lineLength;
+  }
+  
+  /**
+   * Get this Header rendered as a RFC 2822 compliant string.
+   * @return string
+   * @throws Swift_RfcComplianceException
+   */
+  public function toString()
+  {
+    return $this->_tokensToString($this->toTokens());
+  }
+  
+  /**
+   * Returns a string representation of this object.
+   *
+   * @return string
+   *
+   * @see toString()
+   */
+  public function __toString()
+  {
+    return $this->toString();
+  }
+  
+  // -- Points of extension
+  
+  /**
+   * Set the name of this Header field.
+   * @param string $name
+   * @access protected
+   */
+  protected function setFieldName($name)
+  {
+    $this->_name = $name;
+  }
+  
+  /**
+   * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
+   * @access protected
+   */
+  protected function initializeGrammar()
+  {
+    $this->_specials = array(
+      '(', ')', '<', '>', '[', ']',
+      ':', ';', '@', ',', '.', '"'
+      );
+    
+    /*** Refer to RFC 2822 for ABNF grammar ***/
+    
+    //All basic building blocks
+    $this->_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
+    $this->_grammar['WSP'] = '[ \t]';
+    $this->_grammar['CRLF'] = '(?:\r\n)';
+    $this->_grammar['FWS'] = '(?:(?:' . $this->_grammar['WSP'] . '*' .
+        $this->_grammar['CRLF'] . ')?' . $this->_grammar['WSP'] . ')';
+    $this->_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
+    $this->_grammar['quoted-pair'] = '(?:\\\\' . $this->_grammar['text'] . ')';
+    $this->_grammar['ctext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+        '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
+    //Uses recursive PCRE (?1) -- could be a weak point??
+    $this->_grammar['ccontent'] = '(?:' . $this->_grammar['ctext'] . '|' .
+        $this->_grammar['quoted-pair'] . '|(?1))';
+    $this->_grammar['comment'] = '(\((?:' . $this->_grammar['FWS'] . '|' .
+        $this->_grammar['ccontent']. ')*' . $this->_grammar['FWS'] . '?\))';
+    $this->_grammar['CFWS'] = '(?:(?:' . $this->_grammar['FWS'] . '?' .
+        $this->_grammar['comment'] . ')*(?:(?:' . $this->_grammar['FWS'] . '?' .
+        $this->_grammar['comment'] . ')|' . $this->_grammar['FWS'] . '))';
+    $this->_grammar['qtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+        '|[\x21\x23-\x5B\x5D-\x7E])';
+    $this->_grammar['qcontent'] = '(?:' . $this->_grammar['qtext'] . '|' .
+        $this->_grammar['quoted-pair'] . ')';
+    $this->_grammar['quoted-string'] = '(?:' . $this->_grammar['CFWS'] . '?"' .
+        '(' . $this->_grammar['FWS'] . '?' . $this->_grammar['qcontent'] . ')*' .
+        $this->_grammar['FWS'] . '?"' . $this->_grammar['CFWS'] . '?)';
+    $this->_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
+    $this->_grammar['atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
+        $this->_grammar['atext'] . '+' . $this->_grammar['CFWS'] . '?)';
+    $this->_grammar['dot-atom-text'] = '(?:' . $this->_grammar['atext'] . '+' .
+        '(\.' . $this->_grammar['atext'] . '+)*)';
+    $this->_grammar['dot-atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
+        $this->_grammar['dot-atom-text'] . '+' . $this->_grammar['CFWS'] . '?)';
+    $this->_grammar['word'] = '(?:' . $this->_grammar['atom'] . '|' .
+        $this->_grammar['quoted-string'] . ')';
+    $this->_grammar['phrase'] = '(?:' . $this->_grammar['word'] . '+?)';
+    $this->_grammar['no-fold-quote'] = '(?:"(?:' . $this->_grammar['qtext'] .
+        '|' . $this->_grammar['quoted-pair'] . ')*")';
+    $this->_grammar['dtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+        '|[\x21-\x5A\x5E-\x7E])';
+    $this->_grammar['no-fold-literal'] = '(?:\[(?:' . $this->_grammar['dtext'] .
+        '|' . $this->_grammar['quoted-pair'] . ')*\])';
+    
+    //Message IDs
+    $this->_grammar['id-left'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
+        $this->_grammar['no-fold-quote'] . ')';
+    $this->_grammar['id-right'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
+        $this->_grammar['no-fold-literal'] . ')';
+    
+    //Addresses, mailboxes and paths
+    $this->_grammar['local-part'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
+        $this->_grammar['quoted-string'] . ')';
+    $this->_grammar['dcontent'] = '(?:' . $this->_grammar['dtext'] . '|' .
+        $this->_grammar['quoted-pair'] . ')';
+    $this->_grammar['domain-literal'] = '(?:' . $this->_grammar['CFWS'] . '?\[(' .
+        $this->_grammar['FWS'] . '?' . $this->_grammar['dcontent'] . ')*?' .
+        $this->_grammar['FWS'] . '?\]' . $this->_grammar['CFWS'] . '?)';
+    $this->_grammar['domain'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
+        $this->_grammar['domain-literal'] . ')';
+    $this->_grammar['addr-spec'] = '(?:' . $this->_grammar['local-part'] . '@' .
+        $this->_grammar['domain'] . ')';
+  }
+  
+  /**
+   * Get the grammar defined for $name token.
+   * @param string $name execatly as written in the RFC
+   * @return string
+   */
+  protected function getGrammar($name)
+  {
+    if (array_key_exists($name, $this->_grammar))
+    {
+      return $this->_grammar[$name];
+    }
+    else
+    {
+      throw new Swift_RfcComplianceException(
+        "No such grammar '" . $name . "' defined."
+        );
+    }
+  }
+  
+  /**
+   * Escape special characters in a string (convert to quoted-pairs).
+   * @param string $token
+   * @param string[] $include additonal chars to escape
+   * @param string[] $exclude chars from escaping
+   * @return string
+   */
+  protected function escapeSpecials($token, $include = array(),
+    $exclude = array())
+  {
+    foreach (
+      array_merge(array('\\'), array_diff($this->_specials, $exclude), $include) as $char)
+    {
+      $token = str_replace($char, '\\' . $char, $token);
+    }
+    return $token;
+  }
+  
+  /**
+   * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
+   * @param Swift_Mime_Header $header
+   * @param string $string as displayed
+   * @param string $charset of the text
+   * @param Swift_Mime_HeaderEncoder $encoder
+   * @param boolean $shorten the first line to make remove for header name
+   * @return string
+   */
+  protected function createPhrase(Swift_Mime_Header $header, $string, $charset,
+    Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
+  {
+    //Treat token as exactly what was given
+    $phraseStr = $string;
+    //If it's not valid
+    if (!preg_match('/^' . $this->_grammar['phrase'] . '$/D', $phraseStr))
+    {
+      // .. but it is just ascii text, try escaping some characters
+      // and make it a quoted-string
+      if (preg_match('/^' . $this->_grammar['text'] . '*$/D', $phraseStr))
+      {
+        $phraseStr = $this->escapeSpecials(
+          $phraseStr, array('"'), $this->_specials
+          );
+        $phraseStr = '"' . $phraseStr . '"';
+      }
+      else // ... otherwise it needs encoding
+      {
+        //Determine space remaining on line if first line
+        if ($shorten)
+        {
+          $usedLength = strlen($header->getFieldName() . ': ');
+        }
+        else
+        {
+          $usedLength = 0;
+        }
+        $phraseStr = $this->encodeWords($header, $string, $usedLength);
+      }
+    }
+    
+    return $phraseStr;
+  }
+  
+  /**
+   * Encode needed word tokens within a string of input.
+   * @param string $input
+   * @param string $usedLength, optional
+   * @return string
+   */
+  protected function encodeWords(Swift_Mime_Header $header, $input,
+    $usedLength = -1)
+  {
+    $value = '';
+    
+    $tokens = $this->getEncodableWordTokens($input);
+    
+    foreach ($tokens as $token)
+    {
+      //See RFC 2822, Sect 2.2 (really 2.2 ??)
+      if ($this->tokenNeedsEncoding($token))
+      {
+        //Don't encode starting WSP
+        $firstChar = substr($token, 0, 1);
+        switch($firstChar)
+        {
+          case ' ':
+          case "\t":
+            $value .= $firstChar;
+            $token = substr($token, 1);
+        }
+        
+        if (-1 == $usedLength)
+        {
+          $usedLength = strlen($header->getFieldName() . ': ') + strlen($value);
+        }
+        $value .= $this->getTokenAsEncodedWord($token, $usedLength);
+        
+        $header->setMaxLineLength(76); //Forefully override
+      }
+      else
+      {
+        $value .= $token;
+      }
+    }
+    
+    return $value;
+  }
+  
+  /**
+   * Test if a token needs to be encoded or not.
+   * @param string $token
+   * @return boolean
+   */
+  protected function tokenNeedsEncoding($token)
+  {
+    return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
+  }
+  
+  /**
+   * Splits a string into tokens in blocks of words which can be encoded quickly.
+   * @param string $string
+   * @return string[]
+   */
+  protected function getEncodableWordTokens($string)
+  {
+    $tokens = array();
+    
+    $encodedToken = '';
+    //Split at all whitespace boundaries
+    foreach (preg_split('~(?=[\t ])~', $string) as $token)
+    {
+      if ($this->tokenNeedsEncoding($token))
+      {
+        $encodedToken .= $token;
+      }
+      else
+      {
+        if (strlen($encodedToken) > 0)
+        {
+          $tokens[] = $encodedToken;
+          $encodedToken = '';
+        }
+        $tokens[] = $token;
+      }
+    }
+    if (strlen($encodedToken))
+    {
+      $tokens[] = $encodedToken;
+    }
+    
+    return $tokens;
+  }
+  
+  /**
+   * Get a token as an encoded word for safe insertion into headers.
+   * @param string $token to encode
+   * @param int $firstLineOffset, optional
+   * @return string
+   */
+  protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
+  {
+    //Adjust $firstLineOffset to account for space needed for syntax
+    $charsetDecl = $this->_charset;
+    if (isset($this->_lang))
+    {
+      $charsetDecl .= '*' . $this->_lang;
+    }
+    $encodingWrapperLength = strlen(
+      '=?' . $charsetDecl . '?' . $this->_encoder->getName() . '??='
+      );
+    
+    if ($firstLineOffset >= 75) //Does this logic need to be here?
+    {
+      $firstLineOffset = 0;
+    }
+    
+    $encodedTextLines = explode("\r\n",
+      $this->_encoder->encodeString(
+        $token, $firstLineOffset, 75 - $encodingWrapperLength
+        )
+      );
+    
+    foreach ($encodedTextLines as $lineNum => $line)
+    {
+      $encodedTextLines[$lineNum] = '=?' . $charsetDecl .
+        '?' . $this->_encoder->getName() .
+        '?' . $line . '?=';
+    }
+    
+    return implode("\r\n ", $encodedTextLines);
+  }
+  
+  /**
+   * Generates tokens from the given string which include CRLF as individual tokens.
+   * @param string $token
+   * @return string[]
+   * @access protected
+   */
+  protected function generateTokenLines($token)
+  {
+    return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+  }
+  
+  /**
+   * Set a value into the cache.
+   * @param string $value
+   * @access protected
+   */
+  protected function setCachedValue($value)
+  {
+    $this->_cachedValue = $value;
+  }
+  
+  /**
+   * Get the value in the cache.
+   * @return string
+   * @access protected
+   */
+  protected function getCachedValue()
+  {
+    return $this->_cachedValue;
+  }
+  
+  /**
+   * Clear the cached value if $condition is met.
+   * @param boolean $condition
+   * @access protected
+   */
+  protected function clearCachedValueIf($condition)
+  {
+    if ($condition)
+    {
+      $this->setCachedValue(null);
+    }
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Generate a list of all tokens in the final header.
+   * @param string $string input, optional
+   * @return string[]
+   * @access private
+   */
+  protected function toTokens($string = null)
+  {
+    if (is_null($string))
+    {
+      $string = $this->getFieldBody();
+    }
+    
+    $tokens = array();
+    
+    //Generate atoms; split at all invisible boundaries followed by WSP
+    foreach (preg_split('~(?=[ \t])~', $string) as $token)
+    {
+      $tokens = array_merge($tokens, $this->generateTokenLines($token));
+    }
+    
+    return $tokens;
+  }
+  
+  /**
+   * Takes an array of tokens which appear in the header and turns them into
+   * an RFC 2822 compliant string, adding FWSP where needed.
+   * @param string[] $tokens
+   * @return string
+   * @access private
+   */
+  private function _tokensToString(array $tokens)
+  {
+    $lineCount = 0;
+    $headerLines = array();
+    $headerLines[] = $this->_name . ': ';
+    $currentLine =& $headerLines[$lineCount++];
+    
+    //Build all tokens back into compliant header
+    foreach ($tokens as $i => $token)
+    {
+      //Line longer than specified maximum or token was just a new line
+      if (("\r\n" == $token) ||
+        ($i > 0 && strlen($currentLine . $token) > $this->_lineLength)
+        && 0 < strlen($currentLine))
+      {
+        $headerLines[] = '';
+        $currentLine =& $headerLines[$lineCount++];
+      }
+      
+      //Append token to the line
+      if ("\r\n" != $token)
+      {
+        $currentLine .= $token;
+      }
+    }
+    
+    //Implode with FWS (RFC 2822, 2.2.3)
+    return implode("\r\n", $headerLines) . "\r\n";
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php
new file mode 100644
index 0000000..598c0c5
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/DateHeader.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/AbstractHeader.php';
+
+
+/**
+ * A Date MIME Header for Swift Mailer.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
+{
+  
+  /**
+   * The UNIX timestamp value of this Header.
+   * @var int
+   * @access private
+   */
+  private $_timestamp;
+  
+  /**
+   * Creates a new DateHeader with $name and $timestamp.
+   * Example:
+   * <code>
+   * <?php
+   * $header = new Swift_Mime_Headers_DateHeader('Date', time());
+   * ?>
+   * </code>
+   * @param string $name of Header
+   */
+  public function __construct($name)
+  {
+    $this->setFieldName($name);
+  }
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_DATE;
+  }
+  
+  /**
+   * Set the model for the field body.
+   * This method takes a UNIX timestamp.
+   * @param int $model
+   */
+  public function setFieldBodyModel($model)
+  {
+    $this->setTimestamp($model);
+  }
+  
+  /**
+   * Get the model for the field body.
+   * This method returns a UNIX timestamp.
+   * @return mixed
+   */
+  public function getFieldBodyModel()
+  {
+    return $this->getTimestamp();
+  }
+  
+  /**
+   * Get the UNIX timestamp of the Date in this Header.
+   * @return int
+   */
+  public function getTimestamp()
+  {
+    return $this->_timestamp;
+  }
+  
+  /**
+   * Set the UNIX timestamp of the Date in this Header.
+   * @param int $timestamp
+   */
+  public function setTimestamp($timestamp)
+  {
+    if (!is_null($timestamp))
+    {
+      $timestamp = (int) $timestamp;
+    }
+    $this->clearCachedValueIf($this->_timestamp != $timestamp);
+    $this->_timestamp = $timestamp;
+  }
+  
+  /**
+   * Get the string value of the body in this Header.
+   * This is not necessarily RFC 2822 compliant since folding white space will
+   * not be added at this stage (see {@link toString()} for that).
+   * @return string
+   * @see toString()
+   */
+  public function getFieldBody()
+  {
+    if (!$this->getCachedValue())
+    {
+      if (isset($this->_timestamp))
+      {
+        $this->setCachedValue(date('r', $this->_timestamp));
+      }
+    }
+    return $this->getCachedValue();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php
new file mode 100644
index 0000000..55ff737
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/AbstractHeader.php';
+//@require 'Swift/RfcComplianceException.php';
+
+/**
+ * An ID MIME Header for something like Message-ID or Content-ID.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_IdentificationHeader
+  extends Swift_Mime_Headers_AbstractHeader
+{
+  
+  /**
+   * The IDs used in the value of this Header.
+   * This may hold multiple IDs or just a single ID.
+   * @var string[]
+   * @access private
+   */
+  private $_ids = array();
+  
+  /**
+   * Creates a new IdentificationHeader with the given $name and $id.
+   * @param string $name
+   */
+  public function __construct($name)
+  {
+    $this->setFieldName($name);
+    $this->initializeGrammar();
+  }
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_ID;
+  }
+  
+  /**
+   * Set the model for the field body.
+   * This method takes a string ID, or an array of IDs
+   * @param mixed $model
+   * @throws Swift_RfcComplianceException
+   */
+  public function setFieldBodyModel($model)
+  {
+    $this->setId($model);
+  }
+  
+  /**
+   * Get the model for the field body.
+   * This method returns an array of IDs
+   * @return array
+   */
+  public function getFieldBodyModel()
+  {
+    return $this->getIds();
+  }
+  
+  /**
+   * Set the ID used in the value of this header.
+   * @param string $id
+   * @throws Swift_RfcComplianceException
+   */
+  public function setId($id)
+  {
+    return $this->setIds(array($id));
+  }
+  
+  /**
+   * Get the ID used in the value of this Header.
+   * If multiple IDs are set only the first is returned.
+   * @return string
+   */
+  public function getId()
+  {
+    if (count($this->_ids) > 0)
+    {
+      return $this->_ids[0];
+    }
+  }
+  
+  /**
+   * Set a collection of IDs to use in the value of this Header.
+   * @param string[] $ids
+   * @throws Swift_RfcComplianceException
+   */
+  public function setIds(array $ids)
+  {
+    $actualIds = array();
+    
+    foreach ($ids as $k => $id)
+    {
+      if (preg_match(
+        '/^' . $this->getGrammar('id-left') . '@' .
+        $this->getGrammar('id-right') . '$/D',
+        $id
+        ))
+      {
+        $actualIds[] = $id;
+      }
+      else
+      {
+        throw new Swift_RfcComplianceException(
+          'Invalid ID given <' . $id . '>'
+          );
+      }
+    }
+    
+    $this->clearCachedValueIf($this->_ids != $actualIds);
+    $this->_ids = $actualIds;
+  }
+  
+  /**
+   * Get the list of IDs used in this Header.
+   * @return string[]
+   */
+  public function getIds()
+  {
+    return $this->_ids;
+  }
+  
+  /**
+   * Get the string value of the body in this Header.
+   * This is not necessarily RFC 2822 compliant since folding white space will
+   * not be added at this stage (see {@link toString()} for that).
+   * @return string
+   * @see toString()
+   * @throws Swift_RfcComplianceException
+   */
+  public function getFieldBody()
+  {
+    if (!$this->getCachedValue())
+    {
+      $angleAddrs = array();
+    
+      foreach ($this->_ids as $id)
+      {
+        $angleAddrs[] = '<' . $id . '>';
+      }
+    
+      $this->setCachedValue(implode(' ', $angleAddrs));
+    }
+    return $this->getCachedValue();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php
new file mode 100644
index 0000000..77d3bba
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -0,0 +1,316 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/AbstractHeader.php';
+//@require 'Swift/Mime/HeaderEncoder.php';
+
+/**
+ * A Mailbox Address MIME Header for something like From or Sender.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
+{
+  
+  /**
+   * The mailboxes used in this Header.
+   * @var string[]
+   * @access private
+   */
+  private $_mailboxes = array();
+  
+  /**
+   * Creates a new MailboxHeader with $name.
+   * @param string $name of Header
+   * @param Swift_Mime_HeaderEncoder $encoder
+   */
+  public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
+  {
+    $this->setFieldName($name);
+    $this->setEncoder($encoder);
+    $this->initializeGrammar();
+  }
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_MAILBOX;
+  }
+  
+  /**
+   * Set the model for the field body.
+   * This method takes a string, or an array of addresses.
+   * @param mixed $model
+   * @throws Swift_RfcComplianceException
+   */
+  public function setFieldBodyModel($model)
+  {
+    $this->setNameAddresses($model);
+  }
+  
+  /**
+   * Get the model for the field body.
+   * This method returns an associative array like {@link getNameAddresses()}
+   * @return array
+   * @throws Swift_RfcComplianceException
+   */
+  public function getFieldBodyModel()
+  {
+    return $this->getNameAddresses();
+  }
+  
+  /**
+   * Set a list of mailboxes to be shown in this Header.
+   * The mailboxes can be a simple array of addresses, or an array of
+   * key=>value pairs where (email => personalName).
+   * Example:
+   * <code>
+   * <?php
+   * //Sets two mailboxes in the Header, one with a personal name
+   * $header->setNameAddresses(array(
+   *  'chris@swiftmailer.org' => 'Chris Corbyn',
+   *  'mark@swiftmailer.org' //No associated personal name
+   *  ));
+   * ?>
+   * </code>
+   * @param string|string[] $mailboxes
+   * @throws Swift_RfcComplianceException
+   * @see __construct()
+   * @see setAddresses()
+   * @see setValue()
+   */
+  public function setNameAddresses($mailboxes)
+  {
+    $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
+    $this->setCachedValue(null); //Clear any cached value
+  }
+  
+  /**
+   * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
+   * Example:
+   * <code>
+   * <?php
+   * $header = new Swift_Mime_Headers_MailboxHeader('From',
+   *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+   *  'mark@swiftmailer.org' => 'Mark Corbyn')
+   *  );
+   * print_r($header->getNameAddressStrings());
+   * // array (
+   * // 0 => Chris Corbyn <chris@swiftmailer.org>,
+   * // 1 => Mark Corbyn <mark@swiftmailer.org>
+   * // )
+   * ?>
+   * </code>
+   * @return string[]
+   * @throws Swift_RfcComplianceException
+   * @see getNameAddresses()
+   * @see toString()
+   */
+  public function getNameAddressStrings()
+  {
+    return $this->_createNameAddressStrings($this->getNameAddresses());
+  }
+  
+  /**
+   * Get all mailboxes in this Header as key=>value pairs.
+   * The key is the address and the value is the name (or null if none set).
+   * Example:
+   * <code>
+   * <?php
+   * $header = new Swift_Mime_Headers_MailboxHeader('From',
+   *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+   *  'mark@swiftmailer.org' => 'Mark Corbyn')
+   *  );
+   * print_r($header->getNameAddresses());
+   * // array (
+   * // chris@swiftmailer.org => Chris Corbyn,
+   * // mark@swiftmailer.org => Mark Corbyn
+   * // )
+   * ?>
+   * </code>
+   * @return string[]
+   * @see getAddresses()
+   * @see getNameAddressStrings()
+   */
+  public function getNameAddresses()
+  {
+    return $this->_mailboxes;
+  }
+  
+  /**
+   * Makes this Header represent a list of plain email addresses with no names.
+   * Example:
+   * <code>
+   * <?php
+   * //Sets three email addresses as the Header data
+   * $header->setAddresses(
+   *  array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
+   *  );
+   * ?>
+   * </code>
+   * @param string[] $addresses
+   * @throws Swift_RfcComplianceException
+   * @see setNameAddresses()
+   * @see setValue()
+   */
+  public function setAddresses($addresses)
+  {
+    return $this->setNameAddresses(array_values((array) $addresses));
+  }
+  
+  /**
+   * Get all email addresses in this Header.
+   * @return string[]
+   * @see getNameAddresses()
+   */
+  public function getAddresses()
+  {
+    return array_keys($this->_mailboxes);
+  }
+  
+  /**
+   * Remove one or more addresses from this Header.
+   * @param string|string[] $addresses
+   */
+  public function removeAddresses($addresses)
+  {
+    $this->setCachedValue(null);
+    foreach ((array) $addresses as $address)
+    {
+      unset($this->_mailboxes[$address]);
+    }
+  }
+  
+  /**
+   * Get the string value of the body in this Header.
+   * This is not necessarily RFC 2822 compliant since folding white space will
+   * not be added at this stage (see {@link toString()} for that).
+   * @return string
+   * @throws Swift_RfcComplianceException
+   * @see toString()
+   */
+  public function getFieldBody()
+  {
+    //Compute the string value of the header only if needed
+    if (is_null($this->getCachedValue()))
+    {
+      $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
+    }
+    return $this->getCachedValue();
+  }
+  
+  // -- Points of extension
+  
+  /**
+   * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
+   * @param string[] $mailboxes
+   * @return string[]
+   * @access protected
+   */
+  protected function normalizeMailboxes(array $mailboxes)
+  {
+    $actualMailboxes = array();
+    
+    foreach ($mailboxes as $key => $value)
+    {
+      if (is_string($key)) //key is email addr
+      {
+        $address = $key;
+        $name = $value;
+      }
+      else
+      {
+        $address = $value;
+        $name = null;
+      }
+      $this->_assertValidAddress($address);
+      $actualMailboxes[$address] = $name;
+    }
+    
+    return $actualMailboxes;
+  }
+  
+  /**
+   * Produces a compliant, formatted display-name based on the string given.
+   * @param string $displayName as displayed
+   * @param boolean $shorten the first line to make remove for header name
+   * @return string
+   * @access protected
+   */
+  protected function createDisplayNameString($displayName, $shorten = false)
+  {
+    return $this->createPhrase($this, $displayName,
+      $this->getCharset(), $this->getEncoder(), $shorten
+      );
+  }
+  
+  /**
+   * Creates a string form of all the mailboxes in the passed array.
+   * @param string[] $mailboxes
+   * @return string
+   * @throws Swift_RfcComplianceException
+   * @access protected
+   */
+  protected function createMailboxListString(array $mailboxes)
+  {
+    return implode(', ', $this->_createNameAddressStrings($mailboxes));
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Return an array of strings conforming the the name-addr spec of RFC 2822.
+   * @param string[] $mailboxes
+   * @return string[]
+   * @access private
+   */
+  private function _createNameAddressStrings(array $mailboxes)
+  {
+    $strings = array();
+    
+    foreach ($mailboxes as $email => $name)
+    {
+      $mailboxStr = $email;
+      if (!is_null($name))
+      {
+        $nameStr = $this->createDisplayNameString($name, empty($strings));
+        $mailboxStr = $nameStr . ' <' . $mailboxStr . '>';
+      }
+      $strings[] = $mailboxStr;
+    }
+    
+    return $strings;
+  }
+  
+  /**
+   * Throws an Exception if the address passed does not comply with RFC 2822.
+   * @param string $address
+   * @throws Exception If invalid.
+   * @access protected
+   */
+  private function _assertValidAddress($address)
+  {
+    if (!preg_match('/^' . $this->getGrammar('addr-spec') . '$/D',
+      $address))
+    {
+      throw new Swift_RfcComplianceException(
+        'Address in mailbox given [' . $address .
+        '] does not comply with RFC 2822, 3.6.2.'
+        );
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php
new file mode 100644
index 0000000..974b44e
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -0,0 +1,274 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/UnstructuredHeader.php';
+//@require 'Swift/Mime/HeaderEncoder.php';
+//@require 'Swift/Mime/ParameterizedHeader.php';
+//@require 'Swift/Encoder.php';
+
+/**
+ * An abstract base MIME Header.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_ParameterizedHeader
+  extends Swift_Mime_Headers_UnstructuredHeader
+  implements Swift_Mime_ParameterizedHeader
+{
+  
+  /**
+   * The Encoder used to encode the parameters.
+   * @var Swift_Encoder
+   * @access private
+   */
+  private $_paramEncoder;
+  
+  /**
+   * The parameters as an associative array.
+   * @var string[]
+   * @access private
+   */
+  private $_params = array();
+  
+  /**
+   * RFC 2231's definition of a token.
+   * @var string
+   * @access private
+   */
+  private $_tokenRe;
+  
+  /**
+   * Creates a new ParameterizedHeader with $name.
+   * @param string $name
+   * @param Swift_Mime_HeaderEncoder $encoder
+   * @param Swift_Encoder $paramEncoder, optional
+   */ 
+  public function __construct($name, Swift_Mime_HeaderEncoder $encoder,
+    Swift_Encoder $paramEncoder = null)
+  {
+    $this->setFieldName($name);
+    $this->setEncoder($encoder);
+    $this->_paramEncoder = $paramEncoder;
+    $this->initializeGrammar();
+    $this->_tokenRe = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
+  }
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_PARAMETERIZED;
+  }
+  
+  /**
+   * Set the character set used in this Header.
+   * @param string $charset
+   */
+  public function setCharset($charset)
+  {
+    parent::setCharset($charset);
+    if (isset($this->_paramEncoder))
+    {
+      $this->_paramEncoder->charsetChanged($charset);
+    }
+  }
+  
+  /**
+   * Set the value of $parameter.
+   * @param string $parameter
+   * @param string $value
+   */
+  public function setParameter($parameter, $value)
+  {
+    $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+  }
+  
+  /**
+   * Get the value of $parameter.
+   * @return string
+   */
+  public function getParameter($parameter)
+  {
+    $params = $this->getParameters();
+    return array_key_exists($parameter, $params)
+      ? $params[$parameter]
+      : null;
+  }
+  
+  /**
+   * Set an associative array of parameter names mapped to values.
+   * @param string[]
+   */
+  public function setParameters(array $parameters)
+  {
+    $this->clearCachedValueIf($this->_params != $parameters);
+    $this->_params = $parameters;
+  }
+  
+  /**
+   * Returns an associative array of parameter names mapped to values.
+   * @return string[]
+   */
+  public function getParameters()
+  {
+    return $this->_params;
+  }
+  
+  /**
+   * Get the value of this header prepared for rendering.
+   * @return string
+   */
+  public function getFieldBody() //TODO: Check caching here
+  {
+    $body = parent::getFieldBody();
+    foreach ($this->_params as $name => $value)
+    {
+      if (!is_null($value))
+      {
+        //Add the parameter
+        $body .= '; ' . $this->_createParameter($name, $value);
+      }
+    }
+    return $body;
+  }
+  
+  // -- Protected methods
+  
+  /**
+   * Generate a list of all tokens in the final header.
+   * This doesn't need to be overridden in theory, but it is for implementation
+   * reasons to prevent potential breakage of attributes.
+   * @return string[]
+   * @access protected
+   */
+  protected function toTokens($string = null)
+  {
+    $tokens = parent::toTokens(parent::getFieldBody());
+    
+    //Try creating any parameters
+    foreach ($this->_params as $name => $value)
+    {
+      if (!is_null($value))
+      {
+        //Add the semi-colon separator
+        $tokens[count($tokens)-1] .= ';';
+        $tokens = array_merge($tokens, $this->generateTokenLines(
+          ' ' . $this->_createParameter($name, $value)
+          ));
+      }
+    }
+    
+    return $tokens;
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Render a RFC 2047 compliant header parameter from the $name and $value.
+   * @param string $name
+   * @param string $value
+   * @return string
+   * @access private
+   */
+  private function _createParameter($name, $value)
+  {
+    $origValue = $value;
+    
+    $encoded = false;
+    //Allow room for parameter name, indices, "=" and DQUOTEs
+    $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1;
+    $firstLineOffset = 0;
+    
+    //If it's not already a valid parameter value...
+    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
+    {
+      //TODO: text, or something else??
+      //... and it's not ascii
+      if (!preg_match('/^' . $this->getGrammar('text') . '*$/D', $value))
+      {
+        $encoded = true;
+        //Allow space for the indices, charset and language
+        $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1;
+        $firstLineOffset = strlen(
+          $this->getCharset() . "'" . $this->getLanguage() . "'"
+          );
+      }
+    }
+    
+    //Encode if we need to
+    if ($encoded || strlen($value) > $maxValueLength)
+    {
+      if (isset($this->_paramEncoder))
+      {
+        $value = $this->_paramEncoder->encodeString(
+          $origValue, $firstLineOffset, $maxValueLength
+          );
+      }
+      else //We have to go against RFC 2183/2231 in some areas for interoperability
+      {
+        $value = $this->getTokenAsEncodedWord($origValue);
+        $encoded = false;
+      }
+    }
+    
+    $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
+    
+    //Need to add indices
+    if (count($valueLines) > 1)
+    {
+      $paramLines = array();
+      foreach ($valueLines as $i => $line)
+      {
+        $paramLines[] = $name . '*' . $i .
+          $this->_getEndOfParameterValue($line, $encoded, $i == 0);
+      }
+      return implode(";\r\n ", $paramLines);
+    }
+    else
+    {
+      return $name . $this->_getEndOfParameterValue(
+        $valueLines[0], $encoded, true
+        );
+    }
+  }
+  
+  /**
+   * Returns the parameter value from the "=" and beyond.
+   * @param string $value to append
+   * @param boolean $encoded
+   * @param boolean $firstLine
+   * @return string
+   * @access private
+   */
+  private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
+  {
+    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
+    {
+      $value = '"' . $value . '"';
+    }
+    $prepend = '=';
+    if ($encoded)
+    {
+      $prepend = '*=';
+      if ($firstLine)
+      {
+        $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() .
+          "'";
+      }
+    }
+    return $prepend . $value;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php
new file mode 100644
index 0000000..0a8a100
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/PathHeader.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/AbstractHeader.php';
+//@require 'Swift/RfcComplianceException.php';
+
+/**
+ * A Path Header in Swift Mailer, such a Return-Path.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
+{
+  
+  /**
+   * The address in this Header (if specified).
+   * @var string
+   * @access private
+   */
+  private $_address;
+  
+  /**
+   * Creates a new PathHeader with the given $name.
+   * @param string $name
+   */
+  public function __construct($name)
+  {
+    $this->setFieldName($name);
+    $this->initializeGrammar();
+  }
+  
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_PATH;
+  }
+  
+  /**
+   * Set the model for the field body.
+   * This method takes a string for an address.
+   * @param string $model
+   * @throws Swift_RfcComplianceException
+   */
+  public function setFieldBodyModel($model)
+  {
+    $this->setAddress($model);
+  }
+  
+  /**
+   * Get the model for the field body.
+   * This method returns a string email address.
+   * @return mixed
+   */
+  public function getFieldBodyModel()
+  {
+    return $this->getAddress();
+  }
+  
+  /**
+   * Set the Address which should appear in this Header.
+   * @param string $address
+   * @throws Swift_RfcComplianceException
+   */
+  public function setAddress($address)
+  {
+    if (is_null($address))
+    {
+      $this->_address = null;
+    }
+    elseif ('' == $address
+      || preg_match('/^' . $this->getGrammar('addr-spec') . '$/D', $address))
+    {
+      $this->_address = $address;
+    }
+    else
+    {
+      throw new Swift_RfcComplianceException(
+        'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
+        );
+    }
+    $this->setCachedValue(null);
+  }
+  
+  /**
+   * Get the address which is used in this Header (if any).
+   * Null is returned if no address is set.
+   * @return string
+   */
+  public function getAddress()
+  {
+    return $this->_address;
+  }
+  
+  /**
+   * Get the string value of the body in this Header.
+   * This is not necessarily RFC 2822 compliant since folding white space will
+   * not be added at this stage (see {@link toString()} for that).
+   * @return string
+   * @see toString()
+   */
+  public function getFieldBody()
+  {
+    if (!$this->getCachedValue())
+    {
+      if (isset($this->_address))
+      {
+        $this->setCachedValue('<' . $this->_address . '>');
+      }
+    }
+    return $this->getCachedValue();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php
new file mode 100644
index 0000000..fdcc21e
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Headers/AbstractHeader.php';
+//@require 'Swift/Mime/HeaderEncoder.php';
+
+/**
+ * A Simple MIME Header.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_UnstructuredHeader
+  extends Swift_Mime_Headers_AbstractHeader
+{
+  
+  /**
+   * The value of this Header.
+   * @var string
+   * @access private
+   */
+  private $_value;
+  
+  /**
+   * Creates a new SimpleHeader with $name.
+   * @param string $name
+   * @param Swift_Mime_HeaderEncoder $encoder
+   */
+  public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
+  {
+    $this->setFieldName($name);
+    $this->setEncoder($encoder);
+  }
+  /**
+   * Get the type of Header that this instance represents.
+   * @return int
+   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+   */
+  public function getFieldType()
+  {
+    return self::TYPE_TEXT;
+  }
+  
+  /**
+   * Set the model for the field body.
+   * This method takes a string for the field value.
+   * @param string $model
+   */
+  public function setFieldBodyModel($model)
+  {
+    $this->setValue($model);
+  }
+  
+  /**
+   * Get the model for the field body.
+   * This method returns a string.
+   * @return string
+   */
+  public function getFieldBodyModel()
+  {
+    return $this->getValue();
+  }
+  
+  /**
+   * Get the (unencoded) value of this header.
+   * @return string
+   */
+  public function getValue()
+  {
+    return $this->_value;
+  }
+  
+  /**
+   * Set the (unencoded) value of this header.
+   * @param string $value
+   */
+  public function setValue($value)
+  {
+    $this->clearCachedValueIf($this->_value != $value);
+    $this->_value = $value;
+  }
+  
+  /**
+   * Get the value of this header prepared for rendering.
+   * @return string
+   */
+  public function getFieldBody()
+  {
+    if (!$this->getCachedValue())
+    {
+      $this->setCachedValue(
+        str_replace('\\', '\\\\', $this->encodeWords(
+          $this, $this->_value, -1, $this->getCharset(), $this->getEncoder()
+          ))
+        );
+    }
+    return $this->getCachedValue();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php
new file mode 100644
index 0000000..0496c08
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/Message.php
@@ -0,0 +1,230 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/MimeEntity.php';
+
+/**
+ * A Message (RFC 2822) object.
+ * 
+ * @package Swift
+ * @subpackage Mime
+ * 
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_Message extends Swift_Mime_MimeEntity
+{
+  
+  /**
+   * Generates a valid Message-ID and switches to it.
+   * 
+   * @return string
+   */
+  public function generateId();
+  
+  /**
+   * Set the subject of the message.
+   * 
+   * @param string $subject
+   */
+  public function setSubject($subject);
+  
+  /**
+   * Get the subject of the message.
+   * 
+   * @return string
+   */
+  public function getSubject();
+  
+  /**
+   * Set the origination date of the message as a UNIX timestamp.
+   * 
+   * @param int $date
+   */
+  public function setDate($date);
+  
+  /**
+   * Get the origination date of the message as a UNIX timestamp.
+   * 
+   * @return int
+   */
+  public function getDate();
+  
+  /**
+   * Set the return-path (bounce-detect) address.
+   * 
+   * @param string $address
+   */
+  public function setReturnPath($address);
+  
+  /**
+   * Get the return-path (bounce-detect) address.
+   * 
+   * @return string
+   */
+  public function getReturnPath();
+  
+  /**
+   * Set the sender of this message.
+   * 
+   * If multiple addresses are present in the From field, this SHOULD be set.
+   * 
+   * According to RFC 2822 it is a requirement when there are multiple From
+   * addresses, but Swift itself does not require it directly.
+   * 
+   * An associative array (with one element!) can be used to provide a display-
+   * name: i.e. array('email@address' => 'Real Name').
+   * 
+   * If the second parameter is provided and the first is a string, then $name
+   * is associated with the address.
+   * 
+   * @param mixed $address
+   * @param string $name optional
+   */
+  public function setSender($address, $name = null);
+  
+  /**
+   * Get the sender address for this message.
+   * 
+   * This has a higher significance than the From address.
+   * 
+   * @return string
+   */
+  public function getSender();
+  
+  /**
+   * Set the From address of this message.
+   * 
+   * It is permissible for multiple From addresses to be set using an array.
+   * 
+   * If multiple From addresses are used, you SHOULD set the Sender address and
+   * according to RFC 2822, MUST set the sender address.
+   * 
+   * An array can be used if display names are to be provided: i.e.
+   * array('email@address.com' => 'Real Name').
+   * 
+   * If the second parameter is provided and the first is a string, then $name
+   * is associated with the address.
+   *
+   * @param mixed $addresses
+   * @param string $name optional
+   */
+  public function setFrom($addresses, $name = null);
+  
+  /**
+   * Get the From address(es) of this message.
+   * 
+   * This method always returns an associative array where the keys are the
+   * addresses.
+   * 
+   * @return string[]
+   */
+  public function getFrom();
+  
+  /**
+   * Set the Reply-To address(es).
+   * 
+   * Any replies from the receiver will be sent to this address.
+   * 
+   * It is permissible for multiple reply-to addresses to be set using an array.
+   * 
+   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+   * 
+   * If the second parameter is provided and the first is a string, then $name
+   * is associated with the address.
+   * 
+   * @param mixed $addresses
+   * @param string $name optional
+   */
+  public function setReplyTo($addresses, $name = null);
+  
+  /**
+   * Get the Reply-To addresses for this message.
+   * 
+   * This method always returns an associative array where the keys provide the
+   * email addresses.
+   * 
+   * @return string[]
+   */
+  public function getReplyTo();
+  
+  /**
+   * Set the To address(es).
+   * 
+   * Recipients set in this field will receive a copy of this message.
+   * 
+   * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
+   * 
+   * If the second parameter is provided and the first is a string, then $name
+   * is associated with the address.
+   * 
+   * @param mixed $addresses
+   * @param string $name optional
+   */
+  public function setTo($addresses, $name = null);
+  
+  /**
+   * Get the To addresses for this message.
+   * 
+   * This method always returns an associative array, whereby the keys provide
+   * the actual email addresses.
+   * 
+   * @return string[]
+   */
+  public function getTo();
+  
+  /**
+   * Set the Cc address(es).
+   * 
+   * Recipients set in this field will receive a 'carbon-copy' of this message.
+   * 
+   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+   * 
+   * @param mixed $addresses
+   * @param string $name optional
+   */
+  public function setCc($addresses, $name = null);
+  
+  /**
+   * Get the Cc addresses for this message.
+   * 
+   * This method always returns an associative array, whereby the keys provide
+   * the actual email addresses.
+   * 
+   * @return string[]
+   */
+  public function getCc();
+  
+  /**
+   * Set the Bcc address(es).
+   * 
+   * Recipients set in this field will receive a 'blind-carbon-copy' of this
+   * message.
+   * 
+   * In other words, they will get the message, but any other recipients of the
+   * message will have no such knowledge of their receipt of it.
+   * 
+   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+   * 
+   * @param mixed $addresses
+   * @param string $name optional
+   */
+  public function setBcc($addresses, $name = null);
+  
+  /**
+   * Get the Bcc addresses for this message.
+   * 
+   * This method always returns an associative array, whereby the keys provide
+   * the actual email addresses.
+   * 
+   * @return string[]
+   */
+  public function getBcc();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php
new file mode 100644
index 0000000..2b08009
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimeEntity.php
@@ -0,0 +1,108 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/Mime/EncodingObserver.php';
+//@require 'Swift/Mime/CharsetObserver.php';
+
+/**
+ * A MIME entity, such as an attachment.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_MimeEntity
+  extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
+{
+  
+  /** Main message document; there can only be one of these */
+  const LEVEL_TOP = 16;
+  
+  /** An entity which nests with the same precedence as an attachment */
+  const LEVEL_MIXED = 256;
+  
+  /** An entity which nests with the same precedence as a mime part */
+  const LEVEL_ALTERNATIVE = 4096;
+  
+  /** An entity which nests with the same precedence as embedded content */
+  const LEVEL_RELATED = 65536;
+  
+  /**
+   * Get the level at which this entity shall be nested in final document.
+   * The lower the value, the more outermost the entity will be nested.
+   * @return int
+   * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
+   */
+  public function getNestingLevel();
+  
+  /**
+   * Get the qualified content-type of this mime entity.
+   * @return string
+   */
+  public function getContentType();
+  
+  /**
+   * Returns a unique ID for this entity.
+   * For most entities this will likely be the Content-ID, though it has
+   * no explicit semantic meaning and can be considered an identifier for
+   * programming logic purposes.
+   * If a Content-ID header is present, this value SHOULD match the value of
+   * the header.
+   * @return string
+   */
+  public function getId();
+  
+  /**
+   * Get all children nested inside this entity.
+   * These are not just the immediate children, but all children.
+   * @return Swift_Mime_MimeEntity[]
+   */
+  public function getChildren();
+  
+  /**
+   * Set all children nested inside this entity.
+   * This includes grandchildren.
+   * @param Swift_Mime_MimeEntity[] $children
+   */
+  public function setChildren(array $children);
+  
+  /**
+   * Get the collection of Headers in this Mime entity.
+   * @return Swift_Mime_Header[]
+   */
+  public function getHeaders();
+  
+  /**
+   * Get the body content of this entity as a string.
+   * Returns NULL if no body has been set.
+   * @return string
+   */
+  public function getBody();
+  
+  /**
+   * Set the body content of this entity as a string.
+   * @param string $body
+   * @param string $contentType optional
+   */
+  public function setBody($body, $contentType = null);
+  
+  /**
+   * Get this entire entity in its string form.
+   * @return string
+   */
+  public function toString();
+  
+  /**
+   * Get this entire entity as a ByteStream.
+   * @param Swift_InputByteStream $is to write to
+   */
+  public function toByteStream(Swift_InputByteStream $is);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php
new file mode 100644
index 0000000..78c6fe0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/MimePart.php
@@ -0,0 +1,196 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/SimpleMimeEntity.php';
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/Mime/HeaderSet.php';
+//@require 'Swift/KeyCache.php';
+
+/**
+ * A MIME part, in a multipart message.
+ * 
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
+{
+  
+  /** The format parameter last specified by the user */
+  protected $_userFormat;
+  
+  /** The charset last specified by the user */
+  protected $_userCharset;
+  
+  /** The delsp parameter last specified by the user */
+  protected $_userDelSp;
+  
+  /** The nesting level of this MimePart */
+  private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+  
+  /**
+   * Create a new MimePart with $headers, $encoder and $cache.
+   * 
+   * @param Swift_Mime_HeaderSet $headers
+   * @param Swift_Mime_ContentEncoder $encoder
+   * @param Swift_KeyCache $cache
+   * @param string $charset
+   */
+  public function __construct(Swift_Mime_HeaderSet $headers,
+    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, $charset = null)
+  {
+    parent::__construct($headers, $encoder, $cache);
+    $this->setContentType('text/plain');
+    if (!is_null($charset))
+    {
+      $this->setCharset($charset);
+    }
+  }
+  
+  /**
+   * Set the body of this entity, either as a string, or as an instance of
+   * {@link Swift_OutputByteStream}.
+   * 
+   * @param mixed $body
+   * @param string $contentType optional
+   * @param string $charset optional
+   */
+  public function setBody($body, $contentType = null, $charset = null)
+  {
+    parent::setBody($body, $contentType);
+    if (isset($charset))
+    {
+      $this->setCharset($charset);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the character set of this entity.
+   * 
+   * @return string
+   */
+  public function getCharset()
+  {
+    return $this->_getHeaderParameter('Content-Type', 'charset');
+  }
+  
+  /**
+   * Set the character set of this entity.
+   * 
+   * @param string $charset
+   */
+  public function setCharset($charset)
+  {
+    $this->_setHeaderParameter('Content-Type', 'charset', $charset);
+    if ($charset !== $this->_userCharset)
+    {
+      $this->_clearCache();
+    }
+    $this->_userCharset = $charset;
+    parent::charsetChanged($charset);
+    return $this;
+  }
+  
+  /**
+   * Get the format of this entity (i.e. flowed or fixed).
+   * 
+   * @return string
+   */
+  public function getFormat()
+  {
+    return $this->_getHeaderParameter('Content-Type', 'format');
+  }
+  
+  /**
+   * Set the format of this entity (flowed or fixed).
+   * 
+   * @param string $format
+   */
+  public function setFormat($format)
+  {
+    $this->_setHeaderParameter('Content-Type', 'format', $format);
+    $this->_userFormat = $format;
+    return $this;
+  }
+  
+  /**
+   * Test if delsp is being used for this entity.
+   * 
+   * @return boolean
+   */
+  public function getDelSp()
+  {
+    return ($this->_getHeaderParameter('Content-Type', 'delsp') == 'yes')
+      ? true
+      : false;
+  }
+  
+  /**
+   * Turn delsp on or off for this entity.
+   * 
+   * @param boolean $delsp
+   */
+  public function setDelSp($delsp = true)
+  {
+    $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
+    $this->_userDelSp = $delsp;
+    return $this;
+  }
+  
+  /**
+   * Get the nesting level of this entity.
+   * 
+   * @return int
+   * @see LEVEL_TOP, LEVEL_ALTERNATIVE, LEVEL_MIXED, LEVEL_RELATED
+   */
+  public function getNestingLevel()
+  {
+    return $this->_nestingLevel;
+  }
+  
+  /**
+   * Receive notification that the charset has changed on this document, or a
+   * parent document.
+   * 
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->setCharset($charset);
+  }
+  
+  // -- Protected methods
+  
+  /** Fix the content-type and encoding of this entity */
+  protected function _fixHeaders()
+  {
+    parent::_fixHeaders();
+    if (count($this->getChildren()))
+    {
+      $this->_setHeaderParameter('Content-Type', 'charset', null);
+      $this->_setHeaderParameter('Content-Type', 'format', null);
+      $this->_setHeaderParameter('Content-Type', 'delsp', null);
+    }
+    else
+    {
+      $this->setCharset($this->_userCharset);
+      $this->setFormat($this->_userFormat);
+      $this->setDelSp($this->_userDelSp);
+    }
+  }
+  
+  /** Set the nesting level of this entity */
+  protected function _setNestingLevel($level)
+  {
+    $this->_nestingLevel = $level;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php
new file mode 100644
index 0000000..da65ca9
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/ParameterizedHeader.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Header.php';
+
+/**
+ * A MIME Header with parameters.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_ParameterizedHeader extends Swift_Mime_Header
+{
+  
+  /**
+   * Set the value of $parameter.
+   * @param string $parameter
+   * @param string $value
+   */
+  public function setParameter($parameter, $value);
+  
+  /**
+   * Get the value of $parameter.
+   * @return string
+   */
+  public function getParameter($parameter);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php
new file mode 100644
index 0000000..6954ac5
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -0,0 +1,187 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/HeaderFactory.php';
+//@require 'Swift/Mime/HeaderEncoder.php';
+//@require 'Swift/Encoder.php';
+//@require 'Swift/Mime/Headers/MailboxHeader.php';
+//@require 'Swift/Mime/Headers/DateHeader.php';
+//@require 'Swift/Mime/Headers/UnstructuredHeader.php';
+//@require 'Swift/Mime/Headers/ParameterizedHeader.php';
+//@require 'Swift/Mime/Headers/IdentificationHeader.php';
+//@require 'Swift/Mime/Headers/PathHeader.php';
+
+/**
+ * Creates MIME headers.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
+{
+
+  /** The HeaderEncoder used by these headers */
+  private $_encoder;
+  
+  /** The Encoder used by parameters */
+  private $_paramEncoder;
+  
+  /** The charset of created Headers */
+  private $_charset;
+  
+  /**
+   * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
+   * @param Swift_Mime_HeaderEncoder $encoder
+   * @param Swift_Encoder $paramEncoder
+   * @param string $charset
+   */
+  public function __construct(Swift_Mime_HeaderEncoder $encoder,
+    Swift_Encoder $paramEncoder, $charset = null)
+  {
+    $this->_encoder = $encoder;
+    $this->_paramEncoder = $paramEncoder;
+    $this->_charset = $charset;
+  }
+  
+  /**
+   * Create a new Mailbox Header with a list of $addresses.
+   * @param string $name
+   * @param array|string $addresses
+   * @return Swift_Mime_Header
+   */
+  public function createMailboxHeader($name, $addresses = null)
+  {
+    $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder);
+    if (isset($addresses))
+    {
+      $header->setFieldBodyModel($addresses);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Create a new Date header using $timestamp (UNIX time).
+   * @param string $name
+   * @param int $timestamp
+   * @return Swift_Mime_Header
+   */
+  public function createDateHeader($name, $timestamp = null)
+  {
+    $header = new Swift_Mime_Headers_DateHeader($name);
+    if (isset($timestamp))
+    {
+      $header->setFieldBodyModel($timestamp);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Create a new basic text header with $name and $value.
+   * @param string $name
+   * @param string $value
+   * @return Swift_Mime_Header
+   */
+  public function createTextHeader($name, $value = null)
+  {
+    $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder);
+    if (isset($value))
+    {
+      $header->setFieldBodyModel($value);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Create a new ParameterizedHeader with $name, $value and $params.
+   * @param string $name
+   * @param string $value
+   * @param array $params
+   * @return Swift_Mime_ParameterizedHeader
+   */
+  public function createParameterizedHeader($name, $value = null,
+    $params = array())
+  {
+    $header = new Swift_Mime_Headers_ParameterizedHeader($name,
+      $this->_encoder, (strtolower($name) == 'content-disposition')
+        ? $this->_paramEncoder
+        : null
+      );
+    if (isset($value))
+    {
+      $header->setFieldBodyModel($value);
+    }
+    foreach ($params as $k => $v)
+    {
+      $header->setParameter($k, $v);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Create a new ID header for Message-ID or Content-ID.
+   * @param string $name
+   * @param string|array $ids
+   * @return Swift_Mime_Header
+   */
+  public function createIdHeader($name, $ids = null)
+  {
+    $header = new Swift_Mime_Headers_IdentificationHeader($name);
+    if (isset($ids))
+    {
+      $header->setFieldBodyModel($ids);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Create a new Path header with an address (path) in it.
+   * @param string $name
+   * @param string $path
+   * @return Swift_Mime_Header
+   */
+  public function createPathHeader($name, $path = null)
+  {
+    $header = new Swift_Mime_Headers_PathHeader($name);
+    if (isset($path))
+    {
+      $header->setFieldBodyModel($path);
+    }
+    $this->_setHeaderCharset($header);
+    return $header;
+  }
+  
+  /**
+   * Notify this observer that the entity's charset has changed.
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->_charset = $charset;
+    $this->_encoder->charsetChanged($charset);
+    $this->_paramEncoder->charsetChanged($charset);
+  }
+  
+  // -- Private methods
+  
+  /** Apply the charset to the Header */
+  private function _setHeaderCharset(Swift_Mime_Header $header)
+  {
+    if (isset($this->_charset))
+    {
+      $header->setCharset($this->_charset);
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php
new file mode 100644
index 0000000..eeb0221
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleHeaderSet.php
@@ -0,0 +1,396 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/HeaderSet.php';
+//@require 'Swift/Mime/HeaderFactory.php';
+
+/**
+ * A collection of MIME headers.
+ * 
+ * @package Swift
+ * @subpackage Mime
+ * 
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
+{
+  
+  /** HeaderFactory */
+  private $_factory;
+  
+  /** Collection of set Headers */
+  private $_headers = array();
+  
+  /** Field ordering details */
+  private $_order = array();
+  
+  /** List of fields which are required to be displayed */
+  private $_required = array();
+  
+  /** The charset used by Headers */
+  private $_charset;
+  
+  /**
+   * Create a new SimpleHeaderSet with the given $factory.
+   * 
+   * @param Swift_Mime_HeaderFactory $factory
+   * @param string $charset
+   */
+  public function __construct(Swift_Mime_HeaderFactory $factory,
+    $charset = null)
+  {
+    $this->_factory = $factory;
+    if (isset($charset))
+    {
+      $this->setCharset($charset);
+    }
+  }
+  
+  /**
+   * Set the charset used by these headers.
+   * 
+   * @param string $charset
+   */
+  public function setCharset($charset)
+  {
+    $this->_charset = $charset;
+    $this->_factory->charsetChanged($charset);
+    $this->_notifyHeadersOfCharset($charset);
+  }
+  
+  /**
+   * Add a new Mailbox Header with a list of $addresses.
+   * 
+   * @param string $name
+   * @param array|string $addresses
+   */
+  public function addMailboxHeader($name, $addresses = null)
+  {
+    $this->_storeHeader($name,
+      $this->_factory->createMailboxHeader($name, $addresses));
+  }
+  
+  /**
+   * Add a new Date header using $timestamp (UNIX time).
+   * 
+   * @param string $name
+   * @param int $timestamp
+   */
+  public function addDateHeader($name, $timestamp = null)
+  {
+    $this->_storeHeader($name,
+      $this->_factory->createDateHeader($name, $timestamp));
+  }
+  
+  /**
+   * Add a new basic text header with $name and $value.
+   * 
+   * @param string $name
+   * @param string $value
+   */
+  public function addTextHeader($name, $value = null)
+  {
+    $this->_storeHeader($name,
+      $this->_factory->createTextHeader($name, $value));
+  }
+  
+  /**
+   * Add a new ParameterizedHeader with $name, $value and $params.
+   * 
+   * @param string $name
+   * @param string $value
+   * @param array $params
+   */
+  public function addParameterizedHeader($name, $value = null,
+    $params = array())
+  {
+    $this->_storeHeader($name,
+      $this->_factory->createParameterizedHeader($name, $value,
+      $params));
+  }
+  
+  /**
+   * Add a new ID header for Message-ID or Content-ID.
+   * 
+   * @param string $name
+   * @param string|array $ids
+   */
+  public function addIdHeader($name, $ids = null)
+  {
+    $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
+  }
+  
+  /**
+   * Add a new Path header with an address (path) in it.
+   * 
+   * @param string $name
+   * @param string $path
+   */
+  public function addPathHeader($name, $path = null)
+  {
+    $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
+  }
+  
+  /**
+   * Returns true if at least one header with the given $name exists.
+   * 
+   * If multiple headers match, the actual one may be specified by $index.
+   * 
+   * @param string $name
+   * @param int $index
+   * 
+   * @return boolean
+   */
+  public function has($name, $index = 0)
+  {
+    $lowerName = strtolower($name);
+    return array_key_exists($lowerName, $this->_headers)
+      && array_key_exists($index, $this->_headers[$lowerName]);
+  }
+  
+  /**
+   * Set a header in the HeaderSet.
+   * 
+   * The header may be a previously fetched header via {@link get()} or it may
+   * be one that has been created separately.
+   * 
+   * If $index is specified, the header will be inserted into the set at this
+   * offset.
+   * 
+   * @param Swift_Mime_Header $header
+   * @param int $index
+   */
+  public function set(Swift_Mime_Header $header, $index = 0)
+  {
+    $this->_storeHeader($header->getFieldName(), $header, $index);
+  }
+  
+  /**
+   * Get the header with the given $name.
+   * 
+   * If multiple headers match, the actual one may be specified by $index.
+   * Returns NULL if none present.
+   * 
+   * @param string $name
+   * @param int $index
+   * 
+   * @return Swift_Mime_Header
+   */
+  public function get($name, $index = 0)
+  {
+    if ($this->has($name, $index))
+    {
+      $lowerName = strtolower($name);
+      return $this->_headers[$lowerName][$index];
+    }
+  }
+  
+  /**
+   * Get all headers with the given $name.
+   * 
+   * @param string $name
+   * 
+   * @return array
+   */
+  public function getAll($name = null)
+  {
+    if (!isset($name))
+    {
+      $headers = array();
+      foreach ($this->_headers as $collection)
+      {
+        $headers = array_merge($headers, $collection);
+      }
+      return $headers;
+    }
+    
+    $lowerName = strtolower($name);
+    if (!array_key_exists($lowerName, $this->_headers))
+    {
+      return array();
+    }
+    return $this->_headers[$lowerName];
+  }
+  
+  /**
+   * Remove the header with the given $name if it's set.
+   * 
+   * If multiple headers match, the actual one may be specified by $index.
+   * 
+   * @param string $name
+   * @param int $index
+   */
+  public function remove($name, $index = 0)
+  {
+    $lowerName = strtolower($name);
+    unset($this->_headers[$lowerName][$index]);
+  }
+  
+  /**
+   * Remove all headers with the given $name.
+   * 
+   * @param string $name
+   */
+  public function removeAll($name)
+  {
+    $lowerName = strtolower($name);
+    unset($this->_headers[$lowerName]);
+  }
+  
+  /**
+   * Create a new instance of this HeaderSet.
+   * 
+   * @return Swift_Mime_HeaderSet
+   */
+  public function newInstance()
+  {
+    return new self($this->_factory);
+  }
+  
+  /**
+   * Define a list of Header names as an array in the correct order.
+   * 
+   * These Headers will be output in the given order where present.
+   * 
+   * @param array $sequence
+   */
+  public function defineOrdering(array $sequence)
+  {
+    $this->_order = array_flip(array_map('strtolower', $sequence));
+  }
+  
+  /**
+   * Set a list of header names which must always be displayed when set.
+   * 
+   * Usually headers without a field value won't be output unless set here.
+   * 
+   * @param array $names
+   */
+  public function setAlwaysDisplayed(array $names)
+  {
+    $this->_required = array_flip(array_map('strtolower', $names));
+  }
+
+  /**
+   * Notify this observer that the entity's charset has changed.
+   * 
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->setCharset($charset);
+  }
+  
+  /**
+   * Returns a string with a representation of all headers.
+   * 
+   * @return string
+   */
+  public function toString()
+  {
+    $string = '';
+    $headers = $this->_headers;
+    if ($this->_canSort())
+    {
+      uksort($headers, array($this, '_sortHeaders'));
+    }
+    foreach ($headers as $collection)
+    {
+      foreach ($collection as $header)
+      {
+        if ($this->_isDisplayed($header) || $header->getFieldBody() != '')
+        {
+          $string .= $header->toString();
+        }
+      }
+    }
+    return $string;
+  }
+  
+  /**
+   * Returns a string representation of this object.
+   *
+   * @return string
+   *
+   * @see toString()
+   */
+  public function __toString()
+  {
+    return $this->toString();
+  }
+  
+  // -- Private methods
+  
+  /** Save a Header to the internal collection */
+  private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
+  {
+    if (!isset($this->_headers[strtolower($name)]))
+    {
+      $this->_headers[strtolower($name)] = array();
+    }
+    if (!isset($offset))
+    {
+      $this->_headers[strtolower($name)][] = $header;
+    }
+    else
+    {
+      $this->_headers[strtolower($name)][$offset] = $header;
+    }
+  }
+  
+  /** Test if the headers can be sorted */
+  private function _canSort()
+  {
+    return count($this->_order) > 0;
+  }
+  
+  /** uksort() algorithm for Header ordering */
+  private function _sortHeaders($a, $b)
+  {
+    $lowerA = strtolower($a);
+    $lowerB = strtolower($b);
+    $aPos = array_key_exists($lowerA, $this->_order)
+      ? $this->_order[$lowerA]
+      : -1;
+    $bPos = array_key_exists($lowerB, $this->_order)
+      ? $this->_order[$lowerB]
+      : -1;
+      
+    if ($aPos == -1)
+    {
+      return 1;
+    }
+    elseif ($bPos == -1)
+    {
+      return -1;
+    }
+    
+    return ($aPos < $bPos) ? -1 : 1;
+  }
+  
+  /** Test if the given Header is always displayed */
+  private function _isDisplayed(Swift_Mime_Header $header)
+  {
+    return array_key_exists(strtolower($header->getFieldName()), $this->_required);
+  }
+  
+  /** Notify all Headers of the new charset */
+  private function _notifyHeadersOfCharset($charset)
+  {
+    foreach ($this->_headers as $headerGroup)
+    {
+      foreach ($headerGroup as $header)
+      {
+        $header->setCharset($charset);
+      }
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php
new file mode 100644
index 0000000..bbe1e8f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMessage.php
@@ -0,0 +1,609 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Mime/MimePart.php';
+//@require 'Swift/Mime/MimeEntity.php';
+//@require 'Swift/Mime/HeaderSet.php';
+//@require 'Swift/Mime/ContentEncoder.php';
+
+/**
+ * The default email message class.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
+  implements Swift_Mime_Message
+{
+  
+  /**
+   * Create a new SimpleMessage with $headers, $encoder and $cache.
+   * @param Swift_Mime_HeaderSet $headers
+   * @param Swift_Mime_ContentEncoder $encoder
+   * @param Swift_KeyCache $cache
+   * @param string $charset
+   */
+  public function __construct(Swift_Mime_HeaderSet $headers,
+    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, $charset = null)
+  {
+    parent::__construct($headers, $encoder, $cache, $charset);
+    $this->getHeaders()->defineOrdering(array(
+      'Return-Path',
+      'Sender',
+      'Message-ID',
+      'Date',
+      'Subject',
+      'From',
+      'Reply-To',
+      'To',
+      'Cc',
+      'Bcc',
+      'MIME-Version',
+      'Content-Type',
+      'Content-Transfer-Encoding'
+      ));
+    $this->getHeaders()->setAlwaysDisplayed(
+      array('Date', 'Message-ID', 'From')
+      );
+    $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
+    $this->setDate(time());
+    $this->setId($this->getId());
+    $this->getHeaders()->addMailboxHeader('From');
+  }
+  
+  /**
+   * Always returns {@link LEVEL_TOP} for a message instance.
+   * @return int
+   */
+  public function getNestingLevel()
+  {
+    return self::LEVEL_TOP;
+  }
+  
+  /**
+   * Set the subject of this message.
+   * @param string $subject
+   */
+  public function setSubject($subject)
+  {
+    if (!$this->_setHeaderFieldModel('Subject', $subject))
+    {
+      $this->getHeaders()->addTextHeader('Subject', $subject);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the subject of this message.
+   * @return string
+   */
+  public function getSubject()
+  {
+    return $this->_getHeaderFieldModel('Subject');
+  }
+  
+  /**
+   * Set the date at which this message was created.
+   * @param int $date
+   */
+  public function setDate($date)
+  {
+    if (!$this->_setHeaderFieldModel('Date', $date))
+    {
+      $this->getHeaders()->addDateHeader('Date', $date);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the date at which this message was created.
+   * @return int
+   */
+  public function getDate()
+  {
+    return $this->_getHeaderFieldModel('Date');
+  }
+  
+  /**
+   * Set the return-path (the bounce address) of this message.
+   * @param string $address
+   */
+  public function setReturnPath($address)
+  {
+    if (!$this->_setHeaderFieldModel('Return-Path', $address))
+    {
+      $this->getHeaders()->addPathHeader('Return-Path', $address);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the return-path (bounce address) of this message.
+   * @return string
+   */
+  public function getReturnPath()
+  {
+    return $this->_getHeaderFieldModel('Return-Path');
+  }
+  
+  /**
+   * Set the sender of this message.
+   * This does not override the From field, but it has a higher significance.
+   * @param string $sender
+   * @param string $name optional
+   */
+  public function setSender($address, $name = null)
+  {
+    if (!is_array($address) && isset($name))
+    {
+      $address = array($address => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('Sender', (array) $address))
+    {
+      $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the sender of this message.
+   * @return string
+   */
+  public function getSender()
+  {
+    return $this->_getHeaderFieldModel('Sender');
+  }
+  
+  /**
+   * Add a From: address to this message.
+   * 
+   * If $name is passed this name will be associated with the address.
+   * 
+   * @param string $address
+   * @param string $name optional
+   */
+  public function addFrom($address, $name = null)
+  {
+    $current = $this->getFrom();
+    $current[$address] = $name;
+    return $this->setFrom($current);
+  }
+  
+  /**
+   * Set the from address of this message.
+   * 
+   * You may pass an array of addresses if this message is from multiple people.
+   * 
+   * If $name is passed and the first parameter is a string, this name will be
+   * associated with the address.
+   * 
+   * @param string $addresses
+   * @param string $name optional
+   */
+  public function setFrom($addresses, $name = null)
+  {
+    if (!is_array($addresses) && isset($name))
+    {
+      $addresses = array($addresses => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('From', (array) $addresses))
+    {
+      $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the from address of this message.
+   * 
+   * @return string
+   */
+  public function getFrom()
+  {
+    return $this->_getHeaderFieldModel('From');
+  }
+  
+  /**
+   * Add a Reply-To: address to this message.
+   * 
+   * If $name is passed this name will be associated with the address.
+   * 
+   * @param string $address
+   * @param string $name optional
+   */
+  public function addReplyTo($address, $name = null)
+  {
+    $current = $this->getReplyTo();
+    $current[$address] = $name;
+    return $this->setReplyTo($current);
+  }
+  
+  /**
+   * Set the reply-to address of this message.
+   * 
+   * You may pass an array of addresses if replies will go to multiple people.
+   * 
+   * If $name is passed and the first parameter is a string, this name will be
+   * associated with the address.
+   *
+   * @param string $addresses
+   * @param string $name optional
+   */
+  public function setReplyTo($addresses, $name = null)
+  {
+    if (!is_array($addresses) && isset($name))
+    {
+      $addresses = array($addresses => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses))
+    {
+      $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the reply-to address of this message.
+   * 
+   * @return string
+   */
+  public function getReplyTo()
+  {
+    return $this->_getHeaderFieldModel('Reply-To');
+  }
+  
+  /**
+   * Add a To: address to this message.
+   * 
+   * If $name is passed this name will be associated with the address.
+   * 
+   * @param string $address
+   * @param string $name optional
+   */
+  public function addTo($address, $name = null)
+  {
+    $current = $this->getTo();
+    $current[$address] = $name;
+    return $this->setTo($current);
+  }
+  
+  /**
+   * Set the to addresses of this message.
+   * 
+   * If multiple recipients will receive the message and array should be used.
+   * 
+   * If $name is passed and the first parameter is a string, this name will be
+   * associated with the address.
+   * 
+   * @param array $addresses
+   * @param string $name optional
+   */
+  public function setTo($addresses, $name = null)
+  {
+    if (!is_array($addresses) && isset($name))
+    {
+      $addresses = array($addresses => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('To', (array) $addresses))
+    {
+      $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the To addresses of this message.
+   * 
+   * @return array
+   */
+  public function getTo()
+  {
+    return $this->_getHeaderFieldModel('To');
+  }
+  
+  /**
+   * Add a Cc: address to this message.
+   * 
+   * If $name is passed this name will be associated with the address.
+   * 
+   * @param string $address
+   * @param string $name optional
+   */
+  public function addCc($address, $name = null)
+  {
+    $current = $this->getCc();
+    $current[$address] = $name;
+    return $this->setCc($current);
+  }
+  
+  /**
+   * Set the Cc addresses of this message.
+   * 
+   * If $name is passed and the first parameter is a string, this name will be
+   * associated with the address.
+   *
+   * @param array $addresses
+   * @param string $name optional
+   */
+  public function setCc($addresses, $name = null)
+  {
+    if (!is_array($addresses) && isset($name))
+    {
+      $addresses = array($addresses => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('Cc', (array) $addresses))
+    {
+      $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the Cc address of this message.
+   * 
+   * @return array
+   */
+  public function getCc()
+  {
+    return $this->_getHeaderFieldModel('Cc');
+  }
+  
+  /**
+   * Add a Bcc: address to this message.
+   * 
+   * If $name is passed this name will be associated with the address.
+   * 
+   * @param string $address
+   * @param string $name optional
+   */
+  public function addBcc($address, $name = null)
+  {
+    $current = $this->getBcc();
+    $current[$address] = $name;
+    return $this->setBcc($current);
+  }
+  
+  /**
+   * Set the Bcc addresses of this message.
+   * 
+   * If $name is passed and the first parameter is a string, this name will be
+   * associated with the address.
+   * 
+   * @param array $addresses
+   * @param string $name optional
+   */
+  public function setBcc($addresses, $name = null)
+  {
+    if (!is_array($addresses) && isset($name))
+    {
+      $addresses = array($addresses => $name);
+    }
+    
+    if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses))
+    {
+      $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the Bcc addresses of this message.
+   * 
+   * @return array
+   */
+  public function getBcc()
+  {
+    return $this->_getHeaderFieldModel('Bcc');
+  }
+  
+  /**
+   * Set the priority of this message.
+   * The value is an integer where 1 is the highest priority and 5 is the lowest.
+   * @param int $priority
+   */
+  public function setPriority($priority)
+  {
+    $priorityMap = array(
+      1 => 'Highest',
+      2 => 'High',
+      3 => 'Normal',
+      4 => 'Low',
+      5 => 'Lowest'
+      );
+    $pMapKeys = array_keys($priorityMap);
+    if ($priority > max($pMapKeys))
+    {
+      $priority = max($pMapKeys);
+    }
+    elseif ($priority < min($pMapKeys))
+    {
+      $priority = min($pMapKeys);
+    }
+    if (!$this->_setHeaderFieldModel('X-Priority',
+      sprintf('%d (%s)', $priority, $priorityMap[$priority])))
+    {
+      $this->getHeaders()->addTextHeader('X-Priority',
+        sprintf('%d (%s)', $priority, $priorityMap[$priority]));
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the priority of this message.
+   * The returned value is an integer where 1 is the highest priority and 5
+   * is the lowest.
+   * @return int
+   */
+  public function getPriority()
+  {
+    list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
+      '%[1-5]'
+      );
+    return isset($priority) ? $priority : 3;
+  }
+  
+  /**
+   * Ask for a delivery receipt from the recipient to be sent to $addresses
+   * @param array $addresses
+   */
+  public function setReadReceiptTo($addresses)
+  {
+    if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses))
+    {
+      $this->getHeaders()
+        ->addMailboxHeader('Disposition-Notification-To', $addresses);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the addresses to which a read-receipt will be sent.
+   * @return string
+   */
+  public function getReadReceiptTo()
+  {
+    return $this->_getHeaderFieldModel('Disposition-Notification-To');
+  }
+  
+  /**
+   * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
+   * @param Swift_Mime_MimeEntity $entity
+   */
+  public function attach(Swift_Mime_MimeEntity $entity)
+  {
+    $this->setChildren(array_merge($this->getChildren(), array($entity)));
+    return $this;
+  }
+  
+  /**
+   * Remove an already attached entity.
+   * @param Swift_Mime_MimeEntity $entity
+   */
+  public function detach(Swift_Mime_MimeEntity $entity)
+  {
+    $newChildren = array();
+    foreach ($this->getChildren() as $child)
+    {
+      if ($entity !== $child)
+      {
+        $newChildren[] = $child;
+      }
+    }
+    $this->setChildren($newChildren);
+    return $this;
+  }
+  
+  /**
+   * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
+   * This method should be used when embedding images or other data in a message.
+   * @param Swift_Mime_MimeEntity $entity
+   * @return string
+   */
+  public function embed(Swift_Mime_MimeEntity $entity)
+  {
+    $this->attach($entity);
+    return 'cid:' . $entity->getId();
+  }
+  
+  /**
+   * Get this message as a complete string.
+   * @return string
+   */
+  public function toString()
+  {
+    if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
+    {
+      $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+      $string = parent::toString();
+      $this->setChildren($children);
+    }
+    else
+    {
+      $string = parent::toString();
+    }
+    return $string;
+  }
+  
+  /**
+   * Returns a string representation of this object.
+   *
+   * @return string
+   *
+   * @see toString()
+   */
+  public function __toString()
+  {
+    return $this->toString();
+  }
+  
+  /**
+   * Write this message to a {@link Swift_InputByteStream}.
+   * @param Swift_InputByteStream $is
+   */
+  public function toByteStream(Swift_InputByteStream $is)
+  {
+    if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
+    {
+      $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+      parent::toByteStream($is);
+      $this->setChildren($children);
+    }
+    else
+    {
+      parent::toByteStream($is);
+    }
+  }
+  
+  // -- Protected methods
+  
+  /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
+  protected function _getIdField()
+  {
+    return 'Message-ID';
+  }
+  
+  // -- Private methods
+  
+  /** Turn the body of this message into a child of itself if needed */
+  private function _becomeMimePart()
+  {
+    $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
+      $this->_getCache(), $this->_userCharset
+      );
+    $part->setContentType($this->_userContentType);
+    $part->setBody($this->getBody());
+    $part->setFormat($this->_userFormat);
+    $part->setDelSp($this->_userDelSp);
+    $part->_setNestingLevel($this->_getTopNestingLevel());
+    return $part;
+  }
+  
+  /** Get the highest nesting level nested inside this message */
+  private function _getTopNestingLevel()
+  {
+    $highestLevel = $this->getNestingLevel();
+    foreach ($this->getChildren() as $child)
+    {
+      $childLevel = $child->getNestingLevel();
+      if ($highestLevel < $childLevel)
+      {
+        $highestLevel = $childLevel;
+      }
+    }
+    return $highestLevel;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php
new file mode 100644
index 0000000..1615822
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Mime/SimpleMimeEntity.php
@@ -0,0 +1,803 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/HeaderSet.php';
+//@require 'Swift/OutputByteStream.php';
+//@require 'Swift/Mime/ContentEncoder.php';
+//@require 'Swift/KeyCache.php';
+
+/**
+ * A MIME entity, in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
+{
+  
+  /** A collection of Headers for this mime entity */
+  private $_headers;
+  
+  /** The body as a string, or a stream */
+  private $_body;
+  
+  /** The encoder that encodes the body into a streamable format */
+  private $_encoder;
+  
+  /** A mime bounary, if any is used */
+  private $_boundary;
+  
+  /** Mime types to be used based on the nesting level */
+  private $_compositeRanges = array(
+    'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
+    'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
+    'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED)
+    );
+  
+  /** A set of filter rules to define what level an entity should be nested at */
+  private $_compoundLevelFilters = array();
+    
+  /** The nesting level of this entity */
+  private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+  
+  /** A KeyCache instance used during encoding and streaming */
+  private $_cache;
+  
+  /** Direct descendants of this entity */
+  private $_immediateChildren = array();
+  
+  /** All descendants of this entity */
+  private $_children = array();
+  
+  /** The maximum line length of the body of this entity */
+  private $_maxLineLength = 78;
+  
+  /** The order in which alternative mime types should appear */
+  private $_alternativePartOrder = array(
+    'text/plain' => 1,
+    'text/html' => 2,
+    'multipart/related' => 3
+    );
+  
+  /** The CID of this entity */
+  private $_id;
+  
+  /** The key used for accessing the cache */
+  private $_cacheKey;
+  
+  protected $_userContentType;
+  
+  /**
+   * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
+   * @param Swift_Mime_HeaderSet $headers
+   * @param Swift_Mime_ContentEncoder $encoder
+   * @param Swift_KeyCache $cache
+   */
+  public function __construct(Swift_Mime_HeaderSet $headers,
+    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache)
+  {
+    $this->_cacheKey = uniqid();
+    $this->_cache = $cache;
+    $this->_headers = $headers;
+    $this->setEncoder($encoder);
+    $this->_headers->defineOrdering(
+      array('Content-Type', 'Content-Transfer-Encoding')
+      );
+    
+    // This array specifies that, when the entire MIME document contains
+    // $compoundLevel, then for each child within $level, if its Content-Type
+    // is $contentType then it should be treated as if it's level is
+    // $neededLevel instead.  I tried to write that unambiguously! :-\
+    // Data Structure:
+    // array (
+    //   $compoundLevel => array(
+    //     $level => array(
+    //       $contentType => $neededLevel
+    //     )
+    //   )
+    // )
+    
+    $this->_compoundLevelFilters = array(
+      (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
+        self::LEVEL_ALTERNATIVE => array(
+          'text/plain' => self::LEVEL_ALTERNATIVE,
+          'text/html' => self::LEVEL_RELATED
+          )
+        )
+      );
+
+    $this->_id = $this->getRandomId();
+  }
+  
+  /**
+   * Generate a new Content-ID or Message-ID for this MIME entity.
+   * @return string
+   */
+  public function generateId()
+  {
+    $this->setId($this->getRandomId());
+    return $this->_id;
+  }
+  
+  /**
+   * Get the {@link Swift_Mime_HeaderSet} for this entity.
+   * @return Swift_Mime_HeaderSet
+   */
+  public function getHeaders()
+  {
+    return $this->_headers;
+  }
+  
+  /**
+   * Get the nesting level of this entity.
+   * @return int
+   * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
+   */
+  public function getNestingLevel()
+  {
+    return $this->_nestingLevel;
+  }
+  
+  /**
+   * Get the Content-type of this entity.
+   * @return string
+   */
+  public function getContentType()
+  {
+    return $this->_getHeaderFieldModel('Content-Type');
+  }
+  
+  /**
+   * Set the Content-type of this entity.
+   * @param string $type
+   */
+  public function setContentType($type)
+  {
+    $this->_setContentTypeInHeaders($type);
+    // Keep track of the value so that if the content-type changes automatically
+    // due to added child entities, it can be restored if they are later removed
+    $this->_userContentType = $type;
+    return $this;
+  }
+  
+  /**
+   * Get the CID of this entity.
+   * The CID will only be present in headers if a Content-ID header is present.
+   * @return string
+   */
+  public function getId()
+  {
+    return $this->_headers->has($this->_getIdField())
+      ? current((array) $this->_getHeaderFieldModel($this->_getIdField()))
+      : $this->_id;
+  }
+  
+  /**
+   * Set the CID of this entity.
+   * @param string $id
+   */
+  public function setId($id)
+  {
+    if (!$this->_setHeaderFieldModel($this->_getIdField(), $id))
+    {
+      $this->_headers->addIdHeader($this->_getIdField(), $id);
+    }
+    $this->_id = $id;
+    return $this;
+  }
+  
+  /**
+   * Get the description of this entity.
+   * This value comes from the Content-Description header if set.
+   * @return string
+   */
+  public function getDescription()
+  {
+    return $this->_getHeaderFieldModel('Content-Description');
+  }
+  
+  /**
+   * Set the description of this entity.
+   * This method sets a value in the Content-ID header.
+   * @param string $description
+   */
+  public function setDescription($description)
+  {
+    if (!$this->_setHeaderFieldModel('Content-Description', $description))
+    {
+      $this->_headers->addTextHeader('Content-Description', $description);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the maximum line length of the body of this entity.
+   * @return int
+   */
+  public function getMaxLineLength()
+  {
+    return $this->_maxLineLength;
+  }
+  
+  /**
+   * Set the maximum line length of lines in this body.
+   * Though not enforced by the library, lines should not exceed 1000 chars.
+   * @param int $length
+   */
+  public function setMaxLineLength($length)
+  {
+    $this->_maxLineLength = $length;
+    return $this;
+  }
+  
+  /**
+   * Get all children added to this entity.
+   * @return array of Swift_Mime_Entity
+   */
+  public function getChildren()
+  {
+    return $this->_children;
+  }
+  
+  /**
+   * Set all children of this entity.
+   * @param array $children Swiift_Mime_Entity instances
+   * @param int $compoundLevel For internal use only
+   */
+  public function setChildren(array $children, $compoundLevel = null)
+  {
+    //TODO: Try to refactor this logic
+    
+    $compoundLevel = isset($compoundLevel)
+      ? $compoundLevel
+      : $this->_getCompoundLevel($children)
+      ;
+    
+    $immediateChildren = array();
+    $grandchildren = array();
+    $newContentType = $this->_userContentType;
+    
+    foreach ($children as $child)
+    {
+      $level = $this->_getNeededChildLevel($child, $compoundLevel);
+      if (empty($immediateChildren)) //first iteration
+      {
+        $immediateChildren = array($child);
+      }
+      else
+      {
+        $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+        if ($nextLevel == $level)
+        {
+          $immediateChildren[] = $child;
+        }
+        elseif ($level < $nextLevel)
+        {
+          //Re-assign immediateChildren to grandchilden
+          $grandchildren = array_merge($grandchildren, $immediateChildren);
+          //Set new children
+          $immediateChildren = array($child);
+        }
+        else
+        {
+          $grandchildren[] = $child;
+        }
+      }
+    }
+    
+    if (!empty($immediateChildren))
+    {
+      $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+      
+      //Determine which composite media type is needed to accomodate the
+      // immediate children
+      foreach ($this->_compositeRanges as $mediaType => $range)
+      {
+        if ($lowestLevel > $range[0]
+          && $lowestLevel <= $range[1])
+        {
+          $newContentType = $mediaType;
+          break;
+        }
+      }
+      
+      //Put any grandchildren in a subpart
+      if (!empty($grandchildren))
+      {
+        $subentity = $this->_createChild();
+        $subentity->_setNestingLevel($lowestLevel);
+        $subentity->setChildren($grandchildren, $compoundLevel);
+        array_unshift($immediateChildren, $subentity);
+      }
+    }
+    
+    $this->_immediateChildren = $immediateChildren;
+    $this->_children = $children;
+    $this->_setContentTypeInHeaders($newContentType);
+    $this->_fixHeaders();
+    $this->_sortChildren();
+    
+    return $this;
+  }
+  
+  /**
+   * Get the body of this entity as a string.
+   * @return string
+   */
+  public function getBody()
+  {
+    return ($this->_body instanceof Swift_OutputByteStream)
+      ? $this->_readStream($this->_body)
+      : $this->_body;
+  }
+  
+  /**
+   * Set the body of this entity, either as a string, or as an instance of
+   * {@link Swift_OutputByteStream}.
+   * @param mixed $body
+   * @param string $contentType optional
+   */
+  public function setBody($body, $contentType = null)
+  {
+    if ($body !== $this->_body)
+    {
+      $this->_clearCache();
+    }
+    
+    $this->_body = $body;
+    if (isset($contentType))
+    {
+      $this->setContentType($contentType);
+    }
+    return $this;
+  }
+  
+  /**
+   * Get the encoder used for the body of this entity.
+   * @return Swift_Mime_ContentEncoder
+   */
+  public function getEncoder()
+  {
+    return $this->_encoder;
+  }
+  
+  /**
+   * Set the encoder used for the body of this entity.
+   * @param Swift_Mime_ContentEncoder $encoder
+   */
+  public function setEncoder(Swift_Mime_ContentEncoder $encoder)
+  {
+    if ($encoder !== $this->_encoder)
+    {
+      $this->_clearCache();
+    }
+    
+    $this->_encoder = $encoder;
+    $this->_setEncoding($encoder->getName());
+    $this->_notifyEncoderChanged($encoder);
+    return $this;
+  }
+  
+  /**
+   * Get the boundary used to separate children in this entity.
+   * @return string
+   */
+  public function getBoundary()
+  {
+    if (!isset($this->_boundary))
+    {
+      $this->_boundary = '_=_swift_v4_' . time() . uniqid() . '_=_';
+    }
+    return $this->_boundary;
+  }
+  
+  /**
+   * Set the boundary used to separate children in this entity.
+   * @param string $boundary
+   * @throws Swift_RfcComplianceException
+   */
+  public function setBoundary($boundary)
+  {
+    $this->_assertValidBoundary($boundary);
+    $this->_boundary = $boundary;
+    return $this;
+  }
+  
+  /**
+   * Receive notification that the charset of this entity, or a parent entity
+   * has changed.
+   * @param string $charset
+   */
+  public function charsetChanged($charset)
+  {
+    $this->_notifyCharsetChanged($charset);
+  }
+  
+  /**
+   * Receive notification that the encoder of this entity or a parent entity
+   * has changed.
+   * @param Swift_Mime_ContentEncoder $encoder
+   */
+  public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
+  {
+    $this->_notifyEncoderChanged($encoder);
+  }
+  
+  /**
+   * Get this entire entity as a string.
+   * @return string
+   */
+  public function toString()
+  {
+    $string = $this->_headers->toString();
+    if (isset($this->_body) && empty($this->_immediateChildren))
+    {
+      if ($this->_cache->hasKey($this->_cacheKey, 'body'))
+      {
+        $body = $this->_cache->getString($this->_cacheKey, 'body');
+      }
+      else
+      {
+        $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0,
+          $this->getMaxLineLength()
+          );
+        $this->_cache->setString($this->_cacheKey, 'body', $body,
+          Swift_KeyCache::MODE_WRITE
+          );
+      }
+      $string .= $body;
+    }
+    
+    if (!empty($this->_immediateChildren))
+    {
+      foreach ($this->_immediateChildren as $child)
+      {
+        $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
+        $string .= $child->toString();
+      }
+      $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
+    }
+    
+    return $string;
+  }
+  
+  /**
+   * Returns a string representation of this object.
+   *
+   * @return string
+   *
+   * @see toString()
+   */
+  public function __toString()
+  {
+    return $this->toString();
+  }
+  
+  /**
+   * Write this entire entity to a {@link Swift_InputByteStream}.
+   * @param Swift_InputByteStream
+   */
+  public function toByteStream(Swift_InputByteStream $is)
+  {
+    $is->write($this->_headers->toString());
+    $is->commit();
+    
+    if (empty($this->_immediateChildren))
+    {
+      if (isset($this->_body))
+      {
+        if ($this->_cache->hasKey($this->_cacheKey, 'body'))
+        {
+          $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
+        }
+        else
+        {
+          $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
+          if ($cacheIs)
+          {
+            $is->bind($cacheIs);
+          }
+          
+          $is->write("\r\n");
+          
+          if ($this->_body instanceof Swift_OutputByteStream)
+          {
+            $this->_body->setReadPointer(0);
+            
+            $this->_encoder->encodeByteStream($this->_body, $is, 0,
+              $this->getMaxLineLength()
+              );
+          }
+          else
+          {
+            $is->write($this->_encoder->encodeString(
+              $this->getBody(), 0, $this->getMaxLineLength()
+              ));
+          }
+          
+          if ($cacheIs)
+          {
+            $is->unbind($cacheIs);
+          }
+        }
+      }
+    }
+    
+    if (!empty($this->_immediateChildren))
+    {
+      foreach ($this->_immediateChildren as $child)
+      {
+        $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
+        $child->toByteStream($is);
+      }
+      $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
+    }
+  }
+  
+  // -- Protected methods
+  
+  /**
+   * Get the name of the header that provides the ID of this entity */
+  protected function _getIdField()
+  {
+    return 'Content-ID';
+  }
+  
+  /**
+   * Get the model data (usually an array or a string) for $field.
+   */
+  protected function _getHeaderFieldModel($field)
+  {
+    if ($this->_headers->has($field))
+    {
+      return $this->_headers->get($field)->getFieldBodyModel();
+    }
+  }
+  
+  /**
+   * Set the model data for $field.
+   */
+  protected function _setHeaderFieldModel($field, $model)
+  {
+    if ($this->_headers->has($field))
+    {
+      $this->_headers->get($field)->setFieldBodyModel($model);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+  
+  /**
+   * Get the parameter value of $parameter on $field header.
+   */
+  protected function _getHeaderParameter($field, $parameter)
+  {
+    if ($this->_headers->has($field))
+    {
+      return $this->_headers->get($field)->getParameter($parameter);
+    }
+  }
+  
+  /**
+   * Set the parameter value of $parameter on $field header.
+   */
+  protected function _setHeaderParameter($field, $parameter, $value)
+  {
+    if ($this->_headers->has($field))
+    {
+      $this->_headers->get($field)->setParameter($parameter, $value);
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+  
+  /**
+   * Re-evaluate what content type and encoding should be used on this entity.
+   */
+  protected function _fixHeaders()
+  {
+    if (count($this->_immediateChildren))
+    {
+      $this->_setHeaderParameter('Content-Type', 'boundary',
+        $this->getBoundary()
+        );
+      $this->_headers->remove('Content-Transfer-Encoding');
+    }
+    else
+    {
+      $this->_setHeaderParameter('Content-Type', 'boundary', null);
+      $this->_setEncoding($this->_encoder->getName());
+    }
+  }
+  
+  /**
+   * Get the KeyCache used in this entity.
+   */
+  protected function _getCache()
+  {
+    return $this->_cache;
+  }
+  
+  /**
+   * Empty the KeyCache for this entity.
+   */
+  protected function _clearCache()
+  {
+    $this->_cache->clearKey($this->_cacheKey, 'body');
+  }
+  
+  /**
+   * Returns a random Content-ID or Message-ID.
+   * @return string
+   */
+  protected function getRandomId()
+  {
+    $idLeft = time() . '.' . uniqid();
+    $idRight = !empty($_SERVER['SERVER_NAME'])
+      ? $_SERVER['SERVER_NAME']
+      : 'swift.generated';
+    return $idLeft . '@' . $idRight;
+  }
+  
+  // -- Private methods
+  
+  private function _readStream(Swift_OutputByteStream $os)
+  {
+    $string = '';
+    while (false !== $bytes = $os->read(8192))
+    {
+      $string .= $bytes;
+    }
+    return $string;
+  }
+  
+  private function _setEncoding($encoding)
+  {
+    if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding))
+    {
+      $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
+    }
+  }
+  
+  private function _assertValidBoundary($boundary)
+  {
+    if (!preg_match(
+      '/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di',
+      $boundary))
+    {
+      throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.');
+    }
+  }
+  
+  private function _setContentTypeInHeaders($type)
+  {
+    if (!$this->_setHeaderFieldModel('Content-Type', $type))
+    {
+      $this->_headers->addParameterizedHeader('Content-Type', $type);
+    }
+  }
+  
+  private function _setNestingLevel($level)
+  {
+    $this->_nestingLevel = $level;
+  }
+  
+  private function _getCompoundLevel($children)
+  {
+    $level = 0;
+    foreach ($children as $child)
+    {
+      $level |= $child->getNestingLevel();
+    }
+    return $level;
+  }
+  
+  private function _getNeededChildLevel($child, $compoundLevel)
+  {
+    $filter = array();
+    foreach ($this->_compoundLevelFilters as $bitmask => $rules)
+    {
+      if (($compoundLevel & $bitmask) === $bitmask)
+      {
+        $filter = $rules + $filter;
+      }
+    }
+    
+    $realLevel = $child->getNestingLevel();
+    $lowercaseType = strtolower($child->getContentType());
+    
+    if (isset($filter[$realLevel])
+      && isset($filter[$realLevel][$lowercaseType]))
+    {
+      return $filter[$realLevel][$lowercaseType];
+    }
+    else
+    {
+      return $realLevel;
+    }
+  }
+  
+  private function _createChild()
+  {
+    return new self($this->_headers->newInstance(),
+      $this->_encoder, $this->_cache);
+  }
+  
+  private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
+  {
+    foreach ($this->_immediateChildren as $child)
+    {
+      $child->encoderChanged($encoder);
+    }
+  }
+  
+  private function _notifyCharsetChanged($charset)
+  {
+    $this->_encoder->charsetChanged($charset);
+    $this->_headers->charsetChanged($charset);
+    foreach ($this->_immediateChildren as $child)
+    {
+      $child->charsetChanged($charset);
+    }
+  }
+  
+  private function _sortChildren()
+  {
+    $shouldSort = false;
+    foreach ($this->_immediateChildren as $child)
+    {
+      //NOTE: This include alternative parts moved into a related part
+      if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE)
+      {
+        $shouldSort = true;
+        break;
+      }
+    }
+    
+    //Sort in order of preference, if there is one
+    if ($shouldSort)
+    {
+      usort($this->_immediateChildren, array($this, '_childSortAlgorithm'));
+    }
+  }
+  
+  private function _childSortAlgorithm($a, $b)
+  {
+    $typePrefs = array();
+    $types = array(
+      strtolower($a->getContentType()),
+      strtolower($b->getContentType())
+      );
+    foreach ($types as $type)
+    {
+      $typePrefs[] = (array_key_exists($type, $this->_alternativePartOrder))
+        ? $this->_alternativePartOrder[$type]
+        : (max($this->_alternativePartOrder) + 1);
+    }
+    return ($typePrefs[0] >= $typePrefs[1]) ? 1 : -1;
+  }
+  
+  // -- Destructor
+  
+  /**
+   * Empties it's own contents from the cache.
+   */
+  public function __destruct()
+  {
+    $this->_cache->clearAll($this->_cacheKey);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php
new file mode 100644
index 0000000..60b6d56
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/MimePart.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/MimePart.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * A MIME part, in a multipart message.
+ * @package Swift
+ * @subpackage Mime
+ * @author Chris Corbyn
+ */
+class Swift_MimePart extends Swift_Mime_MimePart
+{
+  
+  /**
+   * Create a new MimePart.
+   * Details may be optionally passed into the constructor.
+   * @param string $body
+   * @param string $contentType
+   * @param string $charset
+   */
+  public function __construct($body = null, $contentType = null,
+    $charset = null)
+  {
+    call_user_func_array(
+      array($this, 'Swift_Mime_MimePart::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('mime.part')
+      );
+    
+    if (!isset($charset))
+    {
+      $charset = Swift_DependencyContainer::getInstance()
+        ->lookup('properties.charset');
+    }
+    $this->setBody($body);
+    $this->setCharset($charset);
+    if ($contentType)
+    {
+      $this->setContentType($contentType);
+    }
+  }
+  
+  /**
+   * Create a new MimePart.
+   * @param string $body
+   * @param string $contentType
+   * @param string $charset
+   * @return Swift_Mime_MimePart
+   */
+  public static function newInstance($body = null, $contentType = null,
+    $charset = null)
+  {
+    return new self($body, $contentType, $charset);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php
new file mode 100644
index 0000000..951b838
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/OutputByteStream.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract means of reading data.
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ * @package Swift
+ * @subpackage ByteStream
+ * @author Chris Corbyn
+ */
+interface Swift_OutputByteStream
+{
+  
+  /**
+   * Reads $length bytes from the stream into a string and moves the pointer
+   * through the stream by $length. If less bytes exist than are requested the
+   * remaining bytes are given instead. If no bytes are remaining at all, boolean
+   * false is returned.
+   * @param int $length
+   * @return string
+   * @throws Swift_IoException
+   */
+  public function read($length);
+  
+  /**
+   * Move the internal read pointer to $byteOffset in the stream.
+   * @param int $byteOffset
+   * @return boolean
+   * @throws Swift_IoException
+   */
+  public function setReadPointer($byteOffset);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php
new file mode 100644
index 0000000..46a7f44
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/SendListener.php';
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Plugins/Sleeper.php';
+
+/**
+ * Reduces network flooding when sending large amounts of mail.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_AntiFloodPlugin
+  implements Swift_Events_SendListener, Swift_Plugins_Sleeper
+{
+  
+  /**
+   * The number of emails to send before restarting Transport.
+   * @var int
+   * @access private
+   */
+  private $_threshold;
+  
+  /**
+   * The number of seconds to sleep for during a restart.
+   * @var int
+   * @access private
+   */
+  private $_sleep;
+  
+  /**
+   * The internal counter.
+   * @var int
+   * @access private
+   */
+  private $_counter = 0;
+  
+  /**
+   * The Sleeper instance for sleeping.
+   * @var Swift_Plugins_Sleeper
+   * @access private
+   */
+  private $_sleeper;
+  
+  /**
+   * Create a new AntiFloodPlugin with $threshold and $sleep time.
+   * @param int $threshold
+   * @param int $sleep time
+   * @param Swift_Plugins_Sleeper $sleeper (not needed really)
+   */
+  public function __construct($threshold = 99, $sleep = 0,
+    Swift_Plugins_Sleeper $sleeper = null)
+  {
+    $this->setThreshold($threshold);
+    $this->setSleepTime($sleep);
+    $this->_sleeper = $sleeper;
+  }
+  
+  /**
+   * Set the number of emails to send before restarting.
+   * @param int $threshold
+   */
+  public function setThreshold($threshold)
+  {
+    $this->_threshold = $threshold;
+  }
+  
+  /**
+   * Get the number of emails to send before restarting.
+   * @return int
+   */
+  public function getThreshold()
+  {
+    return $this->_threshold;
+  }
+  
+  /**
+   * Set the number of seconds to sleep for during a restart.
+   * @param int $sleep time
+   */
+  public function setSleepTime($sleep)
+  {
+    $this->_sleep = $sleep;
+  }
+  
+  /**
+   * Get the number of seconds to sleep for during a restart.
+   * @return int
+   */
+  public function getSleepTime()
+  {
+    return $this->_sleep;
+  }
+  
+  /**
+   * Invoked immediately before the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+  {
+  }
+  
+  /**
+   * Invoked immediately after the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt)
+  {
+    ++$this->_counter;
+    if ($this->_counter >= $this->_threshold)
+    {
+      $transport = $evt->getTransport();
+      $transport->stop();
+      if ($this->_sleep)
+      {
+        $this->sleep($this->_sleep);
+      }
+      $transport->start();
+      $this->_counter = 0;
+    }
+  }
+  
+  /**
+   * Sleep for $seconds.
+   * @param int $seconds
+   */
+  public function sleep($seconds)
+  {
+    if (isset($this->_sleeper))
+    {
+      $this->_sleeper->sleep($seconds);
+    }
+    else
+    {
+      sleep($seconds);
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php
new file mode 100644
index 0000000..501cd80
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/SendListener.php';
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Events/CommandListener.php';
+//@require 'Swift/Events/CommandEvent.php';
+//@require 'Swift/Events/ResponseListener.php';
+//@require 'Swift/Events/ResponseEvent.php';
+//@require 'Swift/InputByteStream.php';
+
+/**
+ * Reduces network flooding when sending large amounts of mail.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_BandwidthMonitorPlugin
+  implements Swift_Events_SendListener, Swift_Events_CommandListener,
+  Swift_Events_ResponseListener, Swift_InputByteStream
+{
+  
+  /**
+   * The outgoing traffic counter.
+   * @var int
+   * @access private
+   */
+  private $_out = 0;
+  
+  /**
+   * The incoming traffic counter.
+   * @var int
+   * @access private
+   */
+  private $_in = 0;
+  
+  /** Bound byte streams */
+  private $_mirrors = array();
+  
+  /**
+   * Not used.
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+  {
+  }
+  
+  /**
+   * Invoked immediately after the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt)
+  {
+    $message = $evt->getMessage();
+    $message->toByteStream($this);
+  }
+  
+  /**
+   * Invoked immediately following a command being sent.
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function commandSent(Swift_Events_CommandEvent $evt)
+  {
+    $command = $evt->getCommand();
+    $this->_out += strlen($command);
+  }
+  
+  /**
+   * Invoked immediately following a response coming back.
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function responseReceived(Swift_Events_ResponseEvent $evt)
+  {
+    $response = $evt->getResponse();
+    $this->_in += strlen($response);
+  }
+  
+  /**
+   * Called when a message is sent so that the outgoing counter can be increased.
+   * @param string $bytes
+   */
+  public function write($bytes)
+  {
+    $this->_out += strlen($bytes);
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->write($bytes);
+    }
+  }
+  
+  /**
+   * Not used.
+   */
+  public function commit()
+  {
+  }
+  
+  /**
+   * Attach $is to this stream.
+   * The stream acts as an observer, receiving all data that is written.
+   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function bind(Swift_InputByteStream $is)
+  {
+    $this->_mirrors[] = $is;
+  }
+  
+  /**
+   * Remove an already bound stream.
+   * If $is is not bound, no errors will be raised.
+   * If the stream currently has any buffered data it will be written to $is
+   * before unbinding occurs.
+   * 
+   * @param Swift_InputByteStream $is
+   */
+  public function unbind(Swift_InputByteStream $is)
+  {
+    foreach ($this->_mirrors as $k => $stream)
+    {
+      if ($is === $stream)
+      {
+        unset($this->_mirrors[$k]);
+      }
+    }
+  }
+  
+  /**
+   * Not used.
+   */
+  public function flushBuffers()
+  {
+    foreach ($this->_mirrors as $stream)
+    {
+      $stream->flushBuffers();
+    }
+  }
+  
+  /**
+   * Get the total number of bytes sent to the server.
+   * @return int
+   */
+  public function getBytesOut()
+  {
+    return $this->_out;
+  }
+  
+  /**
+   * Get the total number of bytes received from the server.
+   * @return int
+   */
+  public function getBytesIn()
+  {
+    return $this->_in;
+  }
+  
+  /**
+   * Reset the internal counters to zero.
+   */
+  public function reset()
+  {
+    $this->_out = 0;
+    $this->_in = 0;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php
new file mode 100644
index 0000000..9735d0a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Decorator/Replacements.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows customization of Messages on-the-fly.
+ * 
+ * @package Swift
+ * @subpackage Plugins
+ * 
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Decorator_Replacements
+{
+  
+  /**
+   * Return the array of replacements for $address.
+   * 
+   * This method is invoked once for every single recipient of a message.
+   * 
+   * If no replacements can be found, an empty value (NULL) should be returned
+   * and no replacements will then be made on the message.
+   * 
+   * @param string $address
+   * 
+   * @return array
+   */
+  public function getReplacementsFor($address);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php
new file mode 100644
index 0000000..da1a307
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/DecoratorPlugin.php
@@ -0,0 +1,201 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/SendListener.php';
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Plugins/Decorator/Replacements.php';
+
+/**
+ * Allows customization of Messages on-the-fly.
+ * 
+ * @package Swift
+ * @subpackage Plugins
+ * 
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_DecoratorPlugin
+  implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
+{
+
+  /** The replacement map */
+  private $_replacements;
+  
+  /** The body as it was before replacements */
+  private $_orginalBody;
+
+  /** The original subject of the message, before replacements */
+  private $_originalSubject;
+
+  /** Bodies of children before they are replaced */
+  private $_originalChildBodies = array();
+
+  /** The Message that was last replaced */
+  private $_lastMessage;
+
+  /**
+   * Create a new DecoratorPlugin with $replacements.
+   * 
+   * The $replacements can either be an associative array, or an implementation
+   * of {@link Swift_Plugins_Decorator_Replacements}.
+   * 
+   * When using an array, it should be of the form:
+   * <code>
+   * $replacements = array(
+   *  "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
+   *  "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
+   * )
+   * </code>
+   * 
+   * When using an instance of {@link Swift_Plugins_Decorator_Replacements},
+   * the object should return just the array of replacements for the address
+   * given to {@link Swift_Plugins_Decorator_Replacements::getReplacementsFor()}.
+   * 
+   * @param mixed $replacements
+   */
+  public function __construct($replacements)
+  {
+    if (!($replacements instanceof Swift_Plugins_Decorator_Replacements))
+    {
+      $this->_replacements = (array) $replacements;
+    }
+    else
+    {
+      $this->_replacements = $replacements;
+    }
+  }
+
+  /**
+   * Invoked immediately before the Message is sent.
+   * 
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+  {
+    $message = $evt->getMessage();
+    $this->_restoreMessage($message);
+    $to = array_keys($message->getTo());
+    $address = array_shift($to);
+    if ($replacements = $this->getReplacementsFor($address))
+    {
+      $body = $message->getBody();
+      $search = array_keys($replacements);
+      $replace = array_values($replacements);
+      $bodyReplaced = str_replace(
+        $search, $replace, $body
+        );
+      if ($body != $bodyReplaced)
+      {
+        $this->_originalBody = $body;
+        $message->setBody($bodyReplaced);
+      }
+      $subject = $message->getSubject();
+      $subjectReplaced = str_replace(
+        $search, $replace, $subject
+        );
+      if ($subject != $subjectReplaced)
+      {
+        $this->_originalSubject = $subject;
+        $message->setSubject($subjectReplaced);
+      }
+      $children = (array) $message->getChildren();
+      foreach ($children as $child)
+      {
+        list($type, ) = sscanf($child->getContentType(), '%[^/]/%s');
+        if ('text' == $type)
+        {
+          $body = $child->getBody();
+          $bodyReplaced = str_replace(
+            $search, $replace, $body
+            );
+          if ($body != $bodyReplaced)
+          {
+            $child->setBody($bodyReplaced);
+            $this->_originalChildBodies[$child->getId()] = $body;
+          }
+        }
+      }
+      $this->_lastMessage = $message;
+    }
+  }
+  
+  /**
+   * Find a map of replacements for the address.
+   * 
+   * If this plugin was provided with a delegate instance of
+   * {@link Swift_Plugins_Decorator_Replacements} then the call will be
+   * delegated to it.  Otherwise, it will attempt to find the replacements
+   * from the array provided in the constructor.
+   * 
+   * If no replacements can be found, an empty value (NULL) is returned.
+   * 
+   * @param string $address
+   * 
+   * @return array
+   */
+  public function getReplacementsFor($address)
+  {
+    if ($this->_replacements instanceof Swift_Plugins_Decorator_Replacements)
+    {
+      return $this->_replacements->getReplacementsFor($address);
+    }
+    else
+    {
+      return isset($this->_replacements[$address])
+        ? $this->_replacements[$address]
+        : null
+        ;
+    }
+  }
+
+  /**
+   * Invoked immediately after the Message is sent.
+   * 
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt)
+  {
+    $this->_restoreMessage($evt->getMessage());
+  }
+
+  // -- Private methods
+
+  /** Restore a changed message back to its original state */
+  private function _restoreMessage(Swift_Mime_Message $message)
+  {
+    if ($this->_lastMessage === $message)
+    {
+      if (isset($this->_originalBody))
+      {
+        $message->setBody($this->_originalBody);
+        $this->_originalBody = null;
+      }
+      if (isset($this->_originalSubject))
+      {
+        $message->setSubject($this->_originalSubject);
+        $this->_originalSubject = null;
+      }
+      if (!empty($this->_originalChildBodies))
+      {
+        $children = (array) $message->getChildren();
+        foreach ($children as $child)
+        {
+          $id = $child->getId();
+          if (array_key_exists($id, $this->_originalChildBodies))
+          {
+            $child->setBody($this->_originalChildBodies[$id]);
+          }
+        }
+        $this->_originalChildBodies = array();
+      }
+      $this->_lastMessage = null;
+    }
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php
new file mode 100644
index 0000000..9864da0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Logger.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Logs events in the Transport system.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Logger
+{
+  
+  /**
+   * Add a log entry.
+   * @param string $entry
+   */
+  public function add($entry);
+  
+  /**
+   * Clear the log contents.
+   */
+  public function clear();
+  
+  /**
+   * Get this log as a string.
+   * @return string
+   */
+  public function dump();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php
new file mode 100644
index 0000000..d595f26
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/LoggerPlugin.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/CommandListener.php';
+//@require 'Swift/Events/CommandEvent.php';
+//@require 'Swift/Events/ResponseListener.php';
+//@require 'Swift/Events/ResponseEvent.php';
+//@require 'Swift/Events/TransportChangeListener.php';
+//@require 'Swift/Events/TransportChangeEvent.php';
+//@require 'Swift/Events/TransportExceptionEvent.php';
+//@require 'Swift/Events/TransportExceptionListener.php';
+//@require 'Swift/Events/TransportException.php';
+//@require 'Swift/Plugins/Logger.php';
+
+/**
+ * Does real time logging of Transport level information.
+ * 
+ * @package Swift
+ * @subpackage Plugins
+ * 
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_LoggerPlugin
+  implements Swift_Events_CommandListener, Swift_Events_ResponseListener,
+  Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener,
+  Swift_Plugins_Logger
+{
+  
+  /** The logger which is delegated to */
+  private $_logger;
+  
+  /**
+   * Create a new LoggerPlugin using $logger.
+   * 
+   * @param Swift_Plugins_Logger $logger
+   */
+  public function __construct(Swift_Plugins_Logger $logger)
+  {
+    $this->_logger = $logger;
+  }
+  
+  /**
+   * Add a log entry.
+   * 
+   * @param string $entry
+   */
+  public function add($entry)
+  {
+    $this->_logger->add($entry);
+  }
+  
+  /**
+   * Clear the log contents.
+   */
+  public function clear()
+  {
+    $this->_logger->clear();
+  }
+  
+  /**
+   * Get this log as a string.
+   * 
+   * @return string
+   */
+  public function dump()
+  {
+    return $this->_logger->dump();
+  }
+  
+  /**
+   * Invoked immediately following a command being sent.
+   * 
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function commandSent(Swift_Events_CommandEvent $evt)
+  {
+    $command = $evt->getCommand();
+    $this->_logger->add(sprintf(">> %s", $command));
+  }
+  
+  /**
+   * Invoked immediately following a response coming back.
+   * 
+   * @param Swift_Events_ResponseEvent $evt
+   */
+  public function responseReceived(Swift_Events_ResponseEvent $evt)
+  {
+    $response = $evt->getResponse();
+    $this->_logger->add(sprintf("<< %s", $response));
+  }
+  
+  /**
+   * Invoked just before a Transport is started.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
+  {
+    $transportName = get_class($evt->getSource());
+    $this->_logger->add(sprintf("++ Starting %s", $transportName));
+  }
+  
+  /**
+   * Invoked immediately after the Transport is started.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function transportStarted(Swift_Events_TransportChangeEvent $evt)
+  {
+    $transportName = get_class($evt->getSource());
+    $this->_logger->add(sprintf("++ %s started", $transportName));
+  }
+  
+  /**
+   * Invoked just before a Transport is stopped.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
+  {
+    $transportName = get_class($evt->getSource());
+    $this->_logger->add(sprintf("++ Stopping %s", $transportName));
+  }
+  
+  /**
+   * Invoked immediately after the Transport is stopped.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function transportStopped(Swift_Events_TransportChangeEvent $evt)
+  {
+    $transportName = get_class($evt->getSource());
+    $this->_logger->add(sprintf("++ %s stopped", $transportName));
+  }
+  
+  /**
+   * Invoked as a TransportException is thrown in the Transport system.
+   * 
+   * @param Swift_Events_TransportExceptionEvent $evt
+   */
+  public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
+  {
+    $e = $evt->getException();
+    $message = $e->getMessage();
+    $this->_logger->add(sprintf("!! %s", $message));
+    $message .= PHP_EOL;
+    $message .= 'Log data:' . PHP_EOL;
+    $message .= $this->_logger->dump();
+    $evt->cancelBubble();
+    throw new Swift_TransportException($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php
new file mode 100644
index 0000000..930eca2
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Logs to an Array backend.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
+{
+  
+  /**
+   * The log contents.
+   * @var array
+   * @access private
+   */
+  private $_log = array();
+  
+  /**
+   * Max size of the log.
+   * @var int
+   * @access private
+   */
+  private $_size = 0;
+  
+  /**
+   * Create a new ArrayLogger with a maximum of $size entries.
+   * @var int $size
+   */
+  public function __construct($size = 50)
+  {
+    $this->_size = $size;
+  }
+  
+  /**
+   * Add a log entry.
+   * @param string $entry
+   */
+  public function add($entry)
+  {
+    $this->_log[] = $entry;
+    while (count($this->_log) > $this->_size)
+    {
+      array_shift($this->_log);
+    }
+  }
+  
+  /**
+   * Clear the log contents.
+   */
+  public function clear()
+  {
+    $this->_log = array();
+  }
+  
+  /**
+   * Get this log as a string.
+   * @return string
+   */
+  public function dump()
+  {
+    return implode(PHP_EOL, $this->_log);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php
new file mode 100644
index 0000000..83dd54b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Loggers/EchoLogger.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Prints all log messages in real time.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
+{
+  
+  /** Whether or not HTML should be output */
+  private $_isHtml;
+  
+  /**
+   * Create a new EchoLogger.
+   * 
+   * @param boolean $isHtml
+   */
+  public function __construct($isHtml = true)
+  {
+    $this->_isHtml = $isHtml;
+  }
+  
+  /**
+   * Add a log entry.
+   * @param string $entry
+   */
+  public function add($entry)
+  {
+    if ($this->_isHtml)
+    {
+      printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '<br />', PHP_EOL);
+    }
+    else
+    {
+      printf('%s%s', $entry, PHP_EOL);
+    }
+  }
+  
+  /**
+   * Not implemented.
+   */
+  public function clear()
+  {
+  }
+  
+  /**
+   * Not implemented.
+   */
+  public function dump()
+  {
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php
new file mode 100644
index 0000000..1c96dcf
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Connection.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Pop3Connection interface for connecting and disconnecting to a POP3 host.
+ * 
+ * @package Swift
+ * @subpackage Plugins
+ * 
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Pop_Pop3Connection
+{
+  
+  /**
+   * Connect to the POP3 host and throw an Exception if it fails.
+   * 
+   * @throws Swift_Plugins_Pop_Pop3Exception
+   */
+  public function connect();
+  
+  /**
+   * Disconnect from the POP3 host and throw an Exception if it fails.
+   * 
+   * @throws Swift_Plugins_Pop_Pop3Exception
+   */
+  public function disconnect();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php
new file mode 100644
index 0000000..e0205f4
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Pop/Pop3Exception.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/IoException.php';
+
+/**
+ * Pop3Exception thrown when an error occurs connecting to a POP3 host.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * 
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Pop_Pop3Exception extends Swift_IoException
+{
+  
+  /**
+   * Create a new Pop3Exception with $message.
+   * 
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
new file mode 100644
index 0000000..fd1cf46
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -0,0 +1,288 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/TransportChangeListener.php';
+//@require 'Swift/Events/TransportChangeEvent.php';
+
+/**
+ * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP.
+ * 
+ * @package Swift
+ * @subpackage Plugins
+ * 
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_PopBeforeSmtpPlugin
+  implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
+{
+  
+  /** A delegate connection to use (mostly a test hook) */
+  private $_connection;
+  
+  /** Hostname of the POP3 server */
+  private $_host;
+  
+  /** Port number to connect on */
+  private $_port;
+  
+  /** Encryption type to use (if any) */
+  private $_crypto;
+  
+  /** Username to use (if any) */
+  private $_username;
+  
+  /** Password to use (if any) */
+  private $_password;
+  
+  /** Established connection via TCP socket */
+  private $_socket;
+  
+  /** Connect timeout in seconds */
+  private $_timeout = 10;
+  
+  /** SMTP Transport to bind to */
+  private $_transport;
+  
+  /**
+   * Create a new PopBeforeSmtpPlugin for $host and $port.
+   * 
+   * @param string $host
+   * @param int $port
+   * @param string $cypto as "tls" or "ssl"
+   */
+  public function __construct($host, $port = 110, $crypto = null)
+  {
+    $this->_host = $host;
+    $this->_port = $port;
+    $this->_crypto = $crypto;
+  }
+  
+  /**
+   * Create a new PopBeforeSmtpPlugin for $host and $port.
+   * 
+   * @param string $host
+   * @param int $port
+   * @param string $cypto as "tls" or "ssl"
+   * 
+   * @return Swift_Plugins_PopBeforeSmtpPlugin
+   */
+  public static function newInstance($host, $port = 110, $crypto = null)
+  {
+    return new self($host, $port, $crypto);
+  }
+  
+  /**
+   * Set a Pop3Connection to delegate to instead of connecting directly.
+   * 
+   * @param Swift_Plugins_Pop_Pop3Connection $connection
+   */
+  public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
+  {
+    $this->_connection = $connection;
+    return $this;
+  }
+  
+  /**
+   * Bind this plugin to a specific SMTP transport instance.
+   * 
+   * @param Swift_Transport
+   */
+  public function bindSmtp(Swift_Transport $smtp)
+  {
+    $this->_transport = $smtp;
+  }
+  
+  /**
+   * Set the connection timeout in seconds (default 10).
+   * 
+   * @param int $timeout
+   */
+  public function setTimeout($timeout)
+  {
+    $this->_timeout = (int) $timeout;
+    return $this;
+  }
+  
+  /**
+   * Set the username to use when connecting (if needed).
+   * 
+   * @param string $username
+   */
+  public function setUsername($username)
+  {
+    $this->_username = $username;
+    return $this;
+  }
+  
+  /**
+   * Set the password to use when connecting (if needed).
+   * 
+   * @param string $password
+   */
+  public function setPassword($password)
+  {
+    $this->_password = $password;
+    return $this;
+  }
+  
+  /**
+   * Connect to the POP3 host and authenticate.
+   * 
+   * @throws Swift_Plugins_Pop_Pop3Exception if connection fails
+   */
+  public function connect()
+  {
+    if (isset($this->_connection))
+    {
+      $this->_connection->connect();
+    }
+    else
+    {
+      if (!isset($this->_socket))
+      {
+        if (!$socket = fsockopen(
+          $this->_getHostString(), $this->_port, $errno, $errstr, $this->_timeout))
+        {
+          throw new Swift_Plugins_Pop_Pop3Exception(
+            sprintf('Failed to connect to POP3 host [%s]: %s', $this->_host, $errstr)
+          );
+        }
+        $this->_socket = $socket;
+        
+        if (false === $greeting = fgets($this->_socket))
+        {
+          throw new Swift_Plugins_Pop_Pop3Exception(
+            sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
+          );
+        }
+        
+        $this->_assertOk($greeting);
+        
+        if ($this->_username)
+        {
+          $this->_command(sprintf("USER %s\r\n", $this->_username));
+          $this->_command(sprintf("PASS %s\r\n", $this->_password));
+        }
+      }
+    }
+  }
+  
+  /**
+   * Disconnect from the POP3 host.
+   */
+  public function disconnect()
+  {
+    if (isset($this->_connection))
+    {
+      $this->_connection->disconnect();
+    }
+    else
+    {
+      $this->_command("QUIT\r\n");
+      if (!fclose($this->_socket))
+      {
+        throw new Swift_Plugins_Pop_Pop3Exception(
+          sprintf('POP3 host [%s] connection could not be stopped', $this->_host)
+        );
+      }
+      $this->_socket = null;
+    }
+  }
+  
+  /**
+   * Invoked just before a Transport is started.
+   * 
+   * @param Swift_Events_TransportChangeEvent $evt
+   */
+  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
+  {
+    if (isset($this->_transport))
+    {
+      if ($this->_transport !== $evt->getTransport())
+      {
+        return;
+      }
+    }
+    
+    $this->connect();
+    $this->disconnect();
+  }
+  
+  /**
+   * Not used.
+   */
+  public function transportStarted(Swift_Events_TransportChangeEvent $evt)
+  {
+  }
+  
+  /**
+   * Not used.
+   */
+  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
+  {
+  }
+  
+  /**
+   * Not used.
+   */
+  public function transportStopped(Swift_Events_TransportChangeEvent $evt)
+  {
+  }
+  
+  // -- Private Methods
+  
+  private function _command($command)
+  {
+    if (!fwrite($this->_socket, $command))
+    {
+      throw new Swift_Plugins_Pop_Pop3Exception(
+        sprintf('Failed to write command [%s] to POP3 host', trim($command))
+      );
+    }
+    
+    if (false === $response = fgets($this->_socket))
+    {
+      throw new Swift_Plugins_Pop_Pop3Exception(
+        sprintf('Failed to read from POP3 host after command [%s]', trim($command))
+      );
+    }
+    
+    $this->_assertOk($response);
+    
+    return $response;
+  }
+  
+  private function _assertOk($response)
+  {
+    if (substr($response, 0, 3) != '+OK')
+    {
+      throw new Swift_Plugins_Pop_Pop3Exception(
+        sprintf('POP3 command failed [%s]', trim($response))
+      );
+    }
+  }
+  
+  private function _getHostString()
+  {
+    $host = $this->_host;
+    switch (strtolower($this->_crypto))
+    {
+      case 'ssl':
+        $host = 'ssl://' . $host;
+        break;
+      
+      case 'tls':
+        $host = 'tls://' . $host;
+        break;
+    }
+    return $host;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php
new file mode 100644
index 0000000..00d5765
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporter.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Message.php';
+
+/**
+ * The Reporter plugin sends pass/fail notification to a Reporter.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Reporter
+{
+  
+  /** The recipient was accepted for delivery */
+  const RESULT_PASS = 0x01;
+  
+  /** The recipient could not be accepted */
+  const RESULT_FAIL = 0x10;
+  
+  /**
+   * Notifies this ReportNotifier that $address failed or succeeded.
+   * @param Swift_Mime_Message $message
+   * @param string $address
+   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
+   */
+  public function notify(Swift_Mime_Message $message, $address, $result);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php
new file mode 100644
index 0000000..1beac5b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ReporterPlugin.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/SendListener.php';
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Plugins/Reporter.php';
+
+/**
+ * Does real time reporting of pass/fail for each recipient.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_ReporterPlugin
+  implements Swift_Events_SendListener
+{
+  
+  /**
+   * The reporter backend which takes notifications.
+   * @var Swift_Plugin_Reporter
+   * @access private
+   */
+  private $_reporter;
+  
+  /**
+   * Create a new ReporterPlugin using $reporter.
+   * @param Swift_Plugins_Reporter $reporter
+   */
+  public function __construct(Swift_Plugins_Reporter $reporter)
+  {
+    $this->_reporter = $reporter;
+  }
+  
+  /**
+   * Not used.
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+  {
+  }
+  
+  /**
+   * Invoked immediately after the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt)
+  {
+    $message = $evt->getMessage();
+    $failures = array_flip($evt->getFailedRecipients());
+    foreach ((array) $message->getTo() as $address => $null)
+    {
+      $this->_reporter->notify(
+        $message, $address, (array_key_exists($address, $failures)
+        ? Swift_Plugins_Reporter::RESULT_FAIL
+        : Swift_Plugins_Reporter::RESULT_PASS)
+        );
+    }
+    foreach ((array) $message->getCc() as $address => $null)
+    {
+      $this->_reporter->notify(
+        $message, $address, (array_key_exists($address, $failures)
+        ? Swift_Plugins_Reporter::RESULT_FAIL
+        : Swift_Plugins_Reporter::RESULT_PASS)
+        );
+    }
+    foreach ((array) $message->getBcc() as $address => $null)
+    {
+      $this->_reporter->notify(
+        $message, $address, (array_key_exists($address, $failures)
+        ? Swift_Plugins_Reporter::RESULT_FAIL
+        : Swift_Plugins_Reporter::RESULT_PASS)
+        );
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php
new file mode 100644
index 0000000..0022f5e
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Plugins/Reporter.php';
+//@require 'Swift/Mime/Message.php';
+
+/**
+ * A reporter which "collects" failures for the Reporter plugin.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
+{
+  
+  /**
+   * The list of failures.
+   * @var array
+   * @access private
+   */
+  private $_failures = array();
+  private $_failures_cache = array();
+  
+  /**
+   * Notifies this ReportNotifier that $address failed or succeeded.
+   * @param Swift_Mime_Message $message
+   * @param string $address
+   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
+   */
+  public function notify(Swift_Mime_Message $message, $address, $result)
+  {
+    if (self::RESULT_FAIL == $result && !isset($this->_failures_cache[$address]))
+    {
+      $this->_failures[] = $address;
+      $this->_failures_cache[$address] = true;
+    }
+  }
+  
+  /**
+   * Get an array of addresses for which delivery failed.
+   * @return array
+   */
+  public function getFailedRecipients()
+  {
+    return $this->_failures;
+  }
+  
+  /**
+   * Clear the buffer (empty the list).
+   */
+  public function clear()
+  {
+    $this->_failures = $this->_failures_cache = array();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php
new file mode 100644
index 0000000..7370078
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Plugins/Reporter.php';
+//@require 'Swift/Mime/Message.php';
+
+/**
+ * A HTML output reporter for the Reporter plugin.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
+{
+  
+  /**
+   * Notifies this ReportNotifier that $address failed or succeeded.
+   * @param Swift_Mime_Message $message
+   * @param string $address
+   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
+   */
+  public function notify(Swift_Mime_Message $message, $address, $result)
+  {
+    if (self::RESULT_PASS == $result)
+    {
+      echo "<div style=\"color: #fff; background: #006600; padding: 2px; margin: 2px;\">" . PHP_EOL;
+      echo "PASS " . $address . PHP_EOL;
+      echo "</div>" . PHP_EOL;
+      flush();
+    }
+    else
+    {
+      echo "<div style=\"color: #fff; background: #880000; padding: 2px; margin: 2px;\">" . PHP_EOL;
+      echo "FAIL " . $address . PHP_EOL;
+      echo "</div>" . PHP_EOL;
+      flush();
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php
new file mode 100644
index 0000000..148cbd3
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Sleeper.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sleeps for a duration of time.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Sleeper
+{
+  
+  /**
+   * Sleep for $seconds.
+   * @param int $seconds
+   */
+  public function sleep($seconds);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php
new file mode 100644
index 0000000..43bb1f4
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -0,0 +1,188 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Events/SendEvent.php';
+//@require 'Swift/Plugins/BandwidthMonitorPlugin.php';
+//@require 'Swift/Plugins/Sleeper.php';
+//@require 'Swift/Plugins/Timer.php';
+
+/**
+ * Throttles the rate at which emails are sent.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_ThrottlerPlugin
+  extends Swift_Plugins_BandwidthMonitorPlugin
+  implements Swift_Plugins_Sleeper, Swift_Plugins_Timer
+{
+  
+  /** Flag for throttling in bytes per minute */
+  const BYTES_PER_MINUTE = 0x01;
+  
+  /** Flag for throttling in emails per minute */
+  const MESSAGES_PER_MINUTE = 0x10;
+  
+  /**
+   * The Sleeper instance for sleeping.
+   * @var Swift_Plugins_Sleeper
+   * @access private
+   */
+  private $_sleeper;
+  
+  /**
+   * The Timer instance which provides the timestamp.
+   * @var Swift_Plugins_Timer
+   * @access private
+   */
+  private $_timer;
+  
+  /**
+   * The time at which the first email was sent.
+   * @var int
+   * @access private
+   */
+  private $_start;
+  
+  /**
+   * The rate at which messages should be sent.
+   * @var int
+   * @access private
+   */
+  private $_rate;
+  
+  /**
+   * The mode for throttling.
+   * This is {@link BYTES_PER_MINUTE} or {@link MESSAGES_PER_MINUTE}
+   * @var int
+   * @access private
+   */
+  private $_mode;
+  
+  /**
+   * An internal counter of the number of messages sent.
+   * @var int
+   * @access private
+   */
+  private $_messages = 0;
+  
+  /**
+   * Create a new ThrottlerPlugin.
+   * @param int $rate
+   * @param int $mode, defaults to {@link BYTES_PER_MINUTE}
+   * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
+   * @param Swift_Plugins_Timer $timer (only needed in testing)
+   */
+  public function __construct($rate, $mode = self::BYTES_PER_MINUTE,
+    Swift_Plugins_Sleeper $sleeper = null, Swift_Plugins_Timer $timer = null)
+  {
+    $this->_rate = $rate;
+    $this->_mode = $mode;
+    $this->_sleeper = $sleeper;
+    $this->_timer = $timer;
+  }
+  
+  /**
+   * Invoked immediately before the Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+  {
+    $time = $this->getTimestamp();
+    if (!isset($this->_start))
+    {
+      $this->_start = $time;
+    }
+    $duration = $time - $this->_start;
+    
+    if (self::BYTES_PER_MINUTE == $this->_mode)
+    {
+      $sleep = $this->_throttleBytesPerMinute($duration);
+    }
+    else
+    {
+      $sleep = $this->_throttleMessagesPerMinute($duration);
+    }
+    
+    if ($sleep > 0)
+    {
+      $this->sleep($sleep);
+    }
+  }
+  
+  /**
+   * Invoked when a Message is sent.
+   * @param Swift_Events_SendEvent $evt
+   */
+  public function sendPerformed(Swift_Events_SendEvent $evt)
+  {
+    parent::sendPerformed($evt);
+    ++$this->_messages;
+  }
+  
+  /**
+   * Sleep for $seconds.
+   * @param int $seconds
+   */
+  public function sleep($seconds)
+  {
+    if (isset($this->_sleeper))
+    {
+      $this->_sleeper->sleep($seconds);
+    }
+    else
+    {
+      sleep($seconds);
+    }
+  }
+  
+  /**
+   * Get the current UNIX timestamp
+   * @return int
+   */
+  public function getTimestamp()
+  {
+    if (isset($this->_timer))
+    {
+      return $this->_timer->getTimestamp();
+    }
+    else
+    {
+      return time();
+    }
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Get a number of seconds to sleep for.
+   * @param int $timePassed
+   * @return int
+   * @access private
+   */
+  private function _throttleBytesPerMinute($timePassed)
+  {
+    $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
+    return (int) ceil($expectedDuration - $timePassed);
+  }
+  
+  /**
+   * Get a number of seconds to sleep for.
+   * @param int $timePassed
+   * @return int
+   * @access private
+   */
+  private function _throttleMessagesPerMinute($timePassed)
+  {
+    $expectedDuration = $this->_messages / ($this->_rate / 60);
+    return (int) ceil($expectedDuration - $timePassed);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php
new file mode 100644
index 0000000..92207bf
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Plugins/Timer.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides timestamp data.
+ * @package Swift
+ * @subpackage Plugins
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Timer
+{
+  
+  /**
+   * Get the current UNIX timestamp.
+   * @return int
+   */
+  public function getTimestamp();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php
new file mode 100644
index 0000000..20a2e5f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Preferences.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Changes some global preference settings in Swift Mailer.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_Preferences
+{
+  
+  /** Singleton instance */
+  private static $_instance = null;
+  
+  /** Constructor not to be used */
+  private function __construct() { }
+  
+  /**
+   * Get a new instance of Preferences.
+   * @return Swift_Preferences
+   */
+  public static function getInstance()
+  {
+    if (!isset(self::$_instance))
+    {
+      self::$_instance = new self();
+    }
+    return self::$_instance;
+  }
+  
+  /**
+   * Set the default charset used.
+   * @param string
+   * @return Swift_Preferences
+   */
+  public function setCharset($charset)
+  {
+    Swift_DependencyContainer::getInstance()
+      ->register('properties.charset')->asValue($charset);
+    return $this;
+  }
+  
+  /**
+   * Set the directory where temporary files can be saved.
+   * @param string $dir
+   * @return Swift_Preferences
+   */
+  public function setTempDir($dir)
+  {
+    Swift_DependencyContainer::getInstance()
+      ->register('tempdir')->asValue($dir);
+    return $this;
+  }
+  
+  /**
+   * Set the type of cache to use (i.e. "disk" or "array").
+   * @param string $type
+   * @return Swift_Preferences
+   */
+  public function setCacheType($type)
+  {
+    Swift_DependencyContainer::getInstance()
+      ->register('cache')->asAliasOf(sprintf('cache.%s', $type));
+    return $this;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php
new file mode 100644
index 0000000..db29e6d
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/ReplacementFilterFactory.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates StreamFilters.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+interface Swift_ReplacementFilterFactory
+{
+  
+  /**
+   * Create a filter to replace $search with $replace.
+   * @param mixed $search
+   * @param mixed $replace
+   * @return Swift_StreamFilter
+   */
+  public function createFilter($search, $replace);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php
new file mode 100644
index 0000000..5bb394b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/RfcComplianceException.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/SwiftException.php';
+
+/**
+ * RFC Compliance Exception class.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_RfcComplianceException extends Swift_SwiftException
+{
+  
+  /**
+   * Create a new RfcComplianceException with $message.
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php
new file mode 100644
index 0000000..60a7000
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SendmailTransport.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/SendmailTransport.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * SendmailTransport for sending mail through a sendmail/postfix (etc..) binary.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
+{
+  
+  /**
+   * Create a new SendmailTransport, optionally using $command for sending.
+   * @param string $command
+   */
+  public function __construct($command = '/usr/sbin/sendmail -bs')
+  {
+    call_user_func_array(
+      array($this, 'Swift_Transport_SendmailTransport::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('transport.sendmail')
+      );
+    
+    $this->setCommand($command);
+  }
+  
+  /**
+   * Create a new SendmailTransport instance.
+   * @param string $command
+   * @return Swift_SendmailTransport
+   */
+  public static function newInstance($command = '/usr/sbin/sendmail -bs')
+  {
+    return new self($command);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php
new file mode 100644
index 0000000..65180d5
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SmtpTransport.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/EsmtpTransport.php';
+//@require 'Swift/DependencyContainer.php';
+
+/**
+ * Sends Messages over SMTP with ESMTP support.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
+{
+  
+  /**
+   * Create a new SmtpTransport, optionally with $host, $port and $security.
+   * @param string $host
+   * @param int $port
+   * @param int $security
+   */
+  public function __construct($host = 'localhost', $port = 25,
+    $security = null)
+  {
+    call_user_func_array(
+      array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+      Swift_DependencyContainer::getInstance()
+        ->createDependenciesFor('transport.smtp')
+      );
+    
+    $this->setHost($host);
+    $this->setPort($port);
+    $this->setEncryption($security);
+  }
+  
+  /**
+   * Create a new SmtpTransport instance.
+   * @param string $host
+   * @param int $port
+   * @param int $security
+   * @return Swift_SmtpTransport
+   */
+  public static function newInstance($host = 'localhost', $port = 25,
+    $security = null)
+  {
+    return new self($host, $port, $security);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php
new file mode 100644
index 0000000..6c262ce
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilter.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Processes bytes as they pass through a stream and performs filtering.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+interface Swift_StreamFilter
+{
+  
+  /**
+   * Based on the buffer given, this returns true if more buffering is needed.
+   * @param mixed $buffer
+   * @return boolean
+   */
+  public function shouldBuffer($buffer);
+  
+  /**
+   * Filters $buffer and returns the changes.
+   * @param mixed $buffer
+   * @return mixed
+   */
+  public function filter($buffer);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
new file mode 100644
index 0000000..2df52be
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -0,0 +1,188 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/StreamFilter.php';
+
+/**
+ * Processes bytes as they pass through a buffer and replaces sequences in it.
+ * This stream filter deals with Byte arrays rather than simple strings.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_ByteArrayReplacementFilter
+  implements Swift_StreamFilter
+{
+
+  /** The needle(s) to search for */
+  private $_search;
+
+  /** The replacement(s) to make */
+  private $_replace;
+
+  /** The Index for searching */
+  private $_index;
+
+  /** The Search Tree */
+  private $_tree = array();
+
+  /**  Gives the size of the largest search */
+  private $_treeMaxLen = 0;
+  
+  private $_repSize;
+
+  /**
+   * Create a new ByteArrayReplacementFilter with $search and $replace.
+   * @param array $search
+   * @param array $replace
+   */
+  public function __construct($search, $replace)
+  {
+    $this->_search = $search;
+    $this->_index = array();
+    $this->_tree = array();
+    $this->_replace = array();
+    $this->_repSize = array();
+    
+    $tree = null;
+    $i = null;
+    $last_size = $size = 0;
+    foreach ($search as $i => $search_element)
+    {
+      if ($tree !== null)
+      {
+        $tree[-1] = min (count($replace) - 1, $i - 1);
+        $tree[-2] = $last_size;
+      }
+      $tree = &$this->_tree;
+      if (is_array ($search_element))
+      {
+        foreach ($search_element as $k => $char)
+        {
+          $this->_index[$char] = true;
+          if (!isset($tree[$char]))
+          {
+            $tree[$char] = array();
+          }
+          $tree = &$tree[$char];
+        }
+        $last_size = $k+1;
+        $size = max($size, $last_size);
+      }
+      else
+      {
+        $last_size = 1;
+        if (!isset($tree[$search_element]))
+        {
+          $tree[$search_element] = array();
+        }
+        $tree = &$tree[$search_element];
+        $size = max($last_size, $size);
+        $this->_index[$search_element] = true;
+      }
+    }
+    if ($i !== null)
+    {
+      $tree[-1] = min (count ($replace) - 1, $i);
+      $tree[-2] = $last_size;
+      $this->_treeMaxLen = $size;
+    }
+    foreach ($replace as $rep)
+    {
+      if (!is_array($rep))
+      {
+        $rep = array ($rep);
+      }
+      $this->_replace[] = $rep;
+    }
+    for ($i = count($this->_replace) - 1; $i >= 0; --$i)
+    {
+      $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
+      $this->_repSize[$i] = count($rep);
+    }
+  }
+
+  /**
+   * Returns true if based on the buffer passed more bytes should be buffered.
+   * @param array $buffer
+   * @return boolean
+   */
+  public function shouldBuffer($buffer)
+  {
+    $endOfBuffer = end($buffer);
+    return isset ($this->_index[$endOfBuffer]);
+  }
+
+  /**
+   * Perform the actual replacements on $buffer and return the result.
+   * @param array $buffer
+   * @return array
+   */
+  public function filter($buffer, $_minReplaces = -1)
+  {
+    if ($this->_treeMaxLen == 0)
+    {
+      return $buffer;
+    }
+    
+    $newBuffer = array();
+    $buf_size = count($buffer);
+    for ($i = 0; $i < $buf_size; ++$i)
+    {
+      $search_pos = $this->_tree;
+      $last_found = PHP_INT_MAX;
+      // We try to find if the next byte is part of a search pattern
+      for ($j = 0; $j <= $this->_treeMaxLen; ++$j)
+      {
+        // We have a new byte for a search pattern
+        if (isset ($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]]))
+        {
+          $search_pos = $search_pos[$buffer[$p]];
+          // We have a complete pattern, save, in case we don't find a better match later
+          if (isset($search_pos[- 1]) && $search_pos[-1] < $last_found
+            && $search_pos[-1] > $_minReplaces)
+          {
+            $last_found = $search_pos[-1];
+            $last_size = $search_pos[-2];
+          }
+        }
+        // We got a complete pattern
+        elseif ($last_found !== PHP_INT_MAX)
+        {
+          // Adding replacement datas to output buffer
+          $rep_size = $this->_repSize[$last_found];
+          for ($j = 0; $j < $rep_size; ++$j)
+          {
+            $newBuffer[] = $this->_replace[$last_found][$j];
+          }
+          // We Move cursor forward
+          $i += $last_size - 1;
+          // Edge Case, last position in buffer
+          if ($i >= $buf_size)
+          {
+            $newBuffer[] = $buffer[$i];
+          }
+          
+          // We start the next loop
+          continue 2;
+        }
+        else
+        {
+          // this byte is not in a pattern and we haven't found another pattern
+          break;
+        }
+      }
+      // Normal byte, move it to output buffer
+      $newBuffer[] = $buffer[$i];
+    }
+    
+    return $newBuffer;
+  }
+
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php
new file mode 100644
index 0000000..9ab6c30
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/StreamFilter.php';
+
+/**
+ * Processes bytes as they pass through a buffer and replaces sequences in it.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
+{
+  
+  /** The needle(s) to search for */
+  private $_search;
+  
+  /** The replacement(s) to make */
+  private $_replace;
+  
+  /**
+   * Create a new StringReplacementFilter with $search and $replace.
+   * @param string|array $search
+   * @param string|array $replace
+   */
+  public function __construct($search, $replace)
+  {
+    $this->_search = $search;
+    $this->_replace = $replace;
+  }
+  
+  /**
+   * Returns true if based on the buffer passed more bytes should be buffered.
+   * @param string $buffer
+   * @return boolean
+   */
+  public function shouldBuffer($buffer)
+  {
+    $endOfBuffer = substr($buffer, -1);
+    foreach ((array) $this->_search as $needle)
+    {
+      if (false !== strpos($needle, $endOfBuffer))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  /**
+   * Perform the actual replacements on $buffer and return the result.
+   * @param string $buffer
+   * @return string
+   */
+  public function filter($buffer)
+  {
+    return str_replace($this->_search, $this->_replace, $buffer);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
new file mode 100644
index 0000000..fcd4b83
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/StreamFilters/StringReplacementFilter.php';
+//@require 'Swift/StreamFilterFactory.php';
+
+/**
+ * Creates filters for replacing needles in a string buffer.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_StringReplacementFilterFactory
+  implements Swift_ReplacementFilterFactory
+{
+  
+  /** Lazy-loaded filters */
+  private $_filters = array();
+  
+  /**
+   * Create a new StreamFilter to replace $search with $replace in a string.
+   * @param string $search
+   * @param string $replace
+   * @return Swift_StreamFilter
+   */
+  public function createFilter($search, $replace)
+  {
+    if (!isset($this->_filters[$search][$replace]))
+    {
+      if (!isset($this->_filters[$search]))
+      {
+        $this->_filters[$search] = array();
+      }
+      
+      if (!isset($this->_filters[$search][$replace]))
+      {
+        $this->_filters[$search][$replace] = array();
+      }
+      
+      $this->_filters[$search][$replace]
+        = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+    }
+    
+    return $this->_filters[$search][$replace];
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php
new file mode 100644
index 0000000..bd3b656
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/SwiftException.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base Exception class.
+ * @package Swift
+ * @author Chris Corbyn
+ */
+class Swift_SwiftException extends Exception
+{
+  
+  /**
+   * Create a new SwiftException with $message.
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php
new file mode 100644
index 0000000..9b54752
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Events/EventListener.php';
+
+/**
+ * Sends Messages via an abstract Transport subsystem.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport
+{
+
+  /**
+   * Test if this Transport mechanism has started.
+   * 
+   * @return boolean
+   */
+  public function isStarted();
+  
+  /**
+   * Start this Transport mechanism.
+   */
+  public function start();
+  
+  /**
+   * Stop this Transport mechanism.
+   */
+  public function stop();
+  
+  /**
+   * Send the given Message.
+   * 
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null);
+  
+  /**
+   * Register a plugin in the Transport.
+   * 
+   * @param Swift_Events_EventListener $plugin
+   */
+  public function registerPlugin(Swift_Events_EventListener $plugin);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php
new file mode 100644
index 0000000..3329d34
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -0,0 +1,543 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport.php';
+//@require 'Swift/Transport/IoBuffer.php';
+//@require 'Swift/Transport/CommandSentException.php';
+//@require 'Swift/TransportException.php';
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Events/EventDispatcher.php';
+//@require 'Swift/Events/EventListener.php';
+
+/**
+ * Sends Messages over SMTP.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+abstract class Swift_Transport_AbstractSmtpTransport
+  implements Swift_Transport
+{
+  
+  /** Input-Output buffer for sending/receiving SMTP commands and responses */
+  protected $_buffer;
+  
+  /** Connection status */
+  protected $_started = false;
+  
+  /** The domain name to use in HELO command */
+  protected $_domain = '[127.0.0.1]';
+  
+  /** The event dispatching layer */
+  protected $_eventDispatcher;
+  
+  /** Return an array of params for the Buffer */
+  abstract protected function _getBufferParams();
+  
+  /**
+   * Creates a new EsmtpTransport using the given I/O buffer.
+   * 
+   * @param Swift_Transport_IoBuffer $buf
+   * @param Swift_Events_EventDispatcher $dispatcher
+   */
+  public function __construct(Swift_Transport_IoBuffer $buf,
+    Swift_Events_EventDispatcher $dispatcher)
+  {
+    $this->_eventDispatcher = $dispatcher;
+    $this->_buffer = $buf;
+    $this->_lookupHostname();
+  }
+  
+  /**
+   * Set the name of the local domain which Swift will identify itself as.
+   * This should be a fully-qualified domain name and should be truly the domain
+   * you're using.  If your server doesn't have a domain name, use the IP in square
+   * brackets (i.e. [127.0.0.1]).
+   * 
+   * @param string $domain
+   */
+  public function setLocalDomain($domain)
+  {
+    $this->_domain = $domain;
+    return $this;
+  }
+  
+  /**
+   * Get the name of the domain Swift will identify as.
+   * 
+   * @return string
+   */
+  public function getLocalDomain()
+  {
+    return $this->_domain;
+  }
+  
+  /**
+   * Start the SMTP connection.
+   */
+  public function start()
+  {
+    if (!$this->_started)
+    {
+      if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
+      {
+        $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
+        if ($evt->bubbleCancelled())
+        {
+          return;
+        }
+      }
+      
+      try
+      {
+        $this->_buffer->initialize($this->_getBufferParams());
+      }
+      catch (Swift_TransportException $e)
+      {
+        $this->_throwException($e);
+      }
+      $this->_readGreeting();
+      $this->_doHeloCommand();
+      
+      if ($evt)
+      {
+        $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
+      }
+      
+      $this->_started = true;
+    }
+  }
+  
+  /**
+   * Test if an SMTP connection has been established.
+   * 
+   * @return boolean
+   */
+  public function isStarted()
+  {
+    return $this->_started;
+  }
+  
+  /**
+   * Send the given Message.
+   * 
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $sent = 0;
+    $failedRecipients = (array) $failedRecipients;
+    
+    if (!$reversePath = $this->_getReversePath($message))
+    {
+      throw new Swift_TransportException(
+        'Cannot send message without a sender address'
+        );
+    }
+    
+    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
+    {
+      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+      if ($evt->bubbleCancelled())
+      {
+        return 0;
+      }
+    }
+    
+    $to = (array) $message->getTo();
+    $cc = (array) $message->getCc();
+    $bcc = (array) $message->getBcc();
+    
+    $message->setBcc(array());
+    
+    try
+    {
+      $sent += $this->_sendTo($message, $reversePath, $to, $failedRecipients);
+      $sent += $this->_sendCc($message, $reversePath, $cc, $failedRecipients);
+      $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
+    }
+    catch (Exception $e)
+    {
+      $message->setBcc($bcc);
+      throw $e;
+    }
+    
+    $message->setBcc($bcc);
+    
+    if ($evt)
+    {
+      if ($sent == count($to) + count($cc) + count($bcc))
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+      }
+      elseif ($sent > 0)
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
+      }
+      else
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
+      }
+      $evt->setFailedRecipients($failedRecipients);
+      $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+    }
+    
+    $message->generateId(); //Make sure a new Message ID is used
+    
+    return $sent;
+  }
+  
+  /**
+   * Stop the SMTP connection.
+   */
+  public function stop()
+  {
+    if ($this->_started)
+    {
+      if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
+      {
+        $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
+        if ($evt->bubbleCancelled())
+        {
+          return;
+        }
+      }
+      
+      try
+      {
+        $this->executeCommand("QUIT\r\n", array(221));
+      }
+      catch (Swift_TransportException $e) {}
+      
+      try
+      {
+        $this->_buffer->terminate();
+      
+        if ($evt)
+        {
+          $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
+        }
+      }
+      catch (Swift_TransportException $e)
+      {
+        $this->_throwException($e);
+      }
+    }
+    $this->_started = false;
+  }
+  
+  /**
+   * Register a plugin.
+   * 
+   * @param Swift_Events_EventListener $plugin
+   */
+  public function registerPlugin(Swift_Events_EventListener $plugin)
+  {
+    $this->_eventDispatcher->bindEventListener($plugin);
+  }
+  
+  /**
+   * Reset the current mail transaction.
+   */
+  public function reset()
+  {
+    $this->executeCommand("RSET\r\n", array(250));
+  }
+  
+  /**
+   * Get the IoBuffer where read/writes are occurring.
+   * 
+   * @return Swift_Transport_IoBuffer
+   */
+  public function getBuffer()
+  {
+    return $this->_buffer;
+  }
+  
+  /**
+   * Run a command against the buffer, expecting the given response codes.
+   * 
+   * If no response codes are given, the response will not be validated.
+   * If codes are given, an exception will be thrown on an invalid response.
+   * 
+   * @param string $command
+   * @param int[] $codes
+   * @param string[] &$failures
+   * @return string
+   */
+  public function executeCommand($command, $codes = array(), &$failures = null)
+  {
+    $failures = (array) $failures;
+    $seq = $this->_buffer->write($command);
+    $response = $this->_getFullResponse($seq);
+    if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes))
+    {
+      $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
+    }
+    $this->_assertResponseCode($response, $codes);
+    return $response;
+  }
+  
+  // -- Protected methods
+  
+  /** Read the opening SMTP greeting */
+  protected function _readGreeting()
+  {
+    $this->_assertResponseCode($this->_getFullResponse(0), array(220));
+  }
+  
+  /** Send the HELO welcome */
+  protected function _doHeloCommand()
+  {
+    $this->executeCommand(
+      sprintf("HELO %s\r\n", $this->_domain), array(250)
+      );
+  }
+  
+  /** Send the MAIL FROM command */
+  protected function _doMailFromCommand($address)
+  {
+    $this->executeCommand(
+      sprintf("MAIL FROM: <%s>\r\n", $address), array(250)
+      );
+  }
+  
+  /** Send the RCPT TO command */
+  protected function _doRcptToCommand($address)
+  {
+    $this->executeCommand(
+      sprintf("RCPT TO: <%s>\r\n", $address), array(250, 251, 252)
+      );
+  }
+  
+  /** Send the DATA command */
+  protected function _doDataCommand()
+  {
+    $this->executeCommand("DATA\r\n", array(354));
+  }
+  
+  /** Stream the contents of the message over the buffer */
+  protected function _streamMessage(Swift_Mime_Message $message)
+  {
+    $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+    try
+    {
+      $message->toByteStream($this->_buffer);
+      $this->_buffer->flushBuffers();
+    }
+    catch (Swift_TransportException $e)
+    {
+      $this->_throwException($e);
+    }
+    $this->_buffer->setWriteTranslations(array());
+    $this->executeCommand("\r\n.\r\n", array(250));
+  }
+  
+  /** Determine the best-use reverse path for this message */
+  protected function _getReversePath(Swift_Mime_Message $message)
+  {
+    $return = $message->getReturnPath();
+    $sender = $message->getSender();
+    $from = $message->getFrom();
+    $path = null;
+    if (!empty($return))
+    {
+      $path = $return;
+    }
+    elseif (!empty($sender))
+    {
+      // Don't use array_keys
+      reset($sender); // Reset Pointer to first pos
+      $path = key($sender); // Get key
+    }
+    elseif (!empty($from))
+    {
+      reset($from); // Reset Pointer to first pos
+      $path = key($from); // Get key
+    }
+    return $path;
+  }
+  
+  /** Throw a TransportException, first sending it to any listeners */
+  protected function _throwException(Swift_TransportException $e)
+  {
+    if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e))
+    {
+      $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
+      if (!$evt->bubbleCancelled())
+      {
+        throw $e;
+      }
+    }
+    else
+    {
+      throw $e;
+    }
+  }
+  
+  /** Throws an Exception if a response code is incorrect */
+  protected function _assertResponseCode($response, $wanted)
+  {
+    list($code, $separator, $text) = sscanf($response, '%3d%[ -]%s');
+    $valid = (empty($wanted) || in_array($code, $wanted));
+    
+    if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
+      $valid))
+    {
+      $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
+    }
+    
+    if (!$valid)
+    {
+      $this->_throwException(
+        new Swift_TransportException(
+          'Expected response code ' . implode('/', $wanted) . ' but got code ' .
+          '"' . $code . '", with message "' . $response . '"'
+          )
+        );
+    }
+  }
+  
+  /** Get an entire multi-line response using its sequence number */
+  protected function _getFullResponse($seq)
+  {
+    $response = '';
+    try
+    {
+      do
+      {
+        $line = $this->_buffer->readLine($seq);
+        $response .= $line;
+      }
+      while (null !== $line && false !== $line && ' ' != $line{3});
+    }
+    catch (Swift_TransportException $e)
+    {
+      $this->_throwException($e);
+    }
+    return $response;
+  }
+  
+  // -- Private methods
+  
+  /** Send an email to the given recipients from the given reverse path */
+  private function _doMailTransaction($message, $reversePath,
+    array $recipients, array &$failedRecipients)
+  {
+    $sent = 0;
+    $this->_doMailFromCommand($reversePath);
+    foreach ($recipients as $forwardPath)
+    {
+      try
+      {
+        $this->_doRcptToCommand($forwardPath);
+        $sent++;
+      }
+      catch (Swift_TransportException $e)
+      {
+        $failedRecipients[] = $forwardPath;
+      }
+    }
+    
+    if ($sent != 0)
+    {
+      $this->_doDataCommand();
+      $this->_streamMessage($message);
+    }
+    else
+    {
+      $this->reset();
+    }
+    
+    return $sent;
+  }
+  
+  /** Send a message to the given To: recipients */
+  private function _sendTo(Swift_Mime_Message $message, $reversePath,
+    array $to, array &$failedRecipients)
+  {
+    if (empty($to))
+    {
+      return 0;
+    }
+    return $this->_doMailTransaction($message, $reversePath, array_keys($to),
+      $failedRecipients);
+  }
+  
+  /** Send a message to the given Cc: recipients */
+  private function _sendCc(Swift_Mime_Message $message, $reversePath,
+    array $cc, array &$failedRecipients)
+  {
+    if (empty($cc))
+    {
+      return 0;
+    }
+    return $this->_doMailTransaction($message, $reversePath, array_keys($cc),
+      $failedRecipients);
+  }
+  
+  /** Send a message to all Bcc: recipients */
+  private function _sendBcc(Swift_Mime_Message $message, $reversePath,
+    array $bcc, array &$failedRecipients)
+  {
+    $sent = 0;
+    foreach ($bcc as $forwardPath => $name)
+    {
+      $message->setBcc(array($forwardPath => $name));
+      $sent += $this->_doMailTransaction(
+        $message, $reversePath, array($forwardPath), $failedRecipients
+        );
+    }
+    return $sent;
+  }
+  
+  /** Try to determine the hostname of the server this is run on */
+  private function _lookupHostname()
+  {
+    if (!empty($_SERVER['SERVER_NAME'])
+      && $this->_isFqdn($_SERVER['SERVER_NAME']))
+    {
+      $this->_domain = $_SERVER['SERVER_NAME'];
+    }
+    elseif (!empty($_SERVER['SERVER_ADDR']))
+    {
+      $this->_domain = sprintf('[%s]', $_SERVER['SERVER_ADDR']);
+    }
+  }
+  
+  /** Determine is the $hostname is a fully-qualified name */
+  private function _isFqdn($hostname)
+  {
+    //We could do a really thorough check, but there's really no point
+    if (false !== $dotPos = strpos($hostname, '.'))
+    {
+      return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
+    }
+    else
+    {
+      return false;
+    }
+  }
+  
+  /**
+   * Destructor.
+   */
+  public function __destruct()
+  {
+    $this->stop();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
new file mode 100644
index 0000000..4c7e0f2
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/Esmtp/Authenticator.php';
+//@require 'Swift/Transport/SmtpAgent.php';
+//@require 'Swift/TransportException.php';
+
+/**
+ * Handles CRAM-MD5 authentication.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_CramMd5Authenticator
+  implements Swift_Transport_Esmtp_Authenticator
+{
+  
+  /**
+   * Get the name of the AUTH mechanism this Authenticator handles.
+   * @return string
+   */
+  public function getAuthKeyword()
+  {
+    return 'CRAM-MD5';
+  }
+  
+  /**
+   * Try to authenticate the user with $username and $password.
+   * @param Swift_Transport_SmtpAgent $agent
+   * @param string $username
+   * @param string $password
+   * @return boolean
+   */
+  public function authenticate(Swift_Transport_SmtpAgent $agent,
+    $username, $password)
+  {
+    try
+    {
+      $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+      $challenge = base64_decode(substr($challenge, 4));
+      $message = base64_encode(
+        $username . ' ' . $this->_getResponse($password, $challenge)
+        );
+      $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+      return true;
+    }
+    catch (Swift_TransportException $e)
+    {
+      $agent->executeCommand("RSET\r\n", array(250));
+      return false;
+    }
+  }
+  
+  /**
+   * Generate a CRAM-MD5 response from a server challenge.
+   * @param string $secret
+   * @param string $challenge
+   * @return string
+   */
+  private function _getResponse($secret, $challenge)
+  {
+    if (strlen($secret) > 64)
+    {
+      $secret = pack('H32', md5($secret));
+    }
+    
+    if (strlen($secret) < 64)
+    {
+      $secret = str_pad($secret, 64, chr(0));
+    }
+    
+    $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
+    $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+
+    $inner  = pack('H32', md5($k_ipad . $challenge));
+    $digest = md5($k_opad . $inner);
+
+    return $digest;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
new file mode 100644
index 0000000..bd22617
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/Esmtp/Authenticator.php';
+//@require 'Swift/Transport/SmtpAgent.php';
+//@require 'Swift/TransportException.php';
+
+/**
+ * Handles LOGIN authentication.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_LoginAuthenticator
+  implements Swift_Transport_Esmtp_Authenticator
+{
+  
+  /**
+   * Get the name of the AUTH mechanism this Authenticator handles.
+   * @return string
+   */
+  public function getAuthKeyword()
+  {
+    return 'LOGIN';
+  }
+  
+  /**
+   * Try to authenticate the user with $username and $password.
+   * @param Swift_Transport_SmtpAgent $agent
+   * @param string $username
+   * @param string $password
+   * @return boolean
+   */
+  public function authenticate(Swift_Transport_SmtpAgent $agent,
+    $username, $password)
+  {
+    try
+    {
+      $agent->executeCommand("AUTH LOGIN\r\n", array(334));
+      $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
+      $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+      return true;
+    }
+    catch (Swift_TransportException $e)
+    {
+      $agent->executeCommand("RSET\r\n", array(250));
+      return false;
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
new file mode 100644
index 0000000..ddd8094
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/Esmtp/Authenticator.php';
+//@require 'Swift/Transport/SmtpAgent.php';
+//@require 'Swift/TransportException.php';
+
+/**
+ * Handles PLAIN authentication.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_PlainAuthenticator
+  implements Swift_Transport_Esmtp_Authenticator
+{
+  
+  /**
+   * Get the name of the AUTH mechanism this Authenticator handles.
+   * @return string
+   */
+  public function getAuthKeyword()
+  {
+    return 'PLAIN';
+  }
+  
+  /**
+   * Try to authenticate the user with $username and $password.
+   * @param Swift_Transport_SmtpAgent $agent
+   * @param string $username
+   * @param string $password
+   * @return boolean
+   */
+  public function authenticate(Swift_Transport_SmtpAgent $agent,
+    $username, $password)
+  {
+    try
+    {
+      $message = base64_encode($username . chr(0) . $username . chr(0) . $password);
+      $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+      return true;
+    }
+    catch (Swift_TransportException $e)
+    {
+      $agent->executeCommand("RSET\r\n", array(250));
+      return false;
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php
new file mode 100644
index 0000000..a223169
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -0,0 +1,262 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/TransportException.php';
+//@require 'Swift/Transport/EsmtpHandler.php';
+//@require 'Swift/Transport/SmtpAgent.php';
+
+/**
+ * An ESMTP handler for AUTH support.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
+{
+  
+  /**
+   * Authenticators available to process the request.
+   * @var Swift_Transport_Esmtp_Authenticator[]
+   * @access private
+   */
+  private $_authenticators = array();
+  
+  /**
+   * The username for authentication.
+   * @var string
+   * @access private
+   */
+  private $_username;
+  
+  /**
+   * The password for authentication.
+   * @var string
+   * @access private
+   */
+  private $_password;
+  
+  /**
+   * The auth mode for authentication.
+   * @var string
+   * @access private
+   */
+  private $_auth_mode;
+  
+  /**
+   * The ESMTP AUTH parameters available.
+   * @var string[]
+   * @access private
+   */
+  private $_esmtpParams = array();
+  
+  /**
+   * Create a new AuthHandler with $authenticators for support.
+   * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
+   */
+  public function __construct(array $authenticators)
+  {
+    $this->setAuthenticators($authenticators);
+  }
+  
+  /**
+   * Set the Authenticators which can process a login request.
+   * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
+   */
+  public function setAuthenticators(array $authenticators)
+  {
+    $this->_authenticators = $authenticators;
+  }
+  
+  /**
+   * Get the Authenticators which can process a login request.
+   * @return Swift_Transport_Esmtp_Authenticator[]
+   */
+  public function getAuthenticators()
+  {
+    return $this->_authenticators;
+  }
+  
+  /**
+   * Set the username to authenticate with.
+   * @param string $username
+   */
+  public function setUsername($username)
+  {
+    $this->_username = $username;
+  }
+  
+  /**
+   * Get the username to authenticate with.
+   * @return string
+   */
+  public function getUsername()
+  {
+    return $this->_username;
+  }
+  
+  /**
+   * Set the password to authenticate with.
+   * @param string $password
+   */
+  public function setPassword($password)
+  {
+    $this->_password = $password;
+  }
+  
+  /**
+   * Get the password to authenticate with.
+   * @return string
+   */
+  public function getPassword()
+  {
+    return $this->_password;
+  }
+  
+  /**
+   * Set the auth mode to use to authenticate.
+   * @param string $mode
+   */
+  public function setAuthMode($mode)
+  {
+    $this->_auth_mode = $mode;
+  }
+  
+  /**
+   * Get the auth mode to use to authenticate.
+   * @return string
+   */
+  public function getAuthMode()
+  {
+    return $this->_auth_mode;
+  }
+  
+  /**
+   * Get the name of the ESMTP extension this handles.
+   * @return boolean
+   */
+  public function getHandledKeyword()
+  {
+    return 'AUTH';
+  }
+  
+  /**
+   * Set the parameters which the EHLO greeting indicated.
+   * @param string[] $parameters
+   */
+  public function setKeywordParams(array $parameters)
+  {
+    $this->_esmtpParams = $parameters;
+  }
+  
+  /**
+   * Runs immediately after a EHLO has been issued.
+   * @param Swift_Transport_SmtpAgent $agent to read/write
+   */
+  public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+  {
+    if ($this->_username)
+    {
+      $count = 0;
+      foreach ($this->_getAuthenticatorsForAgent() as $authenticator)
+      {
+        if (in_array(strtolower($authenticator->getAuthKeyword()),
+          array_map('strtolower', $this->_esmtpParams)))
+        {
+          $count++;
+          if ($authenticator->authenticate($agent, $this->_username, $this->_password))
+          {
+            return;
+          }
+        }
+      }
+      throw new Swift_TransportException(
+        'Failed to authenticate on SMTP server with username "' .
+        $this->_username . '" using ' . $count . ' possible authenticators'
+        );
+    }
+  }
+  
+  /**
+   * Not used.
+   */
+  public function getMailParams()
+  {
+    return array();
+  }
+  
+  /**
+   * Not used.
+   */
+  public function getRcptParams()
+  {
+    return array();
+  }
+  
+  /**
+   * Not used.
+   */
+  public function onCommand(Swift_Transport_SmtpAgent $agent,
+    $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+  {
+  }
+    
+  /**
+   * Returns +1, -1 or 0 according to the rules for usort().
+   * This method is called to ensure extensions can be execute in an appropriate order.
+   * @param string $esmtpKeyword to compare with
+   * @return int
+   */
+  public function getPriorityOver($esmtpKeyword)
+  {
+    return 0;
+  }
+  
+  /**
+   * Returns an array of method names which are exposed to the Esmtp class.
+   * @return string[]
+   */
+  public function exposeMixinMethods()
+  {
+    return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+  }
+  
+  /**
+   * Not used.
+   */
+  public function resetState()
+  {
+  }
+  
+  // -- Protected methods
+  
+  /**
+   * Returns the authenticator list for the given agent.
+   * @param  Swift_Transport_SmtpAgent $agent
+   * @return array
+   * @access protected
+   */
+  protected function _getAuthenticatorsForAgent()
+  {
+    if (!$mode = strtolower($this->_auth_mode))
+    {
+      return $this->_authenticators;
+    }
+
+    foreach ($this->_authenticators as $authenticator)
+    {
+      if (strtolower($authenticator->getAuthKeyword()) == $mode)
+      {
+        return array($authenticator);
+      }
+    }
+
+    throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
+  }
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php
new file mode 100644
index 0000000..bf166d3
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/SmtpAgent.php';
+
+/**
+ * An Authentication mechanism.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_Esmtp_Authenticator
+{
+  
+  /**
+   * Get the name of the AUTH mechanism this Authenticator handles.
+   * @return string
+   */
+  public function getAuthKeyword();
+  
+  /**
+   * Try to authenticate the user with $username and $password.
+   * @param Swift_Transport_SmtpAgent $agent
+   * @param string $username
+   * @param string $password
+   * @return boolean
+   */
+  public function authenticate(Swift_Transport_SmtpAgent $agent,
+    $username, $password);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php
new file mode 100644
index 0000000..e96f95f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpHandler.php
@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/EsmtpBufferWrapper.php';
+
+/**
+ * An ESMTP handler.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_EsmtpHandler
+{
+  
+  /**
+   * Get the name of the ESMTP extension this handles.
+   * @return boolean
+   */
+  public function getHandledKeyword();
+  
+  /**
+   * Set the parameters which the EHLO greeting indicated.
+   * @param string[] $parameters
+   */
+  public function setKeywordParams(array $parameters);
+  
+  /**
+   * Runs immediately after a EHLO has been issued.
+   * @param Swift_Transport_SmtpAgent $agent to read/write
+   */
+  public function afterEhlo(Swift_Transport_SmtpAgent $agent);
+  
+  /**
+   * Get params which are appended to MAIL FROM:<>.
+   * @return string[]
+   */
+  public function getMailParams();
+  
+  /**
+   * Get params which are appended to RCPT TO:<>.
+   * @return string[]
+   */
+  public function getRcptParams();
+  
+  /**
+   * Runs when a command is due to be sent.
+   * @param Swift_Transport_SmtpAgent $agent to read/write
+   * @param string $command to send
+   * @param int[] $codes expected in response
+   * @param string[] &$failedRecipients
+   * @param boolean &$stop to be set true if the command is now sent
+   */
+  public function onCommand(Swift_Transport_SmtpAgent $agent,
+    $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    
+  /**
+   * Returns +1, -1 or 0 according to the rules for usort().
+   * This method is called to ensure extensions can be execute in an appropriate order.
+   * @param string $esmtpKeyword to compare with
+   * @return int
+   */
+  public function getPriorityOver($esmtpKeyword);
+  
+  /**
+   * Returns an array of method names which are exposed to the Esmtp class.
+   * @return string[]
+   */
+  public function exposeMixinMethods();
+  
+  /**
+   * Tells this handler to clear any buffers and reset its state.
+   */
+  public function resetState();
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php
new file mode 100644
index 0000000..c7833c3
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/EsmtpTransport.php
@@ -0,0 +1,340 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/AbstractSmtpTransport.php';
+//@require 'Swift/Transport/EsmtpHandler.php';
+//@require 'Swift/Transport/IoBuffer.php';
+//@require 'Swift/Transport/SmtpAgent.php';
+//@require 'Swift/TransportException.php';
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Events/EventDispatcher.php';
+
+/**
+ * Sends Messages over SMTP with ESMTP support.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_EsmtpTransport
+  extends Swift_Transport_AbstractSmtpTransport
+  implements Swift_Transport_SmtpAgent
+{
+  
+  /**
+   * ESMTP extension handlers.
+   * @var Swift_Transport_EsmtpHandler[]
+   * @access private
+   */
+  private $_handlers = array();
+  
+  /**
+   * ESMTP capabilities.
+   * @var string[]
+   * @access private
+   */
+  private $_capabilities = array();
+  
+  /**
+   * Connection buffer parameters.
+   * @var array
+   * @access protected
+   */
+  private $_params = array(
+    'protocol' => 'tcp',
+    'host' => 'localhost',
+    'port' => 25,
+    'timeout' => 30,
+    'blocking' => 1,
+    'type' => Swift_Transport_IoBuffer::TYPE_SOCKET
+    );
+  
+  /**
+   * Creates a new EsmtpTransport using the given I/O buffer.
+   * @param Swift_Transport_IoBuffer $buf
+   * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
+   * @param Swift_Events_EventDispatcher $dispatcher
+   */
+  public function __construct(Swift_Transport_IoBuffer $buf,
+    array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
+  {
+    parent::__construct($buf, $dispatcher);
+    $this->setExtensionHandlers($extensionHandlers);
+  }
+  
+  /**
+   * Set the host to connect to.
+   * @param string $host
+   */
+  public function setHost($host)
+  {
+    $this->_params['host'] = $host;
+    return $this;
+  }
+  
+  /**
+   * Get the host to connect to.
+   * @return string
+   */
+  public function getHost()
+  {
+    return $this->_params['host'];
+  }
+  
+  /**
+   * Set the port to connect to.
+   * @param int $port
+   */
+  public function setPort($port)
+  {
+    $this->_params['port'] = (int) $port;
+    return $this;
+  }
+  
+  /**
+   * Get the port to connect to.
+   * @return int
+   */
+  public function getPort()
+  {
+    return $this->_params['port'];
+  }
+  
+  /**
+   * Set the connection timeout.
+   * @param int $timeout seconds
+   */
+  public function setTimeout($timeout)
+  {
+    $this->_params['timeout'] = (int) $timeout;
+    return $this;
+  }
+  
+  /**
+   * Get the connection timeout.
+   * @return int
+   */
+  public function getTimeout()
+  {
+    return $this->_params['timeout'];
+  }
+  
+  /**
+   * Set the encryption type (tls or ssl)
+   * @param string $encryption
+   */
+  public function setEncryption($enc)
+  {
+    $this->_params['protocol'] = $enc;
+    return $this;
+  }
+  
+  /**
+   * Get the encryption type.
+   * @return string
+   */
+  public function getEncryption()
+  {
+    return $this->_params['protocol'];
+  }
+  
+  /**
+   * Set ESMTP extension handlers.
+   * @param Swift_Transport_EsmtpHandler[] $handlers
+   */
+  public function setExtensionHandlers(array $handlers)
+  {
+    $assoc = array();
+    foreach ($handlers as $handler)
+    {
+      $assoc[$handler->getHandledKeyword()] = $handler;
+    }
+    uasort($assoc, array($this, '_sortHandlers'));
+    $this->_handlers = $assoc;
+    $this->_setHandlerParams();
+    return $this;
+  }
+  
+  /**
+   * Get ESMTP extension handlers.
+   * @return Swift_Transport_EsmtpHandler[]
+   */
+  public function getExtensionHandlers()
+  {
+    return array_values($this->_handlers);
+  }
+  
+  /**
+   * Run a command against the buffer, expecting the given response codes.
+   * If no response codes are given, the response will not be validated.
+   * If codes are given, an exception will be thrown on an invalid response.
+   * @param string $command
+   * @param int[] $codes
+   * @param string[] &$failures
+   * @return string
+   */
+  public function executeCommand($command, $codes = array(), &$failures = null)
+  {
+    $failures = (array) $failures;
+    $stopSignal = false;
+    $response = null;
+    foreach ($this->_getActiveHandlers() as $handler)
+    {
+      $response = $handler->onCommand(
+        $this, $command, $codes, $failures, $stopSignal
+        );
+      if ($stopSignal)
+      {
+        return $response;
+      }
+    }
+    return parent::executeCommand($command, $codes, $failures);
+  }
+  
+  // -- Mixin invocation code
+  
+  /** Mixin handling method for ESMTP handlers */
+  public function __call($method, $args)
+  {
+    foreach ($this->_handlers as $handler)
+    {
+      if (in_array(strtolower($method),
+        array_map('strtolower', (array) $handler->exposeMixinMethods())
+        ))
+      {
+        $return = call_user_func_array(array($handler, $method), $args);
+        //Allow fluid method calls
+        if (is_null($return) && substr($method, 0, 3) == 'set')
+        {
+          return $this;
+        }
+        else
+        {
+          return $return;
+        }
+      }
+    }
+    trigger_error('Call to undefined method ' . $method, E_USER_ERROR);
+  }
+  
+  // -- Protected methods
+  
+  /** Get the params to initialize the buffer */
+  protected function _getBufferParams()
+  {
+    return $this->_params;
+  }
+  
+  /** Overridden to perform EHLO instead */
+  protected function _doHeloCommand()
+  {
+    try
+    {
+      $response = $this->executeCommand(
+        sprintf("EHLO %s\r\n", $this->_domain), array(250)
+        );
+    }
+    catch (Swift_TransportException $e)
+    {
+      return parent::_doHeloCommand();
+    }
+
+    $this->_capabilities = $this->_getCapabilities($response);
+    $this->_setHandlerParams();
+    foreach ($this->_getActiveHandlers() as $handler)
+    {
+      $handler->afterEhlo($this);
+    }
+  }
+  
+  /** Overridden to add Extension support */
+  protected function _doMailFromCommand($address)
+  {
+    $handlers = $this->_getActiveHandlers();
+    $params = array();
+    foreach ($handlers as $handler)
+    {
+      $params = array_merge($params, (array) $handler->getMailParams());
+    }
+    $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
+    $this->executeCommand(
+      sprintf("MAIL FROM: <%s>%s\r\n", $address, $paramStr), array(250)
+      );
+  }
+  
+  /** Overridden to add Extension support */
+  protected function _doRcptToCommand($address)
+  {
+    $handlers = $this->_getActiveHandlers();
+    $params = array();
+    foreach ($handlers as $handler)
+    {
+      $params = array_merge($params, (array) $handler->getRcptParams());
+    }
+    $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
+    $this->executeCommand(
+      sprintf("RCPT TO: <%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+      );
+  }
+  
+  // -- Private methods
+  
+  /** Determine ESMTP capabilities by function group */
+  private function _getCapabilities($ehloResponse)
+  {
+    $capabilities = array();
+    $ehloResponse = trim($ehloResponse);
+    $lines = explode("\r\n", $ehloResponse);
+    array_shift($lines);
+    foreach ($lines as $line)
+    {
+      if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches))
+      {
+        $keyword = strtoupper($matches[1]);
+        $paramStr = strtoupper(ltrim($matches[2], ' ='));
+        $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+        $capabilities[$keyword] = $params;
+      }
+    }
+    return $capabilities;
+  }
+  
+  /** Set parameters which are used by each extension handler */
+  private function _setHandlerParams()
+  {
+    foreach ($this->_handlers as $keyword => $handler)
+    {
+      if (array_key_exists($keyword, $this->_capabilities))
+      {
+        $handler->setKeywordParams($this->_capabilities[$keyword]);
+      }
+    }
+  }
+  
+  /** Get ESMTP handlers which are currently ok to use */
+  private function _getActiveHandlers()
+  {
+    $handlers = array();
+    foreach ($this->_handlers as $keyword => $handler)
+    {
+      if (array_key_exists($keyword, $this->_capabilities))
+      {
+        $handlers[] = $handler;
+      }
+    }
+    return $handlers;
+  }
+  
+  /** Custom sort for extension handler ordering */
+  private function _sortHandlers($a, $b)
+  {
+    return $a->getPriorityOver($b->getHandledKeyword());
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php
new file mode 100644
index 0000000..e62491c
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/FailoverTransport.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/LoadBalancedTransport.php';
+//@require 'Swift/Mime/Message.php';
+
+/**
+ * Contains a list of redundant Transports so when one fails, the next is used.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_FailoverTransport
+  extends Swift_Transport_LoadBalancedTransport
+{
+  
+  /**
+   * Registered transport curently used.
+   * @var Swift_Transport
+   * @access private
+   */
+  private $_currentTransport;
+  
+  /**
+   * Creates a new FailoverTransport.
+   */
+  public function __construct()
+  {
+    parent::__construct();
+  }
+  
+  /**
+   * Send the given Message.
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $maxTransports = count($this->_transports);
+    $sent = 0;
+    
+    for ($i = 0; $i < $maxTransports
+      && $transport = $this->_getNextTransport(); ++$i)
+    {
+      try
+      {
+        if (!$transport->isStarted())
+        {
+          $transport->start();
+        }
+        
+        return $transport->send($message, $failedRecipients);
+      }
+      catch (Swift_TransportException $e)
+      {
+        $this->_killCurrentTransport();
+      }
+    }
+    
+    if (count($this->_transports) == 0)
+    {
+      throw new Swift_TransportException(
+        'All Transports in FailoverTransport failed, or no Transports available'
+        );
+    }
+    
+    return $sent;
+  }
+  
+  // -- Protected methods
+  
+  protected function _getNextTransport()
+  {
+    if (!isset($this->_currentTransport))
+    {
+      $this->_currentTransport = parent::_getNextTransport();
+    }
+    return $this->_currentTransport;
+  }
+  
+  protected function _killCurrentTransport()
+  {
+    $this->_currentTransport = null;
+    parent::_killCurrentTransport();
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php
new file mode 100644
index 0000000..ac66ef0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/IoBuffer.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/InputByteStream.php';
+//@require 'Swift/OutputByteStream.php';
+
+/**
+ * Buffers input and output to a resource.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_IoBuffer
+  extends Swift_InputByteStream, Swift_OutputByteStream
+{
+  
+  /** A socket buffer over TCP */
+  const TYPE_SOCKET = 0x0001;
+  
+  /** A process buffer with I/O support */
+  const TYPE_PROCESS = 0x0010;
+  
+  /**
+   * Perform any initialization needed, using the given $params.
+   * Parameters will vary depending upon the type of IoBuffer used.
+   * @param array $params
+   */
+  public function initialize(array $params);
+  
+  /**
+   * Set an individual param on the buffer (e.g. switching to SSL).
+   * @param string $param
+   * @param mixed $value
+   */
+  public function setParam($param, $value);
+  
+  /**
+   * Perform any shutdown logic needed.
+   */
+  public function terminate();
+  
+  /**
+   * Set an array of string replacements which should be made on data written
+   * to the buffer.  This could replace LF with CRLF for example.
+   * @param string[] $replacements
+   */
+  public function setWriteTranslations(array $replacements);
+  
+  /**
+   * Get a line of output (including any CRLF).
+   * The $sequence number comes from any writes and may or may not be used
+   * depending upon the implementation.
+   * @param int $sequence of last write to scan from
+   * @return string
+   */
+  public function readLine($sequence);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php
new file mode 100644
index 0000000..367981b
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/LoadBalancedTransport.php
@@ -0,0 +1,188 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport.php';
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Events/EventListener.php';
+
+/**
+ * Redudantly and rotationally uses several Transports when sending.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_LoadBalancedTransport implements Swift_Transport
+{
+  
+  /** Transports which are deemed useless */
+  private $_deadTransports = array();
+  
+  /**
+   * The Transports which are used in rotation.
+   * 
+   * @var array Swift_Transport
+   * @access protected
+   */
+  protected $_transports = array();
+  
+  /**
+   * Creates a new LoadBalancedTransport.
+   */
+  public function __construct()
+  {
+  }
+  
+  /**
+   * Set $transports to delegate to.
+   * 
+   * @param array $transports Swift_Transport
+   */
+  public function setTransports(array $transports)
+  {
+    $this->_transports = $transports;
+    $this->_deadTransports = array();
+  }
+  
+  /**
+   * Get $transports to delegate to.
+   * 
+   * @return array Swift_Transport
+   */
+  public function getTransports(array $transports)
+  {
+    return array_merge($this->_transports, $this->_deadTransports);
+  }
+  
+  /**
+   * Test if this Transport mechanism has started.
+   * 
+   * @return boolean
+   */
+  public function isStarted()
+  {
+    return count($this->_transports) > 0;
+  }
+  
+  /**
+   * Start this Transport mechanism.
+   */
+  public function start()
+  {
+    $this->_transports = array_merge($this->_transports, $this->_deadTransports);
+  }
+  
+  /**
+   * Stop this Transport mechanism.
+   */
+  public function stop()
+  {
+    foreach ($this->_transports as $transport)
+    {
+      $transport->stop();
+    }
+  }
+  
+  /**
+   * Send the given Message.
+   * 
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $maxTransports = count($this->_transports);
+    $sent = 0;
+    
+    for ($i = 0; $i < $maxTransports
+      && $transport = $this->_getNextTransport(); ++$i)
+    {
+      try
+      {
+        if (!$transport->isStarted())
+        {
+          $transport->start();
+        }
+        if ($sent = $transport->send($message, $failedRecipients))
+        {
+          break;
+        }
+      }
+      catch (Swift_TransportException $e)
+      {
+        $this->_killCurrentTransport();
+      }
+    }
+    
+    if (count($this->_transports) == 0)
+    {
+      throw new Swift_TransportException(
+        'All Transports in LoadBalancedTransport failed, or no Transports available'
+        );
+    }
+    
+    return $sent;
+  }
+  
+  /**
+   * Register a plugin.
+   * 
+   * @param Swift_Events_EventListener $plugin
+   */
+  public function registerPlugin(Swift_Events_EventListener $plugin)
+  {
+    foreach ($this->_transports as $transport)
+    {
+      $transport->registerPlugin($plugin);
+    }
+  }
+  
+  // -- Protected methods
+  
+  /**
+   * Rotates the transport list around and returns the first instance.
+   * 
+   * @return Swift_Transport
+   * @access protected
+   */
+  protected function _getNextTransport()
+  {
+    if ($next = array_shift($this->_transports))
+    {
+      $this->_transports[] = $next;
+    }
+    return $next;
+  }
+  
+  /**
+   * Tag the currently used (top of stack) transport as dead/useless.
+   * 
+   * @access protected
+   */
+  protected function _killCurrentTransport()
+  {
+    if ($transport = array_pop($this->_transports))
+    {
+      try
+      {
+        $transport->stop();
+      }
+      catch (Exception $e)
+      {
+      }
+      $this->_deadTransports[] = $transport;
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php
new file mode 100644
index 0000000..dda882f
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailInvoker.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * This interface intercepts calls to the mail() function.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_MailInvoker
+{
+  
+  /**
+   * Send mail via the mail() function.
+   * 
+   * This method takes the same arguments as PHP mail().
+   * 
+   * @param string $to
+   * @param string $subject
+   * @param string $body
+   * @param string $headers
+   * @param string $extraParams
+   * 
+   * @return boolean
+   */
+  public function mail($to, $subject, $body, $headers = null, $extraParams = null);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php
new file mode 100644
index 0000000..eca59e1
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/MailTransport.php
@@ -0,0 +1,242 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport.php';
+//@require 'Swift/Transport/MailInvoker.php';
+//@require 'Swift/Mime/Message.php';
+//@require 'Swift/Events/EventListener.php';
+
+/**
+ * Sends Messages using the mail() function.
+ * 
+ * It is advised that users do not use this transport if at all possible
+ * since a number of plugin features cannot be used in conjunction with this
+ * transport due to the internal interface in PHP itself.
+ * 
+ * The level of error reporting with this transport is incredibly weak, again
+ * due to limitations of PHP's internal mail() function.  You'll get an
+ * all-or-nothing result from sending.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_MailTransport implements Swift_Transport
+{
+
+  /** Addtional parameters to pass to mail() */
+  private $_extraParams = '-f%s';
+  
+  /** The event dispatcher from the plugin API */
+  private $_eventDispatcher;
+  
+  /** An invoker that calls the mail() function */
+  private $_invoker;
+  
+  /**
+   * Create a new MailTransport with the $log.
+   * @param Swift_Transport_Log $log
+   */
+  public function __construct(Swift_Transport_MailInvoker $invoker,
+    Swift_Events_EventDispatcher $eventDispatcher)
+  {
+    $this->_invoker = $invoker;
+    $this->_eventDispatcher = $eventDispatcher;
+  }
+  
+  /**
+   * Not used.
+   */
+  public function isStarted()
+  {
+    return false;
+  }
+  
+  /**
+   * Not used.
+   */
+  public function start()
+  {
+  }
+  
+  /**
+   * Not used.
+   */
+  public function stop()
+  {
+  }
+  
+  /**
+   * Set the additional parameters used on the mail() function.
+   * 
+   * This string is formatted for sprintf() where %s is the sender address.
+   * 
+   * @param string $params
+   */
+  public function setExtraParams($params)
+  {
+    $this->_extraParams = $params;
+    return $this;
+  }
+  
+  /**
+   * Get the additional parameters used on the mail() function.
+   * 
+   * This string is formatted for sprintf() where %s is the sender address.
+   * 
+   * @return string
+   */
+  public function getExtraParams()
+  {
+    return $this->_extraParams;
+  }
+  
+  /**
+   * Send the given Message.
+   * 
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * 
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $failedRecipients = (array) $failedRecipients;
+    
+    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
+    {
+      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+      if ($evt->bubbleCancelled())
+      {
+        return 0;
+      }
+    }
+    
+    $count = (
+      count((array) $message->getTo())
+      + count((array) $message->getCc())
+      + count((array) $message->getBcc())
+      );
+    
+    $toHeader = $message->getHeaders()->get('To');
+    $subjectHeader = $message->getHeaders()->get('Subject');
+    
+    $to = $toHeader->getFieldBody();
+    $subject = $subjectHeader->getFieldBody();
+    
+    $reversePath = $this->_getReversePath($message);
+    
+    //Remove headers that would otherwise be duplicated
+    $message->getHeaders()->remove('To');
+    $message->getHeaders()->remove('Subject');
+    
+    $messageStr = $message->toString();
+    
+    $message->getHeaders()->set($toHeader);
+    $message->getHeaders()->set($subjectHeader);
+    
+    //Separate headers from body
+    if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n"))
+    {
+      $headers = substr($messageStr, 0, $endHeaders) . "\r\n"; //Keep last EOL
+      $body = substr($messageStr, $endHeaders + 4);
+    }
+    else
+    {
+      $headers = $messageStr . "\r\n";
+      $body = '';
+    }
+    
+    unset($messageStr);
+    
+    if ("\r\n" != PHP_EOL) //Non-windows (not using SMTP)
+    {
+      $headers = str_replace("\r\n", PHP_EOL, $headers);
+      $body = str_replace("\r\n", PHP_EOL, $body);
+    }
+    else //Windows, using SMTP
+    {
+      $headers = str_replace("\r\n.", "\r\n..", $headers);
+      $body = str_replace("\r\n.", "\r\n..", $body);
+    }
+    
+    if ($this->_invoker->mail($to, $subject, $body, $headers,
+      sprintf($this->_extraParams, $reversePath)))
+    {
+      if ($evt)
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+        $evt->setFailedRecipients($failedRecipients);
+        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+      }
+    }
+    else
+    {
+      $failedRecipients = array_merge(
+        $failedRecipients,
+        array_keys((array) $message->getTo()),
+        array_keys((array) $message->getCc()),
+        array_keys((array) $message->getBcc())
+        );
+      
+      if ($evt)
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
+        $evt->setFailedRecipients($failedRecipients);
+        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+      }
+      
+      $message->generateId();
+      
+      $count = 0;
+    }
+    
+    return $count;
+  }
+  
+  /**
+   * Register a plugin.
+   * 
+   * @param Swift_Events_EventListener $plugin
+   */
+  public function registerPlugin(Swift_Events_EventListener $plugin)
+  {
+    $this->_eventDispatcher->bindEventListener($plugin);
+  }
+  
+  // -- Private methods
+  
+  /** Determine the best-use reverse path for this message */
+  private function _getReversePath(Swift_Mime_Message $message)
+  {
+    $return = $message->getReturnPath();
+    $sender = $message->getSender();
+    $from = $message->getFrom();
+    $path = null;
+    if (!empty($return))
+    {
+      $path = $return;
+    }
+    elseif (!empty($sender))
+    {
+      $keys = array_keys($sender);
+      $path = array_shift($keys);
+    }
+    elseif (!empty($from))
+    {
+      $keys = array_keys($from);
+      $path = array_shift($keys);
+    }
+    return $path;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php
new file mode 100644
index 0000000..aae8bde
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SendmailTransport.php
@@ -0,0 +1,173 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/Transport/EsmtpTransport.php';
+//@require 'Swift/Transport/IoBuffer.php';
+//@require 'Swift/Transport/Log.php';
+//@require 'Swift/Events/EventDispatcher.php';
+
+/**
+ * SendmailTransport for sending mail through a sendmail/postfix (etc..) binary.
+ * 
+ * Supported modes are -bs and -t, with any additional flags desired.
+ * It is advised to use -bs mode since error reporting with -t mode is not
+ * possible.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_SendmailTransport
+  extends Swift_Transport_AbstractSmtpTransport
+{
+  
+  /**
+   * Connection buffer parameters.
+   * @var array
+   * @access protected
+   */
+  private $_params = array(
+    'timeout' => 30,
+    'blocking' => 1,
+    'command' => '/usr/sbin/sendmail -bs',
+    'type' => Swift_Transport_IoBuffer::TYPE_PROCESS
+    );
+  
+  /**
+   * Create a new SendmailTransport with $buf for I/O.
+   * @param Swift_Transport_IoBuffer $buf
+   * @param Swift_Events_EventDispatcher $dispatcher
+   */
+  public function __construct(Swift_Transport_IoBuffer $buf,
+    Swift_Events_EventDispatcher $dispatcher)
+  {
+    parent::__construct($buf, $dispatcher);
+  }
+  
+  /**
+   * Start the standalone SMTP session if running in -bs mode.
+   */
+  public function start()
+  {
+    if (false !== strpos($this->getCommand(), ' -bs'))
+    {
+      parent::start();
+    }
+  }
+  
+  /**
+   * Set the command to invoke.
+   * If using -t mode you are strongly advised to include -oi or -i in the
+   * flags. For example: /usr/sbin/sendmail -oi -t
+   * Swift will append a -f<sender> flag if one is not present.
+   * The recommended mode is "-bs" since it is interactive and failure notifications
+   * are hence possible.
+   * @param string $command
+   */
+  public function setCommand($command)
+  {
+    $this->_params['command'] = $command;
+    return $this;
+  }
+  
+  /**
+   * Get the sendmail command which will be invoked.
+   * @return string
+   */
+  public function getCommand()
+  {
+    return $this->_params['command'];
+  }
+  
+  /**
+   * Send the given Message.
+   * Recipient/sender data will be retreived from the Message API.
+   * The return value is the number of recipients who were accepted for delivery.
+   * NOTE: If using 'sendmail -t' you will not be aware of any failures until
+   * they bounce (i.e. send() will always return 100% success).
+   * @param Swift_Mime_Message $message
+   * @param string[] &$failedRecipients to collect failures by-reference
+   * @return int
+   */
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    $failedRecipients = (array) $failedRecipients;
+    $command = $this->getCommand();
+    $buffer = $this->getBuffer();
+    
+    if (false !== strpos($command, ' -t'))
+    {
+      if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
+      {
+        $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt->bubbleCancelled())
+        {
+          return 0;
+        }
+      }
+      
+      if (false === strpos($command, ' -f'))
+      {
+        $command .= ' -f' . $this->_getReversePath($message);
+      }
+      
+      $buffer->initialize(array_merge($this->_params, array('command' => $command)));
+      
+      if (false === strpos($command, ' -i') && false === strpos($command, ' -oi'))
+      {
+        $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+      }
+      else
+      {
+        $buffer->setWriteTranslations(array("\r\n"=>"\n"));
+      }
+      
+      $count = count((array) $message->getTo())
+        + count((array) $message->getCc())
+        + count((array) $message->getBcc())
+        ;
+      $message->toByteStream($buffer);
+      $buffer->flushBuffers();
+      $buffer->setWriteTranslations(array());
+      $buffer->terminate();
+      
+      if ($evt)
+      {
+        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+        $evt->setFailedRecipients($failedRecipients);
+        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+      }
+      
+      $message->generateId();
+    }
+    elseif (false !== strpos($command, ' -bs'))
+    {
+      $count = parent::send($message, $failedRecipients);
+    }
+    else
+    {
+      $this->_throwException(new Swift_TransportException(
+        'Unsupported sendmail command flags [' . $command . ']. ' .
+        'Must be one of "-bs" or "-t" but can include additional flags.'
+        ));
+    }
+    
+    return $count;
+  }
+  
+  // -- Protected methods
+  
+  /** Get the params to initialize the buffer */
+  protected function _getBufferParams()
+  {
+    return $this->_params;
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SimpleMailInvoker.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SimpleMailInvoker.php
new file mode 100644
index 0000000..271ba84
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SimpleMailInvoker.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ Invokes the mail() function in Swift Mailer.
+ 
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ */
+ 
+//@require 'Swift/Transport/MailInvoker.php';
+
+/**
+ * This is the implementation class for {@link Swift_Transport_MailInvoker}.
+ * 
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
+{
+  
+  /**
+   * Send mail via the mail() function.
+   * 
+   * This method takes the same arguments as PHP mail().
+   * 
+   * @param string $to
+   * @param string $subject
+   * @param string $body
+   * @param string $headers
+   * @param string $extraParams
+   * 
+   * @return boolean
+   */
+  public function mail($to, $subject, $body, $headers = null, $extraParams = null)
+  {
+    if (!ini_get('safe_mode'))
+    {
+      return mail($to, $subject, $body, $headers, $extraParams);
+    }
+    else
+    {
+      return mail($to, $subject, $body, $headers);      
+    }
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php
new file mode 100644
index 0000000..ee9b8ed
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/SmtpAgent.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Wraps an IoBuffer to send/receive SMTP commands/responses.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_SmtpAgent
+{
+  
+  /**
+   * Get the IoBuffer where read/writes are occurring.
+   * @return Swift_Transport_IoBuffer
+   */
+  public function getBuffer();
+  
+  /**
+   * Run a command against the buffer, expecting the given response codes.
+   * If no response codes are given, the response will not be validated.
+   * If codes are given, an exception will be thrown on an invalid response.
+   * @param string $command
+   * @param int[] $codes
+   * @param string[] &$failures
+   */
+  public function executeCommand($command, $codes = array(), &$failures = null);
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php
new file mode 100644
index 0000000..01ae8a5
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/Transport/StreamBuffer.php
@@ -0,0 +1,276 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/ByteStream/AbstractFilterableInputStream.php';
+//@require 'Swift/ReplacementFilterFactory.php';
+//@require 'Swift/Transport/IoBuffer.php';
+//@require 'Swift/TransportException.php';
+
+/**
+ * A generic IoBuffer implementation supporting remote sockets and local processes.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_Transport_StreamBuffer
+  extends Swift_ByteStream_AbstractFilterableInputStream
+  implements Swift_Transport_IoBuffer
+{
+  
+  /** A primary socket */
+  private $_stream;
+  
+  /** The input stream */
+  private $_in;
+  
+  /** The output stream */
+  private $_out;
+  
+  /** Buffer initialization parameters */
+  private $_params = array();
+  
+  /** The ReplacementFilterFactory */
+  private $_replacementFactory;
+  
+  /** Translations performed on data being streamed into the buffer */
+  private $_translations = array();
+  
+  /**
+   * Create a new StreamBuffer using $replacementFactory for transformations.
+   * @param Swift_ReplacementFilterFactory $replacementFactory
+   */
+  public function __construct(
+    Swift_ReplacementFilterFactory $replacementFactory)
+  {
+    $this->_replacementFactory = $replacementFactory;
+  }
+  
+  /**
+   * Perform any initialization needed, using the given $params.
+   * Parameters will vary depending upon the type of IoBuffer used.
+   * @param array $params
+   */
+  public function initialize(array $params)
+  {
+    $this->_params = $params;
+    switch ($params['type'])
+    {
+      case self::TYPE_PROCESS:
+        $this->_establishProcessConnection();
+        break;
+      case self::TYPE_SOCKET:
+      default:
+        $this->_establishSocketConnection();
+        break;
+    }
+  }
+  
+  /**
+   * Set an individual param on the buffer (e.g. switching to SSL).
+   * @param string $param
+   * @param mixed $value
+   */
+  public function setParam($param, $value)
+  {
+    if (isset($this->_stream))
+    {
+      switch ($param)
+      {
+        case 'protocol':
+          if (!array_key_exists('protocol', $this->_params)
+            || $value != $this->_params['protocol'])
+          {
+            if ('tls' == $value)
+            {
+              stream_socket_enable_crypto(
+                $this->_stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT
+                );
+            }
+          }
+          break;
+      }
+    }
+    $this->_params[$param] = $value;
+  }
+  
+  /**
+   * Perform any shutdown logic needed.
+   */
+  public function terminate()
+  {
+    if (isset($this->_stream))
+    {
+      switch ($this->_params['type'])
+      {
+        case self::TYPE_PROCESS:
+          fclose($this->_in);
+          fclose($this->_out);
+          proc_close($this->_stream);
+          break;
+        case self::TYPE_SOCKET:
+        default:
+          fclose($this->_stream);
+          break;
+      }
+    }
+    $this->_stream = null;
+    $this->_out = null;
+    $this->_in = null;
+  }
+  
+  /**
+   * Set an array of string replacements which should be made on data written
+   * to the buffer.  This could replace LF with CRLF for example.
+   * @param string[] $replacements
+   */
+  public function setWriteTranslations(array $replacements)
+  {
+    foreach ($this->_translations as $search => $replace)
+    {
+      if (!isset($replacements[$search]))
+      {
+        $this->removeFilter($search);
+        unset($this->_translations[$search]);
+      }
+    }
+    
+    foreach ($replacements as $search => $replace)
+    {
+      if (!isset($this->_translations[$search]))
+      {
+        $this->addFilter(
+          $this->_replacementFactory->createFilter($search, $replace), $search
+          );
+        $this->_translations[$search] = true;
+      }
+    }
+  }
+  
+  /**
+   * Get a line of output (including any CRLF).
+   * The $sequence number comes from any writes and may or may not be used
+   * depending upon the implementation.
+   * @param int $sequence of last write to scan from
+   * @return string
+   */
+  public function readLine($sequence)
+  {
+    if (isset($this->_out) && !feof($this->_out))
+    {
+      $line = fgets($this->_out);
+      return $line;
+    }
+  }
+  
+  /**
+   * Reads $length bytes from the stream into a string and moves the pointer
+   * through the stream by $length. If less bytes exist than are requested the
+   * remaining bytes are given instead. If no bytes are remaining at all, boolean
+   * false is returned.
+   * @param int $length
+   * @return string
+   */
+  public function read($length)
+  {
+    if (isset($this->_out) && !feof($this->_out))
+    {
+      $ret = fread($this->_out, $length);
+      return $ret;
+    }
+  }
+  
+  /** Not implemented */
+  public function setReadPointer($byteOffset)
+  {
+  }
+  
+  // -- Protected methods
+  
+  /** Flush the stream contents */
+  protected function _flush()
+  {
+    if (isset($this->_in))
+    {
+      fflush($this->_in);
+    }
+  }
+  
+  /** Write this bytes to the stream */
+  protected function _commit($bytes)
+  {
+    if (isset($this->_in)
+      && fwrite($this->_in, $bytes))
+    {
+      return ++$this->_sequence;
+    }
+  }
+  
+  // -- Private methods
+  
+  /**
+   * Establishes a connection to a remote server.
+   * @access private
+   */
+  private function _establishSocketConnection()
+  {
+    $host = $this->_params['host'];
+    if (!empty($this->_params['protocol']))
+    {
+      $host = $this->_params['protocol'] . '://' . $host;
+    }
+    $timeout = 15;
+    if (!empty($this->_params['timeout']))
+    {
+      $timeout = $this->_params['timeout'];
+    }
+    if (!$this->_stream = fsockopen($host, $this->_params['port'], $errno, $errstr, $timeout))
+    {
+      throw new Swift_TransportException(
+        'Connection could not be established with host ' . $this->_params['host'] .
+        ' [' . $errstr . ' #' . $errno . ']'
+        );
+    }
+    if (!empty($this->_params['blocking']))
+    {
+      stream_set_blocking($this->_stream, 1);
+    }
+    else
+    {
+      stream_set_blocking($this->_stream, 0);
+    }
+    $this->_in =& $this->_stream;
+    $this->_out =& $this->_stream;
+  }
+  
+  /**
+   * Opens a process for input/output.
+   * @access private
+   */
+  private function _establishProcessConnection()
+  {
+    $command = $this->_params['command'];
+    $descriptorSpec = array(
+      0 => array('pipe', 'r'),
+      1 => array('pipe', 'w'),
+      2 => array('pipe', 'w')
+      );
+    $this->_stream = proc_open($command, $descriptorSpec, $pipes);
+    stream_set_blocking($pipes[2], 0);
+    if ($err = stream_get_contents($pipes[2]))
+    {
+      throw new Swift_TransportException(
+        'Process could not be started [' . $err . ']'
+        );
+    }
+    $this->_in =& $pipes[0];
+    $this->_out =& $pipes[1];
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php b/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php
new file mode 100644
index 0000000..b7cd658
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/classes/Swift/TransportException.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//@require 'Swift/IoException.php';
+
+/**
+ * TransportException thrown when an error occurs in the Transport subsystem.
+ * @package Swift
+ * @subpackage Transport
+ * @author Chris Corbyn
+ */
+class Swift_TransportException extends Swift_IoException
+{
+  
+  /**
+   * Create a new TransportException with $message.
+   * @param string $message
+   */
+  public function __construct($message)
+  {
+    parent::__construct($message);
+  }
+  
+}
diff --git a/includes/kohana/modules/email/vendor/swift/dependency_maps/cache_deps.php b/includes/kohana/modules/email/vendor/swift/dependency_maps/cache_deps.php
new file mode 100644
index 0000000..6058206
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/dependency_maps/cache_deps.php
@@ -0,0 +1,25 @@
+<?php
+
+Swift_DependencyContainer::getInstance()
+  
+  -> register('cache')
+  -> asAliasOf('cache.array')
+  
+  -> register('tempdir')
+  -> asValue('/tmp')
+  
+  -> register('cache.null')
+  -> asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
+  
+  -> register('cache.array')
+  -> asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
+  -> withDependencies(array('cache.inputstream'))
+  
+  -> register('cache.disk')
+  -> asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
+  -> withDependencies(array('cache.inputstream', 'tempdir'))
+  
+  -> register('cache.inputstream')
+  -> asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
+  
+  ;
diff --git a/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php b/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php
new file mode 100644
index 0000000..e03927a
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/dependency_maps/mime_deps.php
@@ -0,0 +1,97 @@
+<?php
+
+require_once dirname(__FILE__) . '/../mime_types.php';
+
+Swift_DependencyContainer::getInstance()
+    
+  -> register('properties.charset')
+  -> asValue('utf-8')
+  
+  -> register('mime.message')
+  -> asNewInstanceOf('Swift_Mime_SimpleMessage')
+  -> withDependencies(array(
+    'mime.headerset',
+    'mime.qpcontentencoder',
+    'cache',
+    'properties.charset'
+  ))
+  
+  -> register('mime.part')
+  -> asNewInstanceOf('Swift_Mime_MimePart')
+  -> withDependencies(array(
+    'mime.headerset',
+    'mime.qpcontentencoder',
+    'cache',
+    'properties.charset'
+  ))
+  
+  -> register('mime.attachment')
+  -> asNewInstanceOf('Swift_Mime_Attachment')
+  -> withDependencies(array(
+    'mime.headerset',
+    'mime.base64contentencoder',
+    'cache'
+  ))
+  -> addConstructorValue($swift_mime_types)
+  
+  -> register('mime.embeddedfile')
+  -> asNewInstanceOf('Swift_Mime_EmbeddedFile')
+  -> withDependencies(array(
+    'mime.headerset',
+    'mime.base64contentencoder',
+    'cache'
+  ))
+  -> addConstructorValue($swift_mime_types)
+  
+  -> register('mime.headerfactory')
+  -> asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
+  -> withDependencies(array(
+      'mime.qpheaderencoder',
+      'mime.rfc2231encoder',
+      'properties.charset'
+    ))
+  
+  -> register('mime.headerset')
+  -> asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
+  -> withDependencies(array('mime.headerfactory', 'properties.charset'))
+  
+  -> register('mime.qpheaderencoder')
+  -> asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
+  -> withDependencies(array('mime.charstream'))
+  
+  -> register('mime.charstream')
+  -> asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
+  -> withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+  
+  -> register('mime.bytecanonicalizer')
+  -> asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
+  -> addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
+  -> addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+  
+  -> register('mime.characterreaderfactory')
+  -> asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
+  
+  -> register('mime.qpcontentencoder')
+  -> asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
+  -> withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+  
+  -> register('mime.7bitcontentencoder')
+  -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+  -> addConstructorValue('7bit')
+  -> addConstructorValue(true)
+  
+  -> register('mime.8bitcontentencoder')
+  -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+  -> addConstructorValue('8bit')
+  -> addConstructorValue(true)
+  
+  -> register('mime.base64contentencoder')
+  -> asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
+  
+  -> register('mime.rfc2231encoder')
+  -> asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
+  -> withDependencies(array('mime.charstream'))
+  
+  ;
+  
+unset($swift_mime_types);
diff --git a/includes/kohana/modules/email/vendor/swift/dependency_maps/transport_deps.php b/includes/kohana/modules/email/vendor/swift/dependency_maps/transport_deps.php
new file mode 100644
index 0000000..32881d6
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/dependency_maps/transport_deps.php
@@ -0,0 +1,62 @@
+<?php
+
+Swift_DependencyContainer::getInstance()
+  
+  -> register('transport.smtp')
+  -> asNewInstanceOf('Swift_Transport_EsmtpTransport')
+  -> withDependencies(array(
+    'transport.buffer',
+    array('transport.authhandler'),
+    'transport.eventdispatcher'
+  ))
+  
+  -> register('transport.sendmail')
+  -> asNewInstanceOf('Swift_Transport_SendmailTransport')
+  -> withDependencies(array(
+    'transport.buffer',
+    'transport.eventdispatcher'
+  ))
+  
+  -> register('transport.mail')
+  -> asNewInstanceOf('Swift_Transport_MailTransport')
+  -> withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
+  
+  -> register('transport.loadbalanced')
+  -> asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
+  
+  -> register('transport.failover')
+  -> asNewInstanceOf('Swift_Transport_FailoverTransport')
+  
+  -> register('transport.mailinvoker')
+  -> asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
+  
+  -> register('transport.buffer')
+  -> asNewInstanceOf('Swift_Transport_StreamBuffer')
+  -> withDependencies(array('transport.replacementfactory'))
+  
+  -> register('transport.authhandler')
+  -> asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
+  -> withDependencies(array(
+    array(
+      'transport.crammd5auth',
+      'transport.loginauth',
+      'transport.plainauth'
+    )
+  ))
+  
+  -> register('transport.crammd5auth')
+  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
+  
+  -> register('transport.loginauth')
+  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
+  
+  -> register('transport.plainauth')
+  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
+  
+  -> register('transport.eventdispatcher')
+  -> asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
+  
+  -> register('transport.replacementfactory')
+  -> asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+  
+  ;
diff --git a/includes/kohana/modules/email/vendor/swift/mime_types.php b/includes/kohana/modules/email/vendor/swift/mime_types.php
new file mode 100644
index 0000000..65c9aa0
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/mime_types.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * List of MIME type automatically detected in Swift Mailer.
+ */
+
+//You may add or take away what you like (lowercase required)
+
+$swift_mime_types = array(
+  'aif'  => 'audio/x-aiff',
+  'aiff' => 'audio/x-aiff',
+  'avi'  => 'video/avi',
+  'bmp'  => 'image/bmp',
+  'bz2'  => 'application/x-bz2',
+  'csv'  => 'text/csv',
+  'dmg'  => 'application/x-apple-diskimage',
+  'doc'  => 'application/msword',
+  'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  'eml'  => 'message/rfc822',
+  'aps'  => 'application/postscript',
+  'exe'  => 'application/x-ms-dos-executable',
+  'flv'  => 'video/x-flv',
+  'gif'  => 'image/gif',
+  'gz'   => 'application/x-gzip',
+  'hqx'  => 'application/stuffit',
+  'htm'  => 'text/html',
+  'html' => 'text/html',
+  'jar'  => 'application/x-java-archive',
+  'jpeg' => 'image/jpeg',
+  'jpg'  => 'image/jpeg',
+  'm3u'  => 'audio/x-mpegurl',
+  'm4a'  => 'audio/mp4',
+  'mdb'  => 'application/x-msaccess',
+  'mid'  => 'audio/midi',
+  'midi' => 'audio/midi',
+  'mov'  => 'video/quicktime',
+  'mp3'  => 'audio/mpeg',
+  'mp4'  => 'video/mp4',
+  'mpeg' => 'video/mpeg',
+  'mpg'  => 'video/mpeg',
+  'odg'  => 'vnd.oasis.opendocument.graphics',
+  'odp'  => 'vnd.oasis.opendocument.presentation',
+  'odt'  => 'vnd.oasis.opendocument.text',
+  'ods'  => 'vnd.oasis.opendocument.spreadsheet',
+  'ogg'  => 'audio/ogg',
+  'pdf'  => 'application/pdf',
+  'png'  => 'image/png',
+  'ppt'  => 'application/vnd.ms-powerpoint',
+  'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  'ps'   => 'application/postscript',
+  'rar'  => 'application/x-rar-compressed',
+  'rtf'  => 'application/rtf',
+  'tar'  => 'application/x-tar',
+  'sit'  => 'application/x-stuffit',
+  'svg'  => 'image/svg+xml',
+  'tif'  => 'image/tiff',
+  'tiff' => 'image/tiff',
+  'ttf'  => 'application/x-font-truetype',
+  'txt'  => 'text/plain',
+  'vcf'  => 'text/x-vcard',
+  'wav'  => 'audio/wav',
+  'wma'  => 'audio/x-ms-wma',
+  'wmv'  => 'audio/x-ms-wmv',
+  'xls'  => 'application/excel',
+  'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  'xml'  => 'application/xml',
+  'zip'  => 'application/zip'
+);
diff --git a/includes/kohana/modules/email/vendor/swift/preferences.php b/includes/kohana/modules/email/vendor/swift/preferences.php
new file mode 100644
index 0000000..0b9e4b1
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/preferences.php
@@ -0,0 +1,20 @@
+<?php
+
+/****************************************************************************/
+/*                                                                          */
+/* YOU MAY WISH TO MODIFY OR REMOVE THE FOLLOWING LINES WHICH SET DEFAULTS  */
+/*                                                                          */
+/****************************************************************************/
+
+// Sets the default charset so that setCharset() is not needed elsewhere
+Swift_Preferences::getInstance()->setCharset('utf-8');
+
+// Without these lines the default caching mechanism is "array" but this uses
+// a lot of memory.
+// If possible, use a disk cache to enable attaching large attachments etc
+if (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()))
+{
+  Swift_Preferences::getInstance()
+    -> setTempDir(sys_get_temp_dir())
+    -> setCacheType('disk');
+}
diff --git a/includes/kohana/modules/email/vendor/swift/swift_init.php b/includes/kohana/modules/email/vendor/swift/swift_init.php
new file mode 100644
index 0000000..fe624a9
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/swift_init.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Dependency injection initialization for Swift Mailer.
+ */
+
+//Load in dependency maps
+require_once dirname(__FILE__) . '/dependency_maps/cache_deps.php';
+require_once dirname(__FILE__) . '/dependency_maps/mime_deps.php';
+require_once dirname(__FILE__) . '/dependency_maps/transport_deps.php';
+
+//Load in global library preferences
+require_once dirname(__FILE__) . '/preferences.php';
diff --git a/includes/kohana/modules/email/vendor/swift/swift_required.php b/includes/kohana/modules/email/vendor/swift/swift_required.php
new file mode 100644
index 0000000..ad1a4ad
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/swift_required.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Autoloader and dependency injection initialization for Swift Mailer.
+ */
+
+//Load Swift utility class
+require_once dirname(__FILE__) . '/classes/Swift.php';
+
+//Start the autoloader
+Swift::registerAutoload();
+
+//Load the init script to set up dependency injection
+require_once dirname(__FILE__) . '/swift_init.php';
diff --git a/includes/kohana/modules/email/vendor/swift/swift_required_pear.php b/includes/kohana/modules/email/vendor/swift/swift_required_pear.php
new file mode 100644
index 0000000..20a6159
--- /dev/null
+++ b/includes/kohana/modules/email/vendor/swift/swift_required_pear.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Autoloader and dependency injection initialization for Swift Mailer.
+ */
+
+//Load Swift utility class
+require_once dirname(__FILE__) . '/Swift.php';
+
+//Start the autoloader
+Swift::registerAutoload();
+
+//Load the init script to set up dependency injection
+require_once dirname(__FILE__) . '/swift_init.php';
diff --git a/includes/kohana/modules/image/README.markdown b/includes/kohana/modules/image/README.markdown
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/image/classes/image.php b/includes/kohana/modules/image/classes/image.php
new file mode 100644
index 0000000..5b04774
--- /dev/null
+++ b/includes/kohana/modules/image/classes/image.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Image extends Kohana_Image {}
diff --git a/includes/kohana/modules/image/classes/image/gd.php b/includes/kohana/modules/image/classes/image/gd.php
new file mode 100644
index 0000000..0c30ba5
--- /dev/null
+++ b/includes/kohana/modules/image/classes/image/gd.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Image_GD extends Kohana_Image_GD {}
diff --git a/includes/kohana/modules/image/classes/kohana/image.php b/includes/kohana/modules/image/classes/kohana/image.php
new file mode 100644
index 0000000..d8b4023
--- /dev/null
+++ b/includes/kohana/modules/image/classes/kohana/image.php
@@ -0,0 +1,747 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Image manipulation support. Allows images to be resized, cropped, etc.
+ *
+ * @package    Kohana/Image
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+abstract class Kohana_Image {
+
+	// Resizing constraints
+	const NONE    = 0x01;
+	const WIDTH   = 0x02;
+	const HEIGHT  = 0x03;
+	const AUTO    = 0x04;
+	const INVERSE = 0x05;
+
+	// Flipping directions
+	const HORIZONTAL = 0x11;
+	const VERTICAL   = 0x12;
+
+	/**
+	 * @var  string  default driver: GD, ImageMagick, etc
+	 */
+	public static $default_driver = 'GD';
+
+	// Status of the driver check
+	protected static $_checked = FALSE;
+
+	/**
+	 * Loads an image and prepares it for manipulation.
+	 *
+	 *     $image = Image::factory('upload/test.jpg');
+	 *
+	 * @param   string   image file path
+	 * @param   string   driver type: GD, ImageMagick, etc
+	 * @return  Image
+	 * @uses    Image::$default_driver
+	 */
+	public static function factory($file, $driver = NULL)
+	{
+		if ($driver === NULL)
+		{
+			// Use the default driver
+			$driver = Image::$default_driver;
+		}
+
+		// Set the class name
+		$class = 'Image_'.$driver;
+
+		return new $class($file);
+	}
+
+	/**
+	 * @var  string  image file path
+	 */
+	public $file;
+
+	/**
+	 * @var  integer  image width
+	 */
+	public $width;
+
+	/**
+	 * @var  integer  image height
+	 */
+	public $height;
+
+	/**
+	 * @var  integer  one of the IMAGETYPE_* constants
+	 */
+	public $type;
+
+	/**
+	 * @var  string  mime type of the image
+	 */
+	public $mime;
+
+	/**
+	 * Loads information about the image. Will throw an exception if the image
+	 * does not exist or is not an image.
+	 *
+	 * @param   string   image file path
+	 * @return  void
+	 * @throws  Kohana_Exception
+	 */
+	public function __construct($file)
+	{
+		try
+		{
+			// Get the real path to the file
+			$file = realpath($file);
+
+			// Get the image information
+			$info = getimagesize($file);
+		}
+		catch (Exception $e)
+		{
+			// Ignore all errors while reading the image
+		}
+
+		if (empty($file) OR empty($info))
+		{
+			throw new Kohana_Exception('Not an image or invalid image: :file',
+				array(':file' => Debug::path($file)));
+		}
+
+		// Store the image information
+		$this->file   = $file;
+		$this->width  = $info[0];
+		$this->height = $info[1];
+		$this->type   = $info[2];
+		$this->mime   = image_type_to_mime_type($this->type);
+	}
+
+	/**
+	 * Render the current image.
+	 *
+	 *     echo $image;
+	 *
+	 * [!!] The output of this function is binary and must be rendered with the
+	 * appropriate Content-Type header or it will not be displayed correctly!
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		try
+		{
+			// Render the current image
+			return $this->render();
+		}
+		catch (Exception $e)
+		{
+			if (is_object(Kohana::$log))
+			{
+				// Get the text of the exception
+				$error = Kohana_Exception::text($e);
+
+				// Add this exception to the log
+				Kohana::$log->add(Log::ERROR, $error);
+			}
+
+			// Showing any kind of error will be "inside" image data
+			return '';
+		}
+	}
+
+	/**
+	 * Resize the image to the given size. Either the width or the height can
+	 * be omitted and the image will be resized proportionally.
+	 *
+	 *     // Resize to 200 pixels on the shortest side
+	 *     $image->resize(200, 200);
+	 *
+	 *     // Resize to 200x200 pixels, keeping aspect ratio
+	 *     $image->resize(200, 200, Image::INVERSE);
+	 *
+	 *     // Resize to 500 pixel width, keeping aspect ratio
+	 *     $image->resize(500, NULL);
+	 *
+	 *     // Resize to 500 pixel height, keeping aspect ratio
+	 *     $image->resize(NULL, 500);
+	 *
+	 *     // Resize to 200x500 pixels, ignoring aspect ratio
+	 *     $image->resize(200, 500, Image::NONE);
+	 *
+	 * @param   integer  new width
+	 * @param   integer  new height
+	 * @param   integer  master dimension
+	 * @return  $this
+	 * @uses    Image::_do_resize
+	 */
+	public function resize($width = NULL, $height = NULL, $master = NULL)
+	{
+		if ($master === NULL)
+		{
+			// Choose the master dimension automatically
+			$master = Image::AUTO;
+		}
+		// Image::WIDTH and Image::HEIGHT deprecated. You can use it in old projects,
+		// but in new you must pass empty value for non-master dimension
+		elseif ($master == Image::WIDTH AND ! empty($width))
+		{
+			$master = Image::AUTO;
+
+			// Set empty height for backward compatibility
+			$height = NULL;
+		}
+		elseif ($master == Image::HEIGHT AND ! empty($height))
+		{
+			$master = Image::AUTO;
+
+			// Set empty width for backward compatibility
+			$width = NULL;
+		}
+
+		if (empty($width))
+		{
+			if ($master === Image::NONE)
+			{
+				// Use the current width
+				$width = $this->width;
+			}
+			else
+			{
+				// If width not set, master will be height
+				$master = Image::HEIGHT;
+			}
+		}
+
+		if (empty($height))
+		{
+			if ($master === Image::NONE)
+			{
+				// Use the current height
+				$height = $this->height;
+			}
+			else
+			{
+				// If height not set, master will be width
+				$master = Image::WIDTH;
+			}
+		}
+
+		switch ($master)
+		{
+			case Image::AUTO:
+				// Choose direction with the greatest reduction ratio
+				$master = ($this->width / $width) > ($this->height / $height) ? Image::WIDTH : Image::HEIGHT;
+			break;
+			case Image::INVERSE:
+				// Choose direction with the minimum reduction ratio
+				$master = ($this->width / $width) > ($this->height / $height) ? Image::HEIGHT : Image::WIDTH;
+			break;
+		}
+
+		switch ($master)
+		{
+			case Image::WIDTH:
+				// Recalculate the height based on the width proportions
+				$height = $this->height * $width / $this->width;
+			break;
+			case Image::HEIGHT:
+				// Recalculate the width based on the height proportions
+				$width = $this->width * $height / $this->height;
+			break;
+		}
+
+		// Convert the width and height to integers, minimum value is 1px
+		$width  = max(round($width), 1);
+		$height = max(round($height), 1);
+
+		$this->_do_resize($width, $height);
+
+		return $this;
+	}
+
+	/**
+	 * Crop an image to the given size. Either the width or the height can be
+	 * omitted and the current width or height will be used.
+	 *
+	 * If no offset is specified, the center of the axis will be used.
+	 * If an offset of TRUE is specified, the bottom of the axis will be used.
+	 *
+	 *     // Crop the image to 200x200 pixels, from the center
+	 *     $image->crop(200, 200);
+	 *
+	 * @param   integer  new width
+	 * @param   integer  new height
+	 * @param   mixed    offset from the left
+	 * @param   mixed    offset from the top
+	 * @return  $this
+	 * @uses    Image::_do_crop
+	 */
+	public function crop($width, $height, $offset_x = NULL, $offset_y = NULL)
+	{
+		if ($width > $this->width)
+		{
+			// Use the current width
+			$width = $this->width;
+		}
+
+		if ($height > $this->height)
+		{
+			// Use the current height
+			$height = $this->height;
+		}
+
+		if ($offset_x === NULL)
+		{
+			// Center the X offset
+			$offset_x = round(($this->width - $width) / 2);
+		}
+		elseif ($offset_x === TRUE)
+		{
+			// Bottom the X offset
+			$offset_x = $this->width - $width;
+		}
+		elseif ($offset_x < 0)
+		{
+			// Set the X offset from the right
+			$offset_x = $this->width - $width + $offset_x;
+		}
+
+		if ($offset_y === NULL)
+		{
+			// Center the Y offset
+			$offset_y = round(($this->height - $height) / 2);
+		}
+		elseif ($offset_y === TRUE)
+		{
+			// Bottom the Y offset
+			$offset_y = $this->height - $height;
+		}
+		elseif ($offset_y < 0)
+		{
+			// Set the Y offset from the bottom
+			$offset_y = $this->height - $height + $offset_y;
+		}
+
+		// Determine the maximum possible width and height
+		$max_width  = $this->width  - $offset_x;
+		$max_height = $this->height - $offset_y;
+
+		if ($width > $max_width)
+		{
+			// Use the maximum available width
+			$width = $max_width;
+		}
+
+		if ($height > $max_height)
+		{
+			// Use the maximum available height
+			$height = $max_height;
+		}
+
+		$this->_do_crop($width, $height, $offset_x, $offset_y);
+
+		return $this;
+	}
+
+	/**
+	 * Rotate the image by a given amount.
+	 *
+	 *     // Rotate 45 degrees clockwise
+	 *     $image->rotate(45);
+	 *
+	 *     // Rotate 90% counter-clockwise
+	 *     $image->rotate(-90);
+	 *
+	 * @param   integer   degrees to rotate: -360-360
+	 * @return  $this
+	 * @uses    Image::_do_rotate
+	 */
+	public function rotate($degrees)
+	{
+		// Make the degrees an integer
+		$degrees = (int) $degrees;
+
+		if ($degrees > 180)
+		{
+			do
+			{
+				// Keep subtracting full circles until the degrees have normalized
+				$degrees -= 360;
+			}
+			while($degrees > 180);
+		}
+
+		if ($degrees < -180)
+		{
+			do
+			{
+				// Keep adding full circles until the degrees have normalized
+				$degrees += 360;
+			}
+			while($degrees < -180);
+		}
+
+		$this->_do_rotate($degrees);
+
+		return $this;
+	}
+
+	/**
+	 * Flip the image along the horizontal or vertical axis.
+	 *
+	 *     // Flip the image from top to bottom
+	 *     $image->flip(Image::HORIZONTAL);
+	 *
+	 *     // Flip the image from left to right
+	 *     $image->flip(Image::VERTICAL);
+	 *
+	 * @param   integer  direction: Image::HORIZONTAL, Image::VERTICAL
+	 * @return  $this
+	 * @uses    Image::_do_flip
+	 */
+	public function flip($direction)
+	{
+		if ($direction !== Image::HORIZONTAL)
+		{
+			// Flip vertically
+			$direction = Image::VERTICAL;
+		}
+
+		$this->_do_flip($direction);
+
+		return $this;
+	}
+
+	/**
+	 * Sharpen the image by a given amount.
+	 *
+	 *     // Sharpen the image by 20%
+	 *     $image->sharpen(20);
+	 *
+	 * @param   integer  amount to sharpen: 1-100
+	 * @return  $this
+	 * @uses    Image::_do_sharpen
+	 */
+	public function sharpen($amount)
+	{
+		// The amount must be in the range of 1 to 100
+		$amount = min(max($amount, 1), 100);
+
+		$this->_do_sharpen($amount);
+
+		return $this;
+	}
+
+	/**
+	 * Add a reflection to an image. The most opaque part of the reflection
+	 * will be equal to the opacity setting and fade out to full transparent.
+	 * Alpha transparency is preserved.
+	 *
+	 *     // Create a 50 pixel reflection that fades from 0-100% opacity
+	 *     $image->reflection(50);
+	 *
+	 *     // Create a 50 pixel reflection that fades from 100-0% opacity
+	 *     $image->reflection(50, 100, TRUE);
+	 *
+	 *     // Create a 50 pixel reflection that fades from 0-60% opacity
+	 *     $image->reflection(50, 60, TRUE);
+	 *
+	 * [!!] By default, the reflection will be go from transparent at the top
+	 * to opaque at the bottom.
+	 *
+	 * @param   integer   reflection height
+	 * @param   integer   reflection opacity: 0-100
+	 * @param   boolean   TRUE to fade in, FALSE to fade out
+	 * @return  $this
+	 * @uses    Image::_do_reflection
+	 */
+	public function reflection($height = NULL, $opacity = 100, $fade_in = FALSE)
+	{
+		if ($height === NULL OR $height > $this->height)
+		{
+			// Use the current height
+			$height = $this->height;
+		}
+
+		// The opacity must be in the range of 0 to 100
+		$opacity = min(max($opacity, 0), 100);
+
+		$this->_do_reflection($height, $opacity, $fade_in);
+
+		return $this;
+	}
+
+	/**
+	 * Add a watermark to an image with a specified opacity. Alpha transparency
+	 * will be preserved.
+	 *
+	 * If no offset is specified, the center of the axis will be used.
+	 * If an offset of TRUE is specified, the bottom of the axis will be used.
+	 *
+	 *     // Add a watermark to the bottom right of the image
+	 *     $mark = Image::factory('upload/watermark.png');
+	 *     $image->watermark($mark, TRUE, TRUE);
+	 *
+	 * @param   object   watermark Image instance
+	 * @param   integer  offset from the left
+	 * @param   integer  offset from the top
+	 * @param   integer  opacity of watermark: 1-100
+	 * @return  $this
+	 * @uses    Image::_do_watermark
+	 */
+	public function watermark(Image $watermark, $offset_x = NULL, $offset_y = NULL, $opacity = 100)
+	{
+		if ($offset_x === NULL)
+		{
+			// Center the X offset
+			$offset_x = round(($this->width - $watermark->width) / 2);
+		}
+		elseif ($offset_x === TRUE)
+		{
+			// Bottom the X offset
+			$offset_x = $this->width - $watermark->width;
+		}
+		elseif ($offset_x < 0)
+		{
+			// Set the X offset from the right
+			$offset_x = $this->width - $watermark->width + $offset_x;
+		}
+
+		if ($offset_y === NULL)
+		{
+			// Center the Y offset
+			$offset_y = round(($this->height - $watermark->height) / 2);
+		}
+		elseif ($offset_y === TRUE)
+		{
+			// Bottom the Y offset
+			$offset_y = $this->height - $watermark->height;
+		}
+		elseif ($offset_y < 0)
+		{
+			// Set the Y offset from the bottom
+			$offset_y = $this->height - $watermark->height + $offset_y;
+		}
+
+		// The opacity must be in the range of 1 to 100
+		$opacity = min(max($opacity, 1), 100);
+
+		$this->_do_watermark($watermark, $offset_x, $offset_y, $opacity);
+
+		return $this;
+	}
+
+	/**
+	 * Set the background color of an image. This is only useful for images
+	 * with alpha transparency.
+	 *
+	 *     // Make the image background black
+	 *     $image->background('#000');
+	 *
+	 *     // Make the image background black with 50% opacity
+	 *     $image->background('#000', 50);
+	 *
+	 * @param   string   hexadecimal color value
+	 * @param   integer  background opacity: 0-100
+	 * @return  $this
+	 * @uses    Image::_do_background
+	 */
+	public function background($color, $opacity = 100)
+	{
+		if ($color[0] === '#')
+		{
+			// Remove the pound
+			$color = substr($color, 1);
+		}
+
+		if (strlen($color) === 3)
+		{
+			// Convert shorthand into longhand hex notation
+			$color = preg_replace('/./', '$0$0', $color);
+		}
+
+		// Convert the hex into RGB values
+		list ($r, $g, $b) = array_map('hexdec', str_split($color, 2));
+
+		// The opacity must be in the range of 0 to 100
+		$opacity = min(max($opacity, 0), 100);
+
+		$this->_do_background($r, $g, $b, $opacity);
+
+		return $this;
+	}
+
+	/**
+	 * Save the image. If the filename is omitted, the original image will
+	 * be overwritten.
+	 *
+	 *     // Save the image as a PNG
+	 *     $image->save('saved/cool.png');
+	 *
+	 *     // Overwrite the original image
+	 *     $image->save();
+	 *
+	 * [!!] If the file exists, but is not writable, an exception will be thrown.
+	 *
+	 * [!!] If the file does not exist, and the directory is not writable, an
+	 * exception will be thrown.
+	 *
+	 * @param   string   new image path
+	 * @param   integer  quality of image: 1-100
+	 * @return  boolean
+	 * @uses    Image::_save
+	 * @throws  Kohana_Exception
+	 */
+	public function save($file = NULL, $quality = 100)
+	{
+		if ($file === NULL)
+		{
+			// Overwrite the file
+			$file = $this->file;
+		}
+
+		if (is_file($file))
+		{
+			if ( ! is_writable($file))
+			{
+				throw new Kohana_Exception('File must be writable: :file',
+					array(':file' => Debug::path($file)));
+			}
+		}
+		else
+		{
+			// Get the directory of the file
+			$directory = realpath(pathinfo($file, PATHINFO_DIRNAME));
+
+			if ( ! is_dir($directory) OR ! is_writable($directory))
+			{
+				throw new Kohana_Exception('Directory must be writable: :directory',
+					array(':directory' => Debug::path($directory)));
+			}
+		}
+
+		// The quality must be in the range of 1 to 100
+		$quality = min(max($quality, 1), 100);
+
+		return $this->_do_save($file, $quality);
+	}
+
+	/**
+	 * Render the image and return the binary string.
+	 *
+	 *     // Render the image at 50% quality
+	 *     $data = $image->render(NULL, 50);
+	 *
+	 *     // Render the image as a PNG
+	 *     $data = $image->render('png');
+	 *
+	 * @param   string   image type to return: png, jpg, gif, etc
+	 * @param   integer  quality of image: 1-100
+	 * @return  string
+	 * @uses    Image::_do_render
+	 */
+	public function render($type = NULL, $quality = 100)
+	{
+		if ($type === NULL)
+		{
+			// Use the current image type
+			$type = image_type_to_extension($this->type, FALSE);
+		}
+
+		return $this->_do_render($type, $quality);
+	}
+
+	/**
+	 * Execute a resize.
+	 *
+	 * @param   integer  new width
+	 * @param   integer  new height
+	 * @return  void
+	 */
+	abstract protected function _do_resize($width, $height);
+
+	/**
+	 * Execute a crop.
+	 *
+	 * @param   integer  new width
+	 * @param   integer  new height
+	 * @param   integer  offset from the left
+	 * @param   integer  offset from the top
+	 * @return  void
+	 */
+	abstract protected function _do_crop($width, $height, $offset_x, $offset_y);
+
+	/**
+	 * Execute a rotation.
+	 *
+	 * @param   integer  degrees to rotate
+	 * @return  void
+	 */
+	abstract protected function _do_rotate($degrees);
+
+	/**
+	 * Execute a flip.
+	 *
+	 * @param   integer  direction to flip
+	 * @return  void
+	 */
+	abstract protected function _do_flip($direction);
+
+	/**
+	 * Execute a sharpen.
+	 *
+	 * @param   integer  amount to sharpen
+	 * @return  void
+	 */
+	abstract protected function _do_sharpen($amount);
+
+	/**
+	 * Execute a reflection.
+	 *
+	 * @param   integer   reflection height
+	 * @param   integer   reflection opacity
+	 * @param   boolean   TRUE to fade out, FALSE to fade in
+	 * @return  void
+	 */
+	abstract protected function _do_reflection($height, $opacity, $fade_in);
+
+	/**
+	 * Execute a watermarking.
+	 *
+	 * @param   object   watermarking Image
+	 * @param   integer  offset from the left
+	 * @param   integer  offset from the top
+	 * @param   integer  opacity of watermark
+	 * @return  void
+	 */
+	abstract protected function _do_watermark(Image $image, $offset_x, $offset_y, $opacity);
+
+	/**
+	 * Execute a background.
+	 *
+	 * @param   integer  red
+	 * @param   integer  green
+	 * @param   integer  blue
+	 * @param   integer  opacity
+	 * @return void
+	 */
+	abstract protected function _do_background($r, $g, $b, $opacity);
+
+	/**
+	 * Execute a save.
+	 *
+	 * @param   string   new image filename
+	 * @param   integer  quality
+	 * @return  boolean
+	 */
+	abstract protected function _do_save($file, $quality);
+
+	/**
+	 * Execute a render.
+	 *
+	 * @param   string    image type: png, jpg, gif, etc
+	 * @param   integer   quality
+	 * @return  string
+	 */
+	abstract protected function _do_render($type, $quality);
+
+} // End Image
diff --git a/includes/kohana/modules/image/classes/kohana/image/gd.php b/includes/kohana/modules/image/classes/kohana/image/gd.php
new file mode 100644
index 0000000..38d0e24
--- /dev/null
+++ b/includes/kohana/modules/image/classes/kohana/image/gd.php
@@ -0,0 +1,584 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Support for image manipulation using [GD](http://php.net/GD).
+ *
+ * @package    Kohana/Image
+ * @category   Drivers
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Kohana_Image_GD extends Image {
+
+	// Is GD bundled or separate?
+	protected static $_bundled;
+
+	/**
+	 * Checks if GD is enabled and bundled. Bundled GD is required for some
+	 * methods to work. Exceptions will be thrown from those methods when GD is
+	 * not bundled.
+	 *
+	 * @return  boolean
+	 */
+	public static function check()
+	{
+		if ( ! function_exists('gd_info'))
+		{
+			throw new Kohana_Exception('GD is either not installed or not enabled, check your configuration');
+		}
+
+		if (defined('GD_BUNDLED'))
+		{
+			// Get the version via a constant, available in PHP 5.
+			Image_GD::$_bundled = GD_BUNDLED;
+		}
+		else
+		{
+			// Get the version information
+			$info = gd_info();
+
+			// Extract the bundled status
+			Image_GD::$_bundled = (bool) preg_match('/\bbundled\b/i', $info['GD Version']);
+		}
+
+		if (defined('GD_VERSION'))
+		{
+			// Get the version via a constant, available in PHP 5.2.4+
+			$version = GD_VERSION;
+		}
+		else
+		{
+			// Get the version information
+			$info = gd_info();
+
+			// Extract the version number
+			preg_match('/\d+\.\d+(?:\.\d+)?/', $info['GD Version'], $matches);
+
+			// Get the major version
+			$version = $matches[0];
+		}
+
+		if ( ! version_compare($version, '2.0.1', '>='))
+		{
+			throw new Kohana_Exception('Image_GD requires GD version :required or greater, you have :version',
+				array('required' => '2.0.1', ':version' => $version));
+		}
+
+		return Image_GD::$_checked = TRUE;
+	}
+
+	// Temporary image resource
+	protected $_image;
+
+	// Function name to open Image
+	protected $_create_function;
+
+	/**
+	 * Runs [Image_GD::check] and loads the image.
+	 *
+	 * @return  void
+	 * @throws  Kohana_Exception
+	 */
+	public function __construct($file)
+	{
+		if ( ! Image_GD::$_checked)
+		{
+			// Run the install check
+			Image_GD::check();
+		}
+
+		parent::__construct($file);
+
+		// Set the image creation function name
+		switch ($this->type)
+		{
+			case IMAGETYPE_JPEG:
+				$create = 'imagecreatefromjpeg';
+			break;
+			case IMAGETYPE_GIF:
+				$create = 'imagecreatefromgif';
+			break;
+			case IMAGETYPE_PNG:
+				$create = 'imagecreatefrompng';
+			break;
+		}
+
+		if ( ! isset($create) OR ! function_exists($create))
+		{
+			throw new Kohana_Exception('Installed GD does not support :type images',
+				array(':type' => image_type_to_extension($this->type, FALSE)));
+		}
+
+		// Save function for future use
+		$this->_create_function = $create;
+
+		// Save filename for lazy loading
+		$this->_image = $this->file;
+	}
+
+	/**
+	 * Destroys the loaded image to free up resources.
+	 *
+	 * @return  void
+	 */
+	public function __destruct()
+	{
+		if (is_resource($this->_image))
+		{
+			// Free all resources
+			imagedestroy($this->_image);
+		}
+	}
+
+	/**
+	 * Loads an image into GD.
+	 *
+	 * @return  void
+	 */
+	protected function _load_image()
+	{
+		if ( ! is_resource($this->_image))
+		{
+			// Gets create function
+			$create = $this->_create_function;
+
+			// Open the temporary image
+			$this->_image = $create($this->file);
+
+			// Preserve transparency when saving
+			imagesavealpha($this->_image, TRUE);
+		}
+	}
+
+	protected function _do_resize($width, $height)
+	{
+		// Presize width and height
+		$pre_width = $this->width;
+		$pre_height = $this->height;
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Test if we can do a resize without resampling to speed up the final resize
+		if ($width > ($this->width / 2) AND $height > ($this->height / 2))
+		{
+			// The maximum reduction is 10% greater than the final size
+			$reduction_width  = round($width  * 1.1);
+			$reduction_height = round($height * 1.1);
+
+			while ($pre_width / 2 > $reduction_width AND $pre_height / 2 > $reduction_height)
+			{
+				// Reduce the size using an O(2n) algorithm, until it reaches the maximum reduction
+				$pre_width /= 2;
+				$pre_height /= 2;
+			}
+
+			// Create the temporary image to copy to
+			$image = $this->_create($pre_width, $pre_height);
+
+			if (imagecopyresized($image, $this->_image, 0, 0, 0, 0, $pre_width, $pre_height, $this->width, $this->height))
+			{
+				// Swap the new image for the old one
+				imagedestroy($this->_image);
+				$this->_image = $image;
+			}
+		}
+
+		// Create the temporary image to copy to
+		$image = $this->_create($width, $height);
+
+		// Execute the resize
+		if (imagecopyresampled($image, $this->_image, 0, 0, 0, 0, $width, $height, $pre_width, $pre_height))
+		{
+			// Swap the new image for the old one
+			imagedestroy($this->_image);
+			$this->_image = $image;
+
+			// Reset the width and height
+			$this->width  = imagesx($image);
+			$this->height = imagesy($image);
+		}
+	}
+
+	protected function _do_crop($width, $height, $offset_x, $offset_y)
+	{
+		// Create the temporary image to copy to
+		$image = $this->_create($width, $height);
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Execute the crop
+		if (imagecopyresampled($image, $this->_image, 0, 0, $offset_x, $offset_y, $width, $height, $width, $height))
+		{
+			// Swap the new image for the old one
+			imagedestroy($this->_image);
+			$this->_image = $image;
+
+			// Reset the width and height
+			$this->width  = imagesx($image);
+			$this->height = imagesy($image);
+		}
+	}
+
+	protected function _do_rotate($degrees)
+	{
+		if ( ! Image_GD::$_bundled)
+		{
+			throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD',
+				array(':function' => 'imagerotate'));
+		}
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Transparent black will be used as the background for the uncovered region
+		$transparent = imagecolorallocatealpha($this->_image, 0, 0, 0, 127);
+
+		// Rotate, setting the transparent color
+		$image = imagerotate($this->_image, 360 - $degrees, $transparent, 1);
+
+		// Save the alpha of the rotated image
+		imagesavealpha($image, TRUE);
+
+		// Get the width and height of the rotated image
+		$width  = imagesx($image);
+		$height = imagesy($image);
+
+		if (imagecopymerge($this->_image, $image, 0, 0, 0, 0, $width, $height, 100))
+		{
+			// Swap the new image for the old one
+			imagedestroy($this->_image);
+			$this->_image = $image;
+
+			// Reset the width and height
+			$this->width  = $width;
+			$this->height = $height;
+		}
+	}
+
+	protected function _do_flip($direction)
+	{
+		// Create the flipped image
+		$flipped = $this->_create($this->width, $this->height);
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		if ($direction === Image::HORIZONTAL)
+		{
+			for ($x = 0; $x < $this->width; $x++)
+			{
+				// Flip each row from top to bottom
+				imagecopy($flipped, $this->_image, $x, 0, $this->width - $x - 1, 0, 1, $this->height);
+			}
+		}
+		else
+		{
+			for ($y = 0; $y < $this->height; $y++)
+			{
+				// Flip each column from left to right
+				imagecopy($flipped, $this->_image, 0, $y, 0, $this->height - $y - 1, $this->width, 1);
+			}
+		}
+
+		// Swap the new image for the old one
+		imagedestroy($this->_image);
+		$this->_image = $flipped;
+
+		// Reset the width and height
+		$this->width  = imagesx($flipped);
+		$this->height = imagesy($flipped);
+	}
+
+	protected function _do_sharpen($amount)
+	{
+		if ( ! Image_GD::$_bundled)
+		{
+			throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD',
+				array(':function' => 'imageconvolution'));
+		}
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Amount should be in the range of 18-10
+		$amount = round(abs(-18 + ($amount * 0.08)), 2);
+
+		// Gaussian blur matrix
+		$matrix = array
+		(
+			array(-1,   -1,    -1),
+			array(-1, $amount, -1),
+			array(-1,   -1,    -1),
+		);
+
+		// Perform the sharpen
+		if (imageconvolution($this->_image, $matrix, $amount - 8, 0))
+		{
+			// Reset the width and height
+			$this->width  = imagesx($this->_image);
+			$this->height = imagesy($this->_image);
+		}
+	}
+
+	protected function _do_reflection($height, $opacity, $fade_in)
+	{
+		if ( ! Image_GD::$_bundled)
+		{
+			throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD',
+				array(':function' => 'imagefilter'));
+		}
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Convert an opacity range of 0-100 to 127-0
+		$opacity = round(abs(($opacity * 127 / 100) - 127));
+
+		if ($opacity < 127)
+		{
+			// Calculate the opacity stepping
+			$stepping = (127 - $opacity) / $height;
+		}
+		else
+		{
+			// Avoid a "divide by zero" error
+			$stepping = 127 / $height;
+		}
+
+		// Create the reflection image
+		$reflection = $this->_create($this->width, $this->height + $height);
+
+		// Copy the image to the reflection
+		imagecopy($reflection, $this->_image, 0, 0, 0, 0, $this->width, $this->height);
+
+		for ($offset = 0; $height >= $offset; $offset++)
+		{
+			// Read the next line down
+			$src_y = $this->height - $offset - 1;
+
+			// Place the line at the bottom of the reflection
+			$dst_y = $this->height + $offset;
+
+			if ($fade_in === TRUE)
+			{
+				// Start with the most transparent line first
+				$dst_opacity = round($opacity + ($stepping * ($height - $offset)));
+			}
+			else
+			{
+				// Start with the most opaque line first
+				$dst_opacity = round($opacity + ($stepping * $offset));
+			}
+
+			// Create a single line of the image
+			$line = $this->_create($this->width, 1);
+
+			// Copy a single line from the current image into the line
+			imagecopy($line, $this->_image, 0, 0, 0, $src_y, $this->width, 1);
+
+			// Colorize the line to add the correct alpha level
+			imagefilter($line, IMG_FILTER_COLORIZE, 0, 0, 0, $dst_opacity);
+
+			// Copy a the line into the reflection
+			imagecopy($reflection, $line, 0, $dst_y, 0, 0, $this->width, 1);
+		}
+
+		// Swap the new image for the old one
+		imagedestroy($this->_image);
+		$this->_image = $reflection;
+
+		// Reset the width and height
+		$this->width  = imagesx($reflection);
+		$this->height = imagesy($reflection);
+	}
+
+	protected function _do_watermark(Image $watermark, $offset_x, $offset_y, $opacity)
+	{
+		if ( ! Image_GD::$_bundled)
+		{
+			throw new Kohana_Exception('This method requires :function, which is only available in the bundled version of GD',
+				array(':function' => 'imagelayereffect'));
+		}
+
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Create the watermark image resource
+		$overlay = imagecreatefromstring($watermark->render());
+
+		imagesavealpha($overlay, TRUE);
+
+		// Get the width and height of the watermark
+		$width  = imagesx($overlay);
+		$height = imagesy($overlay);
+
+		if ($opacity < 100)
+		{
+			// Convert an opacity range of 0-100 to 127-0
+			$opacity = round(abs(($opacity * 127 / 100) - 127));
+
+			// Allocate transparent gray
+			$color = imagecolorallocatealpha($overlay, 127, 127, 127, $opacity);
+
+			// The transparent image will overlay the watermark
+			imagelayereffect($overlay, IMG_EFFECT_OVERLAY);
+
+			// Fill the background with the transparent color
+			imagefilledrectangle($overlay, 0, 0, $width, $height, $color);
+		}
+
+		// Alpha blending must be enabled on the background!
+		imagealphablending($this->_image, TRUE);
+
+		if (imagecopy($this->_image, $overlay, $offset_x, $offset_y, 0, 0, $width, $height))
+		{
+			// Destroy the overlay image
+			imagedestroy($overlay);
+		}
+	}
+
+	protected function _do_background($r, $g, $b, $opacity)
+	{
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Convert an opacity range of 0-100 to 127-0
+		$opacity = round(abs(($opacity * 127 / 100) - 127));
+
+		// Create a new background
+		$background = $this->_create($this->width, $this->height);
+
+		// Allocate the color
+		$color = imagecolorallocatealpha($background, $r, $g, $b, $opacity);
+
+		// Fill the image with white
+		imagefilledrectangle($background, 0, 0, $this->width, $this->height, $color);
+
+		// Alpha blending must be enabled on the background!
+		imagealphablending($background, TRUE);
+
+		// Copy the image onto a white background to remove all transparency
+		if (imagecopy($background, $this->_image, 0, 0, 0, 0, $this->width, $this->height))
+		{
+			// Swap the new image for the old one
+			imagedestroy($this->_image);
+			$this->_image = $background;
+		}
+	}
+
+	protected function _do_save($file, $quality)
+	{
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Get the extension of the file
+		$extension = pathinfo($file, PATHINFO_EXTENSION);
+
+		// Get the save function and IMAGETYPE
+		list($save, $type) = $this->_save_function($extension, $quality);
+
+		// Save the image to a file
+		$status = isset($quality) ? $save($this->_image, $file, $quality) : $save($this->_image, $file);
+
+		if ($status === TRUE AND $type !== $this->type)
+		{
+			// Reset the image type and mime type
+			$this->type = $type;
+			$this->mime = image_type_to_mime_type($type);
+		}
+
+		return TRUE;
+	}
+
+	protected function _do_render($type, $quality)
+	{
+		// Loads image if not yet loaded
+		$this->_load_image();
+
+		// Get the save function and IMAGETYPE
+		list($save, $type) = $this->_save_function($type, $quality);
+
+		// Capture the output
+		ob_start();
+
+		// Render the image
+		$status = isset($quality) ? $save($this->_image, NULL, $quality) : $save($this->_image, NULL);
+
+		if ($status === TRUE AND $type !== $this->type)
+		{
+			// Reset the image type and mime type
+			$this->type = $type;
+			$this->mime = image_type_to_mime_type($type);
+		}
+
+		return ob_get_clean();
+	}
+
+	/**
+	 * Get the GD saving function and image type for this extension.
+	 * Also normalizes the quality setting
+	 *
+	 * @param   string   image type: png, jpg, etc
+	 * @param   integer  image quality
+	 * @return  array    save function, IMAGETYPE_* constant
+	 * @throws  Kohana_Exception
+	 */
+	protected function _save_function($extension, & $quality)
+	{
+		switch (strtolower($extension))
+		{
+			case 'jpg':
+			case 'jpeg':
+				// Save a JPG file
+				$save = 'imagejpeg';
+				$type = IMAGETYPE_JPEG;
+			break;
+			case 'gif':
+				// Save a GIF file
+				$save = 'imagegif';
+				$type = IMAGETYPE_GIF;
+
+				// GIFs do not a quality setting
+				$quality = NULL;
+			break;
+			case 'png':
+				// Save a PNG file
+				$save = 'imagepng';
+				$type = IMAGETYPE_PNG;
+
+				// Use a compression level of 9 (does not affect quality!)
+				$quality = 9;
+			break;
+			default:
+				throw new Kohana_Exception('Installed GD does not support :type images',
+					array(':type' => $extension));
+			break;
+		}
+
+		return array($save, $type);
+	}
+
+	/**
+	 * Create an empty image with the given width and height.
+	 *
+	 * @param   integer   image width
+	 * @param   integer   image height
+	 * @return  resource
+	 */
+	protected function _create($width, $height)
+	{
+		// Create an empty image
+		$image = imagecreatetruecolor($width, $height);
+
+		// Do not apply alpha blending
+		imagealphablending($image, FALSE);
+
+		// Save alpha levels
+		imagesavealpha($image, TRUE);
+
+		return $image;
+	}
+
+} // End Image_GD
diff --git a/includes/kohana/modules/image/config/userguide.php b/includes/kohana/modules/image/config/userguide.php
new file mode 100644
index 0000000..2ca21c4
--- /dev/null
+++ b/includes/kohana/modules/image/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'image' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Image',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Image manipulation.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/image/guide/image/examples.md b/includes/kohana/modules/image/guide/image/examples.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/image/guide/image/index.md b/includes/kohana/modules/image/guide/image/index.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/image/guide/image/menu.md b/includes/kohana/modules/image/guide/image/menu.md
new file mode 100644
index 0000000..b8e8cb3
--- /dev/null
+++ b/includes/kohana/modules/image/guide/image/menu.md
@@ -0,0 +1,3 @@
+## [Image]()
+- [Using](using)
+- [Examples](examples)
\ No newline at end of file
diff --git a/includes/kohana/modules/image/guide/image/using.md b/includes/kohana/modules/image/guide/image/using.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/orm/auth-schema-mysql.sql b/includes/kohana/modules/orm/auth-schema-mysql.sql
new file mode 100644
index 0000000..ec4a4a8
--- /dev/null
+++ b/includes/kohana/modules/orm/auth-schema-mysql.sql
@@ -0,0 +1,49 @@
+CREATE TABLE IF NOT EXISTS `roles` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name` varchar(32) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `uniq_name` (`name`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+INSERT INTO `roles` (`id`, `name`, `description`) VALUES(1, 'login', 'Login privileges, granted after account confirmation');
+INSERT INTO `roles` (`id`, `name`, `description`) VALUES(2, 'admin', 'Administrative user, has access to everything.');
+
+CREATE TABLE IF NOT EXISTS `roles_users` (
+  `user_id` int(10) UNSIGNED NOT NULL,
+  `role_id` int(10) UNSIGNED NOT NULL,
+  PRIMARY KEY  (`user_id`,`role_id`),
+  KEY `fk_role_id` (`role_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `users` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `email` varchar(127) NOT NULL,
+  `username` varchar(32) NOT NULL DEFAULT '',
+  `password` varchar(64) NOT NULL,
+  `logins` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `last_login` int(10) UNSIGNED,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `uniq_username` (`username`),
+  UNIQUE KEY `uniq_email` (`email`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `user_tokens` (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) UNSIGNED NOT NULL,
+  `user_agent` varchar(40) NOT NULL,
+  `token` varchar(40) NOT NULL,
+  `type` varchar(100) NOT NULL,
+  `created` int(10) UNSIGNED NOT NULL,
+  `expires` int(10) UNSIGNED NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `uniq_token` (`token`),
+  KEY `fk_user_id` (`user_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
+
+ALTER TABLE `roles_users`
+  ADD CONSTRAINT `roles_users_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
+  ADD CONSTRAINT `roles_users_ibfk_2` FOREIGN KEY (`role_id`) REFERENCES `roles` (`id`) ON DELETE CASCADE;
+
+ALTER TABLE `user_tokens`
+  ADD CONSTRAINT `user_tokens_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE;
diff --git a/includes/kohana/modules/orm/auth-schema-postgresql.sql b/includes/kohana/modules/orm/auth-schema-postgresql.sql
new file mode 100644
index 0000000..72f6424
--- /dev/null
+++ b/includes/kohana/modules/orm/auth-schema-postgresql.sql
@@ -0,0 +1,53 @@
+CREATE TABLE roles
+(
+  id serial,
+  "name" varchar(32) NOT NULL,
+  description text NOT NULL,
+  CONSTRAINT roles_id_pkey PRIMARY KEY (id),
+  CONSTRAINT roles_name_key UNIQUE (name)
+);
+
+CREATE TABLE roles_users
+(
+  user_id integer,
+  role_id integer
+);
+
+CREATE TABLE users
+(
+  id serial,
+  email varchar(318) NOT NULL,
+  username varchar(32) NOT NULL,
+  "password" varchar(64) NOT NULL,
+  logins integer NOT NULL DEFAULT 0,
+  last_login integer,
+  CONSTRAINT users_id_pkey PRIMARY KEY (id),
+  CONSTRAINT users_username_key UNIQUE (username),
+  CONSTRAINT users_email_key UNIQUE (email),
+  CONSTRAINT users_logins_check CHECK (logins >= 0)
+);
+
+CREATE TABLE user_tokens
+(
+  id serial,
+  user_id integer NOT NULL,
+  user_agent varchar(40) NOT NULL,
+  token character varying(32) NOT NULL,
+  created integer NOT NULL,
+  expires integer NOT NULL,
+  CONSTRAINT user_tokens_id_pkey PRIMARY KEY (id),
+  CONSTRAINT user_tokens_token_key UNIQUE (token)
+);
+
+CREATE INDEX user_id_idx ON roles_users (user_id);
+CREATE INDEX role_id_idx ON roles_users (role_id);
+
+ALTER TABLE roles_users
+  ADD CONSTRAINT user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+  ADD CONSTRAINT role_id_fkey FOREIGN KEY (role_id) REFERENCES roles(id) ON DELETE CASCADE;
+
+ALTER TABLE user_tokens
+  ADD CONSTRAINT user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
+INSERT INTO roles (name, description) VALUES ('login', 'Login privileges, granted after account confirmation');
+INSERT INTO roles (name, description) VALUES ('admin', 'Administrative user, has access to everything.');
diff --git a/includes/kohana/modules/orm/classes/auth/orm.php b/includes/kohana/modules/orm/classes/auth/orm.php
new file mode 100644
index 0000000..ecff72d
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/auth/orm.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Auth_ORM extends Kohana_Auth_ORM { }
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/kohana/auth/orm.php b/includes/kohana/modules/orm/classes/kohana/auth/orm.php
new file mode 100644
index 0000000..4a6d16a
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/kohana/auth/orm.php
@@ -0,0 +1,277 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * ORM Auth driver.
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Auth_ORM extends Auth {
+
+	/**
+	 * Checks if a session is active.
+	 *
+	 * @param   mixed    $role Role name string, role ORM object, or array with role names
+	 * @return  boolean
+	 */
+	public function logged_in($role = NULL)
+	{
+		// Get the user from the session
+		$user = $this->get_user();
+
+		if ( ! $user)
+			return FALSE;
+
+		if ($user instanceof Model_User AND $user->loaded())
+		{
+			// If we don't have a roll no further checking is needed
+			if ( ! $role)
+				return TRUE;
+
+			if (is_array($role))
+			{
+				// Get all the roles
+				$roles = ORM::factory('role')
+							->where('name', 'IN', $role)
+							->find_all()
+							->as_array(NULL, 'id');
+
+				// Make sure all the roles are valid ones
+				if (count($roles) !== count($role))
+					return FALSE;
+			}
+			else
+			{
+				if ( ! is_object($role))
+				{
+					// Load the role
+					$roles = ORM::factory('role', array('name' => $role));
+
+					if ( ! $roles->loaded())
+						return FALSE;
+				}
+			}
+
+			return $user->has('roles', $roles);
+		}
+	}
+
+	/**
+	 * Logs a user in.
+	 *
+	 * @param   string   username
+	 * @param   string   password
+	 * @param   boolean  enable autologin
+	 * @return  boolean
+	 */
+	protected function _login($user, $password, $remember)
+	{
+		if ( ! is_object($user))
+		{
+			$username = $user;
+
+			// Load the user
+			$user = ORM::factory('user');
+			$user->where($user->unique_key($username), '=', $username)->find();
+		}
+
+		// If the passwords match, perform a login
+		if ($user->has('roles', ORM::factory('role', array('name' => 'login'))) AND $user->password === $password)
+		{
+			if ($remember === TRUE)
+			{
+				// Token data
+				$data = array(
+					'user_id'    => $user->id,
+					'expires'    => time() + $this->_config['lifetime'],
+					'user_agent' => sha1(Request::$user_agent),
+				);
+
+				// Create a new autologin token
+				$token = ORM::factory('user_token')
+							->values($data)
+							->create();
+
+				// Set the autologin cookie
+				Cookie::set('authautologin', $token->token, $this->_config['lifetime']);
+			}
+
+			// Finish the login
+			$this->complete_login($user);
+
+			return TRUE;
+		}
+
+		// Login failed
+		return FALSE;
+	}
+
+	/**
+	 * Forces a user to be logged in, without specifying a password.
+	 *
+	 * @param   mixed    username string, or user ORM object
+	 * @param   boolean  mark the session as forced
+	 * @return  boolean
+	 */
+	public function force_login($user, $mark_session_as_forced = FALSE)
+	{
+		if ( ! is_object($user))
+		{
+			$username = $user;
+
+			// Load the user
+			$user = ORM::factory('user');
+			$user->where($user->unique_key($username), '=', $username)->find();
+		}
+
+		if ($mark_session_as_forced === TRUE)
+		{
+			// Mark the session as forced, to prevent users from changing account information
+			$this->_session->set('auth_forced', TRUE);
+		}
+
+		// Run the standard completion
+		$this->complete_login($user);
+	}
+
+	/**
+	 * Logs a user in, based on the authautologin cookie.
+	 *
+	 * @return  mixed
+	 */
+	public function auto_login()
+	{
+		if ($token = Cookie::get('authautologin'))
+		{
+			// Load the token and user
+			$token = ORM::factory('user_token', array('token' => $token));
+
+			if ($token->loaded() AND $token->user->loaded())
+			{
+				if ($token->user_agent === sha1(Request::$user_agent))
+				{
+					// Save the token to create a new unique token
+					$token->save();
+
+					// Set the new token
+					Cookie::set('authautologin', $token->token, $token->expires - time());
+
+					// Complete the login with the found data
+					$this->complete_login($token->user);
+
+					// Automatic login was successful
+					return $token->user;
+				}
+
+				// Token is invalid
+				$token->delete();
+			}
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Gets the currently logged in user from the session (with auto_login check).
+	 * Returns FALSE if no user is currently logged in.
+	 *
+	 * @return  mixed
+	 */
+	public function get_user($default = NULL)
+	{
+		$user = parent::get_user($default);
+
+		if ( ! $user)
+		{
+			// check for "remembered" login
+			$user = $this->auto_login();
+		}
+
+		return $user;
+	}
+
+	/**
+	 * Log a user out and remove any autologin cookies.
+	 *
+	 * @param   boolean  completely destroy the session
+	 * @param	boolean  remove all tokens for user
+	 * @return  boolean
+	 */
+	public function logout($destroy = FALSE, $logout_all = FALSE)
+	{
+		// Set by force_login()
+		$this->_session->delete('auth_forced');
+
+		if ($token = Cookie::get('authautologin'))
+		{
+			// Delete the autologin cookie to prevent re-login
+			Cookie::delete('authautologin');
+
+			// Clear the autologin token from the database
+			$token = ORM::factory('user_token', array('token' => $token));
+
+			if ($token->loaded() AND $logout_all)
+			{
+				ORM::factory('user_token')->where('user_id', '=', $token->user_id)->delete_all();
+			}
+			elseif ($token->loaded())
+			{
+				$token->delete();
+			}
+		}
+
+		return parent::logout($destroy);
+	}
+
+	/**
+	 * Get the stored password for a username.
+	 *
+	 * @param   mixed   username string, or user ORM object
+	 * @return  string
+	 */
+	public function password($user)
+	{
+		if ( ! is_object($user))
+		{
+			$username = $user;
+
+			// Load the user
+			$user = ORM::factory('user');
+			$user->where($user->unique_key($username), '=', $username)->find();
+		}
+
+		return $user->password;
+	}
+
+	/**
+	 * Complete the login for a user by incrementing the logins and setting
+	 * session data: user_id, username, roles.
+	 *
+	 * @param   object  user ORM object
+	 * @return  void
+	 */
+	protected function complete_login($user)
+	{
+		$user->complete_login();
+
+		return parent::complete_login($user);
+	}
+
+	/**
+	 * Compare password with original (hashed). Works for current (logged in) user
+	 *
+	 * @param   string  $password
+	 * @return  boolean
+	 */
+	public function check_password($password)
+	{
+		$user = $this->get_user();
+
+		if ( ! $user)
+			return FALSE;
+
+		return ($this->hash($password) === $user->password);
+	}
+
+} // End Auth ORM
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/kohana/orm.php b/includes/kohana/modules/orm/classes/kohana/orm.php
new file mode 100644
index 0000000..b5ef1e2
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/kohana/orm.php
@@ -0,0 +1,1688 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * [Object Relational Mapping][ref-orm] (ORM) is a method of abstracting database
+ * access to standard PHP calls. All table rows are represented as model objects,
+ * with object properties representing row data. ORM in Kohana generally follows
+ * the [Active Record][ref-act] pattern.
+ *
+ * [ref-orm]: http://wikipedia.org/wiki/Object-relational_mapping
+ * [ref-act]: http://wikipedia.org/wiki/Active_record
+ *
+ * @package    Kohana/ORM
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ *
+ *
+ * @method ORM where()
+ * @method ORM and_where()
+ * @method ORM or_where()
+ * @method ORM where_open()
+ * @method ORM and_where_open()
+ * @method ORM or_where_open()
+ * @method ORM where_close()
+ * @method ORM and_where_close()
+ * @method ORM or_where_close()
+ * @method ORM distinct()
+ * @method ORM select()
+ * @method ORM from()
+ * @method ORM join()
+ * @method ORM on()
+ * @method ORM group_by()
+ * @method ORM having()
+ * @method ORM and_having()
+ * @method ORM or_having()
+ * @method ORM having_open()
+ * @method ORM and_having_open()
+ * @method ORM or_having_open()
+ * @method ORM having_close()
+ * @method ORM and_having_close()
+ * @method ORM or_having_close()
+ * @method ORM order_by()
+ * @method ORM limit()
+ * @method ORM offset()
+ * @method ORM cached()
+ * @method Validation validation()
+ *
+ * @property string $object_name Name of the model
+ * @property string $object_plural Plural name of the model
+ * @property bool $loaded ORM object was loaded?
+ * @property bool $saved ORM object was saved?
+ * @property mixed $primary_key
+ * @property mixed $primary_val
+ * @property string $table_name
+ * @property string $table_columns
+ * @property array $has_one
+ * @property array $belongs_to
+ * @property array $has_many
+ * @property array $has_many_through
+ * @property array $load_with
+ * @property string $updated_column
+ * @property string $created_column
+ */
+class Kohana_ORM extends Model implements serializable {
+
+	/**
+	 * Stores column information for ORM models
+	 * @var array
+	 */
+	protected static $_column_cache = array();
+
+	/**
+	 * Callable database methods
+	 * @var array
+	 */
+	protected static $_db_methods = array
+	(
+		'where', 'and_where', 'or_where', 'where_open', 'and_where_open', 'or_where_open', 'where_close',
+		'and_where_close', 'or_where_close', 'distinct', 'select', 'from', 'join', 'on', 'group_by',
+		'having', 'and_having', 'or_having', 'having_open', 'and_having_open', 'or_having_open',
+		'having_close', 'and_having_close', 'or_having_close', 'order_by', 'limit', 'offset', 'cached',
+	);
+
+	/**
+	 * Members that have access methods
+	 * @var array
+	 */
+	protected static $_properties = array
+	(
+		'object_name', 'object_plural', 'loaded', 'saved', // Object
+		'primary_key', 'primary_val', 'table_name', 'table_columns', // Table
+		'has_one', 'belongs_to', 'has_many', 'has_many_through', 'load_with', // Relationships
+		'updated_column', 'created_column',
+		'validation',
+	);
+
+	/**
+	 * Creates and returns a new model.
+	 *
+	 * @chainable
+	 * @param   string  $model  Model name
+	 * @param   mixed   $id     Parameter for find()
+	 * @return  ORM
+	 */
+	public static function factory($model, $id = NULL)
+	{
+		// Set class name
+		$model = 'Model_'.ucfirst($model);
+
+		return new $model($id);
+	}
+
+	/**
+	 * "Has one" relationships
+	 * @var array
+	 */
+	protected $_has_one = array();
+
+	/**
+	 * "Belongs to" relationships
+	 * @var array
+	 */
+	protected $_belongs_to = array();
+
+	/**
+	 * "Has many" relationships
+	 * @var array
+	 */
+	protected $_has_many = array();
+
+	/**
+	 * Relationships that should always be joined
+	 * @var array
+	 */
+	protected $_load_with = array();
+
+	/**
+	 * Validation object created before saving/updating
+	 * @var Validation
+	 */
+	protected $_validation = NULL;
+
+	/**
+	 * Current object
+	 * @var array
+	 */
+	protected $_object = array();
+
+	/**
+	 * @var array
+	 */
+	protected $_changed = array();
+
+	/**
+	 * @var array
+	 */
+	protected $_related = array();
+
+	/**
+	 * @var bool
+	 */
+	protected $_valid = FALSE;
+
+	/**
+	 * @var bool
+	 */
+	protected $_loaded = FALSE;
+
+	/**
+	 * @var bool
+	 */
+	protected $_saved = FALSE;
+
+	/**
+	 * @var array
+	 */
+	protected $_sorting;
+
+	/**
+	 * Foreign key suffix
+	 * @var string
+	 */
+	protected $_foreign_key_suffix = '_id';
+
+	/**
+	 * Model name
+	 * @var string
+	 */
+	protected $_object_name;
+
+	/**
+	 * Plural model name
+	 * @var string
+	 */
+	protected $_object_plural;
+
+	/**
+	 * Table name
+	 * @var string
+	 */
+	protected $_table_name;
+
+	/**
+	 * Table columns
+	 * @var array
+	 */
+	protected $_table_columns;
+
+	/**
+	 * Auto-update columns for updates
+	 * @var string
+	 */
+	protected $_updated_column = NULL;
+
+	/**
+	 * Auto-update columns for creation
+	 * @var string
+	 */
+	protected $_created_column = NULL;
+
+	/**
+	 * Table primary key
+	 * @var string
+	 */
+	protected $_primary_key = 'id';
+
+	/**
+	 * Primary key value
+	 * @var mixed
+	 */
+	protected $_primary_key_value;
+
+	/**
+	 * Model configuration, table names plural?
+	 * @var bool
+	 */
+	protected $_table_names_plural = TRUE;
+
+	// Suppress ORMs inclusion of <table_name>.*
+	protected $_disable_wild_select = FALSE;
+
+	// Suppress ORMs inclusion of <table_name>. to column joins
+	protected $_disable_join_table_name = FALSE;
+
+	// Suppress ORMs use of limit
+	protected $_disable_limit = FALSE;
+
+	/**
+	 * Model configuration, reload on wakeup?
+	 * @var bool
+	 */
+	protected $_reload_on_wakeup = TRUE;
+
+	/**
+	 * Database Object
+	 * @var Database
+	 */
+	protected $_db = NULL;
+
+	/**
+	 * Database config group
+	 * @var String
+	 */
+	protected $_db_group = NULL;
+
+	/**
+	 * Database methods applied
+	 * @var array
+	 */
+	protected $_db_applied = array();
+
+	/**
+	 * Database methods pending
+	 * @var array
+	 */
+	protected $_db_pending = array();
+
+	/**
+	 * Reset builder
+	 * @var bool
+	 */
+	protected $_db_reset = TRUE;
+
+	/**
+	 * Database query builder
+	 * @var Database_Query_Builder_Where
+	 */
+	protected $_db_builder;
+
+	/**
+	 * With calls already applied
+	 * @var array
+	 */
+	protected $_with_applied = array();
+
+	/**
+	 * Data to be loaded into the model from a database call cast
+	 * @var array
+	 */
+	protected $_cast_data = array();
+
+	/**
+	 * Constructs a new model and loads a record if given
+	 *
+	 * @param   mixed $id Parameter for find or object to load
+	 * @return  void
+	 */
+	public function __construct($id = NULL)
+	{
+		$this->_initialize();
+
+		if ($id !== NULL)
+		{
+			if (is_array($id))
+			{
+				foreach ($id as $column => $value)
+				{
+					// Passing an array of column => values
+					$this->where($column, '=', $value);
+				}
+
+				$this->find();
+			}
+			else
+			{
+				// Passing the primary key
+				$this->where(($this->_disable_join_table_name ? '' : $this->_table_name.'.').$this->_primary_key, '=', $id)->find();
+			}
+		}
+		elseif ( ! empty($this->_cast_data))
+		{
+			// Load preloaded data from a database call cast
+			$this->_load_values($this->_cast_data);
+
+			$this->_cast_data = array();
+		}
+	}
+
+	/**
+	 * Prepares the model database connection, determines the table name,
+	 * and loads column information.
+	 *
+	 * @return void
+	 */
+	protected function _initialize()
+	{
+		// Set the object name and plural name
+		$this->_object_name = strtolower(substr(get_class($this), 6));
+		$this->_object_plural = Inflector::plural($this->_object_name);
+
+		if ( ! is_object($this->_db))
+		{
+			// Get database instance
+			$this->_db = Database::instance($this->_db_group);
+		}
+
+		if (empty($this->_table_name))
+		{
+			// Table name is the same as the object name
+			$this->_table_name = $this->_object_name;
+
+			if ($this->_table_names_plural === TRUE)
+			{
+				// Make the table name plural
+				$this->_table_name = Inflector::plural($this->_table_name);
+			}
+		}
+
+		foreach ($this->_belongs_to as $alias => $details)
+		{
+			$defaults['model'] = $alias;
+			$defaults['foreign_key'] = $alias.$this->_foreign_key_suffix;
+
+			$this->_belongs_to[$alias] = array_merge($defaults, $details);
+		}
+
+		foreach ($this->_has_one as $alias => $details)
+		{
+			$defaults['model'] = $alias;
+			$defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix;
+			$defaults['far_key'] = Inflector::singular($alias).$this->_foreign_key_suffix;
+
+			$this->_has_one[$alias] = array_merge($defaults, $details);
+		}
+
+		foreach ($this->_has_many as $alias => $details)
+		{
+			$defaults['model'] = $this->_model_names_plural ? Inflector::singular($alias) : $alias;
+			$defaults['foreign_key'] = $this->_object_name.$this->_foreign_key_suffix;
+			$defaults['through'] = NULL;
+			$defaults['far_key'] = Inflector::singular($alias).$this->_foreign_key_suffix;
+
+			$this->_has_many[$alias] = array_merge($defaults, $details);
+		}
+
+		// Load column information
+		$this->reload_columns();
+
+		// Clear initial model state
+		$this->clear();
+	}
+
+	/**
+	 * Initializes validation rules, and labels
+	 *
+	 * @return void
+	 */
+	protected function _validation()
+	{
+		// Build the validation object with its rules
+		$this->_validation = Validation::factory($this->_object)
+			->bind(':model', $this);
+
+		foreach ($this->rules() as $field => $rules)
+		{
+			$this->_validation->rules($field, $rules);
+		}
+
+		// Use column names by default for labels
+		$columns = array_keys($this->_table_columns);
+
+		// Merge user-defined labels
+		$labels = array_merge(array_combine($columns, $columns), $this->labels());
+
+		foreach ($labels as $field => $label)
+		{
+			$this->_validation->label($field, $label);
+		}
+	}
+
+	/**
+	 * Reload column definitions.
+	 *
+	 * @chainable
+	 * @param   boolean $force Force reloading
+	 * @return  ORM
+	 */
+	public function reload_columns($force = FALSE)
+	{
+		if ($force === TRUE OR empty($this->_table_columns))
+		{
+			if (isset(ORM::$_column_cache[$this->_object_name]))
+			{
+				// Use cached column information
+				$this->_table_columns = ORM::$_column_cache[$this->_object_name];
+			}
+			else
+			{
+				// Grab column information from database
+				$this->_table_columns = $this->list_columns(TRUE);
+
+				// Load column cache
+				ORM::$_column_cache[$this->_object_name] = $this->_table_columns;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Unloads the current object and clears the status.
+	 *
+	 * @chainable
+	 * @return ORM
+	 */
+	public function clear()
+	{
+		// Create an array with all the columns set to NULL
+		$values = array_combine(array_keys($this->_table_columns), array_fill(0, count($this->_table_columns), NULL));
+
+		// Replace the object and reset the object status
+		$this->_object = $this->_changed = $this->_related = array();
+
+		// Replace the current object with an empty one
+		$this->_load_values($values);
+
+		// Reset primary key
+		$this->_primary_key_value = NULL;
+
+		$this->reset();
+
+		return $this;
+	}
+
+	/**
+	 * Reloads the current object from the database.
+	 *
+	 * @chainable
+	 * @return ORM
+	 */
+	public function reload()
+	{
+		$primary_key = $this->pk();
+
+		// Replace the object and reset the object status
+		$this->_object = $this->_changed = $this->_related = array();
+
+		// Only reload the object if we have one to reload
+		if ($this->_loaded)
+			return $this->clear()
+				->where($this->_table_name.'.'.$this->_primary_key, '=', $primary_key)
+				->find();
+		else
+			return $this->clear();
+	}
+
+	/**
+	 * Checks if object data is set.
+	 *
+	 * @param  string $column Column name
+	 * @return boolean
+	 */
+	public function __isset($column)
+	{
+		return (isset($this->_object[$column]) OR
+			isset($this->_related[$column]) OR
+			isset($this->_has_one[$column]) OR
+			isset($this->_belongs_to[$column]) OR
+			isset($this->_has_many[$column]));
+	}
+
+	/**
+	 * Unsets object data.
+	 *
+	 * @param  string $column Column name
+	 * @return void
+	 */
+	public function __unset($column)
+	{
+		unset($this->_object[$column], $this->_changed[$column], $this->_related[$column]);
+	}
+
+	/**
+	 * Displays the primary key of a model when it is converted to a string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string) $this->pk();
+	}
+
+	/**
+	 * Allows serialization of only the object data and state, to prevent
+	 * "stale" objects being unserialized, which also requires less memory.
+	 *
+	 * @return array
+	 */
+	public function serialize()
+	{
+		// Store only information about the object
+		foreach (array('_primary_key_value', '_object', '_changed', '_loaded', '_saved', '_sorting') as $var)
+		{
+			$data[$var] = $this->{$var};
+		}
+
+		return serialize($data);
+	}
+
+	/**
+	 * Prepares the database connection and reloads the object.
+	 *
+	 * @param string $data String for unserialization
+	 * @return  void
+	 */
+	public function unserialize($data)
+	{
+		// Initialize model
+		$this->_initialize();
+
+		foreach (unserialize($data) as $name => $var)
+		{
+			$this->{$name} = $var;
+		}
+
+		if ($this->_reload_on_wakeup === TRUE)
+		{
+			// Reload the object
+			$this->reload();
+		}
+	}
+
+	/**
+	 * Handles pass-through to database methods. Calls to query methods
+	 * (query, get, insert, update) are not allowed. Query builder methods
+	 * are chainable.
+	 *
+	 * @param   string  $method Method name
+	 * @param   array   $args   Method arguments
+	 * @return  mixed
+	 */
+	public function __call($method, array $args)
+	{
+		if (in_array($method, ORM::$_properties))
+		{
+			if ($method === 'validation')
+			{
+				if ( ! isset($this->_validation))
+				{
+					// Initialize the validation object
+					$this->_validation();
+				}
+			}
+
+			// Return the property
+			return $this->{'_'.$method};
+		}
+		elseif (in_array($method, ORM::$_db_methods))
+		{
+			// Add pending database call which is executed after query type is determined
+			$this->_db_pending[] = array('name' => $method, 'args' => $args);
+
+			return $this;
+		}
+		else
+		{
+			throw new Kohana_Exception('Invalid method :method called in :class',
+				array(':method' => $method, ':class' => get_class($this)));
+		}
+	}
+
+	/**
+	 * Handles retrieval of all model values, relationships, and metadata.
+	 *
+	 * @param   string $column Column name
+	 * @return  mixed
+	 */
+	public function __get($column)
+	{
+		if (array_key_exists($column, $this->_object))
+		{
+			return $this->_object[$column];
+		}
+		elseif (isset($this->_related[$column]))
+		{
+			// Return related model that has already been fetched
+			return $this->_related[$column];
+		}
+		elseif (isset($this->_belongs_to[$column]))
+		{
+			$model = $this->_related($column);
+
+			// Use this model's column and foreign model's primary key
+			$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key;
+			$val = $this->_object[$this->_belongs_to[$column]['foreign_key']];
+
+			$model->where($col, '=', $val)->find();
+
+			return $this->_related[$column] = $model;
+		}
+		elseif (isset($this->_has_one[$column]))
+		{
+			$model = $this->_related($column);
+
+			if (! is_array($this->_has_one[$column]['foreign_key']))
+			{
+				// Use this model's primary key value and foreign model's column
+				$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_one[$column]['foreign_key'];
+				$val = $this->_object[$this->_has_one[$column]['far_key']];
+			}
+			else
+			{
+				foreach ($this->_has_one[$column]['foreign_key'] as $fk)
+				{
+					// Simple has_many relationship, search where target model's foreign key is this model's primary key
+					$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk;
+					$val = $this->_object[$fk];
+
+					$model = $model->where($col, '=', $val);
+				}
+			}
+
+			$model->where($col, '=', $val)->find();
+
+			return $this->_related[$column] = $model;
+		}
+		elseif (isset($this->_has_many[$column]))
+		{
+			$model = ORM::factory($this->_has_many[$column]['model']);
+
+			if (! is_array($this->_has_many[$column]['foreign_key']))
+			{
+				if (isset($this->_has_many[$column]['through']))
+				{
+					// Grab has_many "through" relationship table
+					$through = $this->_has_many[$column]['through'];
+
+					// Join on through model's target foreign key (far_key) and target model's primary key
+					$join_col1 = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['far_key'];
+					$join_col2 = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$model->_primary_key;
+
+					$model->join($through)->on($join_col1, '=', $join_col2);
+
+					// Through table's source foreign key (foreign_key) should be this model's primary key
+					$col = ($this->_disable_join_table_name ? '' : $through.'.').$this->_has_many[$column]['foreign_key'];
+					$val = $this->pk();
+				}
+				else
+				{
+					// Simple has_many relationship, search where target model's foreign key is this model's primary key
+					$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$this->_has_many[$column]['foreign_key'];
+					$val = $this->_object[$this->_has_many[$column]['far_key']];
+				}
+
+				return $model->where($col, '=', $val);
+			}
+			else
+			{
+				foreach ($this->_has_many[$column]['foreign_key'] as $mk => $fk)
+				{
+					if (isset($this->_has_many[$column]['through']))
+					{
+						throw new Kohana_Exception('This code hasnt been written yet!');
+					}
+					else
+					{
+						// Simple has_many relationship, search where target model's foreign key is this model's primary key
+						$col = ($this->_disable_join_table_name ? '' : $model->_table_name.'.').$fk;
+						$val = $this->_object[$mk];
+					}
+
+					$model = $model->where($col, '=', $val);
+				}
+
+				return $model;
+			}
+		}
+		else
+		{
+			throw new Kohana_Exception('The :property property does not exist in the :class class',
+				array(':property' => $column, ':class' => get_class($this)));
+		}
+	}
+
+	/**
+	 * Base set method - this should not be overridden.
+	 *
+	 * @param  string $column  Column name
+	 * @param  mixed  $value   Column value
+	 * @return void
+	 */
+	public function __set($column, $value)
+	{
+		if ( ! isset($this->_object_name))
+		{
+			// Object not yet constructed, so we're loading data from a database call cast
+			$this->_cast_data[$column] = $value;
+		}
+		else
+		{
+			// Set the model's column to given value
+			$this->set($column, $value);
+		}
+	}
+
+	/**
+	 * Handles setting of column
+	 *
+	 * @param  string $column Column name
+	 * @param  mixed  $value  Column value
+	 * @return void
+	 */
+	public function set($column, $value)
+	{
+		if (array_key_exists($column, $this->_object))
+		{
+			// Filter the data
+			$value = $this->run_filter($column, $value);
+
+			// See if the data really changed
+			if ($value !== $this->_object[$column])
+			{
+				$this->_object[$column] = $value;
+
+				// Data has changed
+				$this->_changed[$column] = $column;
+
+				// Object is no longer saved or valid
+				$this->_saved = $this->_valid = FALSE;
+			}
+		}
+		elseif (isset($this->_belongs_to[$column]))
+		{
+			// Update related object itself
+			$this->_related[$column] = $value;
+
+			// Update the foreign key of this model
+			$this->_object[$this->_belongs_to[$column]['foreign_key']] = $value->pk();
+
+			$this->_changed[$column] = $this->_belongs_to[$column]['foreign_key'];
+		}
+		else
+		{
+			throw new Kohana_Exception('The :property: property does not exist in the :class: class',
+				array(':property:' => $column, ':class:' => get_class($this)));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set values from an array with support for one-one relationships.  This method should be used
+	 * for loading in post data, etc.
+	 *
+	 * @param  array $values   Array of column => val
+	 * @param  array $expected Array of keys to take from $values
+	 * @return ORM
+	 */
+	public function values(array $values, array $expected = NULL)
+	{
+		// Default to expecting everything except the primary key
+		if ($expected === NULL)
+		{
+			$expected = array_keys($this->_table_columns);
+
+			// Don't set the primary key by default
+			unset($values[$this->_primary_key]);
+		}
+
+		foreach ($expected as $key => $column)
+		{
+			if (is_string($key))
+			{
+				// isset() fails when the value is NULL (we want it to pass)
+				if ( ! array_key_exists($key, $values))
+					continue;
+
+				// Try to set values to a related model
+				$this->{$key}->values($values[$key], $column);
+			}
+			else
+			{
+				// isset() fails when the value is NULL (we want it to pass)
+				if ( ! array_key_exists($column, $values))
+					continue;
+
+				// Update the column, respects __set()
+				$this->$column = $values[$column];
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns the values of this object as an array, including any related one-one
+	 * models that have already been loaded using with()
+	 *
+	 * @return array
+	 */
+	public function as_array()
+	{
+		$object = array();
+
+		foreach ($this->_object as $column => $value)
+		{
+			// Call __get for any user processing
+			$object[$column] = $this->__get($column);
+		}
+
+		foreach ($this->_related as $column => $model)
+		{
+			// Include any related objects that are already loaded
+			$object[$column] = $model->as_array();
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Binds another one-to-one object to this model.  One-to-one objects
+	 * can be nested using 'object1:object2' syntax
+	 *
+	 * @param  string $target_path Target model to bind to
+	 * @return void
+	 */
+	public function with($target_path)
+	{
+		if (isset($this->_with_applied[$target_path]))
+		{
+			// Don't join anything already joined
+			return $this;
+		}
+
+		// Split object parts
+		$aliases = explode(':', $target_path);
+		$target = $this;
+		foreach ($aliases as $alias)
+		{
+			// Go down the line of objects to find the given target
+			$parent = $target;
+			$target = $parent->_related($alias);
+
+			if ( ! $target)
+			{
+				// Can't find related object
+				return $this;
+			}
+		}
+
+		// Target alias is at the end
+		$target_alias = $alias;
+
+		// Pop-off top alias to get the parent path (user:photo:tag becomes user:photo - the parent table prefix)
+		array_pop($aliases);
+		$parent_path = implode(':', $aliases);
+
+		if (empty($parent_path))
+		{
+			// Use this table name itself for the parent path
+			$parent_path = $this->_table_name;
+		}
+		else
+		{
+			if ( ! isset($this->_with_applied[$parent_path]))
+			{
+				// If the parent path hasn't been joined yet, do it first (otherwise LEFT JOINs fail)
+				$this->with($parent_path);
+			}
+		}
+
+		// Add to with_applied to prevent duplicate joins
+		$this->_with_applied[$target_path] = TRUE;
+
+		// Use the keys of the empty object to determine the columns
+		foreach (array_keys($target->_object) as $column)
+		{
+			$name = $target_path.'.'.$column;
+			$alias = $target_path.':'.$column;
+
+			// Add the prefix so that load_result can determine the relationship
+			$this->select(array($name, $alias));
+		}
+
+		if (isset($parent->_belongs_to[$target_alias]))
+		{
+			// Parent belongs_to target, use target's primary key and parent's foreign key
+			$join_col1 = $target_path.'.'.$target->_primary_key;
+			$join_col2 = $parent_path.'.'.$parent->_belongs_to[$target_alias]['foreign_key'];
+		}
+		else
+		{
+			// Parent has_one target, use parent's primary key as target's foreign key
+			$join_col1 = $parent_path.'.'.$parent->_primary_key;
+			$join_col2 = $target_path.'.'.$parent->_has_one[$target_alias]['foreign_key'];
+		}
+
+		// Join the related object into the result
+		$this->join(array($target->_table_name, $target_path), 'LEFT')->on($join_col1, '=', $join_col2);
+
+		return $this;
+	}
+
+	/**
+	 * Initializes the Database Builder to given query type
+	 *
+	 * @param  integer $type Type of Database query
+	 * @return ORM
+	 */
+	protected function _build($type)
+	{
+		// Construct new builder object based on query type
+		switch ($type)
+		{
+			case Database::SELECT:
+				$this->_db_builder = DB::select();
+			break;
+			case Database::UPDATE:
+				$this->_db_builder = DB::update($this->_table_name);
+			break;
+			case Database::DELETE:
+				$this->_db_builder = DB::delete($this->_table_name);
+		}
+
+		// Process pending database method calls
+		foreach ($this->_db_pending as $method)
+		{
+			$name = $method['name'];
+			$args = $method['args'];
+
+			$this->_db_applied[$name] = $name;
+
+			call_user_func_array(array($this->_db_builder, $name), $args);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Finds and loads a single database row into the object.
+	 *
+	 * @chainable
+	 * @return ORM
+	 */
+	public function find()
+	{
+		if ($this->_loaded)
+			throw new Kohana_Exception('Method find() cannot be called on loaded objects');
+
+		if ( ! empty($this->_load_with))
+		{
+			foreach ($this->_load_with as $alias)
+			{
+				// Bind auto relationships
+				$this->with($alias);
+			}
+		}
+
+		$this->_build(Database::SELECT);
+
+		return $this->_load_result(FALSE);
+	}
+
+	/**
+	 * Finds multiple database rows and returns an iterator of the rows found.
+	 *
+	 * @return Database_Result
+	 */
+	public function find_all()
+	{
+		if ($this->_loaded)
+			throw new Kohana_Exception('Method find_all() cannot be called on loaded objects');
+
+		if ( ! empty($this->_load_with))
+		{
+			foreach ($this->_load_with as $alias)
+			{
+				// Bind auto relationships
+				$this->with($alias);
+			}
+		}
+
+		$this->_build(Database::SELECT);
+
+		return $this->_load_result(TRUE);
+	}
+
+	/**
+	 * Loads a database result, either as a new record for this model, or as
+	 * an iterator for multiple rows.
+	 *
+	 * @chainable
+	 * @param  bool $multiple Return an iterator or load a single row
+	 * @return ORM|Database_Result
+	 */
+	protected function _load_result($multiple = FALSE)
+	{
+		$this->_db_builder->from($this->_table_name);
+
+		if ($multiple === FALSE AND ! $this->_disable_limit)
+		{
+			// Only fetch 1 record
+			$this->_db_builder->limit(1);
+		}
+
+		// Select all columns by default
+		if (! $this->_disable_wild_select)
+			$this->_db_builder->select($this->_table_name.'.*');
+
+		if ( ! isset($this->_db_applied['order_by']) AND ! empty($this->_sorting))
+		{
+			foreach ($this->_sorting as $column => $direction)
+			{
+				if (strpos($column, '.') === FALSE)
+				{
+					// Sorting column for use in JOINs
+					$column = ($this->_disable_join_table_name ? '' : $this->_table_name.'.').$column;
+				}
+
+				$this->_db_builder->order_by($column, $direction);
+			}
+		}
+
+		if ($multiple === TRUE)
+		{
+			// Return database iterator casting to this object type
+			$result = $this->_db_builder->as_object(get_class($this))->execute($this->_db);
+
+			$this->reset();
+
+			return $result;
+		}
+		else
+		{
+			// Load the result as an associative array
+			$result = $this->_db_builder->as_assoc()->execute($this->_db);
+
+			$this->reset();
+
+			if ($result->count() === 1)
+			{
+				// Load object values
+				$this->_load_values($result->current());
+			}
+			else
+			{
+				// Clear the object, nothing was found
+				$this->clear();
+			}
+
+			return $this;
+		}
+	}
+
+	/**
+	 * Loads an array of values into into the current object.
+	 *
+	 * @chainable
+	 * @param  array $values Values to load
+	 * @return ORM
+	 */
+	protected function _load_values(array $values)
+	{
+		if (array_key_exists($this->_primary_key, $values))
+		{
+			if ($values[$this->_primary_key] !== NULL)
+			{
+				// Flag as loaded, saved, and valid
+				$this->_loaded = $this->_saved = $this->_valid = TRUE;
+
+				// Store primary key
+				$this->_primary_key_value = $values[$this->_primary_key];
+			}
+			else
+			{
+				// Not loaded, saved, or valid
+				$this->_loaded = $this->_saved = $this->_valid = FALSE;
+			}
+		}
+
+		// Related objects
+		$related = array();
+
+		foreach ($values as $column => $value)
+		{
+			if (strpos($column, ':') === FALSE)
+			{
+				// Load the value to this model
+				$this->_object[$column] = $value;
+			}
+			else
+			{
+				// Column belongs to a related model
+				list ($prefix, $column) = explode(':', $column, 2);
+
+				$related[$prefix][$column] = $value;
+			}
+		}
+
+		if ( ! empty($related))
+		{
+			foreach ($related as $object => $values)
+			{
+				// Load the related objects with the values in the result
+				$this->_related($object)->_load_values($values);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Rule definitions for validation
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return array();
+	}
+
+	/**
+	 * Filters a value for a specific column
+	 *
+	 * @param  string $field  The column name
+	 * @param  string $value  The value to filter
+	 * @return string
+	 */
+	protected function run_filter($field, $value, $filters=NULL)
+	{
+		if (is_null($filters))
+			$filters = $this->filters();
+
+		// Get the filters for this column
+		$wildcards = empty($filters[TRUE]) ? array() : $filters[TRUE];
+
+		// Merge in the wildcards
+		$filters = empty($filters[$field]) ? $wildcards : array_merge($wildcards, $filters[$field]);
+
+		// Bind the field name and model so they can be used in the filter method
+		$_bound = array
+		(
+			':field' => $field,
+			':model' => $this,
+		);
+
+		foreach ($filters as $array)
+		{
+			// Value needs to be bound inside the loop so we are always using the
+			// version that was modified by the filters that already ran
+			$_bound[':value'] = $value;
+
+			// Filters are defined as array($filter, $params)
+			$filter = $array[0];
+			$params = Arr::get($array, 1, array(':value'));
+
+			foreach ($params as $key => $param)
+			{
+				if (is_string($param) AND array_key_exists($param, $_bound))
+				{
+					// Replace with bound value
+					$params[$key] = $_bound[$param];
+				}
+			}
+
+			if (is_array($filter) OR ! is_string($filter))
+			{
+				// This is either a callback as an array or a lambda
+				$value = call_user_func_array($filter, $params);
+			}
+			elseif (strpos($filter, '::') === FALSE)
+			{
+				// Use a function call
+				$function = new ReflectionFunction($filter);
+
+				// Call $function($this[$field], $param, ...) with Reflection
+				$value = $function->invokeArgs($params);
+			}
+			else
+			{
+				// Split the class and method of the rule
+				list($class, $method) = explode('::', $filter, 2);
+
+				// Use a static method call
+				$method = new ReflectionMethod($class, $method);
+
+				// Call $Class::$method($this[$field], $param, ...) with Reflection
+				$value = $method->invokeArgs(NULL, $params);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Filter definitions for validation
+	 *
+	 * @return array
+	 */
+	public function filters()
+	{
+		return array();
+	}
+
+	/**
+	 * Label definitions for validation
+	 *
+	 * @return array
+	 */
+	public function labels()
+	{
+		return array();
+	}
+
+	/**
+	 * Validates the current model's data
+	 *
+	 * @param  Validation $extra_validation Validation object
+	 * @return ORM
+	 */
+	public function check(Validation $extra_validation = NULL)
+	{
+		// Determine if any external validation failed
+		$extra_errors = ($extra_validation AND ! $extra_validation->check());
+
+		// Always build a new validation object
+		$this->_validation();
+
+		$array = $this->_validation;
+
+		if (($this->_valid = $array->check()) === FALSE OR $extra_errors)
+		{
+			$exception = new ORM_Validation_Exception($this->_object_name, $array);
+
+			if ($extra_errors)
+			{
+				// Merge any possible errors from the external object
+				$exception->add_object('_external', $extra_validation);
+			}
+			throw $exception;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Insert a new object to the database
+	 * @param  Validation $validation Validation object
+	 * @return ORM
+	 */
+	public function create(Validation $validation = NULL)
+	{
+		if ($this->_loaded)
+			throw new Kohana_Exception('Cannot create :model model because it is already loaded.', array(':model' => $this->_object_name));
+
+		// Require model validation before saving
+		if ( ! $this->_valid)
+		{
+			$this->check($validation);
+		}
+
+		$data = array();
+		foreach ($this->_changed as $column)
+		{
+			// Generate list of column => values
+			$data[$column] = $this->_object[$column];
+		}
+
+		if (is_array($this->_created_column))
+		{
+			// Fill the created column
+			$column = $this->_created_column['column'];
+			$format = $this->_created_column['format'];
+
+			$data[$column] = $this->_object[$column] = ($format === TRUE) ? time() : date($format);
+		}
+
+		$result = DB::insert($this->_table_name)
+			->columns(array_keys($data))
+			->values(array_values($data))
+			->execute($this->_db);
+
+		if ( ! array_key_exists($this->_primary_key, $data))
+		{
+			// Load the insert id as the primary key if it was left out
+			$this->_object[$this->_primary_key] = $this->_primary_key_value = $result[0];
+		}
+
+		// Object is now loaded and saved
+		$this->_loaded = $this->_saved = TRUE;
+
+		// All changes have been saved
+		$this->_changed = array();
+
+		return $this;
+	}
+
+	/**
+	 * Updates a single record or multiple records
+	 *
+	 * @chainable
+	 * @param  Validation $validation Validation object
+	 * @return ORM
+	 */
+	public function update(Validation $validation = NULL)
+	{
+		if ( ! $this->_loaded)
+			throw new Kohana_Exception('Cannot update :model model because it is not loaded.', array(':model' => $this->_object_name));
+
+		if (empty($this->_changed))
+		{
+			// Nothing to update
+			return $this;
+		}
+
+		// Require model validation before saving
+		if ( ! $this->_valid)
+		{
+			$this->check($validation);
+		}
+
+		$data = array();
+		foreach ($this->_changed as $column)
+		{
+			// Compile changed data
+			$data[$column] = $this->_object[$column];
+		}
+
+		if (is_array($this->_updated_column))
+		{
+			// Fill the updated column
+			$column = $this->_updated_column['column'];
+			$format = $this->_updated_column['format'];
+
+			$data[$column] = $this->_object[$column] = ($format === TRUE) ? time() : date($format);
+		}
+
+		// Use primary key value
+		$id = $this->pk();
+
+		// Update a single record
+		DB::update($this->_table_name)
+			->set($data)
+			->where($this->_primary_key, '=', $id)
+			->execute($this->_db);
+
+		if (isset($data[$this->_primary_key]))
+		{
+			// Primary key was changed, reflect it
+			$this->_primary_key_value = $data[$this->_primary_key];
+		}
+
+		// Object has been saved
+		$this->_saved = TRUE;
+
+		// All changes have been saved
+		$this->_changed = array();
+
+		return $this;
+	}
+
+	/**
+	 * Updates or Creates the record depending on loaded()
+	 *
+	 * @chainable
+	 * @param  Validation $validation Validation object
+	 * @return ORM
+	 */
+	public function save(Validation $validation = NULL)
+	{
+		return $this->loaded() ? $this->update($validation) : $this->create($validation);
+	}
+
+	/**
+	 * Deletes a single record or multiple records, ignoring relationships.
+	 *
+	 * @chainable
+	 * @return ORM
+	 */
+	public function delete()
+	{
+		if ( ! $this->_loaded)
+			throw new Kohana_Exception('Cannot delete :model model because it is not loaded.', array(':model' => $this->_object_name));
+
+		// Use primary key value
+		$id = $this->pk();
+
+		// Delete the object
+		DB::delete($this->_table_name)
+			->where($this->_primary_key, '=', $id)
+			->execute($this->_db);
+
+		return $this->clear();
+	}
+
+	/**
+	 * Tests if this object has a relationship to a different model,
+	 * or an array of different models.
+	 *
+	 *     // Check if $model has the login role
+	 *     $model->has('roles', ORM::factory('role', array('name' => 'login')));
+	 *     // Check for the login role if you know the roles.id is 5
+	 *     $model->has('roles', 5);
+	 *     // Check for all of the following roles
+	 *     $model->has('roles', array(1, 2, 3, 4));
+
+	 * @param  string  $alias    Alias of the has_many "through" relationship
+	 * @param  mixed   $far_keys Related model, primary key, or an array of primary keys
+	 * @return Database_Result
+	 */
+	public function has($alias, $far_keys)
+	{
+		$far_keys = ($far_keys instanceof ORM) ? $far_keys->pk() : $far_keys;
+
+		// We need an array to simplify the logic
+		$far_keys = (array) $far_keys;
+
+		// Nothing to check if the model isn't loaded or we don't have any far_keys
+		if ( ! $far_keys OR ! $this->_loaded)
+			return FALSE;
+
+		$count = (int) DB::select(array('COUNT("*")', 'records_found'))
+			->from($this->_has_many[$alias]['through'])
+			->where($this->_has_many[$alias]['foreign_key'], '=', $this->pk())
+			->where($this->_has_many[$alias]['far_key'], 'IN', $far_keys)
+			->execute($this->_db)->get('records_found');
+
+		// Rows found need to match the rows searched
+		return $count === count($far_keys);
+	}
+
+	/**
+	 * Adds a new relationship to between this model and another.
+	 *
+	 *     // Add the login role using a model instance
+	 *     $model->add('roles', ORM::factory('role', array('name' => 'login')));
+	 *     // Add the login role if you know the roles.id is 5
+	 *     $model->add('roles', 5);
+	 *     // Add multiple roles (for example, from checkboxes on a form)
+	 *     $model->add('roles', array(1, 2, 3, 4));
+	 *
+	 * @param  string  $alias    Alias of the has_many "through" relationship
+	 * @param  mixed   $far_keys Related model, primary key, or an array of primary keys
+	 * @return ORM
+	 */
+	public function add($alias, $far_keys)
+	{
+		$far_keys = ($far_keys instanceof ORM) ? $far_keys->pk() : $far_keys;
+
+		$columns = array($this->_has_many[$alias]['foreign_key'], $this->_has_many[$alias]['far_key']);
+		$foreign_key = $this->pk();
+
+		$query = DB::insert($this->_has_many[$alias]['through'], $columns);
+
+		foreach ( (array) $far_keys as $key)
+		{
+			$query->values(array($foreign_key, $key));
+		}
+
+		$query->execute($this->_db);
+
+		return $this;
+	}
+
+	/**
+	 * Removes a relationship between this model and another.
+	 *
+	 *     // Remove a role using a model instance
+	 *     $model->remove('roles', ORM::factory('role', array('name' => 'login')));
+	 *     // Remove the role knowing the primary key
+	 *     $model->remove('roles', 5);
+	 *     // Remove multiple roles (for example, from checkboxes on a form)
+	 *     $model->remove('roles', array(1, 2, 3, 4));
+	 *     // Remove all related roles
+	 *     $model->remove('roles');
+	 *
+	 * @param  string $alias    Alias of the has_many "through" relationship
+	 * @param  mixed  $far_keys Related model, primary key, or an array of primary keys
+	 * @return ORM
+	 */
+	public function remove($alias, $far_keys = NULL)
+	{
+		$far_keys = ($far_keys instanceof ORM) ? $far_keys->pk() : $far_keys;
+
+		$query = DB::delete($this->_has_many[$alias]['through'])
+			->where($this->_has_many[$alias]['foreign_key'], '=', $this->pk());
+
+		if ($far_keys !== NULL)
+		{
+			// Remove all the relationships in the array
+			$query->where($this->_has_many[$alias]['far_key'], 'IN', (array) $far_keys);
+		}
+
+		$query->execute($this->_db);
+
+		return $this;
+	}
+
+	/**
+	 * Count the number of records in the table.
+	 *
+	 * @return integer
+	 */
+	public function count_all()
+	{
+		$selects = array();
+
+		foreach ($this->_db_pending as $key => $method)
+		{
+			if ($method['name'] == 'select')
+			{
+				// Ignore any selected columns for now
+				$selects[] = $method;
+				unset($this->_db_pending[$key]);
+			}
+		}
+
+		if ( ! empty($this->_load_with))
+		{
+			foreach ($this->_load_with as $alias)
+			{
+				// Bind relationship
+				$this->with($alias);
+			}
+		}
+
+		$this->_build(Database::SELECT);
+
+		$records = $this->_db_builder->from($this->_table_name)
+			->select(array('COUNT("*")', 'records_found'))
+			->execute($this->_db)
+			->get('records_found');
+
+		// Add back in selected columns
+		$this->_db_pending += $selects;
+
+		$this->reset();
+
+		// Return the total number of records in a table
+		return $records;
+	}
+
+	/**
+	 * Proxy method to Database list_columns.
+	 *
+	 * @return array
+	 */
+	public function list_columns()
+	{
+		// Proxy to database
+		return $this->_db->list_columns($this->_table_name);
+	}
+
+	/**
+	 * Proxy method to Database field_data.
+	 *
+	 * @chainable
+	 * @param  string $sql SQL query to clear
+	 * @return ORM
+	 */
+	public function clear_cache($sql = NULL)
+	{
+		// Proxy to database
+		$this->_db->clear_cache($sql);
+
+		ORM::$_column_cache = array();
+
+		return $this;
+	}
+
+	/**
+	 * Returns an ORM model for the given one-one related alias
+	 *
+	 * @param  string $alias Alias name
+	 * @return ORM
+	 */
+	protected function _related($alias)
+	{
+		if (isset($this->_related[$alias]))
+		{
+			return $this->_related[$alias];
+		}
+		elseif (isset($this->_has_one[$alias]))
+		{
+			return $this->_related[$alias] = ORM::factory($this->_has_one[$alias]['model']);
+		}
+		elseif (isset($this->_belongs_to[$alias]))
+		{
+			return $this->_related[$alias] = ORM::factory($this->_belongs_to[$alias]['model']);
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Returns the value of the primary key
+	 *
+	 * @return mixed Primary key
+	 */
+	public function pk()
+	{
+		return $this->_primary_key_value;
+	}
+
+	/**
+	 * Returns last executed query
+	 *
+	 * @return string
+	 */
+	public function last_query()
+	{
+		return $this->_db->last_query;
+	}
+
+	/**
+	 * Clears query builder.  Passing FALSE is useful to keep the existing
+	 * query conditions for another query.
+	 *
+	 * @param bool $next Pass FALSE to avoid resetting on the next call
+	 * @return ORM
+	 */
+	public function reset($next = TRUE)
+	{
+		if ($next AND $this->_db_reset)
+		{
+			$this->_db_pending   = array();
+			$this->_db_applied   = array();
+			$this->_db_builder   = NULL;
+			$this->_with_applied = array();
+		}
+
+		// Reset on the next call?
+		$this->_db_reset = $next;
+
+		return $this;
+	}
+} // End ORM
diff --git a/includes/kohana/modules/orm/classes/kohana/orm/validation/exception.php b/includes/kohana/modules/orm/classes/kohana/orm/validation/exception.php
new file mode 100644
index 0000000..f4c303b
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/kohana/orm/validation/exception.php
@@ -0,0 +1,182 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * ORM Validation exceptions.
+ *
+ * @package    Kohana/ORM
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ORM_Validation_Exception extends Kohana_Exception {
+
+	/**
+   * Array of validation objects
+   * @var array
+   */
+	protected $_objects = array();
+
+	/**
+   * The _object_name property of the main ORM model this exception was created for
+   * @var string
+   */
+	protected $_object_name = NULL;
+
+	/**
+	 * Constructs a new exception for the specified model
+	 *
+	 * @param  string     $object_name The _object_name of the model this exception is for
+	 * @param  Validation $object      The Validation object of the model
+	 * @param  string     $message     The error message
+	 * @param  array      $values      The array of values for the error message
+	 * @param  integer    $code        The error code for the exception
+	 * @return void
+	 */
+	public function __construct($object_name, Validation $object, $message = 'Failed to validate array', array $values = NULL, $code = 0)
+	{
+		$this->_object_name = $object_name;
+		$this->_objects['_object'] = $object;
+
+		parent::__construct($message, $values, $code);
+	}
+
+	/**
+	 * Adds a Validation object to this exception
+	 *
+	 *     // The following will add a validation object for a profile model
+	 *     // inside the exception for a user model.
+	 *     $e->add_object('profile', $validation);
+	 *     // The errors array will now look something like this
+	 *     // array
+	 *     // (
+	 *     //   'username' => 'This field is required',
+	 *     //   'profile'  => array
+	 *     //   (
+	 *     //     'first_name' => 'This field is required',
+	 *     //   ),
+	 *     // );
+	 *
+	 * @param  string     $alias    The relationship alias from the model
+	 * @param  Validation $object   The Validation object to merge
+	 * @param  mixed      $has_many The array key to use if this exception can be merged multiple times
+	 * @return ORM_Validation_Exception
+	 */
+	public function add_object($alias, Validation $object, $has_many = FALSE)
+	{
+		if ($has_many === TRUE)
+		{
+			// This is most likely a has_many relationship
+			$this->_objects[$alias][]['_object'] = $object;
+		}
+		elseif ($has_many)
+		{
+			// This is most likely a has_many relationship
+			$this->_objects[$alias][$has_many]['_object'] = $object;
+		}
+		else
+		{
+			$this->_objects[$alias]['_object'] = $object;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Merges an ORM_Validation_Exception object into the current exception
+	 * Useful when you want to combine errors into one array
+	 *
+	 * @param  string                   $alias    The relationship alias from the model
+	 * @param  ORM_Validation_Exception $object   The exception to merge
+	 * @param  mixed                    $has_many The array key to use if this exception can be merged multiple times
+	 * @return ORM_Validation_Exception
+	 */
+	public function merge($alias, ORM_Validation_Exception $object, $has_many = FALSE)
+	{
+		if ($has_many === TRUE)
+		{
+			// This is most likely a has_many relationship
+			$this->_objects[$alias][] = $object->objects();
+		}
+		elseif ($has_many)
+		{
+			// This is most likely a has_many relationship
+			$this->_objects[$alias][$has_many] = $object->objects();
+		}
+		else
+		{
+			$this->_objects[$alias] = $object->objects();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns a merged array of the errors from all the Validation objects in this exception
+	 *
+	 *     // Will load Model_User errors from messages/orm-validation/user.php
+	 *     $e->errors('orm-validation');
+	 *
+	 * @param   string  $directory Directory to load error messages from
+	 * @param   mixed   $translate Translate the message
+	 * @return  array
+	 * @see generate_errors()
+	 */
+	public function errors($directory = NULL, $translate = TRUE)
+	{
+		if ($directory !== NULL)
+		{
+			// Everything starts at $directory/$object_name
+			$directory .= '/'.$this->_object_name;
+		}
+
+		return $this->generate_errors($this->_objects, $directory, $translate);
+	}
+
+	/**
+	 * Recursive method to fetch all the errors in this exception
+	 *
+	 * @param  array  $array     Array of Validation objects to get errors from
+	 * @param  string $directory Directory to load error messages from
+	 * @param  mixed  $translate Translate the message
+	 * @return array
+	 */
+	protected function generate_errors(array $array, $directory, $translate)
+	{
+		$errors = array();
+
+		foreach ($array as $alias => $object)
+		{
+			if ($directory === NULL)
+			{
+				// Return the raw errors
+				$file = NULL;
+			}
+			else
+			{
+				$file = trim($directory.'/'.$alias, '/');
+			}
+
+			if (is_array($object))
+			{
+				// Recursively fill the errors array
+				$errors[$alias] = $this->generate_errors($object, $file, $translate);
+			}
+			else
+			{
+				// Merge in this array of errors
+				$errors += $object->errors($directory, $translate);
+			}
+		}
+
+		return $errors;
+	}
+
+	/**
+	 * Returns the protected _objects property from this exception
+	 *
+	 * @return array
+	 */
+	public function objects()
+	{
+		return $this->_objects;
+	}
+} // End Kohana_ORM_Validation_Exception
diff --git a/includes/kohana/modules/orm/classes/model/auth/role.php b/includes/kohana/modules/orm/classes/model/auth/role.php
new file mode 100644
index 0000000..0ad4c66
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/auth/role.php
@@ -0,0 +1,29 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Default auth role
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Model_Auth_Role extends ORM {
+
+	// Relationships
+	protected $_has_many = array('users' => array('through' => 'roles_users'));
+
+	public function rules()
+	{
+		return array(
+			'name' => array(
+				array('not_empty'),
+				array('min_length', array(':value', 4)),
+				array('max_length', array(':value', 32)),
+			),
+			'description' => array(
+				array('max_length', array(':value', 255)),
+			)
+		);
+	}
+
+} // End Auth Role Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/model/auth/user.php b/includes/kohana/modules/orm/classes/model/auth/user.php
new file mode 100644
index 0000000..aeb1563
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/auth/user.php
@@ -0,0 +1,240 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Default auth user
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Model_Auth_User extends ORM {
+
+	/**
+	 * A user has many tokens and roles
+	 *
+	 * @var array Relationhips
+	 */
+	protected $_has_many = array(
+		'user_tokens' => array('model' => 'user_token'),
+		'roles'       => array('model' => 'role', 'through' => 'roles_users'),
+	);
+
+	/**
+	 * Rules for the user model. Because the password is _always_ a hash
+	 * when it's set,you need to run an additional not_empty rule in your controller
+	 * to make sure you didn't hash an empty string. The password rules
+	 * should be enforced outside the model or with a model helper method.
+	 *
+	 * @return array Rules
+	 */
+	public function rules()
+	{
+		return array(
+			'username' => array(
+				array('not_empty'),
+				array('min_length', array(':value', 4)),
+				array('max_length', array(':value', 32)),
+				array('regex', array(':value', '/^[-\pL\pN_.]++$/uD')),
+				array(array($this, 'username_available'), array(':validation', ':field')),
+			),
+			'password' => array(
+				array('not_empty'),
+			),
+			'email' => array(
+				array('not_empty'),
+				array('min_length', array(':value', 4)),
+				array('max_length', array(':value', 127)),
+				array('email'),
+				array(array($this, 'email_available'), array(':validation', ':field')),
+			),
+		);
+	}
+
+	/**
+	 * Filters to run when data is set in this model. The password filter
+	 * automatically hashes the password when it's set in the model.
+	 *
+	 * @return array Filters
+	 */
+	public function filters()
+	{
+		return array(
+			'password' => array(
+				array(array(Auth::instance(), 'hash'))
+			)
+		);
+	}
+
+	/**
+	 * Labels for fields in this model
+	 *
+	 * @return array Labels
+	 */
+	public function labels()
+	{
+		return array(
+			'username'         => 'username',
+			'email'            => 'email address',
+			'password'         => 'password',
+		);
+	}
+
+	/**
+	 * Complete the login for a user by incrementing the logins and saving login timestamp
+	 *
+	 * @return void
+	 */
+	public function complete_login()
+	{
+		if ($this->_loaded)
+		{
+			// Update the number of logins
+			$this->logins = new Database_Expression('logins + 1');
+
+			// Set the last login date
+			$this->last_login = time();
+
+			// Save the user
+			$this->update();
+		}
+	}
+
+	/**
+	 * Does the reverse of unique_key_exists() by triggering error if username exists.
+	 * Validation callback.
+	 *
+	 * @param   Validation  Validation object
+	 * @param   string      Field name
+	 * @return  void
+	 */
+	public function username_available(Validation $validation, $field)
+	{
+		if ($this->unique_key_exists($validation[$field], 'username'))
+		{
+			$validation->error($field, 'username_available', array($validation[$field]));
+		}
+	}
+
+	/**
+	 * Does the reverse of unique_key_exists() by triggering error if email exists.
+	 * Validation callback.
+	 *
+	 * @param   Validation  Validation object
+	 * @param   string      Field name
+	 * @return  void
+	 */
+	public function email_available(Validation $validation, $field)
+	{
+		if ($this->unique_key_exists($validation[$field], 'email'))
+		{
+			$validation->error($field, 'email_available', array($validation[$field]));
+		}
+	}
+
+	/**
+	 * Tests if a unique key value exists in the database.
+	 *
+	 * @param   mixed    the value to test
+	 * @param   string   field name
+	 * @return  boolean
+	 */
+	public function unique_key_exists($value, $field = NULL)
+	{
+		if ($field === NULL)
+		{
+			// Automatically determine field by looking at the value
+			$field = $this->unique_key($value);
+		}
+
+		return (bool) DB::select(array('COUNT("*")', 'total_count'))
+			->from($this->_table_name)
+			->where($field, '=', $value)
+			->where($this->_primary_key, '!=', $this->pk())
+			->execute($this->_db)
+			->get('total_count');
+	}
+
+	/**
+	 * Allows a model use both email and username as unique identifiers for login
+	 *
+	 * @param   string  unique value
+	 * @return  string  field name
+	 */
+	public function unique_key($value)
+	{
+		return Valid::email($value) ? 'email' : 'username';
+	}
+
+	/**
+	 * Password validation for plain passwords.
+	 *
+	 * @param array $values
+	 * @return Validation
+	 */
+	public static function get_password_validation($values)
+	{
+		return Validation::factory($values)
+			->rule('password', 'min_length', array(':value', 8))
+			->rule('password_confirm', 'matches', array(':validation', ':field', 'password'));
+	}
+
+	/**
+	 * Create a new user
+	 *
+	 * Example usage:
+	 * ~~~
+	 * $user = ORM::factory('user')->create_user($_POST, array(
+	 *	'username',
+	 *	'password',
+	 *	'email',
+	 * );
+	 * ~~~
+	 *
+	 * @param array $values
+	 * @param array $expected
+	 * @throws ORM_Validation_Exception
+	 */
+	public function create_user($values, $expected)
+	{
+		// Validation for passwords
+		$extra_validation = Model_User::get_password_validation($values)
+			->rule('password', 'not_empty');
+
+		return $this->values($values, $expected)->create($extra_validation);
+	}
+
+	/**
+	 * Update an existing user
+	 *
+	 * [!!] We make the assumption that if a user does not supply a password, that they do not wish to update their password.
+	 *
+	 * Example usage:
+	 * ~~~
+	 * $user = ORM::factory('user')
+	 *	->where('username', '=', 'kiall')
+	 *	->find()
+	 *	->update_user($_POST, array(
+	 *		'username',
+	 *		'password',
+	 *		'email',
+	 *	);
+	 * ~~~
+	 *
+	 * @param array $values
+	 * @param array $expected
+	 * @throws ORM_Validation_Exception
+	 */
+	public function update_user($values, $expected = NULL)
+	{
+		if (empty($values['password']))
+		{
+			unset($values['password'], $values['password_confirm']);
+		}
+
+		// Validation for passwords
+		$extra_validation = Model_User::get_password_validation($values);
+
+		return $this->values($values, $expected)->update($extra_validation);
+	}
+
+} // End Auth User Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/model/auth/user/token.php b/includes/kohana/modules/orm/classes/model/auth/user/token.php
new file mode 100644
index 0000000..ede1ee8
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/auth/user/token.php
@@ -0,0 +1,70 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+/**
+ * Default auth user toke
+ *
+ * @package    Kohana/Auth
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Model_Auth_User_Token extends ORM {
+
+	// Relationships
+	protected $_belongs_to = array('user' => array());
+
+	/**
+	 * Handles garbage collection and deleting of expired objects.
+	 *
+	 * @return  void
+	 */
+	public function __construct($id = NULL)
+	{
+		parent::__construct($id);
+
+		if (mt_rand(1, 100) === 1)
+		{
+			// Do garbage collection
+			$this->delete_expired();
+		}
+
+		if ($this->expires < time() AND $this->_loaded)
+		{
+			// This object has expired
+			$this->delete();
+		}
+	}
+
+	/**
+	 * Deletes all expired tokens.
+	 *
+	 * @return  ORM
+	 */
+	public function delete_expired()
+	{
+		// Delete all expired tokens
+		DB::delete($this->_table_name)
+			->where('expires', '<', time())
+			->execute($this->_db);
+
+		return $this;
+	}
+
+	public function create(Validation $validation = NULL)
+	{
+		$this->token = $this->create_token();
+
+		return parent::create($validation);
+	}
+
+	protected function create_token()
+	{
+		do
+		{
+			$token = sha1(uniqid(Text::random('alnum', 32), TRUE));
+		}
+		while(ORM::factory('user_token', array('token' => $token))->loaded());
+
+		return $token;
+	}
+
+} // End Auth User Token Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/model/role.php b/includes/kohana/modules/orm/classes/model/role.php
new file mode 100644
index 0000000..983fa96
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/role.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Model_Role extends Model_Auth_Role {
+
+	// This class can be replaced or extended
+
+} // End Role Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/model/user.php b/includes/kohana/modules/orm/classes/model/user.php
new file mode 100644
index 0000000..0726f15
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/user.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Model_User extends Model_Auth_User {
+
+	// This class can be replaced or extended
+
+} // End User Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/model/user/token.php b/includes/kohana/modules/orm/classes/model/user/token.php
new file mode 100644
index 0000000..5d9915a
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/model/user/token.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+class Model_User_Token extends Model_Auth_User_Token {
+
+	// This class can be replaced or extended
+
+} // End User Token Model
\ No newline at end of file
diff --git a/includes/kohana/modules/orm/classes/orm.php b/includes/kohana/modules/orm/classes/orm.php
new file mode 100644
index 0000000..edf2fc2
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/orm.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class ORM extends Kohana_ORM {}
diff --git a/includes/kohana/modules/orm/classes/orm/validation/exception.php b/includes/kohana/modules/orm/classes/orm/validation/exception.php
new file mode 100644
index 0000000..150ceba
--- /dev/null
+++ b/includes/kohana/modules/orm/classes/orm/validation/exception.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * ORM Validation exceptions.
+ *
+ * @package    Kohana/ORM
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class ORM_Validation_Exception extends Kohana_ORM_Validation_Exception {}
diff --git a/includes/kohana/modules/orm/config/userguide.php b/includes/kohana/modules/orm/config/userguide.php
new file mode 100644
index 0000000..a7d270e
--- /dev/null
+++ b/includes/kohana/modules/orm/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'orm' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'ORM',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Official ORM module, a modeling library for object relational mapping.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2011 Kohana Team',
+		)	
+	)
+);
diff --git a/includes/kohana/modules/orm/guide/orm/examples.md b/includes/kohana/modules/orm/guide/orm/examples.md
new file mode 100644
index 0000000..5c21dd4
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/examples.md
@@ -0,0 +1,13 @@
+# Examples
+
+- [Simple](examples/simple): Basic, one table model examples.
+- [Validation](examples/validation): Full example of creating a user account and handling validation errors.
+
+## @TODO:
+
+The following is a sample list of examples that might be useful.  Don't feel limited by this list, or consider these required.  Items on the list can be combined, split up, removed or added to.  All contribution are appreciated.
+
+- Examples of changing things like $_table_name, $_labels, with, etc.
+- Example of a one to one relationship.
+- Example of one to many
+- Example of many to many.
diff --git a/includes/kohana/modules/orm/guide/orm/examples/simple.md b/includes/kohana/modules/orm/guide/orm/examples/simple.md
new file mode 100644
index 0000000..96a23d1
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/examples/simple.md
@@ -0,0 +1,119 @@
+# Simple Examples
+
+This is a simple example of a single ORM model, that has no relationships, but uses validation on the fields. 
+
+## SQL schema
+
+	CREATE TABLE IF NOT EXISTS `members` (
+	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	  `username` varchar(32) NOT NULL,
+	  `first_name` varchar(32) NOT NULL,
+	  `last_name` varchar(32) NOT NULL,
+	  `email` varchar(127) DEFAULT NULL,
+	  PRIMARY KEY (`id`)
+	) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+
+## Model
+	
+	<?php defined('SYSPATH') or die('No direct access allowed.');
+
+	class Model_Member extends ORM {
+
+		public function rules()
+		{
+			return array(
+				'username' => array(
+					array('not_empty'),
+					array('min_length', array(':value', 4)),
+					array('max_length', array(':value', 32)),
+					array('regex', array(':value', '/^[-\pL\pN_.]++$/uD')),
+				),
+				'first_name' => array(
+					array('not_empty'),
+					array('min_length', array(':value', 4)),
+					array('max_length', array(':value', 32)),
+					array('regex', array(':value', '/^[-\pL\pN_.]++$/uD')),
+				),
+				'last_name' => array(
+					array('not_empty'),
+					array('min_length', array(':value', 4)),
+					array('max_length', array(':value', 32)),
+					array('regex', array(':value', '/^[-\pL\pN_.]++$/uD')),
+				),
+				'email' => array(
+					array('not_empty'),
+					array('min_length', array(':value', 4)),
+					array('max_length', array(':value', 127)),
+					array('email'),
+				),
+			);
+		}
+	}
+
+[!!] The array returned by `ORM::rules()` will be passed to a [Validation] object and tested when you call `ORM::save()`. 
+
+[!!] Please notice that defining the primary key "id" in the model is not necessary. Also the table name in the database is plural and the model name is singular.
+
+## Controller
+
+	<?php defined('SYSPATH') or die('No direct access allowed.');
+	
+	class Controller_Member extends Controller_Template {
+		
+		public function action_index()
+		{
+			/**
+			 * Example 1
+			 */
+			
+			// Create an instance of a model
+			$members = ORM::factory('member');
+			
+			// Get all members with the first name "Peter" find_all()
+			// means we get all records matching the query.
+			$members->where('first_name', '=', 'Peter')->find_all();
+
+			// Count records in the $members object
+			$members->count_all();
+			
+			/**
+			 * Example 2
+			 */
+			
+			// Create an instance of a model
+			$member = ORM::factory('member');
+			
+			// Get a member with the user name "bongo" find() means
+			// we only want the first record matching the query.
+			$member->where('username', '=', 'bongo')->find();
+			
+			/**
+			 * Example 3
+			 */
+			
+			// Create an instance of a model
+			$member = ORM::factory('member');
+			
+			// Do an INSERT query
+			$member->username = 'bongo';
+			$member->first_name = 'Peter';
+			$member->last_name = 'Smith';
+			$member->save();
+			
+			/**
+			 * Example 4
+			 */
+			
+			// Create an instance of a model where the
+			// table field "id" is "1"
+			$member = ORM::factory('member', 1);
+			
+			// Do an UPDATE query
+			$member->username = 'bongo';
+			$member->first_name = 'Peter';
+			$member->last_name = 'Smith';
+			$member->save();
+		}
+	}
+
+[!!] $member will be a PHP object where you can access the values from the query e.g. echo $member->first_name
diff --git a/includes/kohana/modules/orm/guide/orm/examples/validation.md b/includes/kohana/modules/orm/guide/orm/examples/validation.md
new file mode 100644
index 0000000..bdbbc0c
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/examples/validation.md
@@ -0,0 +1,137 @@
+# Validation Example
+
+This example will create user accounts and demonstrate how to handle model and controller validation. We will create a form, process it, and display any errors to the user. We will be assuming that the Model_User class contains a method called `hash_password` that is used to turn the plaintext passwords into some kind of hash. The implementation of the hashing methods are beyond the scope of this example and should be provided with the Authentication library you decide to use.
+
+## SQL schema
+
+	CREATE TABLE IF NOT EXISTS `members` (
+	  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+	  `username` varchar(32) NOT NULL,
+	  `password` varchar(100) NOT NULL,
+	  PRIMARY KEY (`id`)
+	) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
+
+## Model
+	
+	<?php defined('SYSPATH') or die('No direct access allowed.');
+
+	class Model_Member extends ORM {
+
+		public function rules()
+		{
+			return array(
+				'username' => array(
+					array('not_empty'),
+					array('min_length', array(':value', 4)),
+					array('max_length', array(':value', 32)),
+					array(array($this, 'username_available')),
+				),
+				'password' => array(
+					array('not_empty'),
+				),
+			);
+		}
+		
+		public function filters()
+		{
+			return array(
+				'password' => array(
+					array(array($this, 'hash_password')),
+				),
+			);
+		}
+
+		public function username_available($username)
+		{
+			// There are simpler ways to do this, but I will use ORM for the sake of the example
+			return ORM::factory('member', array('username' => $username))->loaded();
+		}
+
+		public function hash_password($password)
+		{
+			// Do something to hash the password
+		}
+	}
+
+## HTML Form
+
+Please forgive my slightly ugly form. I am trying not to use any modules or unrelated magic. :)
+
+	<form action="<?= URL::site('/members'); ?>" method="post" accept-charset="utf-8">
+		<label for="username">Username:</label>
+		<input id="username" type="text" name="username" value="<?= Arr::get($values, 'username'); ?>" />
+		<label for="username" class="error"><?= Arr::get($errors, 'username'); ?>
+
+		<label for="password">Password:</label>
+		<input id="password" type="password" name="password" value="<?= Arr::get($values, 'password'); ?>" />
+		<label for="password" class="error"><?= Arr::get($errors, 'password'); ?>
+
+		<label for="password_confirm">Repeat Password:</label>
+		<input id="password_confirm" type="password" name="_external[password_confirm]" value="<?= Arr::path($values, '_external.password_confirm'); ?>" />
+		<label for="password_confirm" class="error"><?= Arr::path($errors, '_external.password_confirm'); ?>
+
+		<button type="submit">Create</button>
+	</form>
+
+## Controller
+
+[!!] Remember that the `password` will be hashed as soon as it is set in the model, for this reason, it is impossible to validate it's length or the fact that it matches the `password_confirm` field. The model should not care about validating the `password_confirm` field, so we add that logic to the controller and simply ask the model to bundle the errors into one tidy array. Read the [filters](filters) section to understand how those work.
+
+	public function action_create()
+	{
+		$view = View::factory('members/create')
+			->set('values', $_POST)
+			->bind('errors', $errors);
+
+		if ($_POST)
+		{
+			$member = ORM::factory('member')
+				// The ORM::values() method is a shortcut to assign many values at once
+				->values($_POST, array('username', 'password'));
+
+			$external_values = array(
+				// The unhashed password is needed for comparing to the password_confirm field
+				'password' => Arr::get($_POST, 'password'),
+			// Add all external values
+			) + Arr::get($_POST, '_external', array());
+			$extra = Validation::factory($external_values)
+				->rule('password_confirm', 'matches', array(':validation', ':field', 'password'));
+
+			try
+			{
+				$member->save($extra);
+				// Redirect the user to his page
+				$this->request->redirect('members/'.$member->id);
+			}
+			catch (ORM_Validation_Exception $e)
+			{
+				$errors = $e->errors('models');
+			}
+		}
+
+		$this->response->body($view);
+	}
+
+## Messages
+
+**application/messages/models/member.php**
+
+	return array(
+		'username' => array(
+			'not_empty' => 'You must provide a username.',
+			'min_length' => 'The username must be at least :param2 characters long.',
+			'max_length' => 'The username must be less than :param2 characters long.',
+			'username_available' => 'This username is not available.',
+		),
+		'password' => array(
+			'not_empty' => 'You must provide a password.',
+		),
+	);
+
+**application/messages/models/member/_external.php**
+
+	return array(
+		'password_confirm' => array(
+			'matches' => 'The password fields did not match.',
+		),
+	);
diff --git a/includes/kohana/modules/orm/guide/orm/filters.md b/includes/kohana/modules/orm/guide/orm/filters.md
new file mode 100644
index 0000000..5f20e60
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/filters.md
@@ -0,0 +1,22 @@
+# Filters
+
+Filters in ORM work much like they used to when they were part of the Validate class in 3.0.x however they have been modified to match the flexible syntax of [Validation] rules in 3.1.x. Filters run as soon as the field is set in your model and should be used to format the data before it is inserted into the Database.
+
+Define your filters the same way you define rules, as an array returned by the `ORM::filters()` method like the following:
+
+	public function filters()
+	{
+		return array(
+			'username' => array(
+				array('trim'),
+			),
+			'password' => array(
+				array(array($this, 'hash_password')),
+			),
+			'created_on' => array(
+				array('Format::date', array(':value', 'Y-m-d H:i:s')),
+			),
+		);
+	}
+
+[!!] When defining filters, you may use the parameters `:value`, `:field`, and `:model` to refer to the field value, field name, and the model instance respectively.
diff --git a/includes/kohana/modules/orm/guide/orm/index.md b/includes/kohana/modules/orm/guide/orm/index.md
new file mode 100644
index 0000000..681c190
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/index.md
@@ -0,0 +1,22 @@
+# ORM
+
+Kohana 3.x includes a powerful Object Relational Mapping (ORM) module that uses the active record pattern and database introspection to determine a model's column information. ORM is integrated tightly with the [Validation] library.
+
+The ORM allows for manipulation and control of data within a database as though it was a PHP object. Once you define the relationships ORM allows you to pull data from your database, manipulate the data in any way you like, and then save the result back to the database without the use of SQL. By creating relationships between models that follow convention over configuration, much of the repetition of writing queries to create, read, update, and delete information from the database can be reduced or entirely removed. All of the relationships can be handled automatically by the ORM library and you can access related data as standard object properties.
+
+ORM is included with the Kohana 3.x install but needs to be enabled before you can use it. In your `application/bootstrap.php` file modify the call to Kohana::modules and include the ORM modules.
+
+## Getting started
+
+Before we use ORM, we must enable the modules required
+
+	Kohana::modules(array(
+		...
+		'database' => MODPATH.'database',
+		'orm' => MODPATH.'orm',
+		...
+	));
+
+[!!] The database module is requried for the ORM module to work. Of course the database module has to be configured to use an existing database.
+
+You can now create your [models](models) and [use ORM](using).
diff --git a/includes/kohana/modules/orm/guide/orm/menu.md b/includes/kohana/modules/orm/guide/orm/menu.md
new file mode 100644
index 0000000..03a43c1
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/menu.md
@@ -0,0 +1,9 @@
+## [ORM]()
+- [Creating ORM Models](models)
+- [Basic usage](using)
+- [Relationships](relationships)
+- [Validation](validation)
+- [Filters](filters)
+- [Examples](examples)
+    - [Simple](examples/simple)
+    - [Validation](examples/validation)
diff --git a/includes/kohana/modules/orm/guide/orm/models.md b/includes/kohana/modules/orm/guide/orm/models.md
new file mode 100644
index 0000000..cffbcff
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/models.md
@@ -0,0 +1,28 @@
+# Creating your Model
+
+To create a model for the table `members` in your database, create the file `application/classes/model/member.php` with the following syntax:
+
+	class Model_Member extends ORM
+	{
+		...
+	}
+
+(this should provide more examples)
+
+## Overriding the Table name
+
+If you wish to change the database table that a model uses, just override the `$_table_name` variable like this:
+
+	protected $_table_name = 'strange_tablename';
+
+## Changing the primary key
+
+ORM assumes each model (and database table) has an `id` column that is indexed and unique. If your primary key column isn't named `id`, that's fine - just override the `$_primary_key` variable like this:
+
+	protected $_primary_key = 'strange_pkey';
+
+## Use a non-default database
+
+For each model, you can define which database configuration ORM will run queries on. If you override the `$_db_group` variable in your model, ORM will connect to that database. Example:
+
+	protected $_db_group = 'alternate';
diff --git a/includes/kohana/modules/orm/guide/orm/relationships.md b/includes/kohana/modules/orm/guide/orm/relationships.md
new file mode 100644
index 0000000..074c129
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/relationships.md
@@ -0,0 +1,123 @@
+# Relationships
+
+Kohana ORM supports four types of object relationships: `belongs_to`, `has_many`, `has_many "through"` and `has_one`. The `has_many "through"` relationship can be used to function like Active Record's `has_many_and_belongs_to` relationship type.
+
+## belongs_to
+
+A `belongs_to` relation should be used when you have one model that belongs to another. For example, a `Child` model belongs_to a `Parent` or a `Flag` model `belongs_to` a `Country`.
+
+This is the base `belongs_to` relationship:
+
+	protected $_belongs_to = array(
+		'[alias name]' => array(
+			'model'       => '[model name]',
+			'foreign_key' => '[column]',
+		),
+	);
+
+You can omit any or all of the keys/values in the array on the right, in which case defaults are used:
+
+	protected $_belongs_to = array('[alias name]' => array());
+
+The **alias name** is what is used to access the related model in your code. If you had a `Post` model that belonged to a `User` model and wished to use the default values of the `belongs_to` configuration then your code would look like this:
+
+	protected $_belongs_to = array('user' => array());
+
+To access the user model, you would use `$post->user`.  Since we're using the defaults above, the alias name will be used for the model name, and the foreign key in the posts table will be the alias name followed by `_id`, in this case it would be `user_id`. (You can change the `_id` suffix by modifying the `$foreign_key_suffix` variable in the model.)
+
+Let's say your `Post` database table schema doesn't have a `user_id` column but instead has an `author_id` column which is a foreign key for a record in the `User` table. You could use code like this:
+
+	protected $_belongs_to = array(
+		'user' => array(
+			'foreign_key' => 'author_id',
+		),
+	);
+
+If you wanted access a post's author by using code like `$post->author` then you would simply need to change the alias and add the `model` index:
+
+	protected $_belongs_to = array(
+		'author' => array(
+			'model'       => 'user',
+		),
+	);
+
+## has_many
+
+The standard `has_many` relationship will likely fall on the other side of a `belongs_to` relationship.  In the above examples, a post belongs to a user.  From the user's perspective, a user has many posts. A has_many relationship is defined below:
+
+	protected $_has_many = array(
+		'[alias name]' => array(
+			'model'       => '[model name]',
+			'foreign_key' => '[column]',
+		),
+	);
+
+Again, you can omit all keys in the right array to use the defaults:
+
+	protected $_has_many = array('[alias name]' => array());
+
+For our user and post example, this would look like the following in the user model:
+
+	protected $_has_many = array('posts' => array());
+
+Using the above, the posts could be access using `$user->posts->find_all()`.  Notice the `find_all()` used in this example. With `belongs_to` and `has_one` relationship types, the model is already loaded with necessary data.  For `has_many` relationships, however, you may want to limit the number of results or add additional conditions to the SQL query; you can do so prior to the `find_all()`.
+
+The model name used by default will be the singular name of the alias using the `inflector` class.  In this case, `posts` uses `post` as the model name.  The foreign key used by default is the owner model's name followed by `_id`.  In this case, the foreign key will be `user_id` and it must exist in the posts table as before.
+
+Let's assume now you want to access the posts using the name `stories` instead, and are still using the `author_id` key as in the `belongs_to` example.  You would define your has_many relationship as:
+
+	protected $_has_many = array(
+		'stories' => array(
+			'model'       => 'post',
+			'foreign_key' => 'author_id',
+		),
+	);
+
+## has_one
+
+A `has_one` relationship is almost identical to a `has_many` relationship.  In a `has_one` relationship, there can be 1 and only 1 relationship (rather than 1 or more in a has_many). If a user can only have one post or story, rather than many then the code would look like this:
+
+	protected $_has_one = array(
+		'story' => array(
+			'model'       => 'post',
+			'foreign_key' => 'author_id',
+		),
+	);
+
+## has_many "through"
+
+A `has_many "through"` relationship is used for many-to-many relationships.  For instance, let's assume now we have an additional model, called `Category`.  Posts may belong to more than one category, and each category may have more than one post.  To link them together, an additional table is needed with columns for a `post_id` and a `category_id` (sometimes called a pivot table).  We'll name the model for this `Post_Category` and the corresponding table `categories_posts`.
+
+To define the `has_many` "through" relationship, the same syntax for standard has_many relationships is used with the addition of a 'through' parameter.  Let's assume we're working with the Post model:
+
+	protected $_has_many = array(
+		'categories' => array(
+			'model'   => 'category',
+			'through' => 'categories_posts',
+		),
+	);
+
+In the Category model:
+
+	protected $_has_many = array(
+		'posts' => array(
+			'model'   => 'post',
+			'through' => 'categories_posts',
+		),
+	);
+
+To access the categories and posts, you simply use `$post->categories->find_all()` and `$category->posts->find_all()`
+
+Methods are available to check for, add, and remove relationships for many-to-many relationships.  Let's assume you have a $post model loaded, and a $category model loaded as well.  You can check to see if the $post is related to this $category with the following call:
+
+	$post->has('categories', $category);
+
+The first parameter is the alias name to use (in case your post model has more than one relationship to the category model) and the second is the model to check for a relationship with.
+
+Assuming you want to add the relationship (by creating a new record in the categories_posts table), you would simply do:
+
+	$post->add('categories', $category);
+
+To remove:
+
+	$post->remove('categories', $category);
diff --git a/includes/kohana/modules/orm/guide/orm/tutorials.md b/includes/kohana/modules/orm/guide/orm/tutorials.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/orm/guide/orm/using.md b/includes/kohana/modules/orm/guide/orm/using.md
new file mode 100644
index 0000000..8d54d65
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/using.md
@@ -0,0 +1,75 @@
+# Basic Usage
+
+## Load a new model instance
+
+To create a new `Model_User` instance, you can do one of two things:
+
+	$user = ORM::factory('user');
+	// Or
+	$user = new Model_User();
+
+## Inserting
+
+To insert a new record into the database, create a new instance of the model:
+
+	$user = ORM::factory('user');
+
+Then, assign values for each of the properties;
+
+	$user->first_name = 'Trent';
+	$user->last_name = 'Reznor';
+	$user->city = 'Mercer';
+	$user->state = 'PA';
+
+Insert the new record into the database by running [ORM::save]:
+
+	$user->save();
+
+[ORM::save] checks to see if a value is set for the primary key (`id` by default). If the primary key is set, then ORM will execute an `UPDATE` otherwise it will execute an `INSERT`.
+
+
+## Finding an object
+
+To find an object you can call the [ORM::find] method or pass the id into the ORM constructor:
+
+	// Find user with ID 20
+	$user = ORM::factory('user')
+		->where('id', '=', 20)
+		->find();
+	// Or
+	$user = ORM::factory('user', 20);
+
+## Check that ORM loaded a record
+
+Use the [ORM::loaded] method to check that ORM successfully loaded a record.
+
+	if ($user->loaded())
+	{
+		// Load was successful
+	}
+	else
+	{
+		// Error
+	}
+
+## Updating and Saving
+
+Once an ORM model has been loaded, you can modify a model's properties like this:
+
+	$user->first_name = "Trent";
+	$user->last_name = "Reznor";
+
+And if you want to save the changes you just made back to the database, just run a `save()` call like this:
+
+	$user->save();
+
+
+
+## Deleting
+
+
+To delete an object, you can call the [ORM::delete] method on a loaded ORM model.
+
+	$user = ORM::factory('user', 20);
+	$user->delete();
+
diff --git a/includes/kohana/modules/orm/guide/orm/validation.md b/includes/kohana/modules/orm/guide/orm/validation.md
new file mode 100644
index 0000000..d83414f
--- /dev/null
+++ b/includes/kohana/modules/orm/guide/orm/validation.md
@@ -0,0 +1,111 @@
+# Validation
+
+ORM models are tightly integrated with the [Validation] library and the module comes with a very flexible [ORM_Validation_Exception] that helps you quickly handle validation errors from basic CRUD operations.
+
+## Defining Rules
+
+Validation rules are defined in the `ORM::rules()` method. This method returns the array of rules to be added to the [Validation] object like so:
+
+	public function rules()
+	{
+		return array(
+			'username' => array(
+				// Uses Valid::not_empty($value);
+				array('not_empty'),
+				// Calls Some_Class::some_method('param1', 'param2');
+				array('Some_Class::some_method', array('param1', 'param2')),
+				// Calls A_Class::a_method($value);
+				array(array('A_Class', 'a_method')),
+				// Calls the lambda function and passes the field value and the validation object
+				array(function($value, Validation $object)
+				{
+					$object->error('some_field', 'some_error');
+				}, array(':value', ':validation')),
+			),
+		);
+	}
+
+### Bound Values
+
+ORM will automatically bind the following values with `Validation::bind()`:
+
+- **:field** - The name of the field the rule is being applied to.
+- **:value** - The value of the field the rule is being applied to.
+- **:model** - The instance of the model that is being validated.
+
+## Automatic Validation
+
+All models automatically validate their own data when `ORM::save()`, `ORM::update()`, or `ORM::create()` is called. Because of this, you should always expect these methods to throw an [ORM_Validation_Exception] when the model's data is invalid.
+
+	public function action_create()
+	{
+		try
+		{
+			$user = ORM::factory('user');
+			$user->username = 'invalid username';
+			$user->save();
+		}
+		catch (ORM_Validation_Exception $e)
+		{
+			$errors = $e->errors();
+		}
+	}
+
+## Handling Validation Exceptions
+
+The [ORM_Validation_Exception] will give you access to the validation errors that were encountered while trying to save a model's information. The `ORM_Validation_Exception::errors()` method works very similarly to `Validation::errors()`. Not passing a first parameter will return the name of the rules that failed. But unlike `Validate::errors()`, the first parameter of `ORM_Validation_Exception::errors()` is a directory path. The model's ORM::$_object_name will be appended to the directory in order to form the message file for `Validation::errors()` to use. The second parameter is identical to that of `Validation::errors()`.
+
+In the below example, the error messages will be defined in `application/messages/models/user.php`
+
+	public function action_create()
+	{
+		try
+		{
+			$user = ORM::factory('user');
+			$user->username = 'invalid username';
+			$user->save();
+		}
+		catch (ORM_Validation_Exception $e)
+		{
+			$errors = $e->errors('models');
+		}
+	}
+
+## External Validation
+
+Certain forms contain information that should not be validated by the model, but by the controller. Information such as a [CSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) token, password verification, or a [CAPTCHA](http://en.wikipedia.org/wiki/CAPTCHA) should never be validated by a model. However, validating information in multiple places and combining the errors to provide the user with a good experience is often quite tedius. For this reason, the [ORM_Validation_Exception] is built to handle multiple Validation objects and namespaces the array of errors automatically for you. `ORM::save()`, `ORM::update()`, and `ORM::create()` all take an optional first parameter which is a [Validation] object to validate along with the model.
+
+	public function action_create()
+	{
+		try
+		{
+			$user = ORM::factory('user');
+			$user->username = $_POST['username'];
+			$user->password = $_POST['password'];
+
+			$extra_rules = Validation::factory($_POST)
+				->rule('password_confirm', 'matches', array(
+					':validation', ':field', 'password'
+				));
+
+			// Pass the extra rules to be validated with the model
+			$user->save($extra_rules);
+		}
+		catch (ORM_Validation_Exception $e)
+		{
+			$errors = $e->errors('models');
+		}
+	}
+
+Because the validation object was passed as a parameter to the model, any errors found in that check will be namespaced into a sub-array called `_external`. The array of errors would look something like this:
+
+	array(
+		'username'  => 'This field cannot be empty.',
+		'_external' => array(
+			'password_confirm' => 'The values you entered in the password fields did not match.',
+		),
+	);
+
+This ensures that errors from multiple validation objects and models will never overwrite each other.
+
+[!!] The power of the [ORM_Validation_Exception] can be leveraged in many different ways to merge errors from related models. Take a look at the list of [Examples](examples) for some great use cases.
diff --git a/includes/kohana/modules/unittest/README.markdown b/includes/kohana/modules/unittest/README.markdown
new file mode 100644
index 0000000..45e45c9
--- /dev/null
+++ b/includes/kohana/modules/unittest/README.markdown
@@ -0,0 +1,36 @@
+# Kohana-PHPUnit integration
+
+This module integrates PHPUnit with Kohana.
+
+If you look through any of the tests provided in this module you'll probably notice all theHorribleCamelCase.
+I've chosen to do this because it's part of the PHPUnit coding conventions and is required for certain features such as auto documentation.
+
+## Requirements
+
+* [PHPUnit](http://www.phpunit.de/) >= 3.4
+
+### Optional extras
+
+* The [Archive module](http://github.com/BRMatt/kohana-archive) is required if you want to download code coverage reports from the web ui, however you can also view them without downloading.
+
+## Installation
+
+**Step 0**: Download this module!
+
+To get it from git execute the following command in the root of your project:
+
+	$ git submodule add git://github.com/kohana/unittest.git modules/unittest
+
+And watch the gitorious magic...
+
+Of course, you can always download the code from the [github project](http://github.com/kohana/unittest) as an archive.
+
+## Running the tests
+
+         $ phpunit --bootstrap=modules/unittest/bootstrap.php {tests}
+
+Where `{tests}` can either be a path to a folder of tests, or a path to the the `tests.php` (`modules/unittest/tests.php`)
+
+Please see the guide pages for more info.  An example of how we run the tests for the kohana project can be found in the [phing build script](https://github.com/kohana/kohana/blob/3.1/master/build.xml#L172).
+
+If you're looking for more info on running the core kohana tests then please see our [dev wiki](https://github.com/kohana/kohana/wiki/Unit-Testing-Kohana)
\ No newline at end of file
diff --git a/includes/kohana/modules/unittest/bootstrap.php b/includes/kohana/modules/unittest/bootstrap.php
new file mode 100644
index 0000000..bcc7679
--- /dev/null
+++ b/includes/kohana/modules/unittest/bootstrap.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * The directory in which your application specific resources are located.
+ * The application directory must contain the bootstrap.php file.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#application
+ */
+$application = 'application';
+
+/**
+ * The directory in which your modules are located.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#modules
+ */
+$modules = 'modules';
+
+/**
+ * The directory in which the Kohana resources are located. The system
+ * directory must contain the classes/kohana.php file.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#system
+ */
+$system = 'system';
+
+/**
+ * The default extension of resource files. If you change this, all resources
+ * must be renamed to use the new extension.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#ext
+ */
+define('EXT', '.php');
+
+/**
+ * Set the PHP error reporting level. If you set this in php.ini, you remove this.
+ * @see  http://php.net/error_reporting
+ *
+ * When developing your application, it is highly recommended to enable notices
+ * and strict warnings. Enable them by using: E_ALL | E_STRICT
+ *
+ * In a production environment, it is safe to ignore notices and strict warnings.
+ * Disable them by using: E_ALL ^ E_NOTICE
+ *
+ * When using a legacy application with PHP >= 5.3, it is recommended to disable
+ * deprecated notices. Disable with: E_ALL & ~E_DEPRECATED
+ */
+error_reporting(E_ALL | E_STRICT);
+
+/**
+ * End of standard configuration! Changing any of the code below should only be
+ * attempted by those with a working knowledge of Kohana internals.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ */
+
+// Set the full path to the docroot
+define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
+
+// Make the application relative to the docroot
+if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
+{
+	$application = DOCROOT.$application;
+}
+
+// Make the modules relative to the docroot
+if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
+{
+	$modules = DOCROOT.$modules;
+}
+
+// Make the system relative to the docroot
+if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
+{
+	$system = DOCROOT.$system;
+}
+
+// Define the absolute paths for configured directories
+define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
+define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
+define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
+
+// Clean up the configuration vars
+unset($application, $modules, $system);
+
+/**
+ * Define the start time of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_TIME'))
+{
+	define('KOHANA_START_TIME', microtime(TRUE));
+}
+
+/**
+ * Define the memory usage at the start of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_MEMORY'))
+{
+	define('KOHANA_START_MEMORY', memory_get_usage());
+}
+
+// Bootstrap the application
+require APPPATH.'bootstrap'.EXT;
+
+// Enable the unittest module
+Kohana::modules(Kohana::modules() + array('unittest' => MODPATH.'unittest'));
\ No newline at end of file
diff --git a/includes/kohana/modules/unittest/classes/controller/unittest.php b/includes/kohana/modules/unittest/classes/controller/unittest.php
new file mode 100644
index 0000000..5daa458
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/controller/unittest.php
@@ -0,0 +1,352 @@
+<?php defined('SYSPATH') or die ('No direct script access.');
+/**
+ * PHPUnit Kohana web based test runner
+ *
+ * @package    Kohana/UnitTest
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @author     Paul Banks
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+class Controller_UnitTest extends Controller_Template
+{
+	/**
+	 * Whether the archive module is available
+	 * @var boolean
+	 */
+	protected $cc_archive_available = FALSE;
+
+	/**
+	 * Unittest config
+	 * @var Config
+	 */
+	protected $config = NULL;
+
+	/**
+	 * The uri by which the report uri will be executed
+	 * @var string
+	 */
+	protected $report_uri = '';
+
+	/**
+	 * The uri by which the run action will be executed
+	 * @var string
+	 */
+	protected $run_uri = '';
+
+	/**
+	 * Is the XDEBUG extension loaded?
+	 * @var boolean
+	 */
+	protected $xdebug_loaded = FALSE;
+
+	/**
+	 * Template
+	 * @var string
+	 */
+	public $template = 'unittest/layout';
+
+	/**
+	 * Loads test suite
+	 */
+	public function before()
+	{
+		parent::before();
+
+		if ( ! Unittest_tests::enabled())
+		{
+			// Pretend this is a normal 404 error...
+			$this->status = 404;
+
+			throw new Kohana_Request_Exception('Unable to find a route to match the URI: :uri',
+				array(':uri' => $this->request->uri()));
+		}
+
+		// Prevent the whitelist from being autoloaded, but allow the blacklist
+		// to be loaded
+		Unittest_Tests::configure_environment(FALSE);
+
+		$this->config = Kohana::config('unittest');
+
+		// This just stops some very very long lines
+		$route = Route::get('unittest');
+		$this->report_uri = $route->uri(array('action' => 'report'));
+		$this->run_uri = $route->uri(array('action' => 'run'));
+
+		// Switch used to disable cc settings
+		$this->xdebug_loaded = extension_loaded('xdebug');
+		$this->cc_archive_enabled = class_exists('Archive');
+
+		Kohana_View::set_global('xdebug_enabled', $this->xdebug_loaded);
+		Kohana_View::set_global('cc_archive_enabled', $this->cc_archive_enabled);
+	}
+
+	/**
+	 * Handles index page for /unittest/ and /unittest/index/
+	 */
+	public function action_index()
+	{
+		$this->template->body = View::factory('unittest/index')
+			->set('run_uri', $this->run_uri)
+			->set('report_uri', $this->report_uri)
+			->set('whitelistable_items', $this->get_whitelistable_items())
+			->set('groups', $this->get_groups_list(Unittest_tests::suite()));
+	}
+
+	/**
+	 * Handles report generation
+	 */
+	public function action_report()
+	{
+		// Fairly foolproof
+		if ( ! $this->config->cc_report_path AND ! class_exists('Archive'))
+			throw new Kohana_Exception('Cannot generate report');
+
+		// We don't want to use the HTML layout, we're sending the user 100111011100110010101100
+		$this->auto_render = FALSE;
+
+		$suite = Unittest_tests::suite();
+		$temp_path = rtrim($this->config->temp_path, '/').'/';
+		$group = (array) Arr::get($_GET, 'group', array());
+
+		// Stop unittest from interpretting "all groups" as "no groups"
+		if (empty($group) OR empty($group[0]))
+		{
+			$group = array();
+		}
+
+		if (Arr::get($_GET, 'use_whitelist', FALSE))
+		{
+			$this->whitelist(Arr::get($_GET, 'whitelist', array()));
+		}
+
+		$runner = new Kohana_Unittest_Runner($suite);
+
+		// If the user wants to download a report
+		if ($this->cc_archive_enabled AND Arr::get($_GET, 'archive') === '1')
+		{
+			// $report is the actual directory of the report,
+			// $folder is the name component of directory
+			list($report, $folder) = $runner->generate_report($group, $temp_path);
+
+			$archive = Archive::factory('zip');
+
+			// TODO: Include the test results?
+			$archive->add($report, 'report', TRUE);
+
+			$filename = $folder.'.zip';
+
+			$archive->save($temp_path.$filename);
+
+			// It'd be nice to clear up afterwards but by deleting the report dir we corrupt the archive
+			// And once the archive has been sent to the user Request stops the script so we can't delete anything
+			// It'll be up to the user to delete files periodically
+			$this->request->send_file($temp_path.$filename, $filename);
+		}
+		else
+		{
+			$folder = trim($this->config->cc_report_path, '/').'/';
+			$path = DOCROOT.$folder;
+
+			if ( ! file_exists($path))
+				throw new Kohana_Exception('Report directory :dir does not exist', array(':dir' => $path));
+
+			if ( ! is_writable($path))
+				throw new Kohana_Exception('Script doesn\'t have permission to write to report dir :dir ', array(':dir' => $path));
+
+			$runner->generate_report($group, $path, FALSE);
+
+			$this->request->redirect(URL::site($folder.'index.html', $this->request));
+		}
+	}
+
+	/**
+	 * Handles test running interface
+	 */
+	public function action_run()
+	{
+		$this->template->body = View::factory('unittest/results');
+
+		// Get the test suite and work out which groups we're testing
+		$suite = Unittest_tests::suite();
+		$group = (array) Arr::get($_GET, 'group', array());
+
+
+		// Stop phpunit from interpretting "all groups" as "no groups"
+		if (empty($group) OR empty($group[0]))
+		{
+			$group = array();
+		}
+
+		// Only collect code coverage if the user asked for it
+		$collect_cc = (bool) Arr::get($_GET, 'collect_cc', FALSE);
+
+		if ($collect_cc AND Arr::get($_GET, 'use_whitelist', FALSE))
+		{
+			$whitelist = $this->whitelist(Arr::get($_GET, 'whitelist', array()));
+		}
+
+		$runner = new Kohana_Unittest_Runner($suite);
+
+		try
+		{
+			$runner->run($group, $collect_cc);
+
+			if ($collect_cc)
+			{
+				$this->template->body->set('coverage', $runner->calculate_cc_percentage());
+			}
+
+			if (isset($whitelist))
+			{
+				$this->template->body->set('coverage_explanation', $this->nice_whitelist_explanation($whitelist));
+			}
+		}
+		catch(Kohana_Exception $e)
+		{
+			// Code coverage is not allowed, possibly xdebug disabled?
+			// TODO: Tell the user this?
+			$runner->run($group);
+		}
+
+		// Show some results
+		$this->template->body
+			->set('results', $runner->results)
+			->set('totals', $runner->totals)
+			->set('time', $this->nice_time($runner->time))
+
+			// Sets group to the currently selected group, or default all groups
+			->set('group', Arr::get($this->get_groups_list($suite), reset($group), 'All groups'))
+			->set('groups', $this->get_groups_list($suite))
+
+			->set('run_uri', $this->request->uri())
+			->set('report_uri', $this->report_uri.url::query())
+
+			// Whitelist related stuff
+			->set('whitelistable_items', $this->get_whitelistable_items())
+			->set('whitelisted_items', isset($whitelist) ? array_keys($whitelist) : array())
+			->set('whitelist', ! empty($whitelist));
+	}
+
+	/**
+	 * Get the list of groups from the test suite, sorted with 'All groups' prefixed
+	 *
+	 * @return array Array of groups in the test suite
+	 */
+	protected function get_groups_list($suite)
+	{
+		// Make groups aray suitable for drop down
+		$groups = $suite->getGroups();
+		if (count($groups) > 0)
+		{
+			sort($groups);
+			$groups = array_combine($groups, $groups);
+		}
+		return array('' => 'All Groups') + $groups;
+	}
+
+	/**
+	 * Gets a list of items that are whitelistable
+	 *
+	 * @return array
+	 */
+	protected function get_whitelistable_items()
+	{
+		static $whitelist;
+
+		if (count($whitelist))
+			return $whitelist;
+
+		$whitelist = array();
+
+		$whitelist['k_app'] = 'Application';
+
+		$k_modules = array_keys(Kohana::modules());
+
+		$whitelist += array_map('ucfirst', array_combine($k_modules, $k_modules));
+
+		$whitelist['k_sys'] = 'Kohana Core';
+
+		return $whitelist;
+	}
+
+	/**
+	 * Whitelists a specified set of modules specified by the user
+	 *
+	 * @param array $modules
+	 */
+	protected function whitelist(array $modules)
+	{
+		$k_modules = Kohana::modules();
+		$whitelist = array();
+
+		// Make sure our whitelist is valid
+		foreach ($modules as $item)
+		{
+			if (isset($k_modules[$item]))
+			{
+				$whitelist[$item] = $k_modules[$item];
+			}
+			elseif ($item === 'k_app')
+			{
+				$whitelist[$item] = APPPATH;
+			}
+			elseif ($item === 'k_sys')
+			{
+				$whitelist[$item] = SYSPATH;
+			}
+		}
+
+		if (count($whitelist))
+		{
+			Unittest_tests::whitelist($whitelist);
+		}
+
+		return $whitelist;
+	}
+
+	/**
+	 * Prettifies the list of whitelisted modules
+	 *
+	 * @param array Array of whitelisted items
+	 * @return string
+	 */
+	protected function nice_whitelist_explanation(array $whitelist)
+	{
+		$items = array_intersect_key($this->get_whitelistable_items(), $whitelist);
+
+		return implode(', ', $items);
+	}
+
+	protected function nice_time($time)
+	{
+		$parts = array();
+
+		if ($time > DATE::DAY)
+		{
+			$parts[] = floor($time/DATE::DAY).'d';
+			$time = $time % DATE::DAY;
+		}
+
+		if ($time > DATE::HOUR)
+		{
+			$parts[] = floor($time/DATE::HOUR).'h';
+			$time = $time % DATE::HOUR;
+		}
+
+		if ($time > DATE::MINUTE)
+		{
+			$parts[] = floor($time/DATE::MINUTE).'m';
+			$time = $time % DATE::MINUTE;
+		}
+
+		if ($time > 0)
+		{
+			$parts[] = round($time, 1).'s';
+		}
+
+		return implode(' ', $parts);
+	}
+} // End Controller_PHPUnit
diff --git a/includes/kohana/modules/unittest/classes/kohana/unittest/database/testcase.php b/includes/kohana/modules/unittest/classes/kohana/unittest/database/testcase.php
new file mode 100644
index 0000000..ae825c7
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/kohana/unittest/database/testcase.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * TestCase for testing a database
+ *
+ * @package    Kohana/UnitTest
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+// @codingStandardsIgnoreFile
+abstract Class Kohana_Unittest_Database_TestCase extends PHPUnit_Extensions_Database_TestCase {
+
+	/**
+	 * Whether we should enable work arounds to make the tests compatible with phpunit 3.4
+	 * @var boolean
+	 */
+	protected static $_assert_type_compatability = NULL;
+
+	/**
+	 * Make sure PHPUnit backs up globals
+	 * @var boolean
+	 */
+	protected $backupGlobals = TRUE;
+
+	/**
+	 * A set of unittest helpers that are shared between normal / database
+	 * testcases
+	 * @var Kohana_Unittest_Helpers
+	 */
+	protected $_helpers = NULL;
+
+	/**
+	 * A default set of environment to be applied before each test
+	 * @var array
+	 */
+	protected $environmentDefault = array();
+
+	/**
+	 * Creates a predefined environment using the default environment
+	 *
+	 * Extending classes that have their own setUp() should call
+	 * parent::setUp()
+	 */
+	public function setUp()
+	{
+		if (self::$_assert_type_compatability === NULL)
+		{
+			if ( ! class_exists('PHPUnit_Runner_Version'))
+			{
+				require_once 'PHPUnit/Runner/Version.php';
+			}
+
+			self::$_assert_type_compatability = version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<=');
+		}
+		
+		$this->_helpers = new Kohana_Unittest_Helpers;
+
+		$this->setEnvironment($this->environmentDefault);
+
+		return parent::setUp();
+	}
+
+	/**
+	 * Restores the original environment overriden with setEnvironment()
+	 *
+	 * Extending classes that have their own tearDown()
+	 * should call parent::tearDown()
+	 */
+	public function tearDown()
+	{
+		$this->_helpers->restore_environment();
+
+		return parent::tearDown();
+	}
+
+	/**
+	 * Creates a connection to the unittesting database
+	 *
+	 * @return PDO
+	 */
+	public function getConnection()
+	{
+		// Get the unittesting db connection
+		$config = Kohana::config('database')
+			->{Kohana::config('unittest')->db_connection};
+
+		if($config['type'] !== 'pdo')
+		{
+			$config['connection']['dsn'] = $config['type'].':'.
+			'host='.$config['connection']['hostname'].';'.
+			'dbname='.$config['connection']['database'];
+		}
+
+		$pdo = new PDO(
+			$config['connection']['dsn'], 
+			$config['connection']['username'], 
+			$config['connection']['password']
+		);
+
+		return $this->createDefaultDBConnection($pdo, $config['connection']['database']);
+	}
+
+	/**
+	 * Gets a connection to the unittest database
+	 *
+	 * @return Kohana_Database The database connection
+	 */
+	public function getKohanaConnection()
+	{
+		return Database::instance(Kohana::config('unittest')->db_connection);
+	}
+
+	/**
+	 * Removes all kohana related cache files in the cache directory
+	 */
+	public function cleanCacheDir()
+	{
+		return Kohana_Unittest_Helpers::clean_cache_dir();
+	}
+
+	/**
+	 * Helper function that replaces all occurences of '/' with
+	 * the OS-specific directory separator
+	 *
+	 * @param string $path The path to act on
+	 * @return string
+	 */
+	public function dirSeparator($path)
+	{
+		return Kohana_Unittest_Helpers::dir_separator($path);
+	}
+
+	/**
+	 * Allows easy setting & backing up of enviroment config
+	 *
+	 * Option types are checked in the following order:
+	 *
+	 * * Server Var
+	 * * Static Variable
+	 * * Config option
+	 *
+	 * @param array $environment List of environment to set
+	 */
+	public function setEnvironment(array $environment)
+	{
+		return $this->_helpers->set_environment($environment);
+	}
+
+	/**
+	 * Check for internet connectivity
+	 *
+	 * @return boolean Whether an internet connection is available
+	 */
+	public function hasInternet()
+	{
+		return Kohana_Unittest_Helpers::has_internet();
+	}
+
+	/**
+	 * Asserts that a variable is of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertInstanceOf($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertType($expected, $actual, $message);
+
+		return parent::assertInstanceOf($expected, $actual, $message);
+	}
+	
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeType($expected, $attributeName, $classOrObject, $message);
+
+		return parent::assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is not of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertNotInstanceOf($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertNotType($expected, $actual, $message);
+
+		return self::assertNotInstanceOf($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeNotType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertInternalType($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertType($expected, $actual, $message);
+		
+		return parent::assertInternalType($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeInternalType($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is not of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertNotInternalType($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertNotType($expected, $actual, $message);
+
+		return self::assertNotInternalType($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeNotType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message);
+	}
+}
diff --git a/includes/kohana/modules/unittest/classes/kohana/unittest/helpers.php b/includes/kohana/modules/unittest/classes/kohana/unittest/helpers.php
new file mode 100644
index 0000000..25ef3d6
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/kohana/unittest/helpers.php
@@ -0,0 +1,169 @@
+<?php 
+
+/**
+ * Unit testing helpers
+ */
+class Kohana_Unittest_Helpers {
+	/**
+	 * Static variable used to work out whether we have an internet 
+	 * connection 
+	 * @see has_internet
+	 * @var boolean
+	 */
+	static protected $_has_internet = NULL;
+
+	/**
+	 * Check for internet connectivity
+	 *
+	 * @return boolean Whether an internet connection is available
+	 */
+	public static function has_internet()
+	{
+		if ( ! isset(self::$_has_internet))
+		{
+			// The @ operator is used here to avoid DNS errors when there is no connection.
+			$sock = @fsockopen("www.google.com", 80, $errno, $errstr, 1);
+
+			self::$_has_internet = (bool) $sock ? TRUE : FALSE;
+		}
+
+		return self::$_has_internet;
+	}
+
+	/**
+	 * Helper function which replaces the "/" to OS-specific delimiter
+	 * 
+	 * @param string $path
+	 * @return string
+	 */
+	static public function dir_separator($path)
+	{
+		return str_replace('/', DIRECTORY_SEPARATOR, $path);
+	}
+
+	/**
+	 * Removes all cache files from the kohana cache dir 
+	 *
+	 * @return void
+	 */
+	static public function clean_cache_dir()
+	{
+		$cache_dir = opendir(Kohana::$cache_dir);
+
+		while ($dir = readdir($cache_dir))
+		{
+			// Cache files are split into directories based on first two characters of hash
+			if ($dir[0] !== '.' AND strlen($dir) === 2)
+			{
+				$dir = self::dir_separator(Kohana::$cache_dir.'/'.$dir.'/');
+	
+				$cache = opendir($dir);
+
+				while ($file = readdir($cache))
+				{
+					if ($file[0] !== '.')
+					{
+						unlink($dir.$file);
+					}
+				}
+
+				closedir($cache);
+
+				rmdir($dir);
+			}
+		}
+
+		closedir($cache_dir);
+	}
+
+	/**
+	 * Backup of the environment variables
+	 * @see set_environment
+	 * @var array
+	 */
+	protected $_environment_backup = array();
+
+	/**
+	 * Allows easy setting & backing up of enviroment config
+	 *
+	 * Option types are checked in the following order:
+	 *
+	 * * Server Var
+	 * * Static Variable
+	 * * Config option
+	 *
+	 * @param array $environment List of environment to set
+	 */
+	public function set_environment(array $environment)
+	{
+		if ( ! count($environment))
+			return FALSE;
+
+		foreach ($environment as $option => $value)
+		{
+			$backup_needed = ! array_key_exists($option, $this->_environment_backup);
+
+			// Handle changing superglobals
+			if (in_array($option, array('_GET', '_POST', '_SERVER', '_FILES')))
+			{
+				// For some reason we need to do this in order to change the superglobals
+				global $$option;
+
+				if ($backup_needed)
+				{
+					$this->_environment_backup[$option] = $$option;
+				}
+
+				// PHPUnit makes a backup of superglobals automatically
+				$$option = $value;
+			}
+			// If this is a static property i.e. Html::$windowed_urls
+			elseif (strpos($option, '::$') !== FALSE)
+			{
+				list($class, $var) = explode('::$', $option, 2);
+
+				$class = new ReflectionClass($class);
+
+				if ($backup_needed)
+				{
+					$this->_environment_backup[$option] = $class->getStaticPropertyValue($var);
+				}
+
+				$class->setStaticPropertyValue($var, $value);
+			}
+			// If this is an environment variable
+			elseif (preg_match('/^[A-Z_-]+$/D', $option) OR isset($_SERVER[$option]))
+			{
+				if ($backup_needed)
+				{
+					$this->_environment_backup[$option] = isset($_SERVER[$option]) ? $_SERVER[$option] : '';
+				}
+				
+				$_SERVER[$option] = $value;
+			}
+			// Else we assume this is a config option
+			else
+			{
+				if ($backup_needed)
+				{
+					$this->_environment_backup[$option] = Kohana::config($option);
+				}
+
+				list($group, $var) = explode('.', $option, 2);
+
+				Kohana::config($group)->set($var, $value);
+			}
+		}
+	}
+
+	/**
+	 * Restores the environment to the original state
+	 *
+	 * @chainable
+	 * @return Kohana_Unittest_Helpers $this 
+	 */
+	public function restore_environment()
+	{
+		$this->set_environment($this->_environment_backup);	
+	}
+}
diff --git a/includes/kohana/modules/unittest/classes/kohana/unittest/runner.php b/includes/kohana/modules/unittest/classes/kohana/unittest/runner.php
new file mode 100644
index 0000000..d85733f
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/kohana/unittest/runner.php
@@ -0,0 +1,313 @@
+<?php
+
+/**
+ * PHPUnit test runner for kohana
+ *
+ * @package    Kohana/UnitTest
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @author	   Paul Banks
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Unittest_Runner implements PHPUnit_Framework_TestListener {
+	/**
+	 * Results
+	 * @var array
+	 */
+	protected $results = array(
+		'errors'     => array(),
+		'failures'   => array(),
+		'skipped'    => array(),
+		'incomplete' => array(),
+	);
+
+	/**
+	 * Test result totals
+	 * @var array
+	 */
+	protected $totals = array(
+		'tests'      => 0,
+		'passed'     => 0,
+		'errors'     => 0,
+		'failures'   => 0,
+		'skipped'    => 0,
+		'incomplete' => 0,
+		'assertions' => 0,
+	);
+
+	/**
+	 * Info about the current test running
+	 * @var array
+	 */
+	protected $current = array();
+
+	/**
+	 * Time for tests to run (seconds)
+	 * @var float
+	 */
+	protected $time = 0;
+
+	/**
+	 * Result collector
+	 * @var PHPUnit_Framework_TestResult
+	 */
+	protected $result = NULL;
+
+	/**
+	 * the test suite to run
+	 * @var PHPUnit_Framework_TestSuite
+	 */
+	protected $suite = NULL;
+
+	/**
+	 * Constructor
+	 *
+	 * @param PHPUnit_Framework_TestSuite $suite    The suite to test
+	 * @param PHPUnit_Framework_TestResult $result  Optional result object to use
+	 */
+	function __construct(PHPUnit_Framework_TestSuite $suite, PHPUnit_Framework_TestResult $result = NULL)
+	{
+		if ($result === NULL)
+		{
+			$result = new PHPUnit_Framework_TestResult;
+		}
+
+		$result->addListener($this);
+
+		$this->suite  = $suite;
+		$this->result = $result;
+	}
+
+	/**
+	 * Magic getter to allow access to member variables
+	 *
+	 * @param string $var Variable to get
+	 * @return mixed
+	 */
+	function __get($var)
+	{
+		return $this->$var;
+	}
+
+	/**
+	 * Calcualtes stats for each file covered by the code testing
+	 *
+	 * Each member of the returned array is formatted like so:
+	 *
+	 * <code>
+	 * array(
+	 *     'coverage'      => $coverage_percent_for_file,
+	 *     'loc'           => $lines_of_code,
+	 *     'locExecutable' => $lines_of_executable_code,
+	 *     'locExecuted'   => $lines_of_code_executed
+	 *   );
+	 * </code>
+	 *
+	 * @return array Statistics for code coverage of each file
+	 */
+	public function calculate_cc()
+	{
+		if ($this->result->getCollectCodeCoverageInformation())
+		{
+			$coverage = $this->result->getCodeCoverageInformation();
+
+			$coverage_summary = PHPUnit_Util_CodeCoverage::getSummary($coverage);
+
+			$stats = array();
+
+			foreach ($coverage_summary as $file => $_lines)
+			{
+				$stats[$file] = PHPUnit_Util_CodeCoverage::getStatistics($coverage_summary, $file);
+			}
+
+			return $stats;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Calculates the percentage code coverage information
+	 *
+	 * @return boolean|float FALSE if cc is not enabled, float for coverage percent
+	 */
+	public function calculate_cc_percentage()
+	{
+		if ($stats = $this->calculate_cc())
+		{
+			$executable = 0;
+			$executed   = 0;
+
+			foreach ($stats as $stat)
+			{
+				$executable += $stat['locExecutable'];
+				$executed   += $stat['locExecuted'];
+			}
+
+			return ($executable > 0) ? ($executed * 100 / $executable) : 100;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Generate a report using the specified $temp_path
+	 *
+	 * @param array  $groups    Groups to test
+	 * @param string $temp_path Temporary path to use while generating report
+	 */
+	public function generate_report(array $groups, $temp_path, $create_sub_dir = TRUE)
+	{
+		if ( ! is_writable($temp_path))
+			throw new Kohana_Exception('Temp path :path does not exist or is not writable by the webserver', array(':path' => $temp_path));
+
+		$folder_path = $temp_path;
+
+		if ($create_sub_dir === TRUE)
+		{
+			// Icky, highly unlikely, but do it anyway
+			// Basically adds "(n)" to the end of the filename until there's a free file
+			$count = 0;
+			do
+			{
+				$folder_name = date('Y-m-d_H:i:s')
+					.(empty($groups) ? '' : ('['.implode(',', $groups).']'))
+					.(($count > 0) ? ('('.$count.')') : '');
+				++$count;
+			}
+			while (is_dir($folder_path.$folder_name));
+
+			$folder_path .= $folder_name;
+
+			mkdir($folder_path, 0777);
+		}
+		else
+		{
+			$folder_name = basename($folder_path);
+		}
+
+		$this->run($groups, TRUE);
+
+		require_once 'PHPUnit/Runner/Version.php';
+		require_once 'PHPUnit/Util/Report.php';
+
+		PHPUnit_Util_Report::render($this->result, $folder_path);
+
+		return array($folder_path, $folder_name);
+	}
+
+	/**
+	 * Runs the test suite using the result specified in the constructor
+	 *
+	 * @param  array $groups       Optional array of groups to test
+	 * @param  bool  $collect_cc   Optional, Should code coverage be collected?
+	 * @return Kohana_PHPUnit      Instance of $this
+	 */
+	public function run(array $groups = array(), $collect_cc = FALSE)
+	{
+		if ($collect_cc AND ! extension_loaded('xdebug'))
+			throw new Kohana_Exception('Code coverage cannot be collected because the xdebug extension is not loaded');
+
+		$this->result->collectCodeCoverageInformation( (bool) $collect_cc);
+
+		// Run the tests.
+		$this->suite->run($this->result, FALSE, $groups);
+
+		return $this;
+	}
+
+	// @codingStandardsIgnoreStart
+	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
+	// @codingStandardsIgnoreEnd
+	{
+		$this->totals['errors']++;
+		$this->current['result'] = 'errors';
+		$this->current['message'] = $test->getStatusMessage();
+	}
+
+	// @codingStandardsIgnoreStart
+	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+	// @codingStandardsIgnoreEnd
+	{
+		$this->totals['failures']++;
+		$this->current['result'] = 'failures';
+		$this->current['message'] = $test->getStatusMessage();
+	}
+
+	// @codingStandardsIgnoreStart
+	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+	// @codingStandardsIgnoreEnd
+	{
+		$this->totals['incomplete']++;
+		$this->current['result'] = 'incomplete';
+		$this->current['message'] = $test->getStatusMessage();
+	}
+
+	// @codingStandardsIgnoreStart
+	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+	// @codingStandardsIgnoreEnd
+	{
+		$this->totals['skipped']++;
+		$this->current['result'] = 'skipped';
+		$this->current['message'] = $test->getStatusMessage();
+	}
+
+	// @codingStandardsIgnoreStart
+	public function startTest(PHPUnit_Framework_Test $test)
+	// @codingStandardsIgnoreEnd
+	{
+		$this->current['name'] = $test->getName(FALSE);
+		$this->current['description'] = $test->toString();
+		$this->current['result'] = 'passed';
+	}
+
+	// @codingStandardsIgnoreStart
+	public function endTest(PHPUnit_Framework_Test $test, $time)
+	// @codingStandardsIgnoreEnd
+	{
+		// Add totals
+		$this->totals['tests']++;
+		$this->totals['assertions'] += $test->getNumAssertions();
+
+		// Handle passed tests
+		if ($this->current['result'] == 'passed')
+		{
+			// Add to total
+			$this->totals['passed']++;
+		}
+		else
+		{
+			// Add to results
+			$this->results[$this->current['result']][] = $this->current;
+		}
+
+		$this->current = array();
+
+		$this->time += $time;
+	}
+
+	// @codingStandardsIgnoreStart
+	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {}
+	// @codingStandardsIgnoreEnd
+
+	// @codingStandardsIgnoreStart
+	public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+	// @codingStandardsIgnoreEnd
+	{
+		// Parse test descriptions to make them look nicer
+		foreach ($this->results as $case => $testresults)
+		{
+			foreach ($testresults as $type => $result)
+			{
+				preg_match('/^(?:([a-z0-9_]+?)::)?([a-z0-9_]+)(?: with data set (#\d+ \(.*?\)))?/i', $result['description'], $m);
+
+				$this->results[$case][$type] += array(
+					'class' => $m[1],
+					'test' => $m[2],
+					'data_set' => isset($m[3]) ? $m[3] : FALSE,
+				);
+			}
+		}
+	}
+}
diff --git a/includes/kohana/modules/unittest/classes/kohana/unittest/testcase.php b/includes/kohana/modules/unittest/classes/kohana/unittest/testcase.php
new file mode 100644
index 0000000..7d6e777
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/kohana/unittest/testcase.php
@@ -0,0 +1,246 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+/**
+ * A version of the stock PHPUnit testcase that includes some extra helpers
+ * and default settings
+ */
+// @codingStandardsIgnoreFile
+abstract class Kohana_Unittest_TestCase extends PHPUnit_Framework_TestCase {
+	
+	/**
+	 * Whether we should enable work arounds to make the tests compatible with phpunit 3.4
+	 * @var boolean
+	 */
+	protected static $_assert_type_compatability = NULL;
+
+	/**
+	 * Make sure PHPUnit backs up globals
+	 * @var boolean
+	 */
+	protected $backupGlobals = TRUE;
+
+	/**
+	 * A set of unittest helpers that are shared between normal / database
+	 * testcases
+	 * @var Kohana_Unittest_Helpers
+	 */
+	protected $_helpers = NULL;
+
+	/**
+	 * A default set of environment to be applied before each test
+	 * @var array
+	 */
+	protected $environmentDefault = array();
+
+	/**
+	 * Creates a predefined environment using the default environment
+	 *
+	 * Extending classes that have their own setUp() should call
+	 * parent::setUp()
+	 */
+	public function setUp()
+	{
+		if (self::$_assert_type_compatability === NULL)
+		{
+			if ( ! class_exists('PHPUnit_Runner_Version'))
+			{
+				require_once 'PHPUnit/Runner/Version.php';
+			}
+
+			self::$_assert_type_compatability = version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<=');
+		}
+
+		$this->_helpers = new Unittest_Helpers;
+
+		$this->setEnvironment($this->environmentDefault);
+	}
+
+	/**
+	 * Restores the original environment overriden with setEnvironment()
+	 *
+	 * Extending classes that have their own tearDown()
+	 * should call parent::tearDown()
+	 */
+	public function tearDown()
+	{
+		$this->_helpers->restore_environment();
+	}
+
+	/**
+	 * Removes all kohana related cache files in the cache directory
+	 */
+	public function cleanCacheDir()
+	{
+		return Unittest_Helpers::clean_cache_dir();
+	}
+
+	/**
+	 * Helper function that replaces all occurences of '/' with
+	 * the OS-specific directory separator
+	 *
+	 * @param string $path The path to act on
+	 * @return string
+	 */
+	public function dirSeparator($path)
+	{
+		return Unittest_Helpers::dir_separator($path);
+	}
+
+	/**
+	 * Allows easy setting & backing up of enviroment config
+	 *
+	 * Option types are checked in the following order:
+	 *
+	 * * Server Var
+	 * * Static Variable
+	 * * Config option
+	 *
+	 * @param array $environment List of environment to set
+	 */
+	public function setEnvironment(array $environment)
+	{
+		return $this->_helpers->set_environment($environment);
+	}
+
+	/**
+	 * Check for internet connectivity
+	 *
+	 * @return boolean Whether an internet connection is available
+	 */
+	public function hasInternet()
+	{
+		return Unittest_Helpers::has_internet();
+	}
+
+	/**
+	 * Asserts that a variable is of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertInstanceOf($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertType($expected, $actual, $message);
+
+		return parent::assertInstanceOf($expected, $actual, $message);
+	}
+	
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeType($expected, $attributeName, $classOrObject, $message);
+
+		return parent::assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is not of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertNotInstanceOf($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertNotType($expected, $actual, $message);
+
+		return self::assertNotInstanceOf($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeNotType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertInternalType($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertType($expected, $actual, $message);
+		
+		return parent::assertInternalType($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeInternalType($expected, $attributeName, $classOrObject, $message);
+	}
+
+	/**
+	 * Asserts that a variable is not of a given type.
+	 *
+	 * @param string $expected
+	 * @param mixed  $actual
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertNotInternalType($expected, $actual, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertNotType($expected, $actual, $message);
+
+		return self::assertNotInternalType($expected, $actual, $message);
+	}
+
+	/**
+	 * Asserts that an attribute is of a given type.
+	 *
+	 * @param string $expected
+	 * @param string $attributeName
+	 * @param mixed  $classOrObject
+	 * @param string $message
+	 * @since Method available since Release 3.5.0
+	 */
+	public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
+	{
+		if (self::$_assert_type_compatability)
+			return self::assertAttributeNotType($expected, $attributeName, $classOrObject, $message);
+
+		return self::assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message);
+	}
+}
diff --git a/includes/kohana/modules/unittest/classes/kohana/unittest/tests.php b/includes/kohana/modules/unittest/classes/kohana/unittest/tests.php
new file mode 100644
index 0000000..dda38e0
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/kohana/unittest/tests.php
@@ -0,0 +1,336 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+/**
+ * PHPUnit testsuite for kohana application
+ *
+ * @package    Kohana/UnitTest
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @author	   Paul Banks
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Unittest_Tests {
+	static protected $cache = array();
+
+	/**
+	 * Flag to identify whether the installed version of phpunit
+	 * is greater than or equal to 3.5
+	 * @var boolean
+	 */
+	static protected $phpunit_v35 = FALSE;
+
+	/**
+	 * Loads test files if they cannot be found by kohana
+	 * @param <type> $class
+	 */
+	static function autoload($class)
+	{
+		$file = str_replace('_', '/', $class);
+
+		if ($file = Kohana::find_file('tests', $file))
+		{
+			require_once $file;
+		}
+	}
+
+	/**
+	 * Configures the environment for testing
+	 *
+	 * Does the following:
+	 *
+	 * * Loads the phpunit framework (for the web ui)
+	 * * Restores exception phpunit error handlers (for cli)
+	 * * registeres an autoloader to load test files
+	 */
+	static public function configure_environment($do_whitelist = TRUE, $do_blacklist = TRUE)
+	{
+		// During a webui request we need to manually load PHPUnit
+		if ( ! class_exists('PHPUnit_Util_Filter', FALSE) AND ! function_exists('phpunit_autoload'))
+		{
+			try
+			{
+				include_once 'PHPUnit/Autoload.php';
+			}
+			catch (ErrorException $e)
+			{
+				include_once 'PHPUnit/Framework.php';
+			}
+		}
+
+		// Allow PHPUnit to handle exceptions and errors
+		if (Kohana::$is_cli)
+		{
+			restore_exception_handler();
+			restore_error_handler();
+		}
+
+		spl_autoload_register(array('Unittest_tests', 'autoload'));
+
+		// As of PHPUnit v3.5 there are slight differences in the way files are black|whitelisted
+		self::$phpunit_v35 = function_exists('phpunit_autoload');
+
+		Unittest_tests::$cache = (($cache = Kohana::cache('unittest_whitelist_cache')) === NULL) ? array() : $cache;
+
+		$config = Kohana::config('unittest');
+
+		if ($do_whitelist AND $config->use_whitelist)
+		{
+			self::whitelist();
+		}
+
+		if ($do_blacklist AND count($config['blacklist']))
+		{
+			Unittest_tests::blacklist($config->blacklist);
+		}
+	}
+
+	/**
+	 * Helper function to see if unittest is enabled in the config
+	 *
+	 * @return boolean
+	 */
+	static function enabled()
+	{
+		$p_environment = Kohana::config('unittest.environment');
+		$k_environment = Kohana::$environment;
+
+		return  (is_array($p_environment) AND in_array($k_environment, $p_environment))
+				OR
+				($k_environment === $p_environment);
+	}
+
+	/**
+	 * Creates the test suite for kohana
+	 *
+	 * @return PHPUnit_Framework_TestSuite
+	 */
+	static function suite()
+	{
+		static $suite = NULL;
+
+		if ($suite instanceof PHPUnit_Framework_TestSuite)
+		{
+			return $suite;
+		}
+
+		$files = Kohana::list_files('tests');
+
+		$suite = new PHPUnit_Framework_TestSuite;
+
+		self::addTests($suite, $files);
+
+		return $suite;
+	}
+
+	/**
+	 * Add files to test suite $suite
+	 *
+	 * Uses recursion to scan subdirectories
+	 *
+	 * @param PHPUnit_Framework_TestSuite  $suite   The test suite to add to
+	 * @param array                        $files   Array of files to test
+	 */
+	// @codingStandardsIgnoreStart
+	static function addTests(PHPUnit_Framework_TestSuite $suite, array $files)
+	// @codingStandardsIgnoreEnd
+	{
+		if (self::$phpunit_v35)
+		{
+			$filter = PHP_CodeCoverage_Filter::getInstance();
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_array($file))
+			{
+				self::addTests($suite, $file);
+			}
+			else
+			{
+				// Make sure we only include php files
+				if (is_file($file) AND substr($file, -strlen(EXT)) === EXT)
+				{
+					// The default PHPUnit TestCase extension
+					if ( ! strpos($file, 'TestCase'.EXT))
+					{
+						$suite->addTestFile($file);
+					}
+					else
+					{
+						require_once($file);
+					}
+
+					if (isset($filter))
+					{
+						$filter->addFileToBlacklist($file);
+					}
+					else
+					{
+						PHPUnit_Util_Filter::addFileToFilter($file);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Blacklist a set of files in PHPUnit code coverage
+	 *
+	 * @param array A set of files to blacklist
+	 */
+	static public function blacklist(array $blacklist_items)
+	{
+		if (self::$phpunit_v35)
+		{
+			$filter = PHP_CodeCoverage_Filter::getInstance();
+
+			foreach ($blacklist_items as $item)
+			{
+				if (is_dir($item))
+				{
+					$filter->addDirectoryToBlacklist($item);
+				}
+				else
+				{
+					$filter->addFileToBlacklist($item);
+				}
+			}
+		}
+		else
+		{
+			foreach ($blacklist_items as $item)
+			{
+				if (is_dir($item))
+				{
+					PHPUnit_Util_Filter::addDirectoryToFilter($item);
+				}
+				else
+				{
+					PHPUnit_Util_Filter::addFileToFilter($item);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Sets the whitelist
+	 *
+	 * If no directories are provided then the function'll load the whitelist
+	 * set in the config file
+	 *
+	 * @param array $directories Optional directories to whitelist
+	 */
+	static public function whitelist(array $directories = NULL)
+	{
+		if (empty($directories))
+		{
+			$directories = self::get_config_whitelist();
+		}
+
+		if (count($directories))
+		{
+			foreach ($directories as & $directory)
+			{
+				$directory = realpath($directory).'/';
+			}
+
+			// Only whitelist the "top" files in the cascading filesystem
+			self::set_whitelist(Kohana::list_files('classes', $directories));
+		}
+	}
+
+	/**
+	 * Works out the whitelist from the config
+	 * Used only on the CLI
+	 *
+	 * @returns array Array of directories to whitelist
+	 */
+	static protected function get_config_whitelist()
+	{
+		$config = Kohana::config('unittest');
+		$directories = array();
+
+		if ($config->whitelist['app'])
+		{
+			$directories['k_app'] = APPPATH;
+		}
+
+		if ($modules = $config->whitelist['modules'])
+		{
+			$k_modules = Kohana::modules();
+
+			// Have to do this because kohana merges config...
+			// If you want to include all modules & override defaults then TRUE must be the first
+			// value in the modules array of your app/config/unittest file
+			if (array_search(TRUE, $modules, TRUE) === (count($modules) - 1))
+			{
+				$modules = $k_modules;
+			}
+			elseif (array_search(FALSE, $modules, TRUE) === FALSE)
+			{
+				$modules = array_intersect_key($k_modules, array_combine($modules, $modules));
+			}
+			else
+			{
+				// modules are disabled
+				$modules = array();
+			}
+
+			$directories += $modules;
+		}
+
+		if ($config->whitelist['system'])
+		{
+			$directories['k_sys'] = SYSPATH;
+		}
+
+		return $directories;
+	}
+
+	/**
+	 * Recursively whitelists an array of files
+	 *
+	 * @param array $files Array of files to whitelist
+	 */
+	static protected function set_whitelist($files)
+	{
+		if (self::$phpunit_v35)
+		{
+			$filter = PHP_CodeCoverage_Filter::getInstance();
+		}
+
+		foreach ($files as $file)
+		{
+			if (is_array($file))
+			{
+				self::set_whitelist($file);
+			}
+			else
+			{
+				if ( ! isset(Unittest_tests::$cache[$file]))
+				{
+					$relative_path = substr($file, strrpos($file, 'classes'.DIRECTORY_SEPARATOR) + 8, -strlen(EXT));
+					$cascading_file = Kohana::find_file('classes', $relative_path);
+
+					// The theory is that if this file is the highest one in the cascading filesystem
+					// then it's safe to whitelist
+					Unittest_tests::$cache[$file] =  ($cascading_file === $file);
+				}
+
+				if (Unittest_tests::$cache[$file])
+				{
+					if (isset($filter))
+					{
+						$filter->addFileToWhitelist($file);
+					}
+					else
+					{
+						PHPUnit_Util_Filter::addFileToWhitelist($file);
+					}
+				}
+			}
+		}
+	}
+
+}
diff --git a/includes/kohana/modules/unittest/classes/unittest/helpers.php b/includes/kohana/modules/unittest/classes/unittest/helpers.php
new file mode 100644
index 0000000..46da816
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/unittest/helpers.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Unittest_Helpers extends Kohana_Unittest_Helpers {}
diff --git a/includes/kohana/modules/unittest/classes/unittest/runner.php b/includes/kohana/modules/unittest/classes/unittest/runner.php
new file mode 100644
index 0000000..02544b2
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/unittest/runner.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Unittest_Runner extends Kohana_Unittest_Runner {}
diff --git a/includes/kohana/modules/unittest/classes/unittest/testcase.php b/includes/kohana/modules/unittest/classes/unittest/testcase.php
new file mode 100644
index 0000000..e8dcacb
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/unittest/testcase.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Unittest_TestCase extends Kohana_Unittest_TestCase {}
diff --git a/includes/kohana/modules/unittest/classes/unittest/tests.php b/includes/kohana/modules/unittest/classes/unittest/tests.php
new file mode 100644
index 0000000..1d6f9fc
--- /dev/null
+++ b/includes/kohana/modules/unittest/classes/unittest/tests.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Unittest_Tests extends Kohana_Unittest_Tests {}
diff --git a/includes/kohana/modules/unittest/config/unittest.php b/includes/kohana/modules/unittest/config/unittest.php
new file mode 100644
index 0000000..1ca506b
--- /dev/null
+++ b/includes/kohana/modules/unittest/config/unittest.php
@@ -0,0 +1,53 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+
+	// The only environment in which the web runner is allowed to run
+	// You can run tests from phpunit cli command regardless of this setting
+	// This can also be set to an array for multiple environments
+	'environment' => Kohana::DEVELOPMENT,
+
+	// This is the folder where we generate and zip all the reports for downloading
+	// Needs to be readable and writable
+	'temp_path' => Kohana::$cache_dir.'/unittest',
+
+	// Path from DOCROOT (i.e. http://yourdomain/) to the folder where HTML cc reports can be published.
+	// If you'd prefer not to allow users to do this then simply set the value to FALSE.
+	// Example value of 'cc_report_path' would allow devs to see report at http://yourdomain/report/
+	'cc_report_path' => 'report',
+
+	// If you don't use a whitelist then only files included during the request will be counted
+	// If you do, then only whitelisted items will be counted
+	'use_whitelist' => TRUE,
+
+	// Items to whitelist, only used in cli
+	// Web runner ui allows user to choose which items to whitelist
+	'whitelist' => array(
+
+		// Should the app be whitelisted?
+		// Useful if you just want to test your application
+		'app' => TRUE,
+
+		// Set to array(TRUE) to include all modules, or use an array of module names
+		// (the keys of the array passed to Kohana::modules() in the bootstrap)
+		// Or set to FALSE to exclude all modules
+		'modules' => array(TRUE),
+
+		// If you don't want the Kohana code coverage reports to pollute your app's,
+		// then set this to FALSE
+		'system' => TRUE,
+	),
+
+	// Does what it says on the tin
+	// Blacklisted files won't be included in code coverage reports
+	// If you use a whitelist then the blacklist will be ignored
+	'use_blacklist' => FALSE,
+
+	// List of individual files/folders to blacklist
+	'blacklist' => array(
+	),
+
+	// A database connection that can be used when testing
+	// This doesn't overwrite anything, tests will have to use this value manually
+	'db_connection' => 'unittest',
+);
diff --git a/includes/kohana/modules/unittest/config/userguide.php b/includes/kohana/modules/unittest/config/userguide.php
new file mode 100644
index 0000000..d809484
--- /dev/null
+++ b/includes/kohana/modules/unittest/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'unittest' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Unittest',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Kohana unit testing.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/unittest/example.phpunit.xml b/includes/kohana/modules/unittest/example.phpunit.xml
new file mode 100644
index 0000000..9792d37
--- /dev/null
+++ b/includes/kohana/modules/unittest/example.phpunit.xml
@@ -0,0 +1,16 @@
+<!--
+	This is an example phpunit.xml file to get you started
+	Copy it to a directory, update the relative paths and rename to phpunit.xml
+	Then to run tests cd into it's directory and just run
+		phpunit
+	(it'll automatically use any phpunit.xml file in the current directory)
+
+	Any options you specify when calling phpunit will override the ones in here
+-->
+<phpunit colors="true" bootstrap="rel/path/to/index.php">
+	<testsuites>
+		<testsuite name="Kohana Tests">
+			<file>rel/path/to/unittest/tests.php</file>
+		</testsuite>
+	</testsuites>
+</phpunit>
diff --git a/includes/kohana/modules/unittest/guide/unittest/index.md b/includes/kohana/modules/unittest/guide/unittest/index.md
new file mode 100644
index 0000000..fb594e2
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/index.md
@@ -0,0 +1,2 @@
+# Unittest 
+
diff --git a/includes/kohana/modules/unittest/guide/unittest/menu.md b/includes/kohana/modules/unittest/guide/unittest/menu.md
new file mode 100644
index 0000000..dcc6dfb
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/menu.md
@@ -0,0 +1,5 @@
+## [UnitTest]()
+   - [Testing](testing)
+   - [Mock Objects](mockobjects)
+   - [Troubleshooting](troubleshooting)
+   - [Testing workflows](testing_workflows)
\ No newline at end of file
diff --git a/includes/kohana/modules/unittest/guide/unittest/mockobjects.md b/includes/kohana/modules/unittest/guide/unittest/mockobjects.md
new file mode 100644
index 0000000..64b2d23
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/mockobjects.md
@@ -0,0 +1,265 @@
+# Mock objects
+
+Sometimes when writing tests you need to test something that depends on an object being in a certain state.
+
+Say for example you're testing a model - you want to make sure that the model is running the correct query, but you don't want it to run on a real database server.  You can create a mock database connection which responds in the way the model expects, but doesn't actually connect to a physical database.
+
+PHPUnit has a built in mock object creator which can generate mocks for classes (inc. abstract ones) on the fly.  
+It creates a class that extends the one you want to mock.  You can also tell PHPUnit to override certain functions to return set values / assert that they're called in a specific way.
+
+## Creating an instance of a mock class
+
+You create mocks from within testcases using the getMock() function, which is defined in `PHPUnit_Framework_TestCase` like so:
+
+	    getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE)
+
+`$originalClassName`
+: The name of the class that you want to mock
+
+`$methods`
+: The methods of $originalClassName that you want to mock.  
+  You need to tell PHPUnit in advance because PHP doesn't allow you to extend an object once it's been initialised.
+
+`$arguments`
+: An array of arguments to pass to the mock's constructor
+
+`$mockClassName`
+: Allows you to specify the name that will be given to the mock
+
+`$callOriginalConstructor`
+: Should the mock call its parent's constructor automatically?
+
+`$callOriginalClone`
+: Should the mock call its parent's clone method?
+
+Most of the time you'll only need to use the first two parameters, i.e.:
+
+	$mock = $this->getMock('ORM');
+
+`$mock` now contains a mock of ORM and can be handled as though it were a vanilla instance of `ORM`
+
+	$mock = $this->getMock('ORM', array('check'));
+
+`$mock` now contains a mock of ORM, but this time we're also mocking the check() method.
+
+## Mocking methods
+
+Assuming we've created a mock object like so:
+
+	$mock = $this->getMock('ORM', array('check'));
+
+We now need to tell PHPUnit how to mock the check function when its called.
+
+### How many times should it be called?
+
+You start off by telling PHPUnit how many times the method should be called by calling expects() on the mock object:
+
+	$mock->expects($matcher);
+
+`expects()` takes one argument, an invoker matcher which you can create using factory methods defined in `PHPUnit_Framework_TestCase`:
+
+#### Possible invoker matchers:
+
+`$this->any()`
+: Returns a matcher that allows the method to be called any number of times
+
+`$this->never()`
+: Returns a matcher that asserts that the method is never called
+
+`$this->once()`
+: Returns a matcher that asserts that the method is only called once
+
+`$this->atLeastOnce()`
+: Returns a matcher that asserts that the method is called at least once
+
+`$this->exactly($count)`
+: Returns a matcher that asserts that the method is called at least `$count` times
+
+`$this->at($index)`
+: Returns a matcher that matches when the method it is evaluated for is invoked at the given $index.
+
+In our example we want `check()` to be called once on our mock object, so if we update it accordingly:
+
+	$mock = $this->getMock('ORM', array('check'));
+
+	$mock->expects($this->once());
+
+### What is the method we're mocking?
+
+Although we told PHPUnit what methods we want to mock, we haven't actually told it what method these rules we're specifiying apply to.  
+You do this by calling `method()` on the returned from `expects()`:
+
+	$mock->expects($matcher)
+		->method($methodName);
+
+As you can probably guess, `method()` takes one parameter, the name of the method you're mocking.  
+There's nothing very fancy about this function.
+
+	$mock = $this->GetMock('ORM', array('check'));
+
+	$mock->expects($this->once())
+		->method('check');
+
+
+### What parameters should our mock method expect?
+
+There are two ways to do this, either
+
+* Tell the method to accept any parameters
+* Tell the method to accept a specific set of parameters
+
+The former can be achieved by calling `withAnyParameters()` on the object returned from `method()`
+
+	$mock->expects($matcher)
+		->method($methodName)
+		->withAnyParameters();
+
+To only allow specific parameters you can use the `with()` method which accepts any number of parameters.  
+The order in which you define the parameters is the order that it expects them to be in when called.
+
+	$mock->expects($matcher)
+		->method($methodName)
+		->with($param1, $param2);
+
+Calling `with()` without any parameters will force the mock method to accept no parameters.
+
+PHPUnit has a fairly complex way of comparing parameters passed to the mock method with the expected values, which can be summarised like so - 
+
+* If the values are identical, they are equal
+* If the values are of different types they are not equal
+* If the values are numbers they they are considered equal if their difference is equal to zero (this level of accuracy can be changed)
+* If the values are objects then they are converted to arrays and are compared as arrays
+* If the values are arrays then any sub-arrays deeper than x levels (default 10) are ignored in the comparision
+* If the values are arrays and one contains more than elements that the other (at any depth up to the max depth), then they are not equal
+
+#### More advanced parameter comparisions
+
+Sometimes you need to be more specific about how PHPUnit should compare parameters, i.e. if you want to make sure that one of the parameters is an instance of an object, yet isn't necessarily identical to a particular instance.
+
+In PHPUnit, the logic for validating objects and datatypes has been refactored into "constraint objects".  If you look in any of the assertX() methods you can see that they are nothing more than wrappers for associating constraint objects with tests.
+
+If a parameter passed to `with()` is not an instance of a constraint object (one which extends `PHPUnit_Framework_Constraint`) then PHPUnit creates a new `IsEqual` comparision object for it.
+
+i.e., the following methods produce the same result:
+
+	->with('foo', 1);
+
+	->with($this->equalTo('foo'), $this->equalTo(1));
+
+Here are some of the wrappers PHPUnit provides for creating constraint objects:
+
+`$this->arrayHasKey($key)`
+: Asserts that the parameter will have an element with index `$key`
+
+`$this->attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)`
+: Asserts that object attribute `$attributeName` of the parameter will satisfy `$constraint`, where constraint is an instance of a constraint (i.e. `$this->equalTo()`)
+
+`$this->fileExists()`
+: Accepts no parameters, asserts that the parameter is a path to a valid file (i.e. `file_exists() === TRUE`)
+
+`$this->greaterThan($value)`
+: Asserts that the parameter is greater than `$value`
+
+`$this->anything()`
+: Returns TRUE regardless of what the parameter is
+
+`$this->equalTo($value, $delta = 0, $canonicalizeEOL = FALSE, $ignoreCase = False)`
+: Asserts that the parameter is equal to `$value` (same as not passing a constraint object to `with()`)
+: `$delta` is the degree of accuracy to use when comparing numbers. i.e. 0 means numbers need to be identical, 1 means numbers can be within a distance of one from each other
+: If `$canonicalizeEOL` is TRUE then all newlines in string values will be converted to `\n` before comparision
+: If `$ignoreCase` is TRUE then both strings will be converted to lowercase before comparision
+
+`$this->identicalTo($value)`
+: Asserts that the parameter is identical to `$value`
+
+`$this->isType($type)`
+: Asserts that the parameter is of type `$type`, where `$type` is a string representation of the core PHP data types
+
+`$this->isInstanceOf($className)`
+: Asserts that the parameter is an instance of `$className`
+
+`$this->lessThan($value)`
+: Asserts that the parameter is less than `$value`
+
+`$this->objectHasAttribute($attribute)`
+: Asserts that the paramater (which is assumed to be an object) has an attribute `$attribute`
+
+`$this->matchesRegularExpression($pattern)`
+: Asserts that the parameter matches the PCRE pattern `$pattern` (using `preg_match()`)
+
+`$this->stringContains($string, $ignoreCase = FALSE)`
+: Asserts that the parameter contains the string `$string`.  If `$ignoreCase` is TRUE then a case insensitive comparision is done
+
+`$this->stringEndsWith($suffix)`
+: Asserts that the parameter ends with `$suffix` (assumes parameter is a string)
+
+`$this->stringStartsWith($prefix)`
+: Asserts that the parameter starts with `$prefix` (assumes parameter is a string)
+
+`$this->contains($value)`
+: Asserts that the parameter contains at least one value that is identical to `$value` (assumes parameter is array or `SplObjectStorage`)
+
+`$this->containsOnly($type, $isNativeType = TRUE)`
+: Asserts that the parameter only contains items of type `$type`. `$isNativeType` should be set to TRUE when `$type` refers to a built in PHP data type (i.e. int, string etc.) (assumes parameter is array)
+
+
+There are more constraint objects than listed here, look in `PHPUnit_Framework_Assert` and `PHPUnit/Framework/Constraint` if you need more constraints.
+
+If we continue our example, we have the following:  
+	
+	$mock->expects($this->once())
+		->method('check')
+		->with();
+
+So far PHPUnit knows that we want the `check()` method to be called once, with no parameters.  Now we just need to get it to return something...
+
+### What should the method return?
+
+This is the final stage of mocking a method.
+
+By default PHPUnit can return either
+
+* A fixed value
+* One of the parameters that were passed to it
+* The return value of a specified callback
+
+Specifying a return value is easy, just call `will()` on the object returned by either `method()` or `with()`.
+
+The function is defined like so:
+
+	public function will(PHPUnit_Framework_MockObject_Stub $stub)
+
+PHPUnit provides some MockObject stubs out of the box, you can access them via (when called from a testcase):
+
+`$this->returnValue($value)`
+: Returns `$value` when the mocked method is called
+
+`$this->returnArgument($argumentIndex)`
+: Returns the `$argumentIndex`th argument that was passed to the mocked method
+
+`$this->returnCallback($callback)`
+: Returns the value of the callback, useful for more complicated mocking.  
+: `$callback` should a valid callback (i.e. `is_callable($callback) === TRUE`).  PHPUnit will pass the callback all of the parameters that the mocked method was passed, in the same order / argument index (i.e. the callback is invoked by `call_user_func_array()`).
+: You can usually create the callback in your testcase, as long as doesn't begin with "test"
+
+Obviously if you really want to you can create your own MockObject stub, but these three should cover most situations.
+
+Updating our example gives:
+
+	$mock->expects($this->once())
+		->method('check')
+		->with()
+		->will($this->returnValue(TRUE));
+
+
+And we're done!
+
+If you now call `$mock->check()` the value TRUE should be returned.
+
+If you don't call a mocked method and PHPUnit expects it to be called then the test the mock was generated for will fail.
+
+
+<!--
+### What about if the mocked method should change everytime its called?
+
+-->
diff --git a/includes/kohana/modules/unittest/guide/unittest/testing.md b/includes/kohana/modules/unittest/guide/unittest/testing.md
new file mode 100644
index 0000000..504478a
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/testing.md
@@ -0,0 +1,117 @@
+### From the command line
+
+	$ phpunit --bootstrap=index.php modules/unittest/tests.php
+
+Of course, you'll need to make sure the path to the tests.php file is correct.  If you want you can copy it to a more accessible location
+
+### From the web
+
+Just navigate to http://example.com/unittest. You may need to use http://example.com/index.php/unittest if you have not enabled url rewriting in your .htaccess.
+
+## Writing tests
+
+If you're writing a test for your application, place it in "application/tests".  Similarly, if you're writing a test for a module place it in modules/[modulefolder]/tests
+
+Rather than tell you how to write tests I'll point you in the direction of the [PHPUnit Manual](http://www.phpunit.de/manual/3.4/en/index.html).  One thing you should bear in mind when writing tests is that testcases should extend Unittest_Testcase rather than PHPUnit_Framework_TestCase, doing so gives you access to useful kohana specific helpers such as `setEnvironment()`.
+
+Here's a taster of some of the cool things you can do with phpunit:
+
+### Data Providers
+
+Sometimes you want to be able to run a specific test with different sets of data to try and test every eventuality
+
+Ordinarily you could use a foreach loop to iterate over an array of test data, however PHPUnit already can take care of this for us rather easily using "Data Providers".  A data provider is a function that returns an array of arguments that can be passed to a test.
+
+	<?php
+
+	Class ReallyCoolTest extends Unittest_TestCase
+	{
+		function providerStrLen()
+		{
+			return array(
+				array('One set of testcase data', 24),
+				array('This is a different one', 23),
+			);
+		}
+
+		/**
+		 * @dataProvider providerStrLen
+		 */
+		function testStrLen($string, $length)
+		{
+			$this->assertSame(
+				$length,
+				strlen($string)
+			);
+		}
+	}
+
+The key thing to notice is the `@dataProvider` tag in the doccomment, this is what tells PHPUnit to use a data provider.  The provider prefix is totally optional but it's a nice standard to identify providers.
+
+For more info see:
+
+* [Data Providers in PHPUnit 3.2](http://sebastian-bergmann.de/archives/702-Data-Providers-in-PHPUnit-3.2.html)
+* [Data Providers](http://www.phpunit.de/manual/3.4/en/writing-tests-for-phpunit.html#writing-tests-for-phpunit.data-providers)
+
+
+### Grouping tests
+
+To allow users to selectively run tests you need to organise your tests into groups.  Here's an example test showing how to do this:
+
+
+	<?php
+
+	/**
+	 * This is a description for my testcase
+	 *
+	 * @group somegroup
+	 * @group somegroup.morespecific
+	 */
+	Class AnotherReallyCoolTest extends Unittest_TestCase
+	{
+		/**
+		 * Tests can also be grouped too!
+		 *
+		 * @group somegroup.morespecific.annoyingstuff
+		 */
+		function testSomeAnnoyingCase()
+		{
+			// CODE!!
+		}
+	}
+
+Our convention is to use lowercase group names, with more specific levels in a group seperated by periods. i.e. The Validate helper tests are part of the following groups:
+
+	kohana
+	kohana.validation
+	kohana.validation.helpers
+
+To actually limit your testing to the "somegroup" group, use:
+
+	$ phpunit --boostrap=index.php --group=somegroup modules/unittest/tests.php
+
+This functionality can be used to record which bug reports a test is for:
+
+	/**
+	 *
+	 * @group bugs.1477
+	 */
+	function testAccountCannotGoBelowZero()
+	{
+		// Some arbitary code
+	}
+
+To see all groups that are available in your code run:
+
+	$ phpunit --boostrap=index.php --list-groups modules/unittest/tests.php
+
+*Note:* the `--list-groups` switch should appear before the path to the test suite loader
+
+You can also exclude groups while testing using the `--exclude-group` switch.  This can be useful if you want to ignore all kohana tests:
+
+	$ phpunit --bootstrap=index.php --exclude-group=kohana modules/unittest/tests.php
+
+For more info see:
+
+* [Better PHPUnit Group Annotations](http://mikenaberezny.com/2007/09/04/better-phpunit-group-annotations/)
+* [TestNG style Grouping of Tests in PHPUnit 3.2](http://sebastian-bergmann.de/archives/697-TestNG-style-Grouping-of-Tests.html)
diff --git a/includes/kohana/modules/unittest/guide/unittest/testing_workflows.md b/includes/kohana/modules/unittest/guide/unittest/testing_workflows.md
new file mode 100644
index 0000000..fa98cee
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/testing_workflows.md
@@ -0,0 +1,51 @@
+# Testing workflows
+
+Having unittests for your application is a nice idea, but unless you actually use them they're about as useful as a chocolate firegaurd.  There are quite a few ways of getting tests "into" your development process and this guide aims to cover a few of them.
+
+## Testing through the webui
+
+The web ui is a fairly temporary solution, aimed at helping developers get into unittesting and code coverage.  Eventually it's hoped that people migrate on to the termainl & CI servers.
+
+To access it goto
+
+	http://example.com/unittest/
+
+*Note:* Your site will need to be in the correct environment in order to use the webui.  See the config file for more details.  You may also need to use http://example.com/index.php/unittest/
+
+## Integrating with IDEs
+
+Modern IDEs have come a long way in the last couple of years and ones like netbeans have pretty decent PHP / PHPUnit support.
+
+### Netbeans (6.8+)
+
+*Note:* Netbeans runs under the assumption that you only have one tests folder per project.  
+If you want to run tests across multiple modules it might be best creating a separate project for each module.
+
+0. Install the unittest module
+
+1. Open the project which you want to enable phpunit testing for.
+
+2. Now open the project's properties dialouge and in the "Tests Dir" field enter the path to your module's (or application's) test directory.  
+   In this case the only tests in this project are within the unittest module
+
+3. Select the phpunit section from the left hand pane and in the area labelled bootstrap enter the path to your app's index.php file
+
+You can also specify a custom test suite loader (enter the path to your tests.php file) and/or a custom configuration file (enter the path to your phpunit.xml file)
+
+## Looping shell
+
+If you're developing in a text editor such as textmate, vim, gedit etc. chances are phpunit support isn't natively supported by your editor.
+
+In such situations you can run a simple bash script to loop over the tests every X seconds, here's an example script:
+
+	while(true) do clear; phpunit; sleep 8; done;
+
+You will probably need to adjust the timeout (`sleep 8`) to suit your own workflow, but 8 seconds seems to be about enough time to see what's erroring before the tests are re-run.
+
+In the above example we're using a phpunit.xml config file to specify all the unit testing settings & to reduce the complexity of the looping script.
+
+## Continuous Integration (CI)
+
+Continuous integration is a team based tool which enables developers to keep tabs on whether changes committed to a project break the application. If a commit causes a test to fail then the build is classed as "broken" and the CI server then alerts developers by email, RSS, IM or glowing (bears|lava lamps) to the fact that someone has broken the build and that all hell's broken lose.
+
+The two more popular CI servers are [Hudson](https://hudson.dev.java.net/) and [phpUnderControl](http://www.phpundercontrol.org/about.html), both of which use [Phing](http://phing.info/) to run the build tasks for your application.
diff --git a/includes/kohana/modules/unittest/guide/unittest/troubleshooting.md b/includes/kohana/modules/unittest/guide/unittest/troubleshooting.md
new file mode 100644
index 0000000..774640e
--- /dev/null
+++ b/includes/kohana/modules/unittest/guide/unittest/troubleshooting.md
@@ -0,0 +1,21 @@
+# Troubleshooting
+
+## I get the error "Class Kohana_Tests could not be found" when testing from the CLI
+
+You need to running PHPUnit >= 3.4, there is a bug in 3.3 which causes this.
+
+## Some of my classes aren't getting whitelisted for code coverage even though their module is
+
+Only the "highest" files in the cascading filesystem are whitelisted for code coverage.
+
+To test your module's file, remove the higher file from the cascading filesystem by disabling their respective module.
+
+A good way of testing is to create a "vanilla" testing environment for your module, devoid of anything that isn't required by the module.
+
+## I get a blank page when trying to generate a code coverage report
+
+Try the following:
+
+1. Generate a html report from the command line using `phpunit {bootstrap info} --coverage-html ./report {insert path to tests.php}`.  If any error messages show up, fix them and try to generate the report again
+2. Increase the php memory limit
+3. Make sure that display_errors is set to "on" in your php.ini config file (this value can sometimes be overriden in a .htaccess file)
diff --git a/includes/kohana/modules/unittest/init.php b/includes/kohana/modules/unittest/init.php
new file mode 100644
index 0000000..c40ba42
--- /dev/null
+++ b/includes/kohana/modules/unittest/init.php
@@ -0,0 +1,16 @@
+<?php
+
+// If we're on the CLI then PHPUnit will already be loaded
+if (class_exists('PHPUnit_Util_Filter', FALSE) OR function_exists('phpunit_autoload'))
+{
+	Unittest_Tests::configure_environment();
+
+	// Stop kohana from processing the request
+	define('SUPPRESS_REQUEST', TRUE);
+}
+
+Route::set('unittest', 'unittest(/<action>)')
+	->defaults(array(
+		'controller' => 'unittest',
+		'action'     => 'index',
+	));
diff --git a/includes/kohana/modules/unittest/tests.php b/includes/kohana/modules/unittest/tests.php
new file mode 100644
index 0000000..dfc21cd
--- /dev/null
+++ b/includes/kohana/modules/unittest/tests.php
@@ -0,0 +1,20 @@
+<?php
+
+if ( ! class_exists('Kohana'))
+{
+	die('Please include the kohana bootstrap file (see README.markdown)');
+}
+
+if ($file = Kohana::find_file('classes', 'unittest/tests'))
+{
+	require_once $file;
+
+	// PHPUnit requires a test suite class to be in this file,
+	// so we create a faux one that uses the kohana base
+	Class TestSuite extends Unittest_Tests
+	{}
+}
+else
+{
+	die('Could not include the test suite');
+}
\ No newline at end of file
diff --git a/includes/kohana/modules/unittest/views/unittest/index.php b/includes/kohana/modules/unittest/views/unittest/index.php
new file mode 100644
index 0000000..b4750fd
--- /dev/null
+++ b/includes/kohana/modules/unittest/views/unittest/index.php
@@ -0,0 +1,66 @@
+<?php defined('SYSPATH') or die('No direct script access.') ?>
+
+<div id="select">
+	<h1>PHPUnit for Kohana 3</h1>
+	<div id="groups">
+		<fieldset class="tests">
+			<legend>Run Tests</legend>
+			<?php echo Form::open($run_uri, array('method' => 'GET'));?>
+
+			<?php echo Form::label('run_group', __('Run a test group')) ?>
+			<?php echo Form::select('group', $groups, NULL, array('id' => 'run_group'));?>
+
+			<?php if ($xdebug_enabled): ?>
+				<?php echo Form::label('run_collect_cc', __('Calculate code coverage')) ?>
+				<?php echo Form::checkbox('collect_cc', 1, TRUE, array('id' => 'run_collect_cc')) ?>
+
+				<div depends_on="#run_collect_cc">
+					<?php echo Form::label('run_use_whitelist', __('Use code coverage whitelist'));?>
+					<?php echo Form::checkbox('use_whitelist', 1, TRUE, array('id' => 'run_use_whitelist')) ?>
+
+					<div depends_on="#run_use_whitelist">
+						<?php echo Form::label('run_whitelist', __('Only calculate coverage for files in selected modules')) ?>
+						<?php echo Form::select('whitelist[]', $whitelistable_items, array(), array('id' => 'run_whitelist', 'multiple' => 'multiple')) ?>
+					</div>
+
+				</div>
+
+			<?php endif ?>
+
+			<?php echo Form::submit('submit', 'Run');?>
+			<?php echo Form::close();?>
+		</fieldset>
+
+		<fieldset class="reports">
+			<legend>Code Coverage Reports</legend>
+			<?php if ( ! $xdebug_enabled): ?>
+				<p><?php echo __('Xdebug needs to be installed to generate reports') ?></p>
+			<?php else: ?>
+				<?php echo Form::open($report_uri, array('method' => 'GET')) ?>
+
+				<?php echo Form::label('cc_group', __('Generate report for')) ?>
+				<?php echo Form::select('group', $groups, NULL, array('id' => 'cc_group'));?>
+
+				<?php echo Form::label('report_archive', __('Download as archive?'));?>
+				<?php echo Form::checkbox('archive', 1, FALSE, array('id' => 'report_archive')) ?>
+
+				<?php echo Form::label('report_use_whitelist', __('Use code coverage whitelist'));?>
+				<?php echo Form::checkbox('use_whitelist', 1, TRUE, array('id' => 'report_use_whitelist')) ?>
+
+				<div depends_on="#report_use_whitelist">
+					<?php echo Form::label('run_whitelist', __('Only calculate coverage for files in selected modules')) ?>
+					<?php echo Form::select('whitelist[]', $whitelistable_items, array(), array('id' => 'run_whitelist', 'multiple' => 'multiple')) ?>
+				</div>
+
+				<?php echo Form::submit('submit', 'Run');?>
+				<?php echo Form::close();?>
+			<?php endif ?>
+		</fieldset>
+	</div>
+
+	<h2>Useful links</h2>
+	<ul>
+		<li><a href="http://www.phpunit.de/manual/current/en/">PHPUnit Manual</a></li>
+		<li><a href="http://github.com/kohana/unittest">Module README</a></li>
+	</ul>
+</div>
diff --git a/includes/kohana/modules/unittest/views/unittest/layout.php b/includes/kohana/modules/unittest/views/unittest/layout.php
new file mode 100644
index 0000000..5132c70
--- /dev/null
+++ b/includes/kohana/modules/unittest/views/unittest/layout.php
@@ -0,0 +1,255 @@
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+		<title>PHPUnit for Kohana</title>
+
+		<style type="text/css">
+			#select {
+				font-family: sans-serif;
+				border: 2px solid black;
+				padding: 20px;
+				margin: 40px 80px;
+			}
+			#select #groups {
+				overflow: auto;
+				margin-bottom: 25px;
+			}
+			#header {
+				background-color: #263038;
+				color: #fff;
+				padding: 20px;
+				font-family: sans-serif;
+				overflow: auto;
+			}
+			#header span {
+				display: block;
+				color: #83919C;
+				margin: 5px 0 0 0;
+			}
+			#header span b {
+				color: #ddd;
+			}
+			#header span.code_coverage .excellent {
+				color: #13CC1C;
+			}
+			#header span.code_coverage .ok {
+				color: #448BFD;
+			}
+			#header span.code_coverage .terrible {
+				color: #FF0A0A;
+			}
+
+			#header fieldset form label {
+				display: block;
+			}
+
+			#header a {
+				color: #4e7aa0;
+			}
+
+			li {
+				margin-bottom: 5px;
+			}
+
+			fieldset {
+				color: #000;
+				background: #E5EFF8;
+				border: 4px solid #4D6171;
+				padding: 20px 20px 0px;
+				font-size: 1.2em;
+				width: 43%;
+				display: block;
+				-moz-border-radius: 2px;
+			}
+
+			fieldset legend {
+				padding: 5px;
+				-moz-border-radius: 2px;
+				color: #FEFEFE;
+				background: #4D6171;
+			}
+			form {
+				display: inline;
+			}
+			fieldset form {
+				display: block;
+			}
+			fieldset#results-options {
+				width: 38%;
+				float:right;
+			}
+			fieldset form label {
+				display: block;
+			}
+
+			fieldset select {
+				width: 45%;
+			}
+
+			fieldset#results-options form label {
+				clear: left;
+				float: left;
+				width: 43%;
+			}
+
+			fieldset#results-options form input {
+				display: block;
+				float:left;
+			}
+
+			fieldset#results-options form input[type="submit"] {
+				float: none;
+				clear: both;
+			}
+
+			fieldset#results-options form select {
+				float: left;
+			}
+
+			fieldset.tests {
+				float: left;
+			}
+
+			fieldset.tests legend {
+				background: #4D6171;
+
+			}
+
+			fieldset.reports {
+				float: right;
+				background: #FC817B;
+				border-color: #D02820;
+			}
+
+			fieldset.reports legend {
+				background: #D02820;
+			}
+
+			fieldset form input[type="submit"] {
+				margin-top: 15px;
+				display: block;
+			}
+
+
+			#results {
+				font-family: sans-serif;
+			}
+			#results > div {
+				margin-top: 10px;
+				padding: 20px;
+			}
+			#results > div ol li{
+				font-size: 1.1em;
+				margin-bottom: 15px;
+				font-weight: bold;
+			}
+			h1, h2 {
+				margin: 0 0 15px;
+			}
+			div.failures-list {
+				background-color: #ffcccc;
+			}
+			div.errors-list {
+				background-color: #ffc;
+			}
+			span.test-case {
+				color: #83919C;
+			}
+			span.test-name {
+				color: #222;
+			}
+			span.test-data-set {
+				display: block;
+				color: #666;
+				font-weight: normal;
+			}
+			span.test-message {
+				display: block;
+				color: #444;
+			}
+			div.big-message {
+				font-size: 2em;
+				text-align: center;
+			}
+			div.all-pass {
+				background-color: #E0FFE0;
+				border: 3px solid #b0FFb0;
+			}
+			div.no-tests {
+				background-color: #FFFFE0;
+				border: 3px solid #FFFFb0;
+			}
+			span.show {
+				font-size: 0.7em;
+				font-weight: normal;
+				color:#4D6171;
+			}
+			.hidden {
+				display: none;
+			}
+			span[title]{
+				border-bottom: 1px dashed #83919C;
+			}
+		</style>
+
+	</head>
+	<body>
+		<?php echo $body ?>
+
+		<?php echo HTML::script('http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js') ?>
+		<script type="text/javascript">
+			$(document).ready(function(){
+
+				// Using our own attribute is a little messy but gets the job done
+				// this isn't very important code anyway...
+				$('[depends_on]').each(function(){
+					var dependent = $(this);
+					var controller = $(dependent.attr('depends_on'));
+
+					// We do this in the loop so that it can access dependent
+					// Javascript scopes are slightly crazy
+					var toggler = function(){
+						if ($(this).attr('checked')){
+							dependent.show();
+						} else {
+							dependent.hide();
+						}
+					}
+
+					// Register the toggler
+					controller.change(toggler);
+
+					// And degrade nicely...
+					if ( ! controller.attr('checked')){
+						dependent.hide();
+					}
+
+				});
+
+			});
+
+			document.write('<style type="text/css"> .collapsed { display: none; } </style>');
+			function toggle(type)
+			{
+				var elem = document.getElementById(type+'-ol');
+				var plus = document.getElementById(type+'-show');
+
+				if (elem.style && elem.style['display'])
+					// Only works with the "style" attr
+					var disp = elem.style['display'];
+				else if (elem.currentStyle)
+					// For MSIE, naturally
+					var disp = elem.currentStyle['display'];
+				else if (window.getComputedStyle)
+					// For most other browsers
+					var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+
+				// Toggle the state of the "display" style
+				elem.style.display = disp == 'block' ? 'none' : 'block';
+				plus.innerHTML = disp == 'block' ? '[<?php echo __('show') ?>]' : '[<?php echo __('hide') ?>]';
+				return false;
+			}
+		</script>
+
+	</body>
+</html>
diff --git a/includes/kohana/modules/unittest/views/unittest/results.php b/includes/kohana/modules/unittest/views/unittest/results.php
new file mode 100644
index 0000000..33b15f0
--- /dev/null
+++ b/includes/kohana/modules/unittest/views/unittest/results.php
@@ -0,0 +1,83 @@
+<?php defined('SYSPATH') or die('No direct script access.') ?>
+<div id="header" class="results">
+	<fieldset id="results-options">
+		<legend>Options</legend>
+		<?php echo Form::open($run_uri, array('method' => 'get'));?>
+		<?php echo Form::label('group', __('Switch Group')) ?>
+		<?php echo Form::select('group', $groups, $group, array('id' => 'group'));?>
+		<?php if ($xdebug_enabled): ?>
+			<?php echo Form::label('collect_cc', __('Collect Coverage')) ?>
+			<?php echo Form::checkbox('collect_cc', 1, isset($coverage), array('id' => 'collect_cc')) ?>
+			<div depends_on="#collect_cc">
+				<?php echo Form::label('use_whitelist', __('Use whitelist'));?>
+				<?php echo Form::checkbox('use_whitelist', 1, $whitelist, array('id' => 'use_whitelist')) ?>
+
+				<div depends_on="#use_whitelist">
+					<?php echo Form::label('whitelist', __('Whitelisted modules')) ?>
+					<?php echo Form::select('whitelist[]', $whitelistable_items, $whitelisted_items, array('id' => 'whitelist', 'multiple' => 'multiple')) ?>
+				</div>
+			</div>
+		<?php endif ?>
+		<?php echo Form::submit('run', 'Run');?>
+		<?php echo Form::close();?>
+	</fieldset>
+	<h1><?php echo is_null($group) ? __('All Groups') : (__('Group').': ') ?> <?php echo $group ?></h1>
+	<span class="time"><?php echo __('Time') ?>: <b><?php echo $time?></b></span>
+	<span class="summary">
+		<?php echo __('Tests') ?> <b><?php echo $totals['tests']?></b>,
+		<?php echo __('Assertions') ?> <b><?php echo $totals['assertions']?></b>,
+		<?php echo __('Failures') ?> <b><?php echo $totals['failures']?></b>,
+		<?php echo __('Skipped') ?> <b><?php echo $totals['skipped']?></b>,
+		<?php echo __('Errors') ?> <b><?php echo $totals['errors']?></b>.
+	</span>
+	<?php if ($xdebug_enabled AND isset($coverage)): ?>
+	<span class="code_coverage">
+		<?php $level_class = ($coverage > 75) ? 'excellent' : (($coverage > 35) ? 'ok' : 'terrible') ?>
+		<?php
+			echo __('Tests covered :percent of the :codebase',
+				array
+				(
+					':percent'  => '<b class="'.$level_class.'">'.num::format($coverage, 2).'%</b>',
+					':codebase' => empty($coverage_explanation) ? 'codebase' : ('<span title="'.$coverage_explanation.'" style="display:inline;">modules</span>'),
+				)
+			);
+		?>,
+		<?php echo HTML::anchor($report_uri, 'View') ?>
+		or
+		<?php echo HTML::anchor($report_uri.'&archive=1', 'Download') ?>
+		the report
+	</span>
+	<?php endif ?>
+</div>
+
+<div id="results">
+	<?php if ($totals['tests'] == 0): ?>
+		<div class="big-message no-tests">No tests in group</div>
+	<?php elseif ($totals['tests'] === $totals['passed']): ?>
+		<div class="big-message all-pass"><?php echo $totals['tests']?> Tests Passed</div>
+	<?php else: ?>
+
+		<?php foreach ($results as $type => $tests):?>
+			<?php if (count($tests) < 1):
+				continue;
+			endif ?>
+			<?php $hide = ($type === 'skipped' OR $type === 'incomplete') ?>
+			<div class="<?php echo $type?>-list">
+				<h2 onclick="toggle('<?php echo $type?>');"><?php echo count($tests)?>
+					<?php echo __(ucfirst(Inflector::singular($type, count($tests))))?>
+					<span id="<?php echo $type?>-show" class="show">[<?php echo $hide ? __('show') : __('hide') ?>]</span></h2>
+				<ol id="<?php echo $type?>-ol" class="<?php echo $hide ? 'hidden' : '' ?>">
+					<?php foreach ($tests as $result): ?>
+						<li>
+							<span class="test-case"><?php echo $result['class']?>::</span><span class="test-name"><?php echo $result['test']?></span>
+							<?php if ($result['data_set']) : ?>
+							<span class="test-data-set"> <?php echo __('with data set')?> <span><?php echo $result['data_set']?></span></span>
+							<?php endif ?>
+							<span class="test-message"><?php echo htmlentities($result['message'])?></span>
+						</li>
+					<?php endforeach ?>
+				</ol>
+			</div>
+		<?php endforeach;?>
+	<?php endif ?>
+</div>
diff --git a/includes/kohana/modules/userguide/README.md b/includes/kohana/modules/userguide/README.md
new file mode 100644
index 0000000..1740174
--- /dev/null
+++ b/includes/kohana/modules/userguide/README.md
@@ -0,0 +1,105 @@
+## What needs to be done?
+
+Most articles are stubs, with a couple links to pages to be used as a reference when writing the page.  The idea is to use the information on those links to help write the new ones.  Some of the old userguide pages can probably be mostly copied, with a few improvements, others will be better to be completely rewritten.  If you ever have questions, please feel free to jump in the kohana irc channel.
+
+## Guidelines
+
+Documentation should use complete sentences, good grammar, and be as clear as possible.  Use lots of example code, but make sure the examples follow the Kohana conventions and style.
+
+Try to commit often, with each commit only changing a file or two, rather than changing a ton of files and commiting it all at once.  This will make it easier to offer feedback and merge your changes.   Make sure your commit messages are clear and descriptive.  Good: "Added initial draft of hello world tutorial."  Bad: "working on docs".
+
+If you feel a menu needs to be rearranged or a module needs new pages, please open a [bug report](http://dev.kohanaframework.org/projects/userguide3/issues/new) to discuss it.
+
+## A brief explanation of how the userguide works:
+
+The userguide uses [Markdown](http://daringfireball.net/projects/markdown/) and [Markdown Extra](http://michelf.com/projects/php-markdown/extra/) for the documentation.  Here is a short intro to [Markdown syntax](http://kohanut.com/docs/using.markdown), as well as the [complete guide](http://daringfireball.net/projects/markdown/syntax), and the things [Markdown Extra adds](http://michelf.com/projects/php-markdown/extra/).  Also read what the userguide adds to markdown at the end of this readme.
+
+### Userguide pages
+
+Userguide pages are in the module they apply to, in `guide/<module>`. Documentation for Kohana is in `system/guide/kohana` and documentation for orm is in `modules/orm/guide/orm`, etc.
+
+Each module has an index page at `guide/<module>/index.md`.
+
+Each module's menu is in `guide/<module>/menu.md`. 
+
+### Images
+
+Any images used in the userguide pages must be in `media/guide/<module>/`.  For example, if a userguide page has `![Image Title](hello-world.jpg)` the image would be located at `media/guide/<module>/hello-world.jpg`.  Images for the ORM module are in `modules/orm/media/guide/orm`, and images for the Kohana docs are in `system/media/guide/kohana`.
+
+### API browser
+
+The API browser is generated from the actual source code.  The descriptions for classes, constants, properties, and methods is extracted from the comments and parsed in Markdown.  For example if you look in the comment for [Kohana_Core::init](http://github.com/kohana/core/blob/c443c44922ef13421f4a/classes/kohana/core.php#L5) you can see a markdown list and table.  These are parsed and show correctly in the API browser.  `@param`, `@uses`, `@throws`, `@returns` and other tags are parsed as well.
+
+## How to Contribute
+
+### If you don't know git, or you don't feel like you are a good documentation writer:
+
+Just submit a [bug report](http://dev.kohanaframework.org/projects/userguide3/issues/new) and explain what you think can be improved.  If you are a good writer but don't know git, just provide some content in your bug report and we will merge it in.
+
+### If you know git:
+
+**Short version**: Create a ticket on redmine for your changes, fork the module whose docs you wish to improve (e.g. `git://github.com/kohana/orm.git` or `git://github.com/kohana/core.git`), checkout the appropriate branch, make changes, and then send a pull request with the ticket number.
+
+**Long version:**  (This still assumes you at least know your way around git, especially how submodules work.)
+
+ 1. Create a ticket on redmine for your changes.
+
+ 2. Fork the specific repo you want to contribute to on github. (For example go to http://github.com/kohana/core and click the fork button.)
+
+ 3. Now go into the repo of the area of docs you want to contribute to and add your forked repo as a new remote, and push to it.
+ 
+		cd system
+		
+		# make sure we are up to date
+		git checkout 3.1/develop
+		git pull
+		
+		# add your repository as a new remote
+		git remote add <your name> git@github.com:<your name>/core.git
+		
+		# (make some changes to the docs)
+		
+		# now commit the changes and push to your repo
+		git commit
+		git push <your name> 3.1/develop
+
+ 4. Send a pull request on github containing the ticket number, and update the ticket with a link to the pull request.
+
+
+# What the userguide adds to markdown:
+
+In addition to the features and syntax of [Markdown](http://daringfireball.net/projects/markdown/) and [Markdown Extra](http://michelf.com/projects/php-markdown/extra/) the following apply to userguide pages and api documentation:
+
+### Namespacing
+
+The first thing to note is that all urls are "namespaced". The name of the module is automatically added to links and image urls, you do not need to include it.  For example, to link to the hello world tutorial page from another page in the Kohana userguide, you should use `[Hello World Tutorial](tutorials/hello-world)` rather than `(kohana/tutorials/hello-world)`.  To link to pages in a different section of the guide, you can use `../`, for example `[Cache](../cache/usage)`.
+
+### Notes
+
+If you put [!!] in front of line it will be a note, put in a box with a lightbulb.
+
+    [!!] This is a note.
+
+### Headers automatically get IDs
+
+Headers are automatically assigned an id, based on the content of the header, so each header can be linked to.  You can manually assign a different id using the syntax as defined in Markdown Extra.  If multiple headers have the same content, like if more than one header is "Examples", only the first will get be automatically assigned an id, so you should manually assign more descriptive ids.  For example:
+
+    ### Examples     {#header-id-examples}
+
+### API links
+
+You can make links to the api browser by wrapping any class name in brackets.  You may also include a function and it will link to that function.  All of the following will link to the API browser:
+
+    [Request]
+	[Request::factory]
+	[Request::factory()]
+
+If you want to have parameters, only put the brackets around the class and function (not the params), and put a backslash in front of the opening parenthesis. 
+
+	[Kohana::config]\('foobar','baz')
+
+### Including Views
+
+You may include a view by putting the name of the view in double curly brackets.  **If the view is not found, no exception or error will be shown!** The curly brackets and view will simply be shown an the page as is.
+
+    {{some/view}}
diff --git a/includes/kohana/modules/userguide/classes/controller/userguide.php b/includes/kohana/modules/userguide/classes/controller/userguide.php
new file mode 100644
index 0000000..f8b8690
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/controller/userguide.php
@@ -0,0 +1,390 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana user guide and api browser.
+ *
+ * @package    Kohana/Userguide
+ * @category   Controllers
+ * @author     Kohana Team
+ */
+class Controller_Userguide extends Controller_Template {
+
+	public $template = 'userguide/template';
+
+	// Routes
+	protected $media;
+	protected $api;
+	protected $guide;
+
+	public function before()
+	{
+		if ($this->request->action() === 'media')
+		{
+			// Do not template media files
+			$this->auto_render = FALSE;
+		}
+		else
+		{
+			// Grab the necessary routes
+			$this->media = Route::get('docs/media');
+			$this->guide = Route::get('docs/guide');
+
+			if (defined('MARKDOWN_PARSER_CLASS'))
+			{
+				throw new Kohana_Exception('Markdown parser already registered. Live documentation will not work in your environment.');
+			}
+
+			// Use customized Markdown parser
+			define('MARKDOWN_PARSER_CLASS', 'Kodoc_Markdown');
+
+			if ( ! class_exists('Markdown', FALSE))
+			{
+				// Load Markdown support
+				require Kohana::find_file('vendor', 'markdown/markdown');
+			}
+
+			// Set the base URL for links and images
+			Kodoc_Markdown::$base_url  = URL::site($this->guide->uri()).'/';
+			Kodoc_Markdown::$image_url = URL::site($this->media->uri()).'/';
+		}
+
+		parent::before();
+	}
+
+	// List all modules that have userguides
+	public function index()
+	{
+		$this->template->title = "Userguide";
+		$this->template->breadcrumb = array('User Guide');
+		$this->template->content = View::factory('userguide/index', array('modules' => $this->_modules()));
+		$this->template->menu = View::factory('userguide/menu', array('modules' => $this->_modules()));
+
+		// Don't show disqus on the index page
+		$this->template->hide_disqus = TRUE;
+	}
+
+	// Display an error if a page isn't found
+	public function error($message)
+	{
+		$this->response->status(404);
+		$this->template->title = "Userguide - Error";
+		$this->template->content = View::factory('userguide/error',array('message' => $message));
+
+		// Don't show disqus on error pages
+		$this->template->hide_disqus = TRUE;
+
+		// If we are in a module and that module has a menu, show that
+		if ($module = $this->request->param('module') AND $menu = $this->file($module.'/menu') AND Kohana::config('userguide.modules.'.$module.'.enabled'))
+		{
+			// Namespace the markdown parser
+			Kodoc_Markdown::$base_url  = URL::site($this->guide->uri()).'/'.$module.'/';
+			Kodoc_Markdown::$image_url = URL::site($this->media->uri()).'/'.$module.'/';
+
+			$this->template->menu = Markdown($this->_get_all_menu_markdown());
+			$this->template->breadcrumb = array(
+				$this->guide->uri() => 'User Guide',
+				$this->guide->uri(array('module' => $module)) => Kohana::config('userguide.modules.'.$module.'.name'),
+				'Error'
+			);
+		}
+		// If we are in the api browser, show the menu and show the api browser in the breadcrumbs
+		else if (Route::name($this->request->route()) == 'docs/api')
+		{
+			$this->template->menu = Kodoc::menu();
+
+			// Bind the breadcrumb
+			$this->template->breadcrumb = array(
+				$this->guide->uri(array('page' => NULL)) => 'User Guide',
+				$this->request->route()->uri() => 'API Browser',
+				'Error'
+			);
+		}
+		// Otherwise, show the userguide module menu on the side
+		else
+		{
+			$this->template->menu = View::factory('userguide/menu',array('modules' => $this->_modules()));
+			$this->template->breadcrumb = array($this->request->route()->uri() => 'User Guide','Error');
+		}
+	}
+
+	public function action_docs()
+	{
+		$module = $this->request->param('module');
+		$page = $this->request->param('page');
+
+		// Trim trailing slash
+		$page = rtrim($page, '/');
+
+		// If no module provided in the url, show the user guide index page, which lists the modules.
+		if ( ! $module)
+		{
+			return $this->index();
+		}
+
+		// If this module's userguide pages are disabled, show the error page
+		if ( ! Kohana::config('userguide.modules.'.$module.'.enabled'))
+		{
+			return $this->error(__('That module doesn\'t exist, or has userguide pages disabled.'));
+		}
+
+		// Prevent "guide/module" and "guide/module/index" from having duplicate content
+		if ( $page == 'index')
+		{
+			return $this->error(__('Userguide page not found'));
+		}
+
+		// If a module is set, but no page was provided in the url, show the index page
+		if ( ! $page )
+		{
+			$page = 'index';
+		}
+
+		// Find the markdown file for this page
+		$file = $this->file($module.'/'.$page);
+
+		// If it's not found, show the error page
+		if ( ! $file)
+		{
+			return $this->error(__('Userguide page not found'));
+		}
+
+		// Namespace the markdown parser
+		Kodoc_Markdown::$base_url  = URL::site($this->guide->uri()).'/'.$module.'/';
+		Kodoc_Markdown::$image_url = URL::site($this->media->uri()).'/'.$module.'/';
+
+		// Set the page title
+		$this->template->title = $page == 'index' ? Kohana::config('userguide.modules.'.$module.'.name') : $this->title($page);
+
+		// Parse the page contents into the template
+		Kodoc_Markdown::$show_toc = true;
+		$this->template->content = Markdown(file_get_contents($file));
+		Kodoc_Markdown::$show_toc = false;
+
+		// Attach this module's menu to the template
+		$this->template->menu = Markdown($this->_get_all_menu_markdown());
+
+		// Bind the breadcrumb
+		$this->template->bind('breadcrumb', $breadcrumb);
+
+		// Bind the copyright
+		$this->template->copyright = Kohana::config('userguide.modules.'.$module.'.copyright');
+
+		// Add the breadcrumb trail
+		$breadcrumb = array();
+		$breadcrumb[$this->guide->uri()] = __('User Guide');
+		$breadcrumb[$this->guide->uri(array('module' => $module))] = Kohana::config('userguide.modules.'.$module.'.name');
+
+		// TODO try and get parent category names (from menu).  Regex magic or javascript dom stuff perhaps?
+
+		// Only add the current page title to breadcrumbs if it isn't the index, otherwise we get repeats.
+		if ($page != 'index')
+		{
+			$breadcrumb[] = $this->template->title;
+		}
+	}
+
+	public function action_api()
+	{
+		// Enable the missing class autoloader.  If a class cannot be found a
+		// fake class will be created that extends Kodoc_Missing
+		spl_autoload_register(array('Kodoc_Missing', 'create_class'));
+
+		// Get the class from the request
+		$class = $this->request->param('class');
+
+		// If no class was passed to the url, display the API index page
+		if ( ! $class)
+		{
+			$this->template->title = __('Table of Contents');
+
+			$this->template->content = View::factory('userguide/api/toc')
+				->set('classes', Kodoc::class_methods())
+				->set('route', $this->request->route());
+		}
+		else
+		{
+			// Create the Kodoc_Class version of this class.
+			$_class = Kodoc_Class::factory($class);
+
+			// If the class requested and the actual class name are different
+			// (different case, orm vs ORM, auth vs Auth) redirect
+			if ($_class->class->name != $class)
+			{
+				$this->request->redirect($this->request->route()->uri(array('class'=>$_class->class->name)));
+			}
+
+			// If this classes immediate parent is Kodoc_Missing, then it should 404
+			if ($_class->class->getParentClass() AND $_class->class->getParentClass()->name == 'Kodoc_Missing')
+				return $this->error('That class was not found. Check your url and make sure that the module with that class is enabled.');
+
+			// If this classes package has been disabled via the config, 404
+			if ( ! Kodoc::show_class($_class))
+				return $this->error('That class is in package that is hidden.  Check the <code>api_packages</code> config setting.');
+
+			// Everything is fine, display the class.
+			$this->template->title = $class;
+
+			$this->template->content = View::factory('userguide/api/class')
+				->set('doc', Kodoc::factory($class))
+				->set('route', $this->request->route());
+		}
+
+		// Attach the menu to the template
+		$this->template->menu = Kodoc::menu();
+
+		// Bind the breadcrumb
+		$this->template->bind('breadcrumb', $breadcrumb);
+
+		// Get the docs URI
+		$guide = Route::get('docs/guide');
+
+		// Add the breadcrumb
+		$breadcrumb = array();
+		$breadcrumb[$this->guide->uri(array('page' => NULL))] = __('User Guide');
+		$breadcrumb[$this->request->route()->uri()] = 'API Browser';
+		$breadcrumb[] = $this->template->title;
+	}
+
+	public function action_media()
+	{
+		// Get the file path from the request
+		$file = $this->request->param('file');
+
+		// Find the file extension
+		$ext = pathinfo($file, PATHINFO_EXTENSION);
+
+		// Remove the extension from the filename
+		$file = substr($file, 0, -(strlen($ext) + 1));
+
+		if ($file = Kohana::find_file('media/guide', $file, $ext))
+		{
+			// Check if the browser sent an "if-none-match: <etag>" header, and tell if the file hasn't changed
+			$this->response->check_cache(sha1($this->request->uri()).filemtime($file), $this->request);
+
+			// Send the file content as the response
+			$this->response->body(file_get_contents($file));
+
+			// Set the proper headers to allow caching
+			$this->response->headers('content-type',  File::mime_by_ext($ext));
+			$this->response->headers('last-modified', date('r', filemtime($file)));
+		}
+		else
+		{
+			// Return a 404 status
+			$this->response->status(404);
+		}
+	}
+
+	public function after()
+	{
+		if ($this->auto_render)
+		{
+			// Get the media route
+			$media = Route::get('docs/media');
+
+			// Add styles
+			$this->template->styles = array(
+				$media->uri(array('file' => 'css/print.css'))  => 'print',
+				$media->uri(array('file' => 'css/screen.css')) => 'screen',
+				$media->uri(array('file' => 'css/kodoc.css'))  => 'screen',
+				$media->uri(array('file' => 'css/shCore.css')) => 'screen',
+				$media->uri(array('file' => 'css/shThemeKodoc.css')) => 'screen',
+			);
+
+			// Add scripts
+			$this->template->scripts = array(
+				$media->uri(array('file' => 'js/jquery.min.js')),
+				$media->uri(array('file' => 'js/jquery.cookie.js')),
+				$media->uri(array('file' => 'js/kodoc.js')),
+				// Syntax Highlighter
+				$media->uri(array('file' => 'js/shCore.js')),
+				$media->uri(array('file' => 'js/shBrushPhp.js')),
+			);
+
+			// Add languages
+			$this->template->translations = Kohana::message('userguide', 'translations');
+		}
+
+		return parent::after();
+	}
+
+	public function file($page)
+	{
+		return Kohana::find_file('guide', $page, 'md');
+	}
+
+	public function section($page)
+	{
+		$markdown = $this->_get_all_menu_markdown();
+
+		if (preg_match('~\*{2}(.+?)\*{2}[^*]+\[[^\]]+\]\('.preg_quote($page).'\)~mu', $markdown, $matches))
+		{
+			return $matches[1];
+		}
+
+		return $page;
+	}
+
+	public function title($page)
+	{
+		$markdown = $this->_get_all_menu_markdown();
+
+		if (preg_match('~\[([^\]]+)\]\('.preg_quote($page).'\)~mu', $markdown, $matches))
+		{
+			// Found a title for this link
+			return $matches[1];
+		}
+
+		return $page;
+	}
+
+	protected function _get_all_menu_markdown()
+	{
+		// Only do this once per request...
+		static $markdown = '';
+
+		if (empty($markdown))
+		{
+			// Get menu items
+			$file = $this->file($this->request->param('module').'/menu');
+
+			if ($file AND $text = file_get_contents($file))
+			{
+				// Add spans around non-link categories. This is a terrible hack.
+				//echo Kohana::debug($text);
+
+				//$text = preg_replace('/(\s*[\-\*\+]\s*)(.*)/','$1<span>$2</span>',$text);
+				$text = preg_replace('/^(\s*[\-\*\+]\s*)([^\[\]]+)$/m','$1<span>$2</span>',$text);
+				//echo Kohana::debug($text);
+				$markdown .= $text;
+			}
+
+		}
+
+		return $markdown;
+	}
+
+	// Get the list of modules from the config, and reverses it so it displays in the order the modules are added, but move Kohana to the top.
+	protected function _modules()
+	{
+		$modules = array_reverse(Kohana::config('userguide.modules'));
+
+		if (isset($modules['kohana']))
+		{
+			$kohana = $modules['kohana'];
+			unset($modules['kohana']);
+			$modules = array_merge(array('kohana' => $kohana), $modules);
+		}
+
+		// Remove modules that have been disabled via config
+		foreach ($modules as $key => $value)
+		{
+			if ( ! Kohana::config('userguide.modules.'.$key.'.enabled'))
+			{
+				unset($modules[$key]);
+			}
+		}
+
+		return $modules;
+	}
+
+} // End Userguide
diff --git a/includes/kohana/modules/userguide/classes/kodoc.php b/includes/kohana/modules/userguide/classes/kodoc.php
new file mode 100644
index 0000000..60484b2
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc extends Kohana_Kodoc {}
diff --git a/includes/kohana/modules/userguide/classes/kodoc/class.php b/includes/kohana/modules/userguide/classes/kodoc/class.php
new file mode 100644
index 0000000..f9037c0
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/class.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc_Class extends Kohana_Kodoc_Class {}
diff --git a/includes/kohana/modules/userguide/classes/kodoc/markdown.php b/includes/kohana/modules/userguide/classes/kodoc/markdown.php
new file mode 100644
index 0000000..0376f1a
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/markdown.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc_Markdown extends Kohana_Kodoc_Markdown {}
diff --git a/includes/kohana/modules/userguide/classes/kodoc/method.php b/includes/kohana/modules/userguide/classes/kodoc/method.php
new file mode 100644
index 0000000..4ff0e7b
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/method.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc_Method extends Kohana_Kodoc_Method {} 
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/classes/kodoc/method/param.php b/includes/kohana/modules/userguide/classes/kodoc/method/param.php
new file mode 100644
index 0000000..fa888d6
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/method/param.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc_Method_Param extends Kohana_Kodoc_Method_Param {}
diff --git a/includes/kohana/modules/userguide/classes/kodoc/missing.php b/includes/kohana/modules/userguide/classes/kodoc/missing.php
new file mode 100644
index 0000000..537de8f
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/missing.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Kodoc_Missing extends Kohana_Kodoc_Missing {  }
diff --git a/includes/kohana/modules/userguide/classes/kodoc/property.php b/includes/kohana/modules/userguide/classes/kodoc/property.php
new file mode 100644
index 0000000..eb5128e
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kodoc/property.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kodoc_Property extends Kohana_Kodoc_Property {}
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc.php b/includes/kohana/modules/userguide/classes/kohana/kodoc.php
new file mode 100644
index 0000000..8bdd9dc
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc.php
@@ -0,0 +1,354 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Documentation generator.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc {
+
+	/**
+	 * @var string  PCRE fragment for matching 'Class', 'Class::method', 'Class::method()' or 'Class::$property'
+	 */
+	public static $regex_class_member = '((\w++)(?:::(\$?\w++))?(?:\(\))?)';
+
+	/**
+	 * Make a class#member API link using an array of matches from [Kodoc::$regex_class_member]
+	 *
+	 * @param   array   $matches    array( 1 => link text, 2 => class name, [3 => member name] )
+	 * @return  string
+	 */
+	public static function link_class_member($matches)
+	{
+		$link = $matches[1];
+		$class = $matches[2];
+		$member = NULL;
+
+		if (isset($matches[3]))
+		{
+			// If the first char is a $ it is a property, e.g. Kohana::$base_url
+			if ($matches[3][0] === '$')
+			{
+				$member = '#property:'.substr($matches[3], 1);
+			}
+			else
+			{
+				$member = '#'.$matches[3];
+			}
+		}
+
+		return HTML::anchor(Route::get('docs/api')->uri(array('class' => $class)).$member, $link, NULL, NULL, TRUE);
+	}
+
+	public static function factory($class)
+	{
+		return new Kodoc_Class($class);
+	}
+
+	/**
+	 * Creates an html list of all classes sorted by category (or package if no category)
+	 *
+	 * @return   string   the html for the menu
+	 */
+	public static function menu()
+	{
+		$classes = Kodoc::classes();
+
+		foreach ($classes as $class)
+		{
+			if (isset($classes['kohana_'.$class]))
+			{
+				// Remove extended classes
+				unset($classes['kohana_'.$class]);
+			}
+		}
+
+		ksort($classes);
+
+		$menu = array();
+
+		$route = Route::get('docs/api');
+
+		foreach ($classes as $class)
+		{
+			$class = Kodoc_Class::factory($class);
+
+			// Test if we should show this class
+			if ( ! Kodoc::show_class($class))
+				continue;
+
+			$link = HTML::anchor($route->uri(array('class' => $class->class->name)), $class->class->name);
+
+			if (isset($class->tags['package']))
+			{
+				foreach ($class->tags['package'] as $package)
+				{
+					if (isset($class->tags['category']))
+					{
+						foreach ($class->tags['category'] as $category)
+						{
+							$menu[$package][$category][] = $link;
+						}
+					}
+					else
+					{
+						$menu[$package]['Base'][] = $link;
+					}
+				}
+			}
+			else
+			{
+				$menu['[Unknown]']['Base'][] = $link;
+			}
+		}
+
+		// Sort the packages
+		ksort($menu);
+
+		return View::factory('userguide/api/menu')
+			->bind('menu', $menu);
+	}
+
+	/**
+	 * Returns an array of all the classes available, built by listing all files in the classes folder and then trying to create that class.
+	 *
+	 * This means any empty class files (as in complety empty) will cause an exception
+	 *
+	 * @param   array   array of files, obtained using Kohana::list_files
+	 * @return  array   an array of all the class names
+	 */
+	public static function classes(array $list = NULL)
+	{
+		if ($list === NULL)
+		{
+			$list = Kohana::list_files('classes');
+		}
+
+		$classes = array();
+
+		foreach ($list as $name => $path)
+		{
+			if (is_array($path))
+			{
+				$classes += Kodoc::classes($path);
+			}
+			else
+			{
+				// Remove "classes/" and the extension
+				$class = substr($name, 8, -(strlen(EXT)));
+
+				// Convert slashes to underscores
+				$class = str_replace(DIRECTORY_SEPARATOR, '_', strtolower($class));
+
+				$classes[$class] = $class;
+			}
+		}
+
+		return $classes;
+	}
+
+	/**
+	 * Get all classes and methods of files in a list.
+	 *
+	 * >  I personally don't like this as it was used on the index page.  Way too much stuff on one page.  It has potential for a package index page though.
+	 * >  For example:  class_methods( Kohana::list_files('classes/sprig') ) could make a nice index page for the sprig package in the api browser
+	 * >     ~bluehawk
+	 *
+	 */
+	public static function class_methods(array $list = NULL)
+	{
+		$list = Kodoc::classes($list);
+
+		$classes = array();
+
+		foreach ($list as $class)
+		{
+			$_class = new ReflectionClass($class);
+
+			if (stripos($_class->name, 'Kohana_') === 0)
+			{
+				// Skip transparent extension classes
+				continue;
+			}
+
+			$methods = array();
+
+			foreach ($_class->getMethods() as $_method)
+			{
+				$declares = $_method->getDeclaringClass()->name;
+
+				if (stripos($declares, 'Kohana_') === 0)
+				{
+					// Remove "Kohana_"
+					$declares = substr($declares, 7);
+				}
+
+				if ($declares === $_class->name OR $declares === "Core")
+				{
+					$methods[] = $_method->name;
+				}
+			}
+
+			sort($methods);
+
+			$classes[$_class->name] = $methods;
+		}
+
+		return $classes;
+	}
+
+	/**
+	 * Parse a comment to extract the description and the tags
+	 *
+	 * @param   string  the comment retreived using ReflectionClass->getDocComment()
+	 * @return  array   array(string $description, array $tags)
+	 */
+	public static function parse($comment)
+	{
+		// Normalize all new lines to \n
+		$comment = str_replace(array("\r\n", "\n"), "\n", $comment);
+
+		// Remove the phpdoc open/close tags and split
+		$comment = array_slice(explode("\n", $comment), 1, -1);
+
+		// Tag content
+		$tags = array();
+
+		foreach ($comment as $i => $line)
+		{
+			// Remove all leading whitespace
+			$line = preg_replace('/^\s*\* ?/m', '', $line);
+
+			// Search this line for a tag
+			if (preg_match('/^@(\S+)(?:\s*(.+))?$/', $line, $matches))
+			{
+				// This is a tag line
+				unset($comment[$i]);
+
+				$name = $matches[1];
+				$text = isset($matches[2]) ? $matches[2] : '';
+
+				switch ($name)
+				{
+					case 'license':
+						if (strpos($text, '://') !== FALSE)
+						{
+							// Convert the lincense into a link
+							$text = HTML::anchor($text);
+						}
+					break;
+					case 'link':
+						$text = preg_split('/\s+/', $text, 2);
+						$text = HTML::anchor($text[0], isset($text[1]) ? $text[1] : $text[0]);
+					break;
+					case 'copyright':
+						if (strpos($text, '(c)') !== FALSE)
+						{
+							// Convert the copyright sign
+							$text = str_replace('(c)', '&copy;', $text);
+						}
+					break;
+					case 'throws':
+						if (preg_match('/^(\w+)\W(.*)$/', $text, $matches))
+						{
+							$text = HTML::anchor(Route::get('docs/api')->uri(array('class' => $matches[1])), $matches[1]).' '.$matches[2];
+						}
+						else
+						{
+							$text = HTML::anchor(Route::get('docs/api')->uri(array('class' => $text)), $text);
+						}
+					break;
+					case 'uses':
+						if (preg_match('/^'.Kodoc::$regex_class_member.'$/i', $text, $matches))
+						{
+							$text = Kodoc::link_class_member($matches);
+						}
+					break;
+					// Don't show @access lines, they are shown elsewhere
+					case 'access':
+						continue 2;
+				}
+
+				// Add the tag
+				$tags[$name][] = $text;
+			}
+			else
+			{
+				// Overwrite the comment line
+				$comment[$i] = (string) $line;
+			}
+		}
+
+		// Concat the comment lines back to a block of text
+		if ($comment = trim(implode("\n", $comment)))
+		{
+			// Parse the comment with Markdown
+			$comment = Markdown($comment);
+		}
+
+		return array($comment, $tags);
+	}
+
+	/**
+	 * Get the source of a function
+	 *
+	 * @param  string   the filename
+	 * @param  int      start line?
+	 * @param  int      end line?
+	 */
+	public static function source($file, $start, $end)
+	{
+		if ( ! $file) return FALSE;
+
+		$file = file($file, FILE_IGNORE_NEW_LINES);
+
+		$file = array_slice($file, $start - 1, $end - $start + 1);
+
+		if (preg_match('/^(\s+)/', $file[0], $matches))
+		{
+			$padding = strlen($matches[1]);
+
+			foreach ($file as & $line)
+			{
+				$line = substr($line, $padding);
+			}
+		}
+
+		return implode("\n", $file);
+	}
+
+	/**
+	 * Test whether a class should be shown, based on the api_packages config option
+	 *
+	 * @param  Kodoc_Class  the class to test
+	 * @return  bool  whether this class should be shown
+	 */
+	public static function show_class(Kodoc_Class $class)
+	{
+		$api_packages = Kohana::config('userguide.api_packages');
+
+		// If api_packages is true, all packages should be shown
+		if ($api_packages === TRUE)
+			return TRUE;
+
+		// Get the package tags for this class (as an array)
+		$packages = Arr::get($class->tags, 'package', array('None'));
+
+		$show_this = FALSE;
+
+		// Loop through each package tag
+		foreach ($packages as $package)
+		{
+			// If this package is in the allowed packages, set show this to true
+			if (in_array($package, explode(',', $api_packages)))
+				$show_this = TRUE;
+		}
+
+		return $show_this;
+	}
+
+
+} // End Kodoc
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/class.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/class.php
new file mode 100644
index 0000000..c6b182d
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/class.php
@@ -0,0 +1,216 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Class documentation generator.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc_Class extends Kodoc {
+
+	/**
+	 * @var  ReflectionClass The ReflectionClass for this class
+	 */
+	public $class;
+
+	/**
+	 * @var  string  modifiers like abstract, final
+	 */
+	public $modifiers;
+
+	/**
+	 * @var  string  description of the class from the comment
+	 */
+	public $description;
+
+	/**
+	 * @var  array  array of tags, retrieved from the comment
+	 */
+	public $tags = array();
+
+	/**
+	 * @var  array  array of this classes constants
+	 */
+	public $constants = array();
+
+	/**
+	 * Loads a class and uses [reflection](http://php.net/reflection) to parse
+	 * the class. Reads the class modifiers, constants and comment. Parses the
+	 * comment to find the description and tags.
+	 *
+	 * @param   string   class name
+	 * @return  void
+	 */
+	public function __construct($class)
+	{
+		$this->class = new ReflectionClass($class);
+
+		if ($modifiers = $this->class->getModifiers())
+		{
+			$this->modifiers = '<small>'.implode(' ', Reflection::getModifierNames($modifiers)).'</small> ';
+		}
+
+		if ($constants = $this->class->getConstants())
+		{
+			foreach ($constants as $name => $value)
+			{
+				$this->constants[$name] = Debug::vars($value);
+			}
+		}
+
+		$parent = $this->class;
+
+		do
+		{
+			if ($comment = $parent->getDocComment())
+			{
+				// Found a description for this class
+				break;
+			}
+		}
+		while ($parent = $parent->getParentClass());
+
+		list($this->description, $this->tags) = Kodoc::parse($comment);
+		
+		// If this class extends Kodoc_Missing, add a warning about possible
+		// incomplete documentation
+		$parent = $this->class;
+		
+		while ($parent = $parent->getParentClass())
+		{
+			if ($parent->name == 'Kodoc_Missing')
+			{
+				$warning = "[!!] **This class, or a class parent, could not be
+				           found or loaded. This could be caused by a missing
+						   module or other dependancy. The documentation for
+						   class may not be complete!**";
+				$this->description = Markdown($warning).$this->description;
+			}
+		}
+	}
+
+	/**
+	 * Gets a list of the class properties as [Kodoc_Property] objects.
+	 *
+	 * @return  array
+	 */
+	public function properties()
+	{
+		$props = $this->class->getProperties();
+
+		usort($props, array($this,'_prop_sort'));
+
+		foreach ($props as $key => $property)
+		{
+			// Create Kodoc Properties for each property
+			$props[$key] = new Kodoc_Property($this->class->name, $property->name);
+		}
+
+		return $props;
+	}
+	
+	protected function _prop_sort($a, $b)
+	{
+		// If one property is public, and the other is not, it goes on top
+		if ($a->isPublic() AND ( ! $b->isPublic()))
+			return -1;
+		if ($b->isPublic() AND ( ! $a->isPublic()))
+			return 1;
+		
+		// If one property is protected and the other is private, it goes on top
+		if ($a->isProtected() AND $b->isPrivate())
+			return -1;
+		if ($b->isProtected() AND $a->isPrivate())
+			return 1;
+		
+		// Otherwise just do alphabetical
+		return strcmp($a->name, $b->name);
+	}
+
+	/**
+	 * Gets a list of the class properties as [Kodoc_Method] objects.
+	 *
+	 * @return  array
+	 */
+	public function methods()
+	{
+		$methods = $this->class->getMethods();
+
+		usort($methods, array($this,'_method_sort'));
+
+		foreach ($methods as $key => $method)
+		{
+			$methods[$key] = new Kodoc_Method($this->class->name, $method->name);
+		}
+
+		return $methods;
+	}
+	
+	/**
+	 * Sort methods based on their visibility and declaring class based on:
+	 *  - methods will be sorted public, protected, then private.
+	 *  - methods that are declared by an ancestor will be after classes
+	 *    declared by the current class
+	 *  - lastly, they will be sorted alphabetically
+	 * 
+	 */
+	protected function _method_sort($a, $b)
+	{
+		// If one method is public, and the other is not, it goes on top
+		if ($a->isPublic() AND ( ! $b->isPublic()))
+			return -1;
+		if ($b->isPublic() AND ( ! $a->isPublic()))
+			return 1;
+		
+		// If one method is protected and the other is private, it goes on top
+		if ($a->isProtected() AND $b->isPrivate())
+			return -1;
+		if ($b->isProtected() AND $a->isPrivate())
+			return 1;
+		
+		// The methods have the same visibility, so check the declaring class depth:
+		
+		
+		/*
+		echo kohana::debug('a is '.$a->class.'::'.$a->name,'b is '.$b->class.'::'.$b->name,
+						   'are the classes the same?', $a->class == $b->class,'if they are, the result is:',strcmp($a->name, $b->name),
+						   'is a this class?', $a->name == $this->class->name,-1,
+						   'is b this class?', $b->name == $this->class->name,1,
+						   'otherwise, the result is:',strcmp($a->class, $b->class)
+						   );
+		*/
+
+		// If both methods are defined in the same class, just compare the method names
+		if ($a->class == $b->class)
+			return strcmp($a->name, $b->name);
+
+		// If one of them was declared by this class, it needs to be on top
+		if ($a->name == $this->class->name)
+			return -1;
+		if ($b->name == $this->class->name)
+			return 1;
+
+		// Otherwise, get the parents of each methods declaring class, then compare which function has more "ancestors"
+		$adepth = 0;
+		$bdepth = 0;
+
+		$parent = $a->getDeclaringClass();
+		do
+		{
+			$adepth++;
+		}
+		while ($parent = $parent->getParentClass());
+
+		$parent = $b->getDeclaringClass();
+		do
+		{
+			$bdepth++;
+		}
+		while ($parent = $parent->getParentClass());
+
+		return $bdepth - $adepth;
+	}
+
+} // End Kodac_Class
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/markdown.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/markdown.php
new file mode 100644
index 0000000..3562126
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/markdown.php
@@ -0,0 +1,264 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Custom Markdown parser for Kohana documentation.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc_Markdown extends MarkdownExtra_Parser {
+
+	/**
+	 * @var  string  base url for links
+	 */
+	public static $base_url = '';
+
+	/**
+	 * @var  string  base url for images
+	 */
+	public static $image_url = '';
+	
+	/**
+	 * Currently defined heading ids.  
+	 * Used to prevent creating multiple headings with same id.
+	 * @var array
+	 */
+	protected $_heading_ids = array();
+	
+	/**
+	 * @var  string   the generated table of contents
+	 */
+	protected static $_toc = "";
+	
+	/**
+	 * Slightly less terrible way to make it so the TOC only shows up when we
+	 * want it to.  set this to true to show the toc.
+	 */
+	public static $show_toc = false;
+	
+	public function __construct()
+	{
+		// doImage is 10, add image url just before
+		$this->span_gamut['doImageURL'] = 9;
+
+		// doLink is 20, add base url just before
+		$this->span_gamut['doBaseURL'] = 19;
+
+		// Add API links
+		$this->span_gamut['doAPI'] = 90;
+
+		// Add note spans last
+		$this->span_gamut['doNotes'] = 100;
+
+		// Parse Kohana view inclusions at the very end
+		$this->document_gamut['doIncludeViews'] = 99;
+
+		// Show table of contents for userguide pages
+		$this->document_gamut['doTOC'] = 100;
+
+		// PHP4 makes me sad.
+		parent::MarkdownExtra_Parser();
+	}
+	
+	/**
+	 * Callback for the heading setext style
+	 * 
+	 * Heading 1
+	 * =========
+	 *
+	 * @param  array    Matches from regex call
+	 * @return string   Generated html
+	 */
+	function _doHeaders_callback_setext($matches) 
+	{
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+			return $matches[0];
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		
+		// Only auto-generate id if one doesn't exist
+		if(empty($attr))
+			$attr = ' id="'.$this->make_heading_id($matches[1]).'"';
+		
+		// Add this header to the page toc
+		$this->_add_to_toc($level,$matches[1],$this->make_heading_id($matches[1]));
+		
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	
+	/**
+	 * Callback for the heading atx style
+	 *
+	 * # Heading 1
+	 *
+	 * @param  array    Matches from regex call
+	 * @return string   Generated html
+	 */
+	function _doHeaders_callback_atx($matches) 
+	{
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		
+		// Only auto-generate id if one doesn't exist
+		if(empty($attr))
+			$attr = ' id="'.$this->make_heading_id($matches[2]).'"';
+		
+		// Add this header to the page toc
+		$this->_add_to_toc($level,$matches[2],$this->make_heading_id($matches[2]));
+		
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+	
+	/**
+	 * Makes a heading id from the heading text
+	 * If any heading share the same name then subsequent headings will have an integer appended
+	 *
+	 * @param  string The heading text
+	 * @return string ID for the heading
+	 */
+	function make_heading_id($heading)
+	{
+		$id = url::title($heading, '-', TRUE);
+		
+		if(isset($this->_heading_ids[$id]))
+		{
+			$id .= '-';
+			
+			$count = 0;
+			
+			while (isset($this->_heading_ids[$id]) AND ++$count)
+			{
+				$id .= $count;
+			}
+		}		
+		
+		return $id;
+	}
+
+	public function doIncludeViews($text)
+	{
+		if (preg_match_all('/{{([^\s{}]++)}}/', $text, $matches, PREG_SET_ORDER))
+		{
+			$replace = array();
+
+			$replace = array();
+
+			foreach ($matches as $set)
+			{
+				list($search, $view) = $set;
+
+				try
+				{
+					$replace[$search] = View::factory($view)->render();
+				}
+				catch (Exception $e)
+				{
+					ob_start();
+
+					// Capture the exception handler output and insert it instead
+					Kohana_exception::handler($e);
+
+					$replace[$search] = ob_get_clean();
+				}
+			}
+
+			$text = strtr($text, $replace);
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Add the current base url to all local links.
+	 *
+	 *     [filesystem](about.filesystem "Optional title")
+	 *
+	 * @param   string  span text
+	 * @return  string
+	 */
+	public function doBaseURL($text)
+	{
+		// URLs containing "://" are left untouched
+		return preg_replace('~(?<!!)(\[.+?\]\()(?!\w++://)(?!#)(\S*(?:\s*+".+?")?\))~', '$1'.Kodoc_Markdown::$base_url.'$2', $text);
+	}
+
+	/**
+	 * Add the current base url to all local images.
+	 *
+	 *     ![Install Page](img/install.png "Optional title")
+	 *
+	 * @param   string  span text
+	 * @return  string
+	 */
+	public function doImageURL($text)
+	{
+		// URLs containing "://" are left untouched
+		return preg_replace('~(!\[.+?\]\()(?!\w++://)(\S*(?:\s*+".+?")?\))~', '$1'.Kodoc_Markdown::$image_url.'$2', $text);
+	}
+
+	/**
+	 * Parses links to the API browser.
+	 *
+	 *     [Class_Name], [Class::method] or [Class::$property]
+	 *
+	 * @param   string   span text
+	 * @return  string
+	 */
+	public function doAPI($text)
+	{
+		return preg_replace_callback('/\['.Kodoc::$regex_class_member.'\]/i', 'Kodoc::link_class_member', $text);
+	}
+
+	/**
+	 * Wrap notes in the applicable markup. Notes can contain single newlines.
+	 *
+	 *     [!!] Remember the milk!
+	 *
+	 * @param   string  span text
+	 * @return  string
+	 */
+	public function doNotes($text)
+	{
+		if ( ! preg_match('/^\[!!\]\s*+(.+?)(?=\n{2,}|$)/s', $text, $match))
+		{
+			return $text;
+		}
+
+		return $this->hashBlock('<p class="note">'.$match[1].'</p>');
+	}
+	
+	protected function _add_to_toc($level, $name, $id)
+	{
+		self::$_toc[] = array(
+			'level' => $level,
+			'name'  => $name,
+			'id'    => $id);
+	}
+	
+	public function doTOC($text)
+	{
+		// Only add the toc do userguide pages, not api since they already have one
+		if (self::$show_toc AND Route::name(Request::current()->route()) == "docs/guide")
+		{
+			$toc = View::factory('userguide/page-toc')
+				->set('array', self::$_toc)
+				->render()
+				;
+
+			if (($offset = strpos($text, '<p>')) !== FALSE)
+			{
+				// Insert the page TOC just before the first <p>, which every
+				// Markdown page should (will?) have.
+				$text = substr_replace($text, $toc, $offset, 0);
+			}
+		}
+
+		return $text;
+	}
+
+} // End Kodoc_Markdown
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/method.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/method.php
new file mode 100644
index 0000000..025055f
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/method.php
@@ -0,0 +1,141 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Class method documentation generator.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc_Method extends Kodoc {
+
+	/**
+	 * @var  ReflectionMethod   The ReflectionMethod for this class
+	 */
+	public $method;
+
+	/**
+	 * @var  array    array of Kodoc_Method_Param
+	 */
+	public $params;
+
+	/**
+	 * @var  array   the things this function can return
+	 */
+	public $return = array();
+
+	/**
+	 * @var  string  the source code for this function
+	 */
+	public $source;
+
+	public function __construct($class, $method)
+	{
+		$this->method = new ReflectionMethod($class, $method);
+
+		$this->class = $parent = $this->method->getDeclaringClass();
+
+		if ($modifiers = $this->method->getModifiers())
+		{
+			$this->modifiers = '<small>'.implode(' ', Reflection::getModifierNames($modifiers)).'</small> ';
+		}
+
+		do
+		{
+			if ($parent->hasMethod($method) AND $comment = $parent->getMethod($method)->getDocComment())
+			{
+				// Found a description for this method
+				break;
+			}
+		}
+		while ($parent = $parent->getParentClass());
+
+		list($this->description, $tags) = Kodoc::parse($comment);
+
+		if ($file = $this->class->getFileName())
+		{
+			$this->source = Kodoc::source($file, $this->method->getStartLine(), $this->method->getEndLine());
+		}
+
+		if (isset($tags['param']))
+		{
+			$params = array();
+
+			foreach ($this->method->getParameters() as $i => $param)
+			{
+				$param = new Kodoc_Method_Param(array($this->method->class, $this->method->name),$i);
+
+				if (isset($tags['param'][$i]))
+				{
+					preg_match('/^(\S+)(?:\s*(?:\$'.$param->name.'\s*)?(.+))?$/', $tags['param'][$i], $matches);
+
+					$param->type = $matches[1];
+
+					if (isset($matches[2]))
+					{
+						$param->description = ucfirst($matches[2]);
+					}
+				}
+				$params[] = $param;
+			}
+
+			$this->params = $params;
+
+			unset($tags['param']);
+		}
+
+		if (isset($tags['return']))
+		{
+			foreach ($tags['return'] as $return)
+			{
+				if (preg_match('/^(\S*)(?:\s*(.+?))?$/', $return, $matches))
+				{
+					$this->return[] = array($matches[1], isset($matches[2]) ? $matches[2] : '');
+				}
+			}
+
+			unset($tags['return']);
+		}
+
+		$this->tags = $tags;
+	}
+
+	public function params_short()
+	{
+		$out = '';
+		$required = TRUE;
+		$first = TRUE;
+		foreach ($this->params as $param)
+		{
+			if ($required AND $param->default AND $first)
+			{
+				$out .= '[ '.$param;
+				$required = FALSE;
+				$first = FALSE;
+			}
+			elseif ($required AND $param->default)
+			{
+				$out .= '[, '.$param;
+				$required = FALSE;
+			}
+			elseif ($first)
+			{
+				$out .= $param;
+				$first = FALSE;
+			}
+			else
+			{
+				$out .= ', '.$param;
+			}
+		}
+
+		if ( ! $required)
+		{
+			$out .= '] ';
+		}
+
+		return $out;
+	}
+
+} // End Kodoc_Method
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/method/param.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/method/param.php
new file mode 100644
index 0000000..33ff592
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/method/param.php
@@ -0,0 +1,101 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Class method parameter documentation generator.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc_Method_Param extends Kodoc {
+
+	/**
+	 * @var  object  ReflectionParameter for this property
+	 */
+	public $param;
+
+	/**
+	 * @var  string  name of this var
+	 */
+	public $name;
+
+	/**
+	 * @var  string  variable type, retrieved from the comment
+	 */
+	public $type;
+
+	/**
+	 * @var  string  default value of this param
+	 */
+	public $default;
+
+	/**
+	 * @var  string  description of this parameter
+	 */
+	public $description;
+
+	/**
+	 * @var  boolean  is the parameter passed by reference?
+	 */
+	public $reference = FALSE;
+
+	/**
+	 * @var  boolean  is the parameter optional?
+	 */
+	public $optional = FALSE;
+
+	public function __construct($method, $param)
+	{
+		$this->param = new ReflectionParameter($method, $param);
+
+		$this->name = $this->param->name;
+
+		if ($this->param->isDefaultValueAvailable())
+		{
+			$this->default = Debug::dump($this->param->getDefaultValue());
+		}
+
+		if ($this->param->isPassedByReference())
+		{
+			$this->reference = TRUE;
+		}
+
+		if ($this->param->isOptional())
+		{
+			$this->optional = TRUE;
+		}
+	}
+
+	public function __toString()
+	{
+		$display = '';
+
+		if ($this->type)
+		{
+			$display .= '<small>'.$this->type.'</small> ';
+		}
+
+		if ($this->reference)
+		{
+			$display .= '<small><abbr title="passed by reference">&</abbr></small> ';
+		}
+
+		if ($this->description)
+		{
+			$display .= '<span class="param" title="'.$this->description.'">$'.$this->name.'</span> ';
+		}
+		else
+		{
+			$display .= '$'.$this->name.' ';
+		}
+
+		if ($this->default)
+		{
+			$display .= '<small>= '.$this->default.'</small> ';
+		}
+
+		return $display;
+	}
+
+} // End Kodoc_Method_Param
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/missing.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/missing.php
new file mode 100644
index 0000000..b3ebcdf
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/missing.php
@@ -0,0 +1,36 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Set Kodoc_Missing::create_class as an autoloading to prevent missing classes
+ * from crashing the api browser.  Classes that are missing a parent will
+ * extend this class, and get a warning in the API browser.
+ *
+ * @package    Kohana/Userguide
+ * @category   Undocumented
+ * @author     Kohana Team
+ * @since      3.0.7
+ */
+abstract class Kohana_Kodoc_Missing {
+
+	/**
+	 * Creates classes when they are otherwise not found.
+	 *
+	 *     Kodoc::create_class('ThisClassDoesNotExist');
+	 *
+	 * [!!] All classes created will extend [Kodoc_Missing].
+	 *
+	 * @param   string   class name
+	 * @return  boolean
+	 * @since   3.0.7
+	 */
+	public static function create_class($class)
+	{
+		if ( ! class_exists($class))
+		{
+			// Create a new missing class
+			eval("class {$class} extends Kodoc_Missing {}");
+		}
+
+		return TRUE;
+	}
+
+} // End Kohana_Kodoc_Missing
diff --git a/includes/kohana/modules/userguide/classes/kohana/kodoc/property.php b/includes/kohana/modules/userguide/classes/kohana/kodoc/property.php
new file mode 100644
index 0000000..1c87369
--- /dev/null
+++ b/includes/kohana/modules/userguide/classes/kohana/kodoc/property.php
@@ -0,0 +1,83 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Class property documentation generator.
+ *
+ * @package    Kohana/Userguide
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Kodoc_Property extends Kodoc {
+
+	/**
+	 * @var  object  ReflectionProperty
+	 */
+	public $property;
+
+	/**
+	 * @var  string   modifiers: public, private, static, etc
+	 */
+	public $modifiers = 'public';
+
+	/**
+	 * @var  string  variable type, retrieved from the comment
+	 */
+	public $type;
+
+	/**
+	 * @var  string  value of the property
+	 */
+	public $value;
+
+	public function __construct($class, $property)
+	{
+		$property = new ReflectionProperty($class, $property);
+
+		list($description, $tags) = Kodoc::parse($property->getDocComment());
+
+		$this->description = $description;
+
+		if ($modifiers = $property->getModifiers())
+		{
+			$this->modifiers = '<small>'.implode(' ', Reflection::getModifierNames($modifiers)).'</small> ';
+		}
+
+		if (isset($tags['var']))
+		{
+			if (preg_match('/^(\S*)(?:\s*(.+?))?$/', $tags['var'][0], $matches))
+			{
+				$this->type = $matches[1];
+
+				if (isset($matches[2]))
+				{
+					$this->description = Markdown($matches[2]);
+				}
+			}
+		}
+
+		$this->property = $property;
+		
+		// Show the value of static properties, but only if they are public or we are php 5.3 or higher and can force them to be accessible
+		if ($property->isStatic() AND ($property->isPublic() OR version_compare(PHP_VERSION, '5.3', '>=')))
+		{
+			// Force the property to be accessible
+			if (version_compare(PHP_VERSION, '5.3', '>='))
+			{
+				$property->setAccessible(TRUE);
+			}
+			
+			// Don't debug the entire object, just say what kind of object it is
+			if (is_object($property->getValue($class)))
+			{
+				$this->value = '<pre>object '.get_class($property->getValue($class)).'()</pre>';
+			}
+			else
+			{
+				$this->value = Debug::vars($property->getValue($class));
+			}
+		}
+		
+	}
+
+} // End Kodoc_Property
diff --git a/includes/kohana/modules/userguide/config/userguide.php b/includes/kohana/modules/userguide/config/userguide.php
new file mode 100644
index 0000000..9b5d252
--- /dev/null
+++ b/includes/kohana/modules/userguide/config/userguide.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') OR die('No direct access allowed.');
+
+return array
+(
+	// Enable the API browser.  TRUE or FALSE
+	'api_browser'  => TRUE,
+	
+	// Enable these packages in the API browser.  TRUE for all packages, or a string of comma seperated packages, using 'None' for a class with no @package
+	// Example: 'api_packages' => 'Kohana,Kohana/Database,Kohana/ORM,None',
+	'api_packages' => TRUE,
+	
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'userguide' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Userguide',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Documentation viewer and api generation.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2011 Kohana Team',
+		)	
+	)
+);
diff --git a/includes/kohana/modules/userguide/guide/de-de/about.conventions.md b/includes/kohana/modules/userguide/guide/de-de/about.conventions.md
new file mode 100644
index 0000000..42f02aa
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/de-de/about.conventions.md
@@ -0,0 +1,300 @@
+# Regeln
+
+Es wird dazu ermutigt, dem Kohana [Programmierstil](http://dev.kohanaframework.org/wiki/kohana2/CodingStyle) zu folgen. Dieser benutzt den [Allman/BSD](http://de.wikipedia.org/wiki/Einr%C3%BCckungsstil#Allman_.2F_BSD_.2F_.E2.80.9EEast_Coast.E2.80.9C_.2F_Horstmann)-Stil.
+
+## Klassennamen und Dateilage {#classes}
+
+Das automatische Laden von Klassen wird durch ihre strengen Namensregeln erm�glicht. Die Klassen beginnen mit einem Gro�buchstaben und ihre W�rter werden durch Unterstriche getrennt. Diese sind entscheidend, an welcher Stelle die Klasse im Dateisystem gefunden wird. 
+
+Folgende Regeln gelten:
+
+1. Binnenversalien (camelCase) sollten nicht benutzt werden, au�er wenn eine weitere Ordner-Ebene unerw�nscht ist
+2. alle Datei- und Verzeichnisnamen in Kleinbuchstaben
+3. alle Klassen werden im `classes`-Verzeichnis in jeder Ebene des [Kaskaden-Dateisystem](about.filesystem) zusammengefasst
+
+[!!] Im Gegensatz zu Kohana v2.x besteht keine Unterteilung zwischen "Controllern", "Models", "Bibliotheken" und "Helfern". Alle Klassen befinden sich im "classes/"-Verzeichnis, unabh�ngig ob es statische "Helfer" oder Objekt-"Bibliotheken" sind. Man kann irgendeinen Klassen-Aufbau (statische Klasse, Singleton, Adapter) verwenden, den man mag.
+
+## Beispiele
+
+Denk daran, dass der Unterstrich in Klassennamen eine tiefere Verzeichnisebene bedeutet. Beachte folgende Beispiele:
+
+Klassenname           | Dateipfad
+----------------------|-------------------------------
+Controller_Template   | classes/controller/template.php
+Model_User            | classes/model/user.php
+Database              | classes/database.php
+Database_Query        | classes/database/query.php
+Form                  | classes/form.php
+
+## Programmierstil {#coding_standards}
+
+Um einen sehr konsistenten Quelltext zu produzieren, bitten wir jeden den folgenden Programmierstil so genau wie m�glich umzusetzen.
+
+### Klammerung
+
+Bitte benutze den den [Allman/BSD](http://de.wikipedia.org/wiki/Einr%C3%BCckungsstil#Allman_.2F_BSD_.2F_.E2.80.9EEast_Coast.E2.80.9C_.2F_Horstmann)-Stil.
+
+### Namensregeln
+
+Kohana benutzt f�r Namen Unter_striche, keine BinnenVersalien (camelCase).
+
+#### Klassen
+
+	// Libary
+	class Beer {
+
+	// Libary extension, uses Kohana_ prefix
+	class Beer extends Kohana_Beer {
+
+	// Controller class, uses Controller_ prefix
+	class Controller_Apple extends Controller {
+
+	// Model class, uses Model_ prefix
+	class Model_Cheese extends Model {
+
+	// Helper class, cf. libary
+	class peanut {
+
+Benutze keine Klammern, wenn eine Klasseninstanz erstellt, aber keine Parameter �bergibt:
+
+	// Correct:
+	$db = new Database;
+
+	// Incorrect:
+	$db = new Database();
+
+#### Funktionen und Methoden
+
+Funktionen sollten kleingeschrieben sein und Unter_striche zur Worttrennung benutzen:
+
+	function drink_beverage($beverage)
+	{
+
+#### Variablen
+
+Alle Variablen sollten ebenfalls kleingeschrieben sein und Unter_striche benutzen, keine BinnenVersalien (camelCase):
+
+	// Correct:
+	$foo = 'bar';
+	$long_example = 'uses underscores';
+
+	// Incorrect:
+	$weDontWantThis = 'understood?';
+
+### Einr�ckung
+
+Du musst zur Einr�ckung deines Quelltextes Tabulatoren benutzen. Leerzeichen f�r Tabellarisierung zu verwenden, ist strengstens verboten.
+
+Vertikaler Abstand (bei Mehrzeiligkeit) wird mit Leerzeichen gemacht. Tabulatoren sind schlecht f�r die vertikale Ausrichtung, weil verschiedene Leute unterschiedliche Tabulatoren-Breiten haben.
+
+	$text = 'this is a long text block that is wrapped. Normally, we aim for '
+		  . 'wrapping at 80 chars. Vertical alignment is very important for '
+		  . 'code readability. Remember that all indentation is done with tabs,'
+		  . 'but vertical alignment should be completed with spaces, after '
+		  . 'indenting with tabs.';
+
+### Zeichenkettenverkn�pfung
+
+Setze keine Leerzeichen um den Verkn�pfungsoperator:
+
+	// Correct:
+	$str = 'one'.$var.'two';
+
+	// Incorrect:
+	$str = 'one'. $var .'two';
+	$str = 'one' . $var . 'two';
+
+### Einzeilige Ausdr�cke
+
+Einzeilige IF-Bedingungen sollten nur bei Anweisungen benutzt werden, die die normale Verarbeitung unterbrechen (z.B. return oder continue):
+
+	// Acceptable:
+	if ($foo == $bar)
+		return $foo;
+
+	if ($foo == $bar)
+		continue;
+
+	if ($foo == $bar)
+		break;
+
+	if ($foo == $bar)
+		throw new Exception('You screwed up!');
+
+	// Not acceptable:
+	if ($baz == $bun)
+		$baz = $bar + 2;
+
+### Vergleichsoperatoren
+
+Bitte benutze OR and AND:
+
+	// Correct:
+	if (($foo AND $bar) OR ($b AND $c))
+
+	// Incorrect:
+	if (($foo && $bar) || ($b && $c))
+	
+Bitte benutze elseif, nicht else if:
+
+	// Correct:
+	elseif ($bar)
+
+	// Incorrect:
+	else if($bar)
+
+### Switch structures
+
+Each case, break and default should be on a separate line. The block inside a case or default must be indented by 1 tab.
+
+	switch ($var)
+	{
+		case 'bar':
+		case 'foo':
+			echo 'hello';
+		break;
+		case 1:
+			echo 'one';
+		break;
+		default:
+			echo 'bye';
+		break;
+	}
+
+### Parentheses
+
+There should be one space after statement name, followed by a parenthesis. The ! (bang) character must have a space on either side to ensure maximum readability. Except in the case of a bang or type casting, there should be no whitespace after an opening parenthesis or before a closing parenthesis.
+
+	// Correct:
+	if ($foo == $bar)
+	if ( ! $foo)
+
+	// Incorrect:
+	if($foo == $bar)
+	if(!$foo)
+	if ((int) $foo)
+	if ( $foo == $bar )
+	if (! $foo)
+
+### Ternaries
+
+All ternary operations should follow a standard format. Use parentheses around expressions only, not around just variables.
+
+	$foo = ($bar == $foo) ? $foo : $bar;
+	$foo = $bar ? $foo : $bar;
+
+All comparisons and operations must be done inside of a parentheses group:
+
+	$foo = ($bar > 5) ? ($bar + $foo) : strlen($bar);
+
+When separating complex ternaries (ternaries where the first part goes beyond ~80 chars) into multiple lines, spaces should be used to line up operators, which should be at the front of the successive lines:
+
+	$foo = ($bar == $foo)
+		 ? $foo
+		 : $bar;
+
+### Type Casting
+
+Type casting should be done with spaces on each side of the cast:
+
+	// Correct:
+	$foo = (string) $bar;
+	if ( (string) $bar)
+
+	// Incorrect:
+	$foo = (string)$bar;
+
+When possible, please use type casting instead of ternary operations:
+
+	// Correct:
+	$foo = (bool) $bar;
+
+	// Incorrect:
+	$foo = ($bar == TRUE) ? TRUE : FALSE;
+
+When casting type to integer or boolean, use the short format:
+
+	// Correct:
+	$foo = (int) $bar;
+	$foo = (bool) $bar;
+
+	// Incorrect:
+	$foo = (integer) $bar;
+	$foo = (boolean) $bar;
+
+### Constants
+
+Always use uppercase for constants:
+
+	// Correct:
+	define('MY_CONSTANT', 'my_value');
+	$a = TRUE;
+	$b = NULL;
+
+	// Incorrect:
+	define('MyConstant', 'my_value');
+	$a = True;
+	$b = null;
+
+Place constant comparisons at the end of tests:
+
+	// Correct:
+	if ($foo !== FALSE)
+
+	// Incorrect:
+	if (FALSE !== $foo)
+
+This is a slightly controversial choice, so I will explain the reasoning. If we were to write the previous example in plain English, the correct example would read:
+
+	if variable $foo is not exactly FALSE
+
+And the incorrect example would read:
+
+	if FALSE is not exactly variable $foo
+
+Since we are reading left to right, it simply doesn't make sense to put the constant first.
+
+### Comments
+
+#### One-line comments
+
+Use //, preferably above the line of code you're commenting on. Leave a space after it and start with a capital. Never use #.
+
+	// Correct
+
+	//Incorrect
+	// incorrect
+	# Incorrect
+
+### Regular expressions
+
+When coding regular expressions please use PCRE rather than the POSIX flavor. PCRE is considered more powerful and faster.
+
+	// Correct:
+	if (preg_match('/abc/i'), $str)
+
+	// Incorrect:
+	if (eregi('abc', $str))
+
+Use single quotes around your regular expressions rather than double quotes. Single-quoted strings are more convenient because of their simplicity. Unlike double-quoted strings they don't support variable interpolation nor integrated backslash sequences like \n or \t, etc.
+
+	// Correct:
+	preg_match('/abc/', $str);
+
+	// Incorrect:
+	preg_match("/abc/", $str);
+
+When performing a regular expression search and replace, please use the $n notation for backreferences. This is preferred over \\n.
+
+	// Correct:
+	preg_replace('/(\d+) dollar/', '$1 euro', $str);
+
+	// Incorrect:
+	preg_replace('/(\d+) dollar/', '\\1 euro', $str);
+
+Finally, please note that the $ character for matching the position at the end of the line allows for a following newline character. Use the D modifier to fix this if needed. [More info](http://blog.php-security.org/archives/76-Holes-in-most-preg_match-filters.html).
+
+	$str = "email@example.com\n";
+
+	preg_match('/^.+@.+$/', $str);  // TRUE
+	preg_match('/^.+@.+$/D', $str); // FALSE
diff --git a/includes/kohana/modules/userguide/guide/de-de/about.kohana.md b/includes/kohana/modules/userguide/guide/de-de/about.kohana.md
new file mode 100644
index 0000000..68af7fb
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/de-de/about.kohana.md
@@ -0,0 +1,15 @@
+# Was ist Kohana?
+
+Kohana ist ein Open-Source-basiertes, [objektorientiertes](http://de.wikipedia.org/wiki/Objektorientierte_Programmierung) [MVC](http://de.wikipedia.org/wiki/Model_View_Controller "Model View Controller")-[Webframework](http://de.wikipedia.org/wiki/Web_Application_Framework) unter Verwendung von [PHP5](http://php.net/manual/de/intro-whatis "PHP Hypertext Preprocessor"). Es wird von Freiwilligen entwickelt, das darauf abzielt schnell, sicher und schlank zu sein.
+
+[!!] Kohana ist unter der [BSD-Lizenz](http://kohanaframework.org/license) ver�ffentlicht, so dass man es rechtlich f�r alle Arten von Open-Source-, kommerzieller oder privater Projekte nutzen kann.
+
+## Was macht Kohana besonders?
+
+Durch den einzigartigen [Dateisystem](about.filesystem)-Aufbau ist alles erweiterbar und man braucht wenige oder keine [Einstellungen](about.configuration) vornehmen. Die [Fehlerbehandlung](debugging.errors) hilft, die Fehlerquelle schnell zu finden, und die [Fehlersuche](debugging) und [Programmanalyse](debugging.profiling) erm�glichen einen Einblick in die Anwendung.
+
+Um die Sicherheit deiner Anwendung zu unterst�tzen, enth�lt Kohana Werkzeuge f�r [XSS-Entfernung](security.xss), [Eingabe-�berpr�fung](security.validation), [signierte Cookies](security.cookies), [Formular](security.forms)- und [HTML](security.html)-Erstellung. Die [Datenbank](security.database)-Schicht bietet Schutz vor [SQL-Injection](http://de.wikipedia.org/wiki/SQL-Injection). Nat�rlich wurde der gesamte offizielle Quelltext sorgf�ltig geschrieben und auf Sicherheit gepr�ft.
+
+## Diese Dokumentation ist schei�e!
+
+Wir bem�hen uns um eine vollst�ndige Dokumentation. Wenn eine Frage trotzdem offen bleibt, versuche es beim [inoffiziellen Wiki](http://kerkness.ca/wiki/doku.php). Wenn du etwas zum Handbuch beitragen oder �ndern willst, erstelle bitte [eine Kopie](http://github.com/kohana/userguide), bearbeite sie und stelle eine Anfrage zur Zusammenf�hrung. Falls du nicht mit git vertraut bist, kannst du auch ein [Feature-Vorschlag](http://dev.kohanaframework.org/projects/kohana3/issues) (Anmeldung erforderlich) machen.
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/developers.md b/includes/kohana/modules/userguide/guide/developers.md
new file mode 100644
index 0000000..80709ef
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/developers.md
@@ -0,0 +1,150 @@
+# Distributed Source Control Management
+
+Unlike SVN, git does not used a central repository. This is why git is "distributed" and SVN is
+"centralized". Although this makes git an extremely powerful system for collaborators, tracking
+changes between various collaborators can quickly become difficult as multiple forks are created.
+
+Please read the following before working with this code:
+
+1. [Dealing with newlines](http://github.com/guides/dealing-with-newlines-in-git)
+2. [Submitting changes from your fork](http://github.com/guides/fork-a-project-and-submit-your-modifications)
+3. [Using SSH keys with github](http://github.com/guides/how-to-not-have-to-type-your-password-for-every-push)
+
+## Managing Remote Repositories
+
+First, you will need to tell git about the remote repository:
+
+    > git remote add kohana git://github.com/kohana/kohana.git
+
+This tells git about the kohana repository and gives it a name which we can use to refer to it when
+fetching changes from the repository.
+
+## Developing locally
+
+There are 3 branches in all the kohana repositories:
+
+* **master** This branch always points to the latest release tag. In essence it points to the last stable edition of the codebase
+* **3.0.x**  This is a release branch for development of the 3.0.x series, i.e. 3.0, 3.0.3, 3.0.8 etc.
+* **3.1.x**  This is a release branch for development of the 3.1.x series, i.e. 3.1, 3.1.4, 3.1.14 etc.
+
+To work on a specific release branch you need to check it out then check out the appropriate branches.
+Release branch names follow the same convention in both kohana/kohana and kohana/core.
+
+To work on 3.0.x you'd do the following:
+
+	> git clone git://github.com/kohana/kohana.git
+	....
+	
+	> cd kohana
+	> git submodule update --init
+	....
+
+	> git checkout 3.0.x
+	Switched to branch '3.0.x'
+	> git submodule update 
+
+	> cd system
+	> git checkout 3.0.x
+	# Switched to branch 3.0.x
+
+It's important that you follow the last step, because unlike svn, git submodules point at a
+specific commit rather than the tip of a branch.  If you cd into the system folder after
+a `git submodule update` and run `git status` you'll be told:
+
+	# Not currently on any branch.
+	nothing to commit (working directory clean)
+
+Similarly, if you want to work on modules, make sure you checkout the correct branch before you start working.
+
+**IMPORTANT:** It is highly recommended that you run the unit tests whilst developing to
+ensure that any changes you make do not break the api. *See TESTING.md for more info*
+
+### Creating new features
+
+New features or API breaking modifications should be developed in separate branches so as to isolate them
+until they're stable and **tests have been written for the feature**.
+
+The naming convention for feature branches is:
+
+	feature/{issue number}-{short hyphenated description}
+	
+	// i.e.
+
+	feature/4045-rewriting-config-system
+	
+When a new feature is complete and tested it can be merged into its respective release branch using
+`git pull --no-ff`. The `--no-ff` switch is important as it tells git to always create a commit
+detailing what branch you're merging from. This makes it a lot easier to analyse a feature's history.
+
+Here's a quick example:
+
+	> git status
+	# On branch feature/4045-rewriting-everything
+	
+	> git checkout 3.1.x
+	# Switched to branch '3.1.x'
+
+	> git merge --no-ff feature/4045-rewriting-everything
+
+**If a change you make intentionally breaks the api then please correct the relevant tests before pushing!**
+
+### Bug fixing 
+
+If you're making a bugfix then before you start create a unit test which reproduces the bug,
+using the `@ticket` notation in the test to reference the bug's issue number
+(i.e. `@ticket 4045` for issue #4045). 
+
+If you run the test then the one you've just made should fail.
+
+Once you've written the bugfix, run the tests again before you commit to make sure that the
+fix actually works,then commiti both the fix and the test.
+
+There is no need to create separate branches for bugfixes, creating them in the main release
+branch is perfectly acceptable.
+
+## Merging Changes from Remote Repositories
+
+Now that you have a remote repository, you can pull changes in the remote "kohana" repository
+into your local repository:
+
+    > git pull kohana master
+
+**Note:** Before you pull changes you should make sure that any modifications you've made locally
+have been committed.
+
+Sometimes a commit you've made locally will conflict with one made in the "kohana" one.
+
+There are a couple of scenarios where this might happen:
+
+### The conflict is to do with a few unrelated commits and you want to keep changes made in both commits
+
+You'll need to manually modify the files to resolve the conflict, see the "Resolving a merge"
+section [in the git-scm book](http://book.git-scm.com/3_basic_branching_and_merging.html) for more info
+
+### You've fixed something locally which someone else has already done in the remote repo
+
+The simplest way to fix this is to remove all the changes that you've made locally.
+
+You can do this using 
+
+    > git reset --hard kohana
+
+### You've fixed something locally which someone else has already fixed but you also have separate commits you'd like to keep
+
+If this is the case then you'll want to use a tool called rebase.  First of all we need to
+get rid of the conflicts created due to the merge:
+
+    > git reset --hard HEAD
+
+Then find the hash of the offending local commit and run:
+
+    > git rebase -i {offending commit hash}
+
+i.e.
+
+	> git rebase -i 57d0b28
+
+A text editor will open with a list of commits, delete the line containing the offending commit
+before saving the file & closing your editor.
+
+Git will remove the commit and you can then pull/merge the remote changes.
diff --git a/includes/kohana/modules/userguide/guide/userguide/adding.md b/includes/kohana/modules/userguide/guide/userguide/adding.md
new file mode 100644
index 0000000..7a5ec68
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/adding.md
@@ -0,0 +1,41 @@
+# Adding your module to the userguide
+
+Making your module work with the userguide is simple.
+
+First, copy this config and place in it `<module>/config/userguide.php`, replacing anything in `<>` with the appropriate things:
+
+	return array
+	(
+		// Leave this alone
+		'modules' => array(
+	
+			// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+			'<modulename>' => array(
+	
+				// Whether this modules userguide pages should be shown
+				'enabled' => TRUE,
+				
+				// The name that should show up on the userguide index page
+				'name' => '<Module Name>',
+	
+				// A short description of this module, shown on the index page
+				'description' => '<Description goes here.>',
+				
+				// Copyright message, shown in the footer for this module
+				'copyright' => '&copy; 2010–2011 <Your Name>',
+			)	
+		)
+	);
+
+Next, create a folder in your module directory called `guide/<modulename>` and create `index.md` and `menu.md`.  All userguide pages use [Markdown](markdown).  The index page is what is shown on the index of your module, the menu is what shows up in the side column.  The menu should be formatted like this:
+
+	## [Module Name]()
+	 - [Page name](page-path)
+	 - [This is a Category](category)
+		 - [Sub Page](category/sub-page)
+		 - [Another](category/another)
+			 - [Sub sub page](category/another/sub-page)
+	 - Categories do not have to be a link to a page
+		 - [Etcetera](etc)
+
+Page paths are relative to `guide/<modulename>`.  So `[Page name](path-path)` would look for `guide/<modulename>/page-name.md` and `[Another](category/another)` would look for `guide/<modulename>/page-name.md`.   The guide pages can be named or arranged any way you want within that folder (with the exception of `menu.md` and `index.md`). The breadcrumbs and page titles are pulled from the `menu.md file`, not the file names or paths.  You can have items that are not pages (a category that doesn't have a corresponding page).  To link to the `index.md` page, you should have an empty link, e.g. `[Module Name]()`.  Do not include `.md` in your links.  
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/userguide/config.md b/includes/kohana/modules/userguide/guide/userguide/config.md
new file mode 100644
index 0000000..a566040
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/config.md
@@ -0,0 +1,35 @@
+# Configuration
+
+The userguide has the following config options, available in `config/userguide.php`.
+
+	return array
+	(
+		// Enable the API browser.  TRUE or FALSE
+		'api_browser'  => TRUE,
+		
+		// Enable these packages in the API browser.  TRUE for all packages, or a string of comma seperated packages, using 'None' for a class with no @package
+		// Example: 'api_packages' => 'Kohana,Kohana/Database,Kohana/ORM,None',
+		'api_packages' => TRUE,
+		
+	);
+
+You can enable or disabled the entire api browser, or limit it to only show certain packages.  To disable a module from showing pages in the userguide, simply change that modules `enabled` option using the cascading filesystem.  For example:
+
+	`application/config/userguide.php`
+	
+	return array
+	(
+		'modules' => array
+		(
+			'kohana' => array
+			(
+				'enabled' => FALSE,
+			),
+			'database' => array
+			(
+				'enabled' => FALSE,
+			)
+		)
+	)
+	
+Using this you could make the userguide only show your modules and your classes in the api browser, if you wanted to host your own documentation on your site.  Feel free to change the styles and views as well, but be sure to give credit where credit is due!
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/userguide/contributing.md b/includes/kohana/modules/userguide/guide/userguide/contributing.md
new file mode 100644
index 0000000..fcf4e61
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/contributing.md
@@ -0,0 +1,66 @@
+[!!]  When the docs get merged these images/links should be update
+
+# Contributing
+
+Kohana is community driven, and we rely on community contributions for the documentation.
+
+## Guidelines
+
+Documentation should use complete sentences, good grammar, and be as clear as possible.  Use lots of example code, but make sure the examples follow the Kohana conventions and style.
+
+Try to commit often, with each commit only changing a file or two, rather than changing a ton of files and commiting it all at once.  This will make it easier to offer feedback and merge your changes.   Make sure your commit messages are clear and descriptive.  Bad: "Added docs",  Good: "Added initial draft of hello world tutorial",  Bad: "Fixed typos",  Good: "Fixed typos on the query builder page"
+
+If you feel a menu needs to be rearranged or a module needs new pages, please open a [bug report](http://dev.kohanaframework.org/projects/userguide3/issues/new) to discuss it.
+
+## Quick Method
+
+To quickly point out something that needs improvement, report a [bug report](http://dev.kohanaframework.org/projects/userguide3/issues/new).
+
+If you want to contribute some changes, you can do so right from your browser without even knowing git!
+
+First create an account on [Github](https://github.com/signup/free).
+
+You will need to fork the module for the area you want to improve.  For example, to improve the [ORM documentation](../orm) fork <http://github.com/kohana/orm>.  To improve the [Kohana documentation](../kohana), fork <http://github.com/kohana/core>, etc.  So, find the module you want to improve and click on the Fork button in the top right.
+
+![Fork the module](contrib-github-fork.png)
+
+The files that make the User Guide portion are found in `guide/<module>/`, and the API browser portion is made from the comments in the source code itself.  Navigate to one of the files you want to change and click the edit button in the top right of the file viewer.
+
+![Click on edit to edit the file](contrib-github-edit.png)
+
+Make the changes and add a **detailed commit message**.  Repeat this for as many files as you want to improve. (Note that you can't preview what the changes will look unless you actually test it locally.)
+
+After you have made your changes, send a pull request so your improvements can be reviewed to be merged into the official documentation.
+
+![Send a pull request](contrib-github-pull.png)
+
+Once your pull request has been accepted, you can delete your repository if you want.  Your commit will have been copied to the official branch.
+
+## If you know git
+
+**Short version**: Create a ticket on redmine for your changes, fork the module whose docs you wish to improve (e.g. `git://github.com/kohana/orm.git` or `git://github.com/kohana/core.git`), checkout the appropriate branch, make changes, and then send a pull request with the ticket number.
+
+**Long version:**  (This still assumes you at least know your way around git, especially how submodules work.)
+
+ 1. Create a ticket on redmine for your changes.
+
+ 2. Fork the specific repo you want to contribute to on github. (For example go to http://github.com/kohana/core and click the fork button.)
+
+ 3. Now go into the repo of the area of docs you want to contribute to and add your forked repo as a new remote, and push to it.
+ 
+		cd system
+		
+		# make sure we are up to date
+		git checkout 3.1/develop
+		git pull
+		
+		# add your repository as a new remote
+		git remote add <your name> git@github.com:<your name>/core.git
+		
+		# (make some changes to the docs)
+		
+		# now commit the changes and push to your repo
+		git commit
+		git push <your name> 3.1/develop
+
+ 4. Send a pull request on github containing the ticket number, and update the ticket with a link to the pull request.
diff --git a/includes/kohana/modules/userguide/guide/userguide/index.md b/includes/kohana/modules/userguide/guide/userguide/index.md
new file mode 100644
index 0000000..810f8d7
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/index.md
@@ -0,0 +1,3 @@
+# Userguide
+
+The userguide module provides documentation viewing including browsing the source code comments.
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/userguide/markdown.md b/includes/kohana/modules/userguide/guide/userguide/markdown.md
new file mode 100644
index 0000000..3367fbd
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/markdown.md
@@ -0,0 +1,235 @@
+# Markdown Syntax
+
+The userguide uses [Markdown](http://daringfireball.net/projects/markdown/) and [Markdown Extra](http://michelf.com/projects/php-markdown/extra/) for the userguide pages, and the in-code comments used to generate the API browser.  This is a brief summary of most of Markdown and Markdown extra features.  It does not cover everything, and it does not cover all the caveats.
+
+[!!] Be sure to check out the **[Userguide Specific Syntax](#userguide-specific-syntax)** for things that Userguide adds to markdown.
+
+## Headers
+
+    # Header 1
+	
+	## Header 2
+	
+	### Header 3
+	
+	#### Header 4
+
+## Paragraphs
+~~~
+Regular text will be transformed into paragraphs.
+Single returns will not make a new paragraph, this
+allows for wrapping (especially for in-code
+comments).
+
+A new paragraph will start if there is a blank line between
+blocks of text.  Chars like > and & are escaped for you.
+
+To make a line break,  
+put two spaces at the  
+end of a line.
+~~~
+Regular text will be transformed into paragraphs.
+Single returns will not make a new paragraph, this
+allows for wrapping (especially for in-code
+comments).
+
+A new paragraph will start if there is a blank line between
+blocks of text.  Chars like > and & are escaped for you.
+
+To make a line break,  
+put two spaces at the  
+end of a line.
+
+## Links
+~~~
+This is a normal link: [Kohana](http://kohanaframework.org).
+
+This link has a title: [Kohana](http://kohanaframework.org "The swift PHP framework")
+~~~
+This is a normal link: [Kohana](http://kohanaframework.org)
+
+This link has a title: [Kohana](http://kohanaframework.org "The swift PHP framework")
+
+## Code blocks
+
+	For inline code simply surround some `text with tick marks.`
+	
+For inline code simply surround some `text with tick marks.`
+
+	// For a block of code,
+	// indent in four spaces,
+	// or with a tab
+
+You can also do a "fenced" code block:
+
+	~~~
+	A fenced code block has tildes
+	          above and below it
+	This is sometimes useful when code is near lists
+	~~~
+~~~
+A fenced code block has tildes
+		  above and below it
+This is sometimes useful when code is near lists
+~~~
+
+## Unordered Lists
+
+~~~
+*  To make a unordered list, put an asterisk, minus, or + at the beginning
+-  of each line, surrounded by spaces.  You can mix * - and +, but it
++  makes no difference.
+~~~
+*  To make a unordered list, put an asterisk, minus, or + at the beginning
+-  of each line, surrounded by spaces.  You can mix * - and +, but it
++  makes no difference.
+
+## Ordered Lists
+
+~~~
+1.  For ordered lists, put a number and a period
+2.  On each line that you want numbered.
+9.  It doesn't actually have to be the correct number order
+5.  Just as long as each line has a number
+~~~
+1.  For ordered lists, put a number and a period
+2.  On each line that you want numbered.
+9.  It doesn't actually have to be the correct number order
+5.  Just as long as each line has a number
+
+## Nested Lists
+
+~~~
+*  To nest lists you just add four spaces before the * or number
+	1. Like this
+		*  It's pretty basic, this line has eight spaces, so its nested twice
+	1. And this line is back to the second level
+		*  Out to third level again
+*  And back to the first level
+~~~
+*  To nest lists you just add four spaces before the * or number
+	1. Like this
+		*  It's pretty basic, this line has eight spaces, so its nested twice
+	1. And this line is back to the second level
+		*  Out to third level again
+*  And back to the first level
+
+## Italics and Bold
+
+~~~
+Surround text you want *italics* with *asterisks* or _underscores_.
+
+**Double asterisks** or __double underscores__ makes text bold.
+
+***Triple*** will do *both at the same **time***.
+~~~
+Surround text you want *italics* with *asterisks* or _underscores_.
+
+**Double asterisks** or __double underscores__ makes text **bold**.
+
+___Triple___ will do *both at the same **time***.
+
+## Horizontal Rules
+
+Horizontal rules are made by placing 3 or more hyphens, asterisks, or underscores on a line by themselves.
+~~~
+---
+* * * *
+_____________________
+~~~
+---
+* * * *
+_____________________
+
+## Images
+
+Image syntax looks like this:
+
+	![Alt text](/path/to/img.jpg)
+	
+	![Alt text](/path/to/img.jpg "Optional title")
+
+[!!] Note that the images in userguide are [namespaced](#namespacing).
+
+## Tables
+~~~
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell
+~~~
+
+First Header  | Second Header
+------------- | -------------
+Content Cell  | Content Cell
+Content Cell  | Content Cell
+
+Note that the pipes on the very left and very right side are optional, and you can change the text-alignment by adding a colon on the right, or on both sides for center.
+~~~
+| Item      | Value | Savings |
+| --------- | -----:|:-------:|
+| Computer  | $1600 |   40%   |
+| Phone     |   $12 |   30%   |
+| Pipe      |    $1 |    0%   |
+~~~
+| Item      | Value | Savings |
+| --------- | -----:|:-------:|
+| Computer  | $1600 |   40%   |
+| Phone     |   $12 |   30%   |
+| Pipe      |    $1 |    0%   |
+
+# Userguide Specific Syntax
+
+In addition to the features and syntax of [Markdown](http://daringfireball.net/projects/markdown/) and [Markdown Extra](http://michelf.com/projects/php-markdown/extra/) the following apply to userguide pages and api documentation:
+
+## Namespacing
+
+The first thing to note is that all links are "namespaced" to the current module.  For example, from anywhere within the Kohana core docs you do not need to include `kohana` at the beginning of a link url.  For example: `[Hello World Tutorial](tutorials/hello-world)` rather than `(kohana/tutorials/hello-world)`.
+
+To link to a modules index page, have an empty url like: `[Kohana]()`.
+
+To link to page in a different module, prefix your url with `../` and the module name.  For example: `[Kohana Routes](../kohana/routing)`
+
+**Images are also namespaced**, using `![Alt Text](imagename.jpg)` would look for `media/guide/<modulename>/imagename.jpg`.
+
+## API Links
+
+You can make links to the api browser by wrapping any class name in brackets.  You may also include a function name, or propery name to link to that specifically.  All of the following will link to the API browser:
+
+	[Request]  
+	[Request::execute]  
+	[Request::execute()]  
+	[Request::$status]  
+
+[Request]  
+[Request::execute]  
+[Request::execute()]  
+[Request::$status]  
+
+If you want to have parameters and have the function be clickable, only put the brackets around the class and function (not the params), and put a backslash in front of the opening parenthesis.
+
+	[Kohana::config]\('foobar','baz')
+	
+[Kohana::config]\('foobar','baz')
+
+## Notes
+
+If you put `[!!]` in front of a line it will be a "note" and be placed in a box with a lightbulb.
+
+	[!!]  This is a note
+
+will display as:
+	
+[!!] This is a note
+
+## Headers automatically get IDs
+
+Headers are automatically assigned an id, based on the content of the header, so each header can be linked to. You can manually assign a different id using the syntax as defined in Markdown Extra. If multiple headers have the same content (e.g. more than one "Examples" header), only the first will get be automatically assigned an id, so you should manually assign more descriptive ids. For example:
+
+	### Examples     {#more-descriptive-id}
+
+## Including Views
+
+If you need you may include a regular Kohana View file by placing the name of the view in double curly brackets.  **If the view is not found, no error or exception will be shown, the curly brackets and view name will simply remain there!**
+
+	{{some/view/file}}
diff --git a/includes/kohana/modules/userguide/guide/userguide/menu.md b/includes/kohana/modules/userguide/guide/userguide/menu.md
new file mode 100644
index 0000000..e3f53ef
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/menu.md
@@ -0,0 +1,7 @@
+## [Userguide]()
+ - [Using the Userguide](using)
+ - [How userguide works](works)
+ - [Contributing](contributing)
+ - [Markdown Syntax](markdown)
+ - [Configuration](config)
+ - [Adding your module](adding)
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/userguide/modules.md b/includes/kohana/modules/userguide/guide/userguide/modules.md
new file mode 100644
index 0000000..e69de29
diff --git a/includes/kohana/modules/userguide/guide/userguide/using.md b/includes/kohana/modules/userguide/guide/userguide/using.md
new file mode 100644
index 0000000..662351c
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/using.md
@@ -0,0 +1 @@
+Give tips on how to most effectively use the user guide.  How to navigate around, how things are organized, etc. 
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/guide/userguide/works.md b/includes/kohana/modules/userguide/guide/userguide/works.md
new file mode 100644
index 0000000..e78c48a
--- /dev/null
+++ b/includes/kohana/modules/userguide/guide/userguide/works.md
@@ -0,0 +1,25 @@
+# How the Userguide works
+
+The userguide uses [Markdown](markdown) for the documentation.  Both the userguide pages, and the in code comments for the API browser are written in markdown.
+
+## Userguide pages
+
+Userguide pages are in the module they apply to, in `guide/<module>`. For example, documentation for Kohana is in `system/guide/kohana` and documentation for orm is in `modules/orm/guide/orm`, database is in `modules/database/guide/database`, etc.
+
+Each module has an index page at `guide/<module>/index.md`.
+
+Each module's menu is at `guide/<module>/menu.md`.
+
+All other pages are are in `guide/<module>` and can be organized in subfolders and named however you want.
+
+For more info on how to make your module have userguide pages, see [Adding your module](adding).
+
+### Images
+
+Any images used in the userguide pages must be in `media/guide/<module>/`.  For example, if a page has `![Image Title](hello-world.jpg)` the image would be located at `media/guide/<module>/hello-world.jpg`.  Images for the ORM module are in `modules/orm/media/guide/orm`, and images for the Kohana docs are in `system/media/guide/kohana`.
+
+### API browser
+
+The API browser is generated from the actual source code.  The descriptions for classes, constants, properties, and methods is extracted from the comments and parsed in Markdown.  For example if you look in the comment for [Kohana_Core::init](http://github.com/kohana/core/blob/c443c44922ef13421f4a/classes/kohana/core.php#L5) you can see a markdown list and table.  These are parsed and show correctly in the API browser.  `@param`, `@uses`, `@throws`, `@returns` and other tags are parsed as well.
+
+TODO: give more specific details on how to comment your classes, constants, methods, etc. including package and how it relates to the api module.
diff --git a/includes/kohana/modules/userguide/i18n/de.php b/includes/kohana/modules/userguide/i18n/de.php
new file mode 100644
index 0000000..836f663
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/de.php
@@ -0,0 +1,6 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'Handbuch'
+);
diff --git a/includes/kohana/modules/userguide/i18n/es.php b/includes/kohana/modules/userguide/i18n/es.php
new file mode 100644
index 0000000..22175dc
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/es.php
@@ -0,0 +1,6 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'Guía de Usuario'
+);
diff --git a/includes/kohana/modules/userguide/i18n/fr.php b/includes/kohana/modules/userguide/i18n/fr.php
new file mode 100644
index 0000000..017d6a3
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/fr.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'Guide Utilisateur'
+);
+
diff --git a/includes/kohana/modules/userguide/i18n/he.php b/includes/kohana/modules/userguide/i18n/he.php
new file mode 100644
index 0000000..0d392ed
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/he.php
@@ -0,0 +1,6 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'מדריך למשתמש'
+);
diff --git a/includes/kohana/modules/userguide/i18n/nl.php b/includes/kohana/modules/userguide/i18n/nl.php
new file mode 100644
index 0000000..c93ebf5
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/nl.php
@@ -0,0 +1,6 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'Gebruiksaanwijzing'
+);
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/i18n/ru.php b/includes/kohana/modules/userguide/i18n/ru.php
new file mode 100644
index 0000000..ecf4ce0
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/ru.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => 'Руководство пользователя'
+);
+
diff --git a/includes/kohana/modules/userguide/i18n/zh.php b/includes/kohana/modules/userguide/i18n/zh.php
new file mode 100644
index 0000000..6025fdd
--- /dev/null
+++ b/includes/kohana/modules/userguide/i18n/zh.php
@@ -0,0 +1,28 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'User Guide' => '用户手册',
+
+	// Errors
+	'Error' => '错误',
+	'Userguide page not found' => '用户手册页面无法找到',
+	'API Reference: Class not found.' => 'API 参考: 没有找到此类。',
+	'That class is hidden' => '那个是隐藏类',
+
+	// API
+	'Table of Contents' => '目录',
+	'Available Classes' => '可用的类',
+	'Class Contents' => '类列表',
+	'Constants' => '常量',
+	'Properties' => '属性',
+	'Methods' => '方法',
+	'None' => '无',
+	'Parameters' => '参数',
+	'Parameter' => '参数',
+	'Type' => '类型',
+	'Description' => '描述',
+	'Default' => '默认',
+	'Return Values' => '返回值',
+	'Source Code' => '源代码',
+);
diff --git a/includes/kohana/modules/userguide/init.php b/includes/kohana/modules/userguide/init.php
new file mode 100644
index 0000000..a812316
--- /dev/null
+++ b/includes/kohana/modules/userguide/init.php
@@ -0,0 +1,30 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+// Static file serving (CSS, JS, images)
+Route::set('docs/media', 'guide/media(/<file>)', array('file' => '.+'))
+	->defaults(array(
+		'controller' => 'userguide',
+		'action'     => 'media',
+		'file'       => NULL,
+	));
+
+// API Browser, if enabled
+if (Kohana::config('userguide.api_browser') === TRUE)
+{
+	Route::set('docs/api', 'guide/api(/<class>)', array('class' => '[a-zA-Z0-9_]+'))
+		->defaults(array(
+			'controller' => 'userguide',
+			'action'     => 'api',
+			'class'      => NULL,
+		));
+}
+
+// User guide pages, in modules
+Route::set('docs/guide', 'guide(/<module>(/<page>))', array(
+		'page' => '.+',
+	))
+	->defaults(array(
+		'controller' => 'userguide',
+		'action'     => 'docs',
+		'module'     => '',
+	));
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/media/guide/css/api.css b/includes/kohana/modules/userguide/media/guide/css/api.css
new file mode 100644
index 0000000..56361f7
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/api.css
@@ -0,0 +1,34 @@
+/* Api browser stuff */
+
+/* api index page */
+div.class-list div.class { width: 50%; }
+div.class-list div.class.left { float: left; clear: both; }
+div.class-list div.class.right { float: right; }
+	div.class-list div.class h2 { background:none; }
+
+/* table of contents at the top of each class */
+div.toc { }
+div.toc div {float:left; width: 33%;}
+div.toc div h3 {margin-top:0; background:none; }
+
+
+/* constants */
+div.constants dl dt {font-weight:bold; margin-bottom:1.5em;}
+div.constants dl dd {margin-left:1.5em; margin-bottom:1.5em;}
+
+/* properties */
+div.properties dl dt { font-weight:bold; margin-top:1.5em; margin-bottom:1.5em;}
+div.properties dl dt small, div.properties dl dt code { font-weight:normal; font-size:0.9em; }
+div.properties dl dd {margin-left:1.5em; margin-bottom:1.5em;}
+
+/* functions */
+
+div.method { padding:0 1.5em; border:1px solid #c8cfaf; border-radius:5px; margin-bottom:1.5em; }
+div.method h3 { background:none; margin-top:0; margin-left:-1em; margin-right:-1em; padding:.75em 0 .75em 1.17em; background:#e8efcf; border-top-left-radius:5px; border-top-right-radius:5px; }
+div.method h3 .param { font-weight: normal; cursor: help; border-bottom:1px dashed #666;}
+div.method h3 abbr.param { text-transform: none; font-size: 1em; }
+
+dl.tags { overflow: auto; background: #e8efcf; padding: 1em; border: solid 6px #d8dfbf; margin-bottom:1.5em; }
+	dl.tags dt { margin: 0; clear: both; float: left; width: 25%; }
+	dl.tags dd { margin: 0; padding: 0; clear: right; float: right; }
+	
diff --git a/includes/kohana/modules/userguide/media/guide/css/kodoc.css b/includes/kohana/modules/userguide/media/guide/css/kodoc.css
new file mode 100644
index 0000000..391c2d7
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/kodoc.css
@@ -0,0 +1,142 @@
+@import url('api.css');
+
+html { background: #00262f; font-size: 70%; }
+body { margin: 0; }
+ol ol, ol ul, ul ul, ul ol { margin-bottom: 0; }
+a img { border: 0; }
+
+h1 small,
+h2 small,
+h3 small,
+h4 small { font-weight: normal; font-size: 0.7em; }
+h5 small,
+h6 small { font-weight: normal; font-size: 0.8em; }
+
+dl dd { margin-left: 0; }
+
+code {
+	color:#6BAA3D;
+	font-family: Consolas, 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace;
+}
+
+pre {
+	background:#fff;
+	border-radius:10px;
+	padding:1.5em;
+	font-size:0.9em;
+	margin-top:1.5em;
+	margin-bottom:1.5em;
+	overflow:auto;
+}
+
+.highlighted div.line {
+	font-size:1em;
+	line-height:1.3 !important;
+}
+
+table {
+	background:#eee;
+	border-left: 1px solid #CCC;
+	border-top: 1px solid #CCC;
+	margin-bottom:1.5em;
+	width: 100%;
+}
+
+table td, table th {
+	padding:0.4em 0.8em;
+	line-height:1.4286;
+	border-right: 1px solid #CCC;
+	border-bottom: 1px solid #CCC;
+}
+
+table th {
+	background: #ddd;
+}
+
+table tr:nth-child(even) {
+	background: #fff;
+}
+
+.caps { text-transform: uppercase; font-size: 0.8em; font-weight: normal; }
+.status { text-transform: lowercase; font-variant: small-caps; font-weight: bold; color: #911; }
+.container .colborder { border-color: #d3d8bc; }
+
+.note {
+	padding: 1.5em;
+	padding-left: 5em;
+	background: #e8efcf url('../img/lightbulb_48.png') no-repeat 1em center;
+	border-radius: 0.6em;
+	overflow: auto;
+}
+
+h1 a.permalink,
+h2 a.permalink,
+h3 a.permalink,
+h4 a.permalink,
+h5 a.permalink,
+h6 a.permalink {
+	font-size: 0.6em;
+	line-height: 100%;
+	vertical-align: middle;
+	margin-left: 1em;
+	padding: 0;
+	font-weight: normal;
+	display: none;
+	position: inherit;
+}
+
+h1:hover a.permalink,
+h2:hover a.permalink,
+h3:hover a.permalink,
+h4:hover a.permalink,
+h5:hover a.permalink,
+h6:hover a.permalink {
+	display: inline;
+}
+
+
+#header,
+#content,
+#footer { float: left; clear: both; width: 100%; }
+
+#header { padding: 58px 0 2em; background: #77c244 url(../img/header.png) center top repeat-x; }
+	#logo { display: block; float: left; }
+	#menu { float: right; margin-top: 12px; background: #113c32; -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+	#menu ul { float: left; margin: 0; padding: 0 0.5em 0 0; }
+		#menu li { display: block; float: left; margin: 0; padding: 0; }
+		#menu li.first { padding-left: 0.5em; }
+			#menu li a { display: block; height: 32px; line-height: 32px; padding: 0 0.8em; border-right: solid 1px #0f362d; border-left: solid 1px #144539; letter-spacing: 0.05em; text-decoration: none; text-transform: uppercase; color: #efefef; font-size: 90%; }
+			#menu li.first a { border-left: 0; }
+			#menu li.last a { border-right: 0; }
+			#menu li a:hover { background: #164e41; border-left-color: #195a4b; color: #fff; text-shadow: #fff 0 0 1px; }
+
+#content { background: #f1f8db url(../img/content.png) center top repeat-x; }
+	#content .wrapper { min-height: 390px; padding: 1em 0; background: transparent url(../img/wrapper.png) center top no-repeat; }
+	#content div.page-toc { float: right; margin: 1em; margin-top: 0; padding: 1em; background: #fff; border: solid 0.1em #e8efcf; border-radius: 0.6em; }
+	#content p.intro { padding: 1em 20px; padding-left: 20px; margin: 0 -20px; font-size: 1.2em; }
+	#content a { color: #004352; }
+	#content a:hover { color: #00758f; }
+	#content a:active { text-decoration: none; }
+
+#breadcrumb { margin: 0 0 1em; padding: 0 0 0.5em; list-style: none; border-bottom: solid 1px #e8efcf; }
+	#breadcrumb li { display: inline-block; margin: 0; padding: 0 0.4em 0 0; text-transform: uppercase; font-size: 11px; }
+	#breadcrumb li:before { content: '»'; padding-right: 0.4em; }
+	#breadcrumb li a { color: #999; text-decoration: none; }
+
+#topics {  }
+	#topics ul,
+	#topics ol { list-style-type:none; margin: 0; padding: 0;}
+		#topics ul li,
+		#topics ol li { margin:0; padding: 0; margin-left: 1em; }
+		#topics ul li a.current,
+		#topics ol li a.current { font-weight: bold; }
+	#topics span,
+	#topics a { display: block; padding: 0; margin: 0; }
+	#topics span { cursor: pointer; }
+	#topics span.toggle { display: block; float: left; width: 1em; padding-right: 0.4em; margin-left: -1.4em; text-align: center; }
+
+	#topics li span { cursor:pointer; }
+
+#footer { padding: 1em 0; background: #00262f; color: #405c63; text-shadow: #00262f 0.1em 0.1em 1px; font-size: 0.9em; }
+	#footer a { color: #809397; }
+	#footer div.last { text-align: right; }
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/media/guide/css/print.css b/includes/kohana/modules/userguide/media/guide/css/print.css
new file mode 100644
index 0000000..5feae02
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/print.css
@@ -0,0 +1,50 @@
+
+/* Smaller font for printing */
+body {
+	font:14px/1.5 Helvetica,Arial;
+}
+
+/* Show link urls, imitating markdown syntax */
+a:link, a:visited { text-decoration:none; }
+a:link:before, a:visited:before { content:"["; }
+a:link:after, a:visited:after { content:"](" attr(href) ")"; }
+
+/* Hide things like navigation, header links, etc. */
+#kodoc-header,
+#kodoc-nav,
+#kodoc-menu,
+#kodoc-page-toc,
+.syntaxhighlighter .toolbar,
+h1 a.permalink,
+h2 a.permalink,
+h3 a.permalink,
+h4 a.permalink,
+h5 a.permalink,
+h6 a.permalink
+{ display:none; }
+
+pre {
+	padding:1em;
+	border:1px dashed #999;
+}
+
+table {
+	border-left: 1px solid #999;
+	border-top: 1px solid #999;
+}
+
+table td, table th {
+	padding:0.4em 0.8em;
+	border-right: 1px solid #999;
+	border-bottom: 1px solid #999;
+}
+
+/* syntax highlighter tables inside pre cause problems */
+pre table, pre table td, pre table th {
+	padding:0;
+	border:none;
+}
+
+p.note { padding:1em; border: 1px solid black; }
+
+p.note:before { content:"Note: "; font-weight:bold; }
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/media/guide/css/screen.css b/includes/kohana/modules/userguide/media/guide/css/screen.css
new file mode 100644
index 0000000..cff2570
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/screen.css
@@ -0,0 +1,267 @@
+/* -----------------------------------------------------------------------
+
+   BlueTrip CSS Framework
+
+   Mike Crittenden
+   mike@capsizedesigns.com
+   Copyright 2008 Mike Crittenden
+
+   License - MIT or GPL (whichever suits you better)
+
+----------------------------------------------------------------------- */
+
+/* MEYER RESET v1.0 */
+
+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outline:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}
+
+/* BASIC TYPOGRAPHY */
+
+html { font-size: 62.5%; font-family: "Liberation Sans", Helvetica, Arial, sans-serif; }
+strong, th, thead td, h1, h2, h3, h4, h5, h6 { font-weight: bold; }
+cite, em, dfn { font-style: italic; }
+code, kbd, samp, pre, tt, var, input[type='text'], input[type='password'], textarea { font-size: 92%; font-family: monaco, "Lucida Console", courier, monospace; }
+del { text-decoration: line-through; color: #666; }
+ins, dfn { border-bottom: 1px solid #ccc; }
+small, sup, sub { font-size: 85%; }
+abbr, acronym { text-transform: uppercase; font-size: 85%; letter-spacing: .1em; }
+a abbr, a acronym { border: none; }
+abbr[title], acronym[title], dfn[title] { cursor: help; border-bottom: 1px solid #ccc; }
+sup { vertical-align: super; }
+sub { vertical-align: sub; }
+
+/* QUOTES */
+
+blockquote { border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; color: #666; }
+blockquote *:first-child:before { content: "\201C"; }
+blockquote *:first-child:after { content: "\201D"; }
+
+/* FORMS */
+
+fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; }
+legend { font-weight: bold; font-size:1.2em; }
+label { font-weight: bold; }
+textarea, input[type='text'], input[type='password'], select { border: 1px solid #ccc; background: #fff; }
+textarea:hover, input[type='text']:hover, input[type='password']:hover, select:hover { border-color: #aaa; }
+textarea:focus, input[type='text']:focus, input[type='password']:focus, select:focus { border-color: #888; outline: 2px solid #ffffaa; }
+input, select { cursor: pointer; }
+input[type='text'],input[type='password'] { cursor: text; }
+
+/* BASE SIZES */
+
+.container { font-size: 1.2em; line-height: 1.6em; }
+h1 { font-size: 1.9em; }
+h2 { font-size: 1.7em; }
+h3 { font-size: 1.5em; }
+h4 { font-size: 1.3em; }
+h5 { font-size: 1.2em; }
+h6 { font-size: 1em; }
+
+/* LISTS */
+
+ul li { margin-left: .85em; }
+ul { list-style-type: disc; }
+ul ul { list-style-type: square; }
+ul ul ul { list-style-type: circle; }
+ol { list-style-position: outside; list-style-type: decimal; }
+dt { font-weight: bold; }
+
+/* TABLES */
+
+table { border-top: 1px solid #ccc;  border-left: 1px solid #ccc; }
+th, td { border-bottom: 1px solid #ddd; border-right: 1px solid #ccc; }
+
+/* MARGINS & PADDINGS */
+
+blockquote *:first-child { margin: .8em 0; }
+hr, p, ul, ol, dl, pre, blockquote, address, table, form { margin-bottom: 1.6em; }
+/* NOTE: Calulate header margins: TOP: 1.6em/size, BOTTOM: 1.6em/size/2 */
+h1 { margin: 1em 0 .5em;  }
+h2 { margin: 1.07em 0 .535em; }
+h3 { margin: 1.14em 0 .57em; }
+h4 { margin: 1.23em 0 .615em; }
+h5 { margin: 1.33em 0 .67em; }
+h6 { margin: 1.6em 0 .8em; }
+th, td { padding: .8em; }
+caption { padding-bottom: .8em; } /* padding instead of margin for IE */
+blockquote { padding: 0 1em; margin: 1.6em 0; }
+fieldset { padding: 0 1em 1em 1em; margin: 1.6em 0; } /* padding-top is margin-top for fieldsets in Opera */
+legend { padding-left: .8em; padding-right: .8em; }
+legend+* { margin-top: 1em; } /* compensates for the opera margin bug */
+textarea, input { padding: .3em .4em .15em .4em; }
+select { padding: .1em .2em 0 .2em; }
+option { padding: 0 .4em; }
+a { position: relative; padding: 0.3em 0 .1em 0; } /* for larger click-area */
+dt { margin-top: .8em; margin-bottom: .4em; }
+ul { margin-left: 1.5em; }
+ol { margin-left: 2.35em; }
+ol ol, ul ol { margin-left: 2.5em; }
+form div { margin-bottom: .8em; }
+
+/* COLORS */
+
+a:link { text-decoration: underline; color: #36c; }
+a:visited { text-decoration: underline; color: #99c; }
+a:hover { text-decoration: underline; color: #c33; }
+a:active, a:focus { text-decoration: underline; color: #000; }
+code, pre { color: #c33; } /* very optional, but still useful. W3C uses about the same colors for codes */
+
+/* 24 COLUMN GRID */
+
+.container {width:950px;margin:0 auto;overflow:hidden;}
+.showgrid {background:url(../img/grid.png);}
+body {margin:1.5em 0;}
+div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23 {float:left;margin-right:10px;}
+div.span-24 {float:left;}
+div.last {margin-right:0;}
+.span-1 {width:30px;}
+.span-2 {width:70px;}
+.span-3 {width:110px;}
+.span-4 {width:150px;}
+.span-5 {width:190px;}
+.span-6 {width:230px;}
+.span-7 {width:270px;}
+.span-8 {width:310px;}
+.span-9 {width:350px;}
+.span-10 {width:390px;}
+.span-11 {width:430px;}
+.span-12 {width:470px;}
+.span-13 {width:510px;}
+.span-14 {width:550px;}
+.span-15 {width:590px;}
+.span-16 {width:630px;}
+.span-17 {width:670px;}
+.span-18 {width:710px;}
+.span-19 {width:750px;}
+.span-20 {width:790px;}
+.span-21 {width:830px;}
+.span-22 {width:870px;}
+.span-23 {width:910px;}
+.span-24, div.span-24 {width:950px;}
+.suffix-1 {padding-right:40px;}
+.suffix-2 {padding-right:80px;}
+.suffix-3 {padding-right:120px;}
+.suffix-4 {padding-right:160px;}
+.suffix-5 {padding-right:200px;}
+.suffix-6 {padding-right:240px;}
+.suffix-7 {padding-right:280px;}
+.suffix-8 {padding-right:320px;}
+.suffix-9 {padding-right:360px;}
+.suffix-10 {padding-right:400px;}
+.suffix-11 {padding-right:440px;}
+.suffix-12 {padding-right:480px;}
+.suffix-13 {padding-right:520px;}
+.suffix-14 {padding-right:560px;}
+.suffix-15 {padding-right:600px;}
+.suffix-16 {padding-right:640px;}
+.suffix-17 {padding-right:680px;}
+.suffix-18 {padding-right:720px;}
+.suffix-19 {padding-right:760px;}
+.suffix-20 {padding-right:800px;}
+.suffix-21 {padding-right:840px;}
+.suffix-22 {padding-right:880px;}
+.suffix-23 {padding-right:920px;}
+.prefix-1 {padding-left:40px;}
+.prefix-2 {padding-left:80px;}
+.prefix-3 {padding-left:120px;}
+.prefix-4 {padding-left:160px;}
+.prefix-5 {padding-left:200px;}
+.prefix-6 {padding-left:240px;}
+.prefix-7 {padding-left:280px;}
+.prefix-8 {padding-left:320px;}
+.prefix-9 {padding-left:360px;}
+.prefix-10 {padding-left:400px;}
+.prefix-11 {padding-left:440px;}
+.prefix-12 {padding-left:480px;}
+.prefix-13 {padding-left:520px;}
+.prefix-14 {padding-left:560px;}
+.prefix-15 {padding-left:600px;}
+.prefix-16 {padding-left:640px;}
+.prefix-17 {padding-left:680px;}
+.prefix-18 {padding-left:720px;}
+.prefix-19 {padding-left:760px;}
+.prefix-20 {padding-left:800px;}
+.prefix-21 {padding-left:840px;}
+.prefix-22 {padding-left:880px;}
+.prefix-23 {padding-left:920px;}
+div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;}
+div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;}
+.pull-1 {margin-left:-40px;}
+.pull-2 {margin-left:-80px;}
+.pull-3 {margin-left:-120px;}
+.pull-4 {margin-left:-160px;}
+.pull-5 {margin-left:-200px;}
+.pull-6 {margin-left:-240px;}
+.pull-7 {margin-left:-280px;}
+.pull-8 {margin-left:-320px;}
+.pull-9 {margin-left:-360px;}
+.pull-10 {margin-left:-400px;}
+.pull-11 {margin-left:-440px;}
+.pull-12 {margin-left:-480px;}
+.pull-13 {margin-left:-520px;}
+.pull-14 {margin-left:-560px;}
+.pull-15 {margin-left:-600px;}
+.pull-16 {margin-left:-640px;}
+.pull-17 {margin-left:-680px;}
+.pull-18 {margin-left:-720px;}
+.pull-19 {margin-left:-760px;}
+.pull-20 {margin-left:-800px;}
+.pull-21 {margin-left:-840px;}
+.pull-22 {margin-left:-880px;}
+.pull-23 {margin-left:-920px;}
+.pull-24 {margin-left:-960px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
+.push-1 {margin:0 -40px 1.5em 40px;}
+.push-2 {margin:0 -80px 1.5em 80px;}
+.push-3 {margin:0 -120px 1.5em 120px;}
+.push-4 {margin:0 -160px 1.5em 160px;}
+.push-5 {margin:0 -200px 1.5em 200px;}
+.push-6 {margin:0 -240px 1.5em 240px;}
+.push-7 {margin:0 -280px 1.5em 280px;}
+.push-8 {margin:0 -320px 1.5em 320px;}
+.push-9 {margin:0 -360px 1.5em 360px;}
+.push-10 {margin:0 -400px 1.5em 400px;}
+.push-11 {margin:0 -440px 1.5em 440px;}
+.push-12 {margin:0 -480px 1.5em 480px;}
+.push-13 {margin:0 -520px 1.5em 520px;}
+.push-14 {margin:0 -560px 1.5em 560px;}
+.push-15 {margin:0 -600px 1.5em 600px;}
+.push-16 {margin:0 -640px 1.5em 640px;}
+.push-17 {margin:0 -680px 1.5em 680px;}
+.push-18 {margin:0 -720px 1.5em 720px;}
+.push-19 {margin:0 -760px 1.5em 760px;}
+.push-20 {margin:0 -800px 1.5em 800px;}
+.push-21 {margin:0 -840px 1.5em 840px;}
+.push-22 {margin:0 -880px 1.5em 880px;}
+.push-23 {margin:0 -920px 1.5em 920px;}
+.push-24 {margin:0 -960px 1.5em 960px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;}
+.clearfix:after {content:".";display:block;height:0;clear:both;visibility:hidden;max-height:0;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}
+
+/* Creates fancy serif style type */
+.fancy { color: #666; font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; font-style: italic; font-weight: normal; }
+
+/* TEXT CLASSES */
+
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+.thin {font-weight: lighter;}
+.error, .notice, .success {padding:.8em;margin-bottom:1.6em;border:2px solid #ddd;}
+.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
+.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
+.error a {color:#8a1f11; background:none; padding:0; margin:0; }
+.notice a {color:#514721; background:none; padding:0; margin:0; }
+.success a {color:#264409; background:none; padding:0; margin:0; }
+.center {text-align: center;}
diff --git a/includes/kohana/modules/userguide/media/guide/css/shCore.css b/includes/kohana/modules/userguide/media/guide/css/shCore.css
new file mode 100644
index 0000000..34f6864
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/shCore.css
@@ -0,0 +1,226 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter a,
+.syntaxhighlighter div,
+.syntaxhighlighter code,
+.syntaxhighlighter table,
+.syntaxhighlighter table td,
+.syntaxhighlighter table tr,
+.syntaxhighlighter table tbody,
+.syntaxhighlighter table thead,
+.syntaxhighlighter table caption,
+.syntaxhighlighter textarea {
+  -moz-border-radius: 0 0 0 0 !important;
+  -webkit-border-radius: 0 0 0 0 !important;
+  background: none !important;
+  border: 0 !important;
+  bottom: auto !important;
+  float: none !important;
+  height: auto !important;
+  left: auto !important;
+  line-height: 1.1em !important;
+  margin: 0 !important;
+  outline: 0 !important;
+  overflow: visible !important;
+  padding: 0 !important;
+  position: static !important;
+  right: auto !important;
+  text-align: left !important;
+  top: auto !important;
+  vertical-align: baseline !important;
+  width: auto !important;
+  box-sizing: content-box !important;
+  font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
+  font-weight: normal !important;
+  font-style: normal !important;
+  font-size: 1em !important;
+  min-height: inherit !important;
+  min-height: auto !important;
+}
+
+.syntaxhighlighter {
+  width: 100% !important;
+  margin: 1em 0 1em 0 !important;
+  position: relative !important;
+  overflow: auto !important;
+  font-size: 1em !important;
+}
+.syntaxhighlighter.source {
+  overflow: hidden !important;
+}
+.syntaxhighlighter .bold {
+  font-weight: bold !important;
+}
+.syntaxhighlighter .italic {
+  font-style: italic !important;
+}
+.syntaxhighlighter .line {
+  white-space: pre !important;
+}
+.syntaxhighlighter table {
+  width: 100% !important;
+}
+.syntaxhighlighter table caption {
+  text-align: left !important;
+  padding: .5em 0 0.5em 1em !important;
+}
+.syntaxhighlighter table td.code {
+  width: 100% !important;
+}
+.syntaxhighlighter table td.code .container {
+  position: relative !important;
+}
+.syntaxhighlighter table td.code .container textarea {
+  box-sizing: border-box !important;
+  position: absolute !important;
+  left: 0 !important;
+  top: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  border: none !important;
+  background: white !important;
+  padding-left: 1em !important;
+  overflow: hidden !important;
+  white-space: pre !important;
+}
+.syntaxhighlighter table td.gutter .line {
+  text-align: right !important;
+  padding: 0 0.5em 0 1em !important;
+}
+.syntaxhighlighter table td.code .line {
+  padding: 0 1em !important;
+}
+.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
+  padding-left: 0em !important;
+}
+.syntaxhighlighter.show {
+  display: block !important;
+}
+.syntaxhighlighter.collapsed table {
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  padding: 0.1em 0.8em 0em 0.8em !important;
+  font-size: 1em !important;
+  position: static !important;
+  width: auto !important;
+  height: auto !important;
+}
+.syntaxhighlighter.collapsed .toolbar span {
+  display: inline !important;
+  margin-right: 1em !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a {
+  padding: 0 !important;
+  display: none !important;
+}
+.syntaxhighlighter.collapsed .toolbar span a.expandSource {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar {
+  position: absolute !important;
+  right: 1px !important;
+  top: 1px !important;
+  width: 11px !important;
+  height: 11px !important;
+  font-size: 10px !important;
+  z-index: 10 !important;
+}
+.syntaxhighlighter .toolbar span.title {
+  display: inline !important;
+}
+.syntaxhighlighter .toolbar a {
+  display: block !important;
+  text-align: center !important;
+  text-decoration: none !important;
+  padding-top: 1px !important;
+}
+.syntaxhighlighter .toolbar a.expandSource {
+  display: none !important;
+}
+.syntaxhighlighter.ie {
+  font-size: .9em !important;
+  padding: 1px 0 1px 0 !important;
+}
+.syntaxhighlighter.ie .toolbar {
+  line-height: 8px !important;
+}
+.syntaxhighlighter.ie .toolbar a {
+  padding-top: 0px !important;
+}
+.syntaxhighlighter.printing .line.alt1 .content,
+.syntaxhighlighter.printing .line.alt2 .content,
+.syntaxhighlighter.printing .line.highlighted .number,
+.syntaxhighlighter.printing .line.highlighted.alt1 .content,
+.syntaxhighlighter.printing .line.highlighted.alt2 .content {
+  background: none !important;
+}
+.syntaxhighlighter.printing .line .number {
+  color: #bbbbbb !important;
+}
+.syntaxhighlighter.printing .line .content {
+  color: black !important;
+}
+.syntaxhighlighter.printing .toolbar {
+  display: none !important;
+}
+.syntaxhighlighter.printing a {
+  text-decoration: none !important;
+}
+.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
+  color: black !important;
+}
+.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
+  color: blue !important;
+}
+.syntaxhighlighter.printing .keyword {
+  color: #006699 !important;
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter.printing .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter.printing .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter.printing .script {
+  font-weight: bold !important;
+}
+.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
+  color: red !important;
+}
+.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
+  color: black !important;
+}
diff --git a/includes/kohana/modules/userguide/media/guide/css/shThemeDefault.css b/includes/kohana/modules/userguide/media/guide/css/shThemeDefault.css
new file mode 100644
index 0000000..1365411
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/shThemeDefault.css
@@ -0,0 +1,117 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+.syntaxhighlighter {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.alt1 {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.alt2 {
+  background-color: white !important;
+}
+.syntaxhighlighter .line.highlighted.alt1, .syntaxhighlighter .line.highlighted.alt2 {
+  background-color: #e0e0e0 !important;
+}
+.syntaxhighlighter .line.highlighted.number {
+  color: black !important;
+}
+.syntaxhighlighter table caption {
+  color: black !important;
+}
+.syntaxhighlighter .gutter {
+  color: #afafaf !important;
+}
+.syntaxhighlighter .gutter .line {
+  border-right: 3px solid #6ce26c !important;
+}
+.syntaxhighlighter .gutter .line.highlighted {
+  background-color: #6ce26c !important;
+  color: white !important;
+}
+.syntaxhighlighter.printing .line .content {
+  border: none !important;
+}
+.syntaxhighlighter.collapsed {
+  overflow: visible !important;
+}
+.syntaxhighlighter.collapsed .toolbar {
+  color: blue !important;
+  background: white !important;
+  border: 1px solid #6ce26c !important;
+}
+.syntaxhighlighter.collapsed .toolbar a {
+  color: blue !important;
+}
+.syntaxhighlighter.collapsed .toolbar a:hover {
+  color: red !important;
+}
+.syntaxhighlighter .toolbar {
+  color: white !important;
+  background: #6ce26c !important;
+  border: none !important;
+}
+.syntaxhighlighter .toolbar a {
+  color: white !important;
+}
+.syntaxhighlighter .toolbar a:hover {
+  color: black !important;
+}
+.syntaxhighlighter .plain, .syntaxhighlighter .plain a {
+  color: black !important;
+}
+.syntaxhighlighter .comments, .syntaxhighlighter .comments a {
+  color: #008200 !important;
+}
+.syntaxhighlighter .string, .syntaxhighlighter .string a {
+  color: blue !important;
+}
+.syntaxhighlighter .keyword {
+  color: #006699 !important;
+}
+.syntaxhighlighter .preprocessor {
+  color: gray !important;
+}
+.syntaxhighlighter .variable {
+  color: #aa7700 !important;
+}
+.syntaxhighlighter .value {
+  color: #009900 !important;
+}
+.syntaxhighlighter .functions {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .constants {
+  color: #0066cc !important;
+}
+.syntaxhighlighter .script {
+  font-weight: bold !important;
+  color: #006699 !important;
+  background-color: none !important;
+}
+.syntaxhighlighter .color1, .syntaxhighlighter .color1 a {
+  color: gray !important;
+}
+.syntaxhighlighter .color2, .syntaxhighlighter .color2 a {
+  color: #ff1493 !important;
+}
+.syntaxhighlighter .color3, .syntaxhighlighter .color3 a {
+  color: red !important;
+}
+
+.syntaxhighlighter .keyword {
+  font-weight: bold !important;
+}
diff --git a/includes/kohana/modules/userguide/media/guide/css/shThemeKodoc.css b/includes/kohana/modules/userguide/media/guide/css/shThemeKodoc.css
new file mode 100644
index 0000000..ec4740d
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/css/shThemeKodoc.css
@@ -0,0 +1,183 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
+ *
+ * @version
+ * 2.1.364 (October 15 2009)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2009 Alex Gorbatchev.
+ *
+ * @license
+ * This file is part of SyntaxHighlighter.
+ * 
+ * SyntaxHighlighter 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 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * SyntaxHighlighter is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with SyntaxHighlighter.  If not, see <http://www.gnu.org/copyleft/lesser.html>.
+ */
+/************************************
+ * Default Syntax Highlighter theme.
+ * 
+ * Interface elements.
+ ************************************/
+
+.syntaxhighlighter
+{
+	
+}
+
+.syntaxhighlighter
+{
+	width: 100% !important;
+	margin: 0 !important;
+	padding: 1px !important; /* adds a little border on top and bottom */
+	position: relative !important;
+	/*background-color: #fff !important;*/
+}
+
+/* Highlighed line number */
+.syntaxhighlighter .line.highlighted .number
+{
+	color: black !important;
+}
+
+/* Highlighed line */
+.syntaxhighlighter .line.highlighted.alt1,
+.syntaxhighlighter .line.highlighted.alt2
+{
+	background-color: #e0e0e0 !important;
+}
+
+/* Gutter line numbers */
+.syntaxhighlighter .line .number
+{
+	color: #afafaf !important;
+}
+
+/* Add border to the lines */
+.syntaxhighlighter .line .content
+{
+	border-left: none !important;
+	padding-left: 0 !important;
+	color: #000 !important;
+}
+
+.syntaxhighlighter.printing .line .content 
+{
+	border: 0 !important;
+}
+
+/* First line */
+.syntaxhighlighter .line.alt1
+{
+	/*background-color: #fff !important;*/
+}
+
+/* Second line */
+.syntaxhighlighter .line.alt2
+{
+	/*background-color: #F8F8F8 !important;*/
+}
+
+.syntaxhighlighter .toolbar
+{
+	background-color: #F8F8F8 !important;
+	border: #E7E5DC solid 1px !important;
+}
+
+.syntaxhighlighter .toolbar a
+{
+	color: #a0a0a0 !important;
+}
+
+.syntaxhighlighter .toolbar a:hover
+{
+	color: red !important;
+}
+
+/************************************
+ * Actual syntax highlighter colors.
+ ************************************/
+.syntaxhighlighter .plain,
+.syntaxhighlighter .plain a
+{ 
+	color: #000 !important;
+}
+
+.syntaxhighlighter .comments,
+.syntaxhighlighter .comments a
+{ 
+	color: #008200 !important;
+}
+
+.syntaxhighlighter .string,
+.syntaxhighlighter .string a
+{
+	color: blue !important; 
+}
+
+.syntaxhighlighter .keyword
+{ 
+	color: #069 !important; 
+	font-weight: bold !important; 
+}
+
+.syntaxhighlighter .preprocessor 
+{ 
+	color: gray !important; 
+}
+
+.syntaxhighlighter .variable 
+{ 
+	color: #a70 !important; 
+}
+
+.syntaxhighlighter .value
+{ 
+	color: #090 !important; 
+}
+
+.syntaxhighlighter .functions
+{ 
+	color: #ff1493 !important; 
+}
+
+.syntaxhighlighter .constants
+{ 
+	color: #0066CC !important; 
+}
+
+.syntaxhighlighter .script
+{ 
+	background-color: yellow !important;
+}
+
+.syntaxhighlighter .color1,
+.syntaxhighlighter .color1 a
+{ 
+	color: #808080 !important; 
+}
+
+.syntaxhighlighter .color2,
+.syntaxhighlighter .color2 a
+{ 
+	color: #ff1493 !important; 
+}
+
+.syntaxhighlighter .color3,
+.syntaxhighlighter .color3 a
+{ 
+	color: red !important; 
+}
diff --git a/includes/kohana/modules/userguide/media/guide/img/arrows.png b/includes/kohana/modules/userguide/media/guide/img/arrows.png
new file mode 100644
index 0000000..e10a3ca
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/arrows.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/breadcrumbs.png b/includes/kohana/modules/userguide/media/guide/img/breadcrumbs.png
new file mode 100644
index 0000000..04b9e02
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/breadcrumbs.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/content.png b/includes/kohana/modules/userguide/media/guide/img/content.png
new file mode 100644
index 0000000..29be8c6
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/content.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/ext_link.png b/includes/kohana/modules/userguide/media/guide/img/ext_link.png
new file mode 100644
index 0000000..16f9b92
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/ext_link.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/h2_line.png b/includes/kohana/modules/userguide/media/guide/img/h2_line.png
new file mode 100644
index 0000000..1e59ea4
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/h2_line.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/h3_line.png b/includes/kohana/modules/userguide/media/guide/img/h3_line.png
new file mode 100644
index 0000000..82459f5
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/h3_line.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/header.png b/includes/kohana/modules/userguide/media/guide/img/header.png
new file mode 100644
index 0000000..07b1dd3
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/header.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/kohana.png b/includes/kohana/modules/userguide/media/guide/img/kohana.png
new file mode 100644
index 0000000..f0583ef
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/kohana.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/lightbulb_48.png b/includes/kohana/modules/userguide/media/guide/img/lightbulb_48.png
new file mode 100644
index 0000000..f84346e
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/lightbulb_48.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/lines.png b/includes/kohana/modules/userguide/media/guide/img/lines.png
new file mode 100644
index 0000000..e017fc2
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/lines.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/orange-tab.png b/includes/kohana/modules/userguide/media/guide/img/orange-tab.png
new file mode 100644
index 0000000..f8c6fcd
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/orange-tab.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/img/wrapper.png b/includes/kohana/modules/userguide/media/guide/img/wrapper.png
new file mode 100644
index 0000000..bcfa871
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/img/wrapper.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/js/jquery.cookie.js b/includes/kohana/modules/userguide/media/guide/js/jquery.cookie.js
new file mode 100644
index 0000000..6df1fac
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/jquery.cookie.js
@@ -0,0 +1,96 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Create a cookie with the given name and value and other optional parameters.
+ *
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Set the value of a cookie.
+ * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
+ * @desc Create a cookie with all available options.
+ * @example $.cookie('the_cookie', 'the_value');
+ * @desc Create a session cookie.
+ * @example $.cookie('the_cookie', null);
+ * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
+ *       used when the cookie was set.
+ *
+ * @param String name The name of the cookie.
+ * @param String value The value of the cookie.
+ * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
+ * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
+ *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
+ *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
+ *                             when the the browser exits.
+ * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
+ * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
+ * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
+ *                        require a secure protocol (like HTTPS).
+ * @type undefined
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+
+/**
+ * Get the value of a cookie with the given name.
+ *
+ * @example $.cookie('the_cookie');
+ * @desc Get the value of a cookie.
+ *
+ * @param String name The name of the cookie.
+ * @return The value of the cookie.
+ * @type String
+ *
+ * @name $.cookie
+ * @cat Plugins/Cookie
+ * @author Klaus Hartl/klaus.hartl@stilbuero.de
+ */
+jQuery.cookie = function(name, value, options) {
+    if (typeof value != 'undefined') { // name and value given, set cookie
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+        var expires = '';
+        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
+            var date;
+            if (typeof options.expires == 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+        }
+        // CAUTION: Needed to parenthesize options.path and options.domain
+        // in the following expressions, otherwise they evaluate to undefined
+        // in the packed version for some reason...
+        var path = options.path ? '; path=' + (options.path) : '';
+        var domain = options.domain ? '; domain=' + (options.domain) : '';
+        var secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    } else { // only name given, get cookie
+        var cookieValue = null;
+        if (document.cookie && document.cookie != '') {
+            var cookies = document.cookie.split(';');
+            for (var i = 0; i < cookies.length; i++) {
+                var cookie = jQuery.trim(cookies[i]);
+                // Does this cookie string begin with the name we want?
+                if (cookie.substring(0, name.length + 1) == (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+};
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/media/guide/js/jquery.min.js b/includes/kohana/modules/userguide/media/guide/js/jquery.min.js
new file mode 100644
index 0000000..8f3ca2e
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/jquery.min.js
@@ -0,0 +1,167 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
+h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
+h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
+"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
+e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
+"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
+s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
+j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
+toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
+-1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
+if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
+if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
+b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
+!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
+l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
+z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
+s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
+s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
+[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
+false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
+k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
+scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
+1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
+"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
+c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
+else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
+c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
+a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
+colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
+1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
+l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
+"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
+if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
+a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
+attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
+b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
+c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
+arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
+d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
+c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
+w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
+8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
+"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
+d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
+Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
+c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
+var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
+xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
+B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
+"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
+0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
+a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
+1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
+"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
+c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
+[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
+break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
+q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
+l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
+return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
+B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
+i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
+i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
+"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
+m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
+true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
+g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
+0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
+"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
+i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
+if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
+g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
+for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
+i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
+n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
+function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
+p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
+t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
+function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
+c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
+not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
+h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
+c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
+2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
+b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
+e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={option:[1,
+"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
+else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
+c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
+b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
+this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
+prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
+1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
+d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
+jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
+zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
+h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
+if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
+d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
+e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
+"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
+!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
+getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
+script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
+!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
+false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
+A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
+b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
+c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
+c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
+encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
+[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
+e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
+if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
+3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
+d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
+d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
+"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
+1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
+d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
+Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
+var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
+this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
+this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
+c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
+b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
+h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
+for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
+parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
+height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
+f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
+"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
+e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
+c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
+c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
+b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
diff --git a/includes/kohana/modules/userguide/media/guide/js/kodoc.js b/includes/kohana/modules/userguide/media/guide/js/kodoc.js
new file mode 100644
index 0000000..70d8b48
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/kodoc.js
@@ -0,0 +1,97 @@
+$(document).ready(function()
+{
+
+// Syntax highlighter
+
+	$('pre:not(.debug) code').each(function()
+	{
+		$(this).addClass('brush: php, class-name: highlighted');
+	});
+
+	SyntaxHighlighter.config.tagName = 'code';
+	// Don't show the toolbar or line-numbers.
+	SyntaxHighlighter.defaults.gutter = false;
+	SyntaxHighlighter.all();
+	
+	// Any link that has the current page as its href should be class="current"
+	$('a[href="'+ window.location.pathname +'"]').addClass('current');
+
+	// Breadcrumbs magic
+	$('#breadcrumb li.last').each(function()
+	{
+		var $this = $(this);
+		var $topics = $('#topics li').has('a.current').slice(0, -1);
+
+		$topics.each(function()
+		{
+			// Create a copy of the menu link
+			var $crumb = $(this).children('a:first, span:not(.toggle):first').clone();
+
+			// Insert the menu link into the breadcrumbs
+			$('<li></li>').html($crumb).insertBefore($this);
+		});
+	});
+
+	// Collapsing menus
+	$('#topics li:has(li)').each(function()
+	{
+		var $this = $(this);
+		var toggle = $('<span class="toggle"></span>');
+		var menu = $this.find('>ul,>ol');
+
+		toggle.click(function()
+		{
+			if (menu.is(':visible'))
+			{
+				menu.stop(true, true).slideUp('fast');
+				toggle.html('+');
+			}
+			else
+			{
+				menu.stop(true, true).slideDown('fast');
+				toggle.html('&ndash;');
+			}
+		});
+
+		$this.find('>span').click(function()
+		{
+			// Menu without a link
+			toggle.click();
+		});
+
+		if ( ! $this.is(':has(a.current)'))
+		{
+			menu.hide();
+		}
+
+		toggle.html(menu.is(':visible') ? '&ndash;' : '+').prependTo($this);
+	});
+
+// Show source links
+
+	$('#kodoc-main .method-source').each(function()
+	{
+		var self = $(this);
+		var togg = $(' <a class="sourcecode-toggle">[show]</a>').appendTo($('h4', self));
+		var code = self.find('pre').hide();
+
+		togg.toggle(function()
+		{
+			togg.html('[hide]');
+			code.stop(true, true).slideDown();
+		},
+		function()
+		{
+			togg.html('[show]');
+			code.stop(true, true).slideUp();
+		});
+	});
+
+	// "Link to this" link that appears when you hover over a header
+	$('#body')
+		.find('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id]')
+		.append(function(){
+			var $this = $(this);
+			return '<a href="#' + $this.attr('id') + '" class="permalink">link to this</a>';
+		});
+});
diff --git a/includes/kohana/modules/userguide/media/guide/js/shBrushPhp.js b/includes/kohana/modules/userguide/media/guide/js/shBrushPhp.js
new file mode 100644
index 0000000..95e6e43
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/shBrushPhp.js
@@ -0,0 +1,88 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+	// CommonJS
+	typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+	function Brush()
+	{
+		var funcs	=	'abs acos acosh addcslashes addslashes ' +
+						'array_change_key_case array_chunk array_combine array_count_values array_diff '+
+						'array_diff_assoc array_diff_key array_diff_uassoc array_diff_ukey array_fill '+
+						'array_filter array_flip array_intersect array_intersect_assoc array_intersect_key '+
+						'array_intersect_uassoc array_intersect_ukey array_key_exists array_keys array_map '+
+						'array_merge array_merge_recursive array_multisort array_pad array_pop array_product '+
+						'array_push array_rand array_reduce array_reverse array_search array_shift '+
+						'array_slice array_splice array_sum array_udiff array_udiff_assoc '+
+						'array_udiff_uassoc array_uintersect array_uintersect_assoc '+
+						'array_uintersect_uassoc array_unique array_unshift array_values array_walk '+
+						'array_walk_recursive atan atan2 atanh base64_decode base64_encode base_convert '+
+						'basename bcadd bccomp bcdiv bcmod bcmul bindec bindtextdomain bzclose bzcompress '+
+						'bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite ceil chdir '+
+						'checkdate checkdnsrr chgrp chmod chop chown chr chroot chunk_split class_exists '+
+						'closedir closelog copy cos cosh count count_chars date decbin dechex decoct '+
+						'deg2rad delete ebcdic2ascii echo empty end ereg ereg_replace eregi eregi_replace error_log '+
+						'error_reporting escapeshellarg escapeshellcmd eval exec exit exp explode extension_loaded '+
+						'feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents '+
+						'fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype '+
+						'floatval flock floor flush fmod fnmatch fopen fpassthru fprintf fputcsv fputs fread fscanf '+
+						'fseek fsockopen fstat ftell ftok getallheaders getcwd getdate getenv gethostbyaddr gethostbyname '+
+						'gethostbynamel getimagesize getlastmod getmxrr getmygid getmyinode getmypid getmyuid getopt '+
+						'getprotobyname getprotobynumber getrandmax getrusage getservbyname getservbyport gettext '+
+						'gettimeofday gettype glob gmdate gmmktime ini_alter ini_get ini_get_all ini_restore ini_set '+
+						'interface_exists intval ip2long is_a is_array is_bool is_callable is_dir is_double '+
+						'is_executable is_file is_finite is_float is_infinite is_int is_integer is_link is_long '+
+						'is_nan is_null is_numeric is_object is_readable is_real is_resource is_scalar is_soap_fault '+
+						'is_string is_subclass_of is_uploaded_file is_writable is_writeable mkdir mktime nl2br '+
+						'parse_ini_file parse_str parse_url passthru pathinfo print readlink realpath rewind rewinddir rmdir '+
+						'round str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split '+
+						'str_word_count strcasecmp strchr strcmp strcoll strcspn strftime strip_tags stripcslashes '+
+						'stripos stripslashes stristr strlen strnatcasecmp strnatcmp strncasecmp strncmp strpbrk '+
+						'strpos strptime strrchr strrev strripos strrpos strspn strstr strtok strtolower strtotime '+
+						'strtoupper strtr strval substr substr_compare';
+
+		var keywords =	'abstract and array as break case catch cfunction class clone const continue declare default die do ' +
+						'else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach ' +
+						'function include include_once global goto if implements interface instanceof namespace new ' +
+						'old_function or private protected public return require require_once static switch ' +
+						'throw try use var while xor ';
+		
+		var constants	= '__FILE__ __LINE__ __METHOD__ __FUNCTION__ __CLASS__';
+
+		this.regexList = [
+			{ regex: SyntaxHighlighter.regexLib.singleLineCComments,	css: 'comments' },			// one line comments
+			{ regex: SyntaxHighlighter.regexLib.multiLineCComments,		css: 'comments' },			// multiline comments
+			{ regex: SyntaxHighlighter.regexLib.doubleQuotedString,		css: 'string' },			// double quoted strings
+			{ regex: SyntaxHighlighter.regexLib.singleQuotedString,		css: 'string' },			// single quoted strings
+			{ regex: /\$\w+/g,											css: 'variable' },			// variables
+			{ regex: new RegExp(this.getKeywords(funcs), 'gmi'),		css: 'functions' },			// common functions
+			{ regex: new RegExp(this.getKeywords(constants), 'gmi'),	css: 'constants' },			// constants
+			{ regex: new RegExp(this.getKeywords(keywords), 'gm'),		css: 'keyword' }			// keyword
+			];
+
+		this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
+	};
+
+	Brush.prototype	= new SyntaxHighlighter.Highlighter();
+	Brush.aliases	= ['php'];
+
+	SyntaxHighlighter.brushes.Php = Brush;
+
+	// CommonJS
+	typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/includes/kohana/modules/userguide/media/guide/js/shCore.js b/includes/kohana/modules/userguide/media/guide/js/shCore.js
new file mode 100644
index 0000000..b47b645
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/shCore.js
@@ -0,0 +1,17 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ * 
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+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}('K M;I(M)1S 2U("2a\'t 4k M 4K 2g 3l 4G 4H");(6(){6 r(f,e){I(!M.1R(f))1S 3m("3s 15 4R");K a=f.1w;f=M(f.1m,t(f)+(e||""));I(a)f.1w={1m:a.1m,19:a.19?a.19.1a(0):N};H f}6 t(f){H(f.1J?"g":"")+(f.4s?"i":"")+(f.4p?"m":"")+(f.4v?"x":"")+(f.3n?"y":"")}6 B(f,e,a,b){K c=u.L,d,h,g;v=R;5K{O(;c--;){g=u[c];I(a&g.3r&&(!g.2p||g.2p.W(b))){g.2q.12=e;I((h=g.2q.X(f))&&h.P===e){d={3k:g.2b.W(b,h,a),1C:h};1N}}}}5v(i){1S i}5q{v=11}H d}6 p(f,e,a){I(3b.Z.1i)H f.1i(e,a);O(a=a||0;a<f.L;a++)I(f[a]===e)H a;H-1}M=6(f,e){K a=[],b=M.1B,c=0,d,h;I(M.1R(f)){I(e!==1d)1S 3m("2a\'t 5r 5I 5F 5B 5C 15 5E 5p");H r(f)}I(v)1S 2U("2a\'t W 3l M 59 5m 5g 5x 5i");e=e||"";O(d={2N:11,19:[],2K:6(g){H e.1i(g)>-1},3d:6(g){e+=g}};c<f.L;)I(h=B(f,c,b,d)){a.U(h.3k);c+=h.1C[0].L||1}Y I(h=n.X.W(z[b],f.1a(c))){a.U(h[0]);c+=h[0].L}Y{h=f.3a(c);I(h==="[")b=M.2I;Y I(h==="]")b=M.1B;a.U(h);c++}a=15(a.1K(""),n.Q.W(e,w,""));a.1w={1m:f,19:d.2N?d.19:N};H a};M.3v="1.5.0";M.2I=1;M.1B=2;K C=/\\$(?:(\\d\\d?|[$&`\'])|{([$\\w]+)})/g,w=/[^5h]+|([\\s\\S])(?=[\\s\\S]*\\1)/g,A=/^(?:[?*+]|{\\d+(?:,\\d*)?})\\??/,v=11,u=[],n={X:15.Z.X,1A:15.Z.1A,1C:1r.Z.1C,Q:1r.Z.Q,1e:1r.Z.1e},x=n.X.W(/()??/,"")[1]===1d,D=6(){K f=/^/g;n.1A.W(f,"");H!f.12}(),y=6(){K f=/x/g;n.Q.W("x",f,"");H!f.12}(),E=15.Z.3n!==1d,z={};z[M.2I]=/^(?:\\\\(?:[0-3][0-7]{0,2}|[4-7][0-7]?|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S]))/;z[M.1B]=/^(?:\\\\(?:0(?:[0-3][0-7]{0,2}|[4-7][0-7]?)?|[1-9]\\d*|x[\\29-26-f]{2}|u[\\29-26-f]{4}|c[A-3o-z]|[\\s\\S])|\\(\\?[:=!]|[?*+]\\?|{\\d+(?:,\\d*)?}\\??)/;M.1h=6(f,e,a,b){u.U({2q:r(f,"g"+(E?"y":"")),2b:e,3r:a||M.1B,2p:b||N})};M.2n=6(f,e){K a=f+"/"+(e||"");H M.2n[a]||(M.2n[a]=M(f,e))};M.3c=6(f){H r(f,"g")};M.5l=6(f){H f.Q(/[-[\\]{}()*+?.,\\\\^$|#\\s]/g,"\\\\$&")};M.5e=6(f,e,a,b){e=r(e,"g"+(b&&E?"y":""));e.12=a=a||0;f=e.X(f);H b?f&&f.P===a?f:N:f};M.3q=6(){M.1h=6(){1S 2U("2a\'t 55 1h 54 3q")}};M.1R=6(f){H 53.Z.1q.W(f)==="[2m 15]"};M.3p=6(f,e,a,b){O(K c=r(e,"g"),d=-1,h;h=c.X(f);){a.W(b,h,++d,f,c);c.12===h.P&&c.12++}I(e.1J)e.12=0};M.57=6(f,e){H 6 a(b,c){K d=e[c].1I?e[c]:{1I:e[c]},h=r(d.1I,"g"),g=[],i;O(i=0;i<b.L;i++)M.3p(b[i],h,6(k){g.U(d.3j?k[d.3j]||"":k[0])});H c===e.L-1||!g.L?g:a(g,c+1)}([f],0)};15.Z.1p=6(f,e){H J.X(e[0])};15.Z.W=6(f,e){H J.X(e)};15.Z.X=6(f){K e=n.X.1p(J,14),a;I(e){I(!x&&e.L>1&&p(e,"")>-1){a=15(J.1m,n.Q.W(t(J),"g",""));n.Q.W(f.1a(e.P),a,6(){O(K c=1;c<14.L-2;c++)I(14[c]===1d)e[c]=1d})}I(J.1w&&J.1w.19)O(K b=1;b<e.L;b++)I(a=J.1w.19[b-1])e[a]=e[b];!D&&J.1J&&!e[0].L&&J.12>e.P&&J.12--}H e};I(!D)15.Z.1A=6(f){(f=n.X.W(J,f))&&J.1J&&!f[0].L&&J.12>f.P&&J.12--;H!!f};1r.Z.1C=6(f){M.1R(f)||(f=15(f));I(f.1J){K e=n.1C.1p(J,14);f.12=0;H e}H f.X(J)};1r.Z.Q=6(f,e){K a=M.1R(f),b,c;I(a&&1j e.58()==="3f"&&e.1i("${")===-1&&y)H n.Q.1p(J,14);I(a){I(f.1w)b=f.1w.19}Y f+="";I(1j e==="6")c=n.Q.W(J,f,6(){I(b){14[0]=1f 1r(14[0]);O(K d=0;d<b.L;d++)I(b[d])14[0][b[d]]=14[d+1]}I(a&&f.1J)f.12=14[14.L-2]+14[0].L;H e.1p(N,14)});Y{c=J+"";c=n.Q.W(c,f,6(){K d=14;H n.Q.W(e,C,6(h,g,i){I(g)5b(g){24"$":H"$";24"&":H d[0];24"`":H d[d.L-1].1a(0,d[d.L-2]);24"\'":H d[d.L-1].1a(d[d.L-2]+d[0].L);5a:i="";g=+g;I(!g)H h;O(;g>d.L-3;){i=1r.Z.1a.W(g,-1)+i;g=1Q.3i(g/10)}H(g?d[g]||"":"$")+i}Y{g=+i;I(g<=d.L-3)H d[g];g=b?p(b,i):-1;H g>-1?d[g+1]:h}})})}I(a&&f.1J)f.12=0;H c};1r.Z.1e=6(f,e){I(!M.1R(f))H n.1e.1p(J,14);K a=J+"",b=[],c=0,d,h;I(e===1d||+e<0)e=5D;Y{e=1Q.3i(+e);I(!e)H[]}O(f=M.3c(f);d=f.X(a);){I(f.12>c){b.U(a.1a(c,d.P));d.L>1&&d.P<a.L&&3b.Z.U.1p(b,d.1a(1));h=d[0].L;c=f.12;I(b.L>=e)1N}f.12===d.P&&f.12++}I(c===a.L){I(!n.1A.W(f,"")||h)b.U("")}Y b.U(a.1a(c));H b.L>e?b.1a(0,e):b};M.1h(/\\(\\?#[^)]*\\)/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"});M.1h(/\\((?!\\?)/,6(){J.19.U(N);H"("});M.1h(/\\(\\?<([$\\w]+)>/,6(f){J.19.U(f[1]);J.2N=R;H"("});M.1h(/\\\\k<([\\w$]+)>/,6(f){K e=p(J.19,f[1]);H e>-1?"\\\\"+(e+1)+(3R(f.2S.3a(f.P+f[0].L))?"":"(?:)"):f[0]});M.1h(/\\[\\^?]/,6(f){H f[0]==="[]"?"\\\\b\\\\B":"[\\\\s\\\\S]"});M.1h(/^\\(\\?([5A]+)\\)/,6(f){J.3d(f[1]);H""});M.1h(/(?:\\s+|#.*)+/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"},M.1B,6(){H J.2K("x")});M.1h(/\\./,6(){H"[\\\\s\\\\S]"},M.1B,6(){H J.2K("s")})})();1j 2e!="1d"&&(2e.M=M);K 1v=6(){6 r(a,b){a.1l.1i(b)!=-1||(a.1l+=" "+b)}6 t(a){H a.1i("3e")==0?a:"3e"+a}6 B(a){H e.1Y.2A[t(a)]}6 p(a,b,c){I(a==N)H N;K d=c!=R?a.3G:[a.2G],h={"#":"1c",".":"1l"}[b.1o(0,1)]||"3h",g,i;g=h!="3h"?b.1o(1):b.5u();I((a[h]||"").1i(g)!=-1)H a;O(a=0;d&&a<d.L&&i==N;a++)i=p(d[a],b,c);H i}6 C(a,b){K c={},d;O(d 2g a)c[d]=a[d];O(d 2g b)c[d]=b[d];H c}6 w(a,b,c,d){6 h(g){g=g||1P.5y;I(!g.1F){g.1F=g.52;g.3N=6(){J.5w=11}}c.W(d||1P,g)}a.3g?a.3g("4U"+b,h):a.4y(b,h,11)}6 A(a,b){K c=e.1Y.2j,d=N;I(c==N){c={};O(K h 2g e.1U){K g=e.1U[h];d=g.4x;I(d!=N){g.1V=h.4w();O(g=0;g<d.L;g++)c[d[g]]=h}}e.1Y.2j=c}d=e.1U[c[a]];d==N&&b!=11&&1P.1X(e.13.1x.1X+(e.13.1x.3E+a));H d}6 v(a,b){O(K c=a.1e("\\n"),d=0;d<c.L;d++)c[d]=b(c[d],d);H c.1K("\\n")}6 u(a,b){I(a==N||a.L==0||a=="\\n")H a;a=a.Q(/</g,"&1y;");a=a.Q(/ {2,}/g,6(c){O(K d="",h=0;h<c.L-1;h++)d+=e.13.1W;H d+" "});I(b!=N)a=v(a,6(c){I(c.L==0)H"";K d="";c=c.Q(/^(&2s;| )+/,6(h){d=h;H""});I(c.L==0)H d;H d+\'<17 1g="\'+b+\'">\'+c+"</17>"});H a}6 n(a,b){a.1e("\\n");O(K c="",d=0;d<50;d++)c+="                    ";H a=v(a,6(h){I(h.1i("\\t")==-1)H h;O(K g=0;(g=h.1i("\\t"))!=-1;)h=h.1o(0,g)+c.1o(0,b-g%b)+h.1o(g+1,h.L);H h})}6 x(a){H a.Q(/^\\s+|\\s+$/g,"")}6 D(a,b){I(a.P<b.P)H-1;Y I(a.P>b.P)H 1;Y I(a.L<b.L)H-1;Y I(a.L>b.L)H 1;H 0}6 y(a,b){6 c(k){H k[0]}O(K d=N,h=[],g=b.2D?b.2D:c;(d=b.1I.X(a))!=N;){K i=g(d,b);I(1j i=="3f")i=[1f e.2L(i,d.P,b.23)];h=h.1O(i)}H h}6 E(a){K b=/(.*)((&1G;|&1y;).*)/;H a.Q(e.3A.3M,6(c){K d="",h=N;I(h=b.X(c)){c=h[1];d=h[2]}H\'<a 2h="\'+c+\'">\'+c+"</a>"+d})}6 z(){O(K a=1E.36("1k"),b=[],c=0;c<a.L;c++)a[c].3s=="20"&&b.U(a[c]);H b}6 f(a){a=a.1F;K b=p(a,".20",R);a=p(a,".3O",R);K c=1E.4i("3t");I(!(!a||!b||p(a,"3t"))){B(b.1c);r(b,"1m");O(K d=a.3G,h=[],g=0;g<d.L;g++)h.U(d[g].4z||d[g].4A);h=h.1K("\\r");c.39(1E.4D(h));a.39(c);c.2C();c.4C();w(c,"4u",6(){c.2G.4E(c);b.1l=b.1l.Q("1m","")})}}I(1j 3F!="1d"&&1j M=="1d")M=3F("M").M;K e={2v:{"1g-27":"","2i-1s":1,"2z-1s-2t":11,1M:N,1t:N,"42-45":R,"43-22":4,1u:R,16:R,"3V-17":R,2l:11,"41-40":R,2k:11,"1z-1k":11},13:{1W:"&2s;",2M:R,46:11,44:11,34:"4n",1x:{21:"4o 1m",2P:"?",1X:"1v\\n\\n",3E:"4r\'t 4t 1D O: ",4g:"4m 4B\'t 51 O 1z-1k 4F: ",37:\'<!4T 1z 4S "-//4V//3H 4W 1.0 4Z//4Y" "1Z://2y.3L.3K/4X/3I/3H/3I-4P.4J"><1z 4I="1Z://2y.3L.3K/4L/5L"><3J><4N 1Z-4M="5G-5M" 6K="2O/1z; 6J=6I-8" /><1t>6L 1v</1t></3J><3B 1L="25-6M:6Q,6P,6O,6N-6F;6y-2f:#6x;2f:#6w;25-22:6v;2O-3D:3C;"><T 1L="2O-3D:3C;3w-32:1.6z;"><T 1L="25-22:6A-6E;">1v</T><T 1L="25-22:.6C;3w-6B:6R;"><T>3v 3.0.76 (72 73 3x)</T><T><a 2h="1Z://3u.2w/1v" 1F="38" 1L="2f:#3y">1Z://3u.2w/1v</a></T><T>70 17 6U 71.</T><T>6T 6X-3x 6Y 6D.</T></T><T>6t 61 60 J 1k, 5Z <a 2h="6u://2y.62.2w/63-66/65?64=5X-5W&5P=5O" 1L="2f:#3y">5R</a> 5V <2R/>5U 5T 5S!</T></T></3B></1z>\'}},1Y:{2j:N,2A:{}},1U:{},3A:{6n:/\\/\\*[\\s\\S]*?\\*\\//2c,6m:/\\/\\/.*$/2c,6l:/#.*$/2c,6k:/"([^\\\\"\\n]|\\\\.)*"/g,6o:/\'([^\\\\\'\\n]|\\\\.)*\'/g,6p:1f M(\'"([^\\\\\\\\"]|\\\\\\\\.)*"\',"3z"),6s:1f M("\'([^\\\\\\\\\']|\\\\\\\\.)*\'","3z"),6q:/(&1y;|<)!--[\\s\\S]*?--(&1G;|>)/2c,3M:/\\w+:\\/\\/[\\w-.\\/?%&=:@;]*/g,6a:{18:/(&1y;|<)\\?=?/g,1b:/\\?(&1G;|>)/g},69:{18:/(&1y;|<)%=?/g,1b:/%(&1G;|>)/g},6d:{18:/(&1y;|<)\\s*1k.*?(&1G;|>)/2T,1b:/(&1y;|<)\\/\\s*1k\\s*(&1G;|>)/2T}},16:{1H:6(a){6 b(i,k){H e.16.2o(i,k,e.13.1x[k])}O(K c=\'<T 1g="16">\',d=e.16.2x,h=d.2X,g=0;g<h.L;g++)c+=(d[h[g]].1H||b)(a,h[g]);c+="</T>";H c},2o:6(a,b,c){H\'<2W><a 2h="#" 1g="6e 6h\'+b+" "+b+\'">\'+c+"</a></2W>"},2b:6(a){K b=a.1F,c=b.1l||"";b=B(p(b,".20",R).1c);K d=6(h){H(h=15(h+"6f(\\\\w+)").X(c))?h[1]:N}("6g");b&&d&&e.16.2x[d].2B(b);a.3N()},2x:{2X:["21","2P"],21:{1H:6(a){I(a.V("2l")!=R)H"";K b=a.V("1t");H e.16.2o(a,"21",b?b:e.13.1x.21)},2B:6(a){a=1E.6j(t(a.1c));a.1l=a.1l.Q("47","")}},2P:{2B:6(){K a="68=0";a+=", 18="+(31.30-33)/2+", 32="+(31.2Z-2Y)/2+", 30=33, 2Z=2Y";a=a.Q(/^,/,"");a=1P.6Z("","38",a);a.2C();K b=a.1E;b.6W(e.13.1x.37);b.6V();a.2C()}}}},35:6(a,b){K c;I(b)c=[b];Y{c=1E.36(e.13.34);O(K d=[],h=0;h<c.L;h++)d.U(c[h]);c=d}c=c;d=[];I(e.13.2M)c=c.1O(z());I(c.L===0)H d;O(h=0;h<c.L;h++){O(K g=c[h],i=a,k=c[h].1l,j=3W 0,l={},m=1f M("^\\\\[(?<2V>(.*?))\\\\]$"),s=1f M("(?<27>[\\\\w-]+)\\\\s*:\\\\s*(?<1T>[\\\\w-%#]+|\\\\[.*?\\\\]|\\".*?\\"|\'.*?\')\\\\s*;?","g");(j=s.X(k))!=N;){K o=j.1T.Q(/^[\'"]|[\'"]$/g,"");I(o!=N&&m.1A(o)){o=m.X(o);o=o.2V.L>0?o.2V.1e(/\\s*,\\s*/):[]}l[j.27]=o}g={1F:g,1n:C(i,l)};g.1n.1D!=N&&d.U(g)}H d},1M:6(a,b){K c=J.35(a,b),d=N,h=e.13;I(c.L!==0)O(K g=0;g<c.L;g++){b=c[g];K i=b.1F,k=b.1n,j=k.1D,l;I(j!=N){I(k["1z-1k"]=="R"||e.2v["1z-1k"]==R){d=1f e.4l(j);j="4O"}Y I(d=A(j))d=1f d;Y 6H;l=i.3X;I(h.2M){l=l;K m=x(l),s=11;I(m.1i("<![6G[")==0){m=m.4h(9);s=R}K o=m.L;I(m.1i("]]\\>")==o-3){m=m.4h(0,o-3);s=R}l=s?m:l}I((i.1t||"")!="")k.1t=i.1t;k.1D=j;d.2Q(k);b=d.2F(l);I((i.1c||"")!="")b.1c=i.1c;i.2G.74(b,i)}}},2E:6(a){w(1P,"4k",6(){e.1M(a)})}};e.2E=e.2E;e.1M=e.1M;e.2L=6(a,b,c){J.1T=a;J.P=b;J.L=a.L;J.23=c;J.1V=N};e.2L.Z.1q=6(){H J.1T};e.4l=6(a){6 b(j,l){O(K m=0;m<j.L;m++)j[m].P+=l}K c=A(a),d,h=1f e.1U.5Y,g=J,i="2F 1H 2Q".1e(" ");I(c!=N){d=1f c;O(K k=0;k<i.L;k++)(6(){K j=i[k];g[j]=6(){H h[j].1p(h,14)}})();d.28==N?1P.1X(e.13.1x.1X+(e.13.1x.4g+a)):h.2J.U({1I:d.28.17,2D:6(j){O(K l=j.17,m=[],s=d.2J,o=j.P+j.18.L,F=d.28,q,G=0;G<s.L;G++){q=y(l,s[G]);b(q,o);m=m.1O(q)}I(F.18!=N&&j.18!=N){q=y(j.18,F.18);b(q,j.P);m=m.1O(q)}I(F.1b!=N&&j.1b!=N){q=y(j.1b,F.1b);b(q,j.P+j[0].5Q(j.1b));m=m.1O(q)}O(j=0;j<m.L;j++)m[j].1V=c.1V;H m}})}};e.4j=6(){};e.4j.Z={V:6(a,b){K c=J.1n[a];c=c==N?b:c;K d={"R":R,"11":11}[c];H d==N?c:d},3Y:6(a){H 1E.4i(a)},4c:6(a,b){K c=[];I(a!=N)O(K d=0;d<a.L;d++)I(1j a[d]=="2m")c=c.1O(y(b,a[d]));H J.4e(c.6b(D))},4e:6(a){O(K b=0;b<a.L;b++)I(a[b]!==N)O(K c=a[b],d=c.P+c.L,h=b+1;h<a.L&&a[b]!==N;h++){K g=a[h];I(g!==N)I(g.P>d)1N;Y I(g.P==c.P&&g.L>c.L)a[b]=N;Y I(g.P>=c.P&&g.P<d)a[h]=N}H a},4d:6(a){K b=[],c=2u(J.V("2i-1s"));v(a,6(d,h){b.U(h+c)});H b},3U:6(a){K b=J.V("1M",[]);I(1j b!="2m"&&b.U==N)b=[b];a:{a=a.1q();K c=3W 0;O(c=c=1Q.6c(c||0,0);c<b.L;c++)I(b[c]==a){b=c;1N a}b=-1}H b!=-1},2r:6(a,b,c){a=["1s","6i"+b,"P"+a,"6r"+(b%2==0?1:2).1q()];J.3U(b)&&a.U("67");b==0&&a.U("1N");H\'<T 1g="\'+a.1K(" ")+\'">\'+c+"</T>"},3Q:6(a,b){K c="",d=a.1e("\\n").L,h=2u(J.V("2i-1s")),g=J.V("2z-1s-2t");I(g==R)g=(h+d-1).1q().L;Y I(3R(g)==R)g=0;O(K i=0;i<d;i++){K k=b?b[i]:h+i,j;I(k==0)j=e.13.1W;Y{j=g;O(K l=k.1q();l.L<j;)l="0"+l;j=l}a=j;c+=J.2r(i,k,a)}H c},49:6(a,b){a=x(a);K c=a.1e("\\n");J.V("2z-1s-2t");K d=2u(J.V("2i-1s"));a="";O(K h=J.V("1D"),g=0;g<c.L;g++){K i=c[g],k=/^(&2s;|\\s)+/.X(i),j=N,l=b?b[g]:d+g;I(k!=N){j=k[0].1q();i=i.1o(j.L);j=j.Q(" ",e.13.1W)}i=x(i);I(i.L==0)i=e.13.1W;a+=J.2r(g,l,(j!=N?\'<17 1g="\'+h+\' 5N">\'+j+"</17>":"")+i)}H a},4f:6(a){H a?"<4a>"+a+"</4a>":""},4b:6(a,b){6 c(l){H(l=l?l.1V||g:g)?l+" ":""}O(K d=0,h="",g=J.V("1D",""),i=0;i<b.L;i++){K k=b[i],j;I(!(k===N||k.L===0)){j=c(k);h+=u(a.1o(d,k.P-d),j+"48")+u(k.1T,j+k.23);d=k.P+k.L+(k.75||0)}}h+=u(a.1o(d),c()+"48");H h},1H:6(a){K b="",c=["20"],d;I(J.V("2k")==R)J.1n.16=J.1n.1u=11;1l="20";J.V("2l")==R&&c.U("47");I((1u=J.V("1u"))==11)c.U("6S");c.U(J.V("1g-27"));c.U(J.V("1D"));a=a.Q(/^[ ]*[\\n]+|[\\n]*[ ]*$/g,"").Q(/\\r/g," ");b=J.V("43-22");I(J.V("42-45")==R)a=n(a,b);Y{O(K h="",g=0;g<b;g++)h+=" ";a=a.Q(/\\t/g,h)}a=a;a:{b=a=a;h=/<2R\\s*\\/?>|&1y;2R\\s*\\/?&1G;/2T;I(e.13.46==R)b=b.Q(h,"\\n");I(e.13.44==R)b=b.Q(h,"");b=b.1e("\\n");h=/^\\s*/;g=4Q;O(K i=0;i<b.L&&g>0;i++){K k=b[i];I(x(k).L!=0){k=h.X(k);I(k==N){a=a;1N a}g=1Q.4q(k[0].L,g)}}I(g>0)O(i=0;i<b.L;i++)b[i]=b[i].1o(g);a=b.1K("\\n")}I(1u)d=J.4d(a);b=J.4c(J.2J,a);b=J.4b(a,b);b=J.49(b,d);I(J.V("41-40"))b=E(b);1j 2H!="1d"&&2H.3S&&2H.3S.1C(/5s/)&&c.U("5t");H b=\'<T 1c="\'+t(J.1c)+\'" 1g="\'+c.1K(" ")+\'">\'+(J.V("16")?e.16.1H(J):"")+\'<3Z 5z="0" 5H="0" 5J="0">\'+J.4f(J.V("1t"))+"<3T><3P>"+(1u?\'<2d 1g="1u">\'+J.3Q(a)+"</2d>":"")+\'<2d 1g="17"><T 1g="3O">\'+b+"</T></2d></3P></3T></3Z></T>"},2F:6(a){I(a===N)a="";J.17=a;K b=J.3Y("T");b.3X=J.1H(a);J.V("16")&&w(p(b,".16"),"5c",e.16.2b);J.V("3V-17")&&w(p(b,".17"),"56",f);H b},2Q:6(a){J.1c=""+1Q.5d(1Q.5n()*5k).1q();e.1Y.2A[t(J.1c)]=J;J.1n=C(e.2v,a||{});I(J.V("2k")==R)J.1n.16=J.1n.1u=11},5j:6(a){a=a.Q(/^\\s+|\\s+$/g,"").Q(/\\s+/g,"|");H"\\\\b(?:"+a+")\\\\b"},5f:6(a){J.28={18:{1I:a.18,23:"1k"},1b:{1I:a.1b,23:"1k"},17:1f M("(?<18>"+a.18.1m+")(?<17>.*?)(?<1b>"+a.1b.1m+")","5o")}}};H e}();1j 2e!="1d"&&(2e.1v=1v);',62,441,'||||||function|||||||||||||||||||||||||||||||||||||return|if|this|var|length|XRegExp|null|for|index|replace|true||div|push|getParam|call|exec|else|prototype||false|lastIndex|config|arguments|RegExp|toolbar|code|left|captureNames|slice|right|id|undefined|split|new|class|addToken|indexOf|typeof|script|className|source|params|substr|apply|toString|String|line|title|gutter|SyntaxHighlighter|_xregexp|strings|lt|html|test|OUTSIDE_CLASS|match|brush|document|target|gt|getHtml|regex|global|join|style|highlight|break|concat|window|Math|isRegExp|throw|value|brushes|brushName|space|alert|vars|http|syntaxhighlighter|expandSource|size|css|case|font|Fa|name|htmlScript|dA|can|handler|gm|td|exports|color|in|href|first|discoveredBrushes|light|collapse|object|cache|getButtonHtml|trigger|pattern|getLineHtml|nbsp|numbers|parseInt|defaults|com|items|www|pad|highlighters|execute|focus|func|all|getDiv|parentNode|navigator|INSIDE_CLASS|regexList|hasFlag|Match|useScriptTags|hasNamedCapture|text|help|init|br|input|gi|Error|values|span|list|250|height|width|screen|top|500|tagName|findElements|getElementsByTagName|aboutDialog|_blank|appendChild|charAt|Array|copyAsGlobal|setFlag|highlighter_|string|attachEvent|nodeName|floor|backref|output|the|TypeError|sticky|Za|iterate|freezeTokens|scope|type|textarea|alexgorbatchev|version|margin|2010|005896|gs|regexLib|body|center|align|noBrush|require|childNodes|DTD|xhtml1|head|org|w3|url|preventDefault|container|tr|getLineNumbersHtml|isNaN|userAgent|tbody|isLineHighlighted|quick|void|innerHTML|create|table|links|auto|smart|tab|stripBrs|tabs|bloggerMode|collapsed|plain|getCodeLinesHtml|caption|getMatchesHtml|findMatches|figureOutLineNumbers|removeNestedMatches|getTitleHtml|brushNotHtmlScript|substring|createElement|Highlighter|load|HtmlScript|Brush|pre|expand|multiline|min|Can|ignoreCase|find|blur|extended|toLowerCase|aliases|addEventListener|innerText|textContent|wasn|select|createTextNode|removeChild|option|same|frame|xmlns|dtd|twice|1999|equiv|meta|htmlscript|transitional|1E3|expected|PUBLIC|DOCTYPE|on|W3C|XHTML|TR|EN|Transitional||configured|srcElement|Object|after|run|dblclick|matchChain|valueOf|constructor|default|switch|click|round|execAt|forHtmlScript|token|gimy|functions|getKeywords|1E6|escape|within|random|sgi|another|finally|supply|MSIE|ie|toUpperCase|catch|returnValue|definition|event|border|imsx|constructing|one|Infinity|from|when|Content|cellpadding|flags|cellspacing|try|xhtml|Type|spaces|2930402|hosted_button_id|lastIndexOf|donate|active|development|keep|to|xclick|_s|Xml|please|like|you|paypal|cgi|cmd|webscr|bin|highlighted|scrollbars|aspScriptTags|phpScriptTags|sort|max|scriptScriptTags|toolbar_item|_|command|command_|number|getElementById|doubleQuotedString|singleLinePerlComments|singleLineCComments|multiLineCComments|singleQuotedString|multiLineDoubleQuotedString|xmlComments|alt|multiLineSingleQuotedString|If|https|1em|000|fff|background|5em|xx|bottom|75em|Gorbatchev|large|serif|CDATA|continue|utf|charset|content|About|family|sans|Helvetica|Arial|Geneva|3em|nogutter|Copyright|syntax|close|write|2004|Alex|open|JavaScript|highlighter|July|02|replaceChild|offset|83'.split('|'),0,{}))
diff --git a/includes/kohana/modules/userguide/media/guide/js/sizzle.js b/includes/kohana/modules/userguide/media/guide/js/sizzle.js
new file mode 100644
index 0000000..c52b77d
--- /dev/null
+++ b/includes/kohana/modules/userguide/media/guide/js/sizzle.js
@@ -0,0 +1,1068 @@
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function(){
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),
+		soFar = selector, ret, cur, pop, i;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec("");
+		m = chunker.exec(soFar);
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice(1,1);
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var filter = Expr.filter[ type ], found, item, left = match[1];
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				elem, i = 0, l = checkSet.length;
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck, nodeCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck, nodeCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			return match[1].toLowerCase();
+		},
+		CHILD: function(match){
+			if ( match[1] === "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return (/h\d/i).test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+		input: function(elem){
+			return (/input|select|textarea|button/i).test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 === i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
+		},
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					if ( type === "first" ) { 
+						return true; 
+					}
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					return true;
+				case 'nth':
+					var first = match[2], last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+					if ( first === 0 ) {
+						return diff === 0;
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [], i = 0;
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( "sourceIndex" in document.documentElement ) {
+	sortOrder = function( a, b ) {
+		if ( !a.sourceIndex || !b.sourceIndex ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.sourceIndex ? -1 : 1;
+		}
+
+		var ret = a.sourceIndex - b.sourceIndex;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( document.createRange ) {
+	sortOrder = function( a, b ) {
+		if ( !a.ownerDocument || !b.ownerDocument ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.ownerDocument ? -1 : 1;
+		}
+
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle, div = document.createElement("div");
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function(query, context, extra, seed){
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {
+				try {
+					return makeArray( context.querySelectorAll(query), extra );
+				} catch(e){}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		div = null; // release memory in IE
+	})();
+}
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context, isXML) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+Sizzle.contains = document.compareDocumentPosition ? function(a, b){
+	return !!(a.compareDocumentPosition(b) & 16);
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+Sizzle.isXML = function(elem){
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function(selector, context){
+	var tmpSet = [], later = "", match,
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+
+window.Sizzle = Sizzle;
+
+})();
diff --git a/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-edit.png b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-edit.png
new file mode 100644
index 0000000..b90eb91
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-edit.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-fork.png b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-fork.png
new file mode 100644
index 0000000..a557b83
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-fork.png differ
diff --git a/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-pull.png b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-pull.png
new file mode 100644
index 0000000..e2bc602
Binary files /dev/null and b/includes/kohana/modules/userguide/media/guide/userguide/contrib-github-pull.png differ
diff --git a/includes/kohana/modules/userguide/messages/userguide.php b/includes/kohana/modules/userguide/messages/userguide.php
new file mode 100644
index 0000000..5397d2e
--- /dev/null
+++ b/includes/kohana/modules/userguide/messages/userguide.php
@@ -0,0 +1,14 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	'translations' => array(
+		'de-de' => 'Deutsch',
+		'en-us' => 'English',
+		'es-es' => 'Español',
+		'zh-cn' => '简体中文',
+		'ru-ru' => 'Русский',
+		'fr-fr' => 'Français',
+		'he-il' => 'עברית',
+		'nl'	=> 'Nederlands',
+	),
+);
diff --git a/includes/kohana/modules/userguide/vendor/markdown/License.text b/includes/kohana/modules/userguide/vendor/markdown/License.text
new file mode 100644
index 0000000..52c868b
--- /dev/null
+++ b/includes/kohana/modules/userguide/vendor/markdown/License.text
@@ -0,0 +1,36 @@
+PHP Markdown & Extra
+Copyright (c) 2004-2008 Michel Fortin  
+<http://www.michelf.com/>  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+<http://daringfireball.net/>   
+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 "Markdown" 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/includes/kohana/modules/userguide/vendor/markdown/markdown.php b/includes/kohana/modules/userguide/vendor/markdown/markdown.php
new file mode 100644
index 0000000..b649f6c
--- /dev/null
+++ b/includes/kohana/modules/userguide/vendor/markdown/markdown.php
@@ -0,0 +1,2909 @@
+<?php
+#
+# Markdown Extra  -  A text-to-HTML conversion tool for web writers
+#
+# PHP Markdown & Extra
+# Copyright (c) 2004-2008 Michel Fortin  
+# <http://www.michelf.com/projects/php-markdown/>
+#
+# Original Markdown
+# Copyright (c) 2004-2006 John Gruber  
+# <http://daringfireball.net/projects/markdown/>
+#
+
+
+define( 'MARKDOWN_VERSION',  "1.0.1m" ); # Sat 21 Jun 2008
+define( 'MARKDOWNEXTRA_VERSION',  "1.2.3" ); # Wed 31 Dec 2008
+
+
+#
+# Global default settings:
+#
+
+# Change to ">" for HTML output
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+
+# Define the width of a tab for code blocks.
+@define( 'MARKDOWN_TAB_WIDTH',     4 );
+
+# Optional title attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+
+# Optional class attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+
+
+#
+# WordPress settings:
+#
+
+# Change to false to remove Markdown from posts and/or comments.
+@define( 'MARKDOWN_WP_POSTS',      true );
+@define( 'MARKDOWN_WP_COMMENTS',   true );
+
+
+
+### Standard Function Interface ###
+
+@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+
+function Markdown($text) {
+#
+# Initialize the parser and return the result of its transform method.
+#
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
+}
+
+
+### WordPress Plugin Interface ###
+
+/*
+Plugin Name: Markdown Extra
+Plugin URI: http://www.michelf.com/projects/php-markdown/
+Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>
+Version: 1.2.2
+Author: Michel Fortin
+Author URI: http://www.michelf.com/
+*/
+
+if (isset($wp_version)) {
+	# More details about how it works here:
+	# <http://www.michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
+	
+	# Post content and excerpts
+	# - Remove WordPress paragraph generator.
+	# - Run Markdown on excerpt, then remove all tags.
+	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
+	if (MARKDOWN_WP_POSTS) {
+		remove_filter('the_content',     'wpautop');
+        remove_filter('the_content_rss', 'wpautop');
+		remove_filter('the_excerpt',     'wpautop');
+		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+        add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
+		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
+		add_filter('get_the_excerpt', 'trim', 7);
+		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt_rss', 'mdwp_strip_p');
+		
+		remove_filter('content_save_pre',  'balanceTags', 50);
+		remove_filter('excerpt_save_pre',  'balanceTags', 50);
+		add_filter('the_content',  	  'balanceTags', 50);
+		add_filter('get_the_excerpt', 'balanceTags', 9);
+	}
+	
+	# Add a footnote id prefix to posts when inside a loop.
+	function mdwp_MarkdownPost($text) {
+		static $parser;
+		if (!$parser) {
+			$parser_class = MARKDOWN_PARSER_CLASS;
+			$parser = new $parser_class;
+		}
+		if (is_single() || is_page() || is_feed()) {
+			$parser->fn_id_prefix = "";
+		} else {
+			$parser->fn_id_prefix = get_the_ID() . ".";
+		}
+		return $parser->transform($text);
+	}
+	
+	# Comments
+	# - Remove WordPress paragraph generator.
+	# - Remove WordPress auto-link generator.
+	# - Scramble important tags before passing them to the kses filter.
+	# - Run Markdown on excerpt then remove paragraph tags.
+	if (MARKDOWN_WP_COMMENTS) {
+		remove_filter('comment_text', 'wpautop', 30);
+		remove_filter('comment_text', 'make_clickable');
+		add_filter('pre_comment_content', 'Markdown', 6);
+		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
+		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
+		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_excerpt', 'Markdown', 6);
+		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
+	
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		$mdwp_hidden_tags = explode(' ',
+			'<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
+		$mdwp_placeholders = explode(' ', str_rot13(
+			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
+			'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
+	}
+	
+	function mdwp_add_p($text) {
+		if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
+			$text = '<p>'.$text.'</p>';
+			$text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
+		}
+		return $text;
+	}
+	
+	function mdwp_strip_p($t) { return preg_replace('{</?p>}i', '', $t); }
+
+	function mdwp_hide_tags($text) {
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
+	}
+	function mdwp_show_tags($text) {
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
+	}
+}
+
+
+### bBlog Plugin Info ###
+
+function identify_modifier_markdown() {
+	return array(
+		'name' => 'markdown',
+		'type' => 'modifier',
+		'nicename' => 'PHP Markdown Extra',
+		'description' => 'A text-to-HTML conversion tool for web writers',
+		'authors' => 'Michel Fortin and John Gruber',
+		'licence' => 'GPL',
+		'version' => MARKDOWNEXTRA_VERSION,
+		'help' => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>',
+		);
+}
+
+
+### Smarty Modifier Interface ###
+
+function smarty_modifier_markdown($text) {
+	return Markdown($text);
+}
+
+
+### Textile Compatibility Mode ###
+
+# Rename this file to "classTextile.php" and it can replace Textile everywhere.
+
+if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) {
+	# Try to include PHP SmartyPants. Should be in the same directory.
+	@include_once 'smartypants.php';
+	# Fake Textile class. It calls Markdown instead.
+	class Textile {
+		function TextileThis($text, $lite='', $encode='') {
+			if ($lite == '' && $encode == '')    $text = Markdown($text);
+			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+			return $text;
+		}
+		# Fake restricted version: restrictions are not supported for now.
+		function TextileRestricted($text, $lite='', $noimage='') {
+			return $this->TextileThis($text, $lite);
+		}
+		# Workaround to ensure compatibility with TextPattern 4.0.3.
+		function blockLite($text) { return $text; }
+	}
+}
+
+
+
+#
+# Markdown Parser Class
+#
+
+class Markdown_Parser {
+
+	# Regex to match balanced [brackets].
+	# Needed to insert a maximum bracked depth while converting to PHP.
+	var $nested_brackets_depth = 6;
+	var $nested_brackets_re;
+	
+	var $nested_url_parenthesis_depth = 4;
+	var $nested_url_parenthesis_re;
+
+	# Table of hash values for escaped characters:
+	var $escape_chars = '\`*_{}[]()>#+-.!';
+	var $escape_chars_re;
+
+	# Change to ">" for HTML output.
+	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+	var $tab_width = MARKDOWN_TAB_WIDTH;
+	
+	# Change to `true` to disallow markup or entities.
+	var $no_markup = false;
+	var $no_entities = false;
+	
+	# Predefined urls and titles for reference links and images.
+	var $predef_urls = array();
+	var $predef_titles = array();
+
+
+	function Markdown_Parser() {
+	#
+	# Constructor function. Initialize appropriate member variables.
+	#
+		$this->_initDetab();
+		$this->prepareItalicsAndBold();
+	
+		$this->nested_brackets_re = 
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('\])*', $this->nested_brackets_depth);
+	
+		$this->nested_url_parenthesis_re = 
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+		
+		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+		
+		# Sort document, block, and span gamut in ascendent priority order.
+		asort($this->document_gamut);
+		asort($this->block_gamut);
+		asort($this->span_gamut);
+	}
+
+
+	# Internal hashes used during transformation.
+	var $urls = array();
+	var $titles = array();
+	var $html_hashes = array();
+	
+	# Status flag to avoid invalid nesting.
+	var $in_anchor = false;
+	
+	
+	function setup() {
+	#
+	# Called before the transformation process starts to setup parser 
+	# states.
+	#
+		# Clear global hashes.
+		$this->urls = $this->predef_urls;
+		$this->titles = $this->predef_titles;
+		$this->html_hashes = array();
+		
+		$in_anchor = false;
+	}
+	
+	function teardown() {
+	#
+	# Called after the transformation process to clear any variable 
+	# which may be taking up memory unnecessarly.
+	#
+		$this->urls = array();
+		$this->titles = array();
+		$this->html_hashes = array();
+	}
+
+
+	function transform($text) {
+	#
+	# Main function. Performs some preprocessing on the input text
+	# and pass it through the document gamut.
+	#
+		$this->setup();
+	
+		# Remove UTF-8 BOM and marker character in input, if present.
+		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+
+		# Standardize line endings:
+		#   DOS to Unix and Mac to Unix
+		$text = preg_replace('{\r\n?}', "\n", $text);
+
+		# Make sure $text ends with a couple of newlines:
+		$text .= "\n\n";
+
+		# Convert all tabs to spaces.
+		$text = $this->detab($text);
+
+		# Turn block-level HTML blocks into hash entries
+		$text = $this->hashHTMLBlocks($text);
+
+		# Strip any lines consisting only of spaces and tabs.
+		# This makes subsequent regexen easier to write, because we can
+		# match consecutive blank lines with /\n+/ instead of something
+		# contorted like /[ ]*\n+/ .
+		$text = preg_replace('/^[ ]+$/m', '', $text);
+
+		# Run document gamut methods.
+		foreach ($this->document_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		$this->teardown();
+
+		return $text . "\n";
+	}
+	
+	var $document_gamut = array(
+		# Strip link definitions, store in hashes.
+		"stripLinkDefinitions" => 20,
+		
+		"runBasicBlockGamut"   => 30,
+		);
+
+
+	function stripLinkDefinitions($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: ^[id]: url "optional title"
+		$text = preg_replace_callback('{
+							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							  [ ]*
+							  \n?				# maybe *one* newline
+							  [ ]*
+							<?(\S+?)>?			# url = $2
+							  [ ]*
+							  \n?				# maybe one newline
+							  [ ]*
+							(?:
+								(?<=\s)			# lookbehind for whitespace
+								["(]
+								(.*?)			# title = $3
+								[")]
+								[ ]*
+							)?	# title is optional
+							(?:\n+|\Z)
+			}xm',
+			array(&$this, '_stripLinkDefinitions_callback'),
+			$text);
+		return $text;
+	}
+	function _stripLinkDefinitions_callback($matches) {
+		$link_id = strtolower($matches[1]);
+		$this->urls[$link_id] = $matches[2];
+		$this->titles[$link_id] =& $matches[3];
+		return ''; # String that will replace the block
+	}
+
+
+	function hashHTMLBlocks($text) {
+		if ($this->no_markup)  return $text;
+
+		$less_than_tab = $this->tab_width - 1;
+
+		# Hashify HTML blocks:
+		# We only want to do this for block-level HTML tags, such as headers,
+		# lists, and tables. That's because we still want to wrap <p>s around
+		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+		# phrase emphasis, and spans. The list of tags we're looking for is
+		# hard-coded:
+		#
+		# *  List "a" is made of tags which can be both inline or block-level.
+		#    These will be treated block-level when the start tag is alone on 
+		#    its line, otherwise they're not matched here and will be taken as 
+		#    inline later.
+		# *  List "b" is made of tags which are always block-level;
+		#
+		$block_tags_a_re = 'ins|del';
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+						   'script|noscript|form|fieldset|iframe|math';
+
+		# Regular expression for the content of a block tag.
+		$nested_tags_level = 4;
+		$attr = '
+			(?>				# optional tag attributes
+			  \s			# starts with whitespace
+			  (?>
+				[^>"/]+		# text outside quotes
+			  |
+				/+(?!>)		# slash not followed by ">"
+			  |
+				"[^"]*"		# text inside double quotes (tolerate ">")
+			  |
+				\'[^\']*\'	# text inside single quotes (tolerate ">")
+			  )*
+			)?	
+			';
+		$content =
+			str_repeat('
+				(?>
+				  [^<]+			# content without tag
+				|
+				  <\2			# nested opening tag
+					'.$attr.'	# attributes
+					(?>
+					  />
+					|
+					  >', $nested_tags_level).	# end of opening tag
+					  '.*?'.					# last level nested tag content
+			str_repeat('
+					  </\2\s*>	# closing nested tag
+					)
+				  |				
+					<(?!/\2\s*>	# other tags with a different name
+				  )
+				)*',
+				$nested_tags_level);
+		$content2 = str_replace('\2', '\3', $content);
+
+		# First, look for nested blocks, e.g.:
+		# 	<div>
+		# 		<div>
+		# 		tags for inner block must be indented.
+		# 		</div>
+		# 	</div>
+		#
+		# The outermost tags must start at the left margin for this to match, and
+		# the inner nested divs must be indented.
+		# We need to do this before the next, more liberal match, because the next
+		# match will start at the first `<div>` and stop at the first `</div>`.
+		$text = preg_replace_callback('{(?>
+			(?>
+				(?<=\n\n)		# Starting after a blank line
+				|				# or
+				\A\n?			# the beginning of the doc
+			)
+			(						# save in $1
+
+			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
+			  # in between.
+					
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_b_re.')# start tag = $2
+						'.$attr.'>			# attributes followed by > and \n
+						'.$content.'		# content, support nesting
+						</\2>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+
+			| # Special version for tags of group a.
+
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_a_re.')# start tag = $3
+						'.$attr.'>[ ]*\n	# attributes followed by >
+						'.$content2.'		# content, support nesting
+						</\3>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+					
+			| # Special case just for <hr />. It was easier to make a special 
+			  # case than to make the other regex more complicated.
+			
+						[ ]{0,'.$less_than_tab.'}
+						<(hr)				# start tag = $2
+						'.$attr.'			# attributes
+						/?>					# the matching end tag
+						[ ]*
+						(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # Special case for standalone HTML comments:
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<!-- .*? -->
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+			
+			| # PHP and ASP-style processor instructions (<? and <%)
+			
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<([?%])			# $2
+						.*?
+						\2>
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+					
+			)
+			)}Sxmi',
+			array(&$this, '_hashHTMLBlocks_callback'),
+			$text);
+
+		return $text;
+	}
+	function _hashHTMLBlocks_callback($matches) {
+		$text = $matches[1];
+		$key  = $this->hashBlock($text);
+		return "\n\n$key\n\n";
+	}
+	
+	
+	function hashPart($text, $boundary = 'X') {
+	#
+	# Called whenever a tag must be hashed when a function insert an atomic 
+	# element in the text stream. Passing $text to through this function gives
+	# a unique text-token which will be reverted back when calling unhash.
+	#
+	# The $boundary argument specify what character should be used to surround
+	# the token. By convension, "B" is used for block elements that needs not
+	# to be wrapped into paragraph tags at the end, ":" is used for elements
+	# that are word separators and "X" is used in the general case.
+	#
+		# Swap back any tag hash found in $text so we do not have to `unhash`
+		# multiple times at the end.
+		$text = $this->unhash($text);
+		
+		# Then hash the block.
+		static $i = 0;
+		$key = "$boundary\x1A" . ++$i . $boundary;
+		$this->html_hashes[$key] = $text;
+		return $key; # String that will replace the tag.
+	}
+
+
+	function hashBlock($text) {
+	#
+	# Shortcut function for hashPart with block-level boundaries.
+	#
+		return $this->hashPart($text, 'B');
+	}
+
+
+	var $block_gamut = array(
+	#
+	# These are all the transformations that form block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		"doHeaders"         => 10,
+		"doHorizontalRules" => 20,
+		
+		"doLists"           => 40,
+		"doCodeBlocks"      => 50,
+		"doBlockQuotes"     => 60,
+		);
+
+	function runBlockGamut($text) {
+	#
+	# Run block gamut tranformations.
+	#
+		# We need to escape raw HTML in Markdown source before doing anything 
+		# else. This need to be done for each block, and not only at the 
+		# begining in the Markdown function since hashed blocks can be part of
+		# list items and could have been indented. Indented blocks would have 
+		# been seen as a code block in a previous pass of hashHTMLBlocks.
+		$text = $this->hashHTMLBlocks($text);
+		
+		return $this->runBasicBlockGamut($text);
+	}
+	
+	function runBasicBlockGamut($text) {
+	#
+	# Run block gamut tranformations, without hashing HTML blocks. This is 
+	# useful when HTML blocks are known to be already hashed, like in the first
+	# whole-document pass.
+	#
+		foreach ($this->block_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+		
+		# Finally form paragraph and restore hashed blocks.
+		$text = $this->formParagraphs($text);
+
+		return $text;
+	}
+	
+	
+	function doHorizontalRules($text) {
+		# Do Horizontal Rules:
+		return preg_replace(
+			'{
+				^[ ]{0,3}	# Leading space
+				([-*_])		# $1: First marker
+				(?>			# Repeated marker group
+					[ ]{0,2}	# Zero, one, or two spaces.
+					\1			# Marker character
+				){2,}		# Group repeated at least twice
+				[ ]*		# Tailing spaces
+				$			# End of line.
+			}mx',
+			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+			$text);
+	}
+
+
+	var $span_gamut = array(
+	#
+	# These are all the transformations that occur *within* block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		# Process character escapes, code spans, and inline HTML
+		# in one shot.
+		"parseSpan"           => -30,
+
+		# Process anchor and image tags. Images must come first,
+		# because ![foo][f] looks like an anchor.
+		"doImages"            =>  10,
+		"doAnchors"           =>  20,
+		
+		# Make links out of things like `<http://example.com/>`
+		# Must come after doAnchors, because you can use < and >
+		# delimiters in inline links like [this](<url>).
+		"doAutoLinks"         =>  30,
+		"encodeAmpsAndAngles" =>  40,
+
+		"doItalicsAndBold"    =>  50,
+		"doHardBreaks"        =>  60,
+		);
+
+	function runSpanGamut($text) {
+	#
+	# Run span gamut tranformations.
+	#
+		foreach ($this->span_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		return $text;
+	}
+	
+	
+	function doHardBreaks($text) {
+		# Do hard breaks:
+		return preg_replace_callback('/ {2,}\n/', 
+			array(&$this, '_doHardBreaks_callback'), $text);
+	}
+	function _doHardBreaks_callback($matches) {
+		return $this->hashPart("<br$this->empty_element_suffix\n");
+	}
+
+
+	function doAnchors($text) {
+	#
+	# Turn Markdown link shortcuts into XHTML <a> tags.
+	#
+		if ($this->in_anchor) return $text;
+		$this->in_anchor = true;
+		
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+			)
+			}xs',
+			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# href = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# href = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# Title = $7
+				  \6		# matching quote
+				  [ ]*	# ignore any spaces/tabs between closing quote and )
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_DoAnchors_inline_callback'), $text);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link test][1]
+		# or [link test](/foo)
+		#
+//		$text = preg_replace_callback('{
+//			(					# wrap whole match in $1
+//			  \[
+//				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
+//			  \]
+//			)
+//			}xs',
+//			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		$this->in_anchor = false;
+		return $text;
+	}
+	function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+
+		if ($link_id == "") {
+			# for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+		
+		# lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeAttribute($url);
+			
+			$result = "<a href=\"$url\"";
+			if ( isset( $this->titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+		
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+	function _doAnchors_inline_callback($matches) {
+		$whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+		
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+
+	function doImages($text) {
+	#
+	# Turn Markdown image shortcuts into <img> tags.
+	#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs', 
+			array(&$this, '_doImages_reference_callback'), $text);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+			  \s?			# One optional whitespace character
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# src url = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# src url = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# title = $7
+				  \6		# matching quote
+				  [ ]*
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_doImages_inline_callback'), $text);
+
+		return $text;
+	}
+	function _doImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
+		}
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		if (isset($this->urls[$link_id])) {
+			$url = $this->encodeAttribute($this->urls[$link_id]);
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (isset($this->titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+	function _doImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeAttribute($url);
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\""; # $title already quoted
+		}
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+
+	function doHeaders($text) {
+		# Setext-style headers:
+		#	  Header 1
+		#	  ========
+		#  
+		#	  Header 2
+		#	  --------
+		#
+		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_callback_setext($matches) {
+		# Terrible hack to check we haven't found an empty list item.
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+			return $matches[0];
+		
+		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doLists($text) {
+	#
+	# Form HTML ordered (numbered) and unordered (bulleted) lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+		$markers_relist = array($marker_ul_re, $marker_ol_re);
+
+		foreach ($markers_relist as $marker_re) {
+			# Re-usable pattern to match any entirel ul or ol list:
+			$whole_list_re = '
+				(								# $1 = whole list
+				  (								# $2
+					[ ]{0,'.$less_than_tab.'}
+					('.$marker_re.')			# $3 = first list item marker
+					[ ]+
+				  )
+				  (?s:.+?)
+				  (								# $4
+					  \z
+					|
+					  \n{2,}
+					  (?=\S)
+					  (?!						# Negative lookahead for another list item marker
+						[ ]*
+						'.$marker_re.'[ ]+
+					  )
+				  )
+				)
+			'; // mx
+			
+			# We use a different prefix before nested lists than top-level lists.
+			# See extended comment in _ProcessListItems().
+		
+			if ($this->list_level) {
+				$text = preg_replace_callback('{
+						^
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+			else {
+				$text = preg_replace_callback('{
+						(?:(?<=\n)\n|\A\n?) # Must eat the newline
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+		}
+
+		return $text;
+	}
+	function _doLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+		
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul_re/", $matches[3]) ? "ul" : "ol";
+		
+		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		
+		$list .= "\n";
+		$result = $this->processListItems($list, $marker_any_re);
+		
+		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+		return "\n". $result ."\n\n";
+	}
+
+	var $list_level = 0;
+
+	function processListItems($list_str, $marker_any_re) {
+	#
+	#	Process the contents of a single ordered or unordered list, splitting it
+	#	into individual list items.
+	#
+		# The $this->list_level global keeps track of when we're inside a list.
+		# Each time we enter a list, we increment it; when we leave a list,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+		
+		$this->list_level++;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		$list_str = preg_replace_callback('{
+			(\n)?							# leading line = $1
+			(^[ ]*)							# leading whitespace = $2
+			('.$marker_any_re.'				# list marker and space = $3
+				(?:[ ]+|(?=\n))	# space only required if item is not empty
+			)
+			((?s:.*?))						# list item text   = $4
+			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
+			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+			}xm',
+			array(&$this, '_processListItems_callback'), $list_str);
+
+		$this->list_level--;
+		return $list_str;
+	}
+	function _processListItems_callback($matches) {
+		$item = $matches[4];
+		$leading_line =& $matches[1];
+		$leading_space =& $matches[2];
+		$marker_space = $matches[3];
+		$tailing_blank_line =& $matches[5];
+
+		if ($leading_line || $tailing_blank_line || 
+			preg_match('/\n{2,}/', $item))
+		{
+			# Replace marker with the appropriate whitespace indentation
+			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $this->runBlockGamut($this->outdent($item)."\n");
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = $this->doLists($this->outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->runSpanGamut($item);
+		}
+
+		return "<li>" . $item . "</li>\n";
+	}
+
+
+	function doCodeBlocks($text) {
+	#
+	#	Process Markdown `<pre><code>` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A\n?)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?>
+					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array(&$this, '_doCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+
+	function makeCodeSpan($code) {
+	#
+	# Create a code span markup for $code. Called from handleSpanToken.
+	#
+		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		return $this->hashPart("<code>$code</code>");
+	}
+
+
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S)(?![.,:;]\s)',
+		'*' => '(?<=\S)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S)(?<!_)_(?!_)',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S)(?![.,:;]\s)',
+		'**' => '(?<=\S)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S)(?<!_)__(?!_)',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S)(?![.,:;]\s)',
+		'***' => '(?<=\S)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S)(?<!_)___(?!_)',
+		);
+	var $em_strong_prepared_relist;
+	
+	function prepareItalicsAndBold() {
+	#
+	# Prepare regular expressions for seraching emphasis tokens in any
+	# context.
+	#
+		foreach ($this->em_relist as $em => $em_re) {
+			foreach ($this->strong_relist as $strong => $strong_re) {
+				# Construct list of allowed token expressions.
+				$token_relist = array();
+				if (isset($this->em_strong_relist["$em$strong"])) {
+					$token_relist[] = $this->em_strong_relist["$em$strong"];
+				}
+				$token_relist[] = $em_re;
+				$token_relist[] = $strong_re;
+				
+				# Construct master expression from list.
+				$token_re = '{('. implode('|', $token_relist) .')}';
+				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+			}
+		}
+	}
+	
+	function doItalicsAndBold($text) {
+		$token_stack = array('');
+		$text_stack = array('');
+		$em = '';
+		$strong = '';
+		$tree_char_em = false;
+		
+		while (1) {
+			#
+			# Get prepared regular expression for seraching emphasis tokens
+			# in current context.
+			#
+			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+			
+			#
+			# Each loop iteration seach for the next emphasis token. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			$text_stack[0] .= $parts[0];
+			$token =& $parts[1];
+			$text =& $parts[2];
+			
+			if (empty($token)) {
+				# Reached end of text span: empty stack without emitting.
+				# any more emphasis.
+				while ($token_stack[0]) {
+					$text_stack[1] .= array_shift($token_stack);
+					$text_stack[0] .= array_shift($text_stack);
+				}
+				break;
+			}
+			
+			$token_len = strlen($token);
+			if ($tree_char_em) {
+				# Reached closing marker while inside a three-char emphasis.
+				if ($token_len == 3) {
+					# Three-char closing marker, close em and strong.
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong><em>$span</em></strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$em = '';
+					$strong = '';
+				} else {
+					# Other closing marker: close one em or strong and
+					# change current token state to match the other
+					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$tag = $token_len == 2 ? "strong" : "em";
+					$span = $text_stack[0];
+					$span = $this->runSpanGamut($span);
+					$span = "<$tag>$span</$tag>";
+					$text_stack[0] = $this->hashPart($span);
+					$$tag = ''; # $$tag stands for $em or $strong
+				}
+				$tree_char_em = false;
+			} else if ($token_len == 3) {
+				if ($em) {
+					# Reached closing marker for both em and strong.
+					# Closing strong marker:
+					for ($i = 0; $i < 2; ++$i) {
+						$shifted_token = array_shift($token_stack);
+						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<$tag>$span</$tag>";
+						$text_stack[0] .= $this->hashPart($span);
+						$$tag = ''; # $$tag stands for $em or $strong
+					}
+				} else {
+					# Reached opening three-char emphasis marker. Push on token 
+					# stack; will be handled by the special condition above.
+					$em = $token{0};
+					$strong = "$em$em";
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$tree_char_em = true;
+				}
+			} else if ($token_len == 2) {
+				if ($strong) {
+					# Unwind any dangling emphasis marker:
+					if (strlen($token_stack[0]) == 1) {
+						$text_stack[1] .= array_shift($token_stack);
+						$text_stack[0] .= array_shift($text_stack);
+					}
+					# Closing strong marker:
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong>$span</strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$strong = '';
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$strong = $token;
+				}
+			} else {
+				# Here $token_len == 1
+				if ($em) {
+					if (strlen($token_stack[0]) == 1) {
+						# Closing emphasis marker:
+						array_shift($token_stack);
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<em>$span</em>";
+						$text_stack[0] .= $this->hashPart($span);
+						$em = '';
+					} else {
+						$text_stack[0] .= $token;
+					}
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$em = $token;
+				}
+			}
+		}
+		return $text_stack[0];
+	}
+
+
+	function doBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*>[ ]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array(&$this, '_doBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	function _doBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content, 
+		# so we need to fix that:
+		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
+			array(&$this, '_DoBlockQuotes_callback2'), $bq);
+
+		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+	}
+	function _doBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+				# Is a paragraph.
+				$value = $this->runSpanGamut($value);
+				$value = preg_replace('/^([ ]*)/', "<p>", $value);
+				$value .= "</p>";
+				$grafs[$key] = $this->unhash($value);
+			}
+			else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf = $value;
+				$block = $this->html_hashes[$graf];
+				$graf = $block;
+//				if (preg_match('{
+//					\A
+//					(							# $1 = <div> tag
+//					  <div  \s+
+//					  [^>]*
+//					  \b
+//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
+//					  1
+//					  \2
+//					  [^>]*
+//					  >
+//					)
+//					(							# $3 = contents
+//					.*
+//					)
+//					(</div>)					# $4 = closing tag
+//					\z
+//					}xs', $block, $matches))
+//				{
+//					list(, $div_open, , $div_content, $div_close) = $matches;
+//
+//					# We can't call Markdown(), because that resets the hash;
+//					# that initialization code should be pulled into its own sub, though.
+//					$div_content = $this->hashHTMLBlocks($div_content);
+//					
+//					# Run document gamut methods on the content.
+//					foreach ($this->document_gamut as $method => $priority) {
+//						$div_content = $this->$method($div_content);
+//					}
+//
+//					$div_open = preg_replace(
+//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+//				}
+				$grafs[$key] = $graf;
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	function encodeAttribute($text) {
+	#
+	# Encode text for a double-quoted HTML attribute. This function
+	# is *not* suitable for attributes enclosed in single quotes.
+	#
+		$text = $this->encodeAmpsAndAngles($text);
+		$text = str_replace('"', '&quot;', $text);
+		return $text;
+	}
+	
+	
+	function encodeAmpsAndAngles($text) {
+	#
+	# Smart processing for ampersands and angle brackets that need to 
+	# be encoded. Valid character entities are left alone unless the
+	# no-entities mode is set.
+	#
+		if ($this->no_entities) {
+			$text = str_replace('&', '&amp;', $text);
+		} else {
+			# Ampersand-encoding based entirely on Nat Irons's Amputator
+			# MT plugin: <http://bumppo.net/projects/amputator/>
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+								'&amp;', $text);;
+		}
+		# Encode remaining <'s
+		$text = str_replace('<', '&lt;', $text);
+
+		return $text;
+	}
+
+
+	function doAutoLinks($text) {
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i', 
+			array(&$this, '_doAutoLinks_url_callback'), $text);
+
+		# Email addresses: <address@domain.foo>
+		$text = preg_replace_callback('{
+			<
+			(?:mailto:)?
+			(
+				[-.\w\x80-\xFF]+
+				\@
+				[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
+			)
+			>
+			}xi',
+			array(&$this, '_doAutoLinks_email_callback'), $text);
+
+		return $text;
+	}
+	function _doAutoLinks_url_callback($matches) {
+		$url = $this->encodeAttribute($matches[1]);
+		$link = "<a href=\"$url\">$url</a>";
+		return $this->hashPart($link);
+	}
+	function _doAutoLinks_email_callback($matches) {
+		$address = $matches[1];
+		$link = $this->encodeEmailAddress($address);
+		return $this->hashPart($link);
+	}
+
+
+	function encodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+	#
+	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	#   With some optimizations by Milian Wolff.
+	#
+		$addr = "mailto:" . $addr;
+		$chars = preg_split('/(?<!^)(?!$)/', $addr);
+		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		
+		foreach ($chars as $key => $char) {
+			$ord = ord($char);
+			# Ignore non-ascii chars.
+			if ($ord < 128) {
+				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+				# roughly 10% raw, 45% hex, 45% dec
+				# '@' *must* be encoded. I insist.
+				if ($r > 90 && $char != '@') /* do nothing */;
+				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+				else              $chars[$key] = '&#'.$ord.';';
+			}
+		}
+		
+		$addr = implode('', $chars);
+		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
+		$addr = "<a href=\"$addr\">$text</a>";
+
+		return $addr;
+	}
+
+
+	function parseSpan($str) {
+	#
+	# Take the string $str and parse it into tokens, hashing embeded HTML,
+	# escaped characters and handling code spans.
+	#
+		$output = '';
+		
+		$span_re = '{
+				(
+					\\\\'.$this->escape_chars_re.'
+				|
+					(?<![`\\\\])
+					`+						# code span marker
+			'.( $this->no_markup ? '' : '
+				|
+					<!--    .*?     -->		# comment
+				|
+					<\?.*?\?> | <%.*?%>		# processing instruction
+				|
+					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					(?>
+						\s
+						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
+					)?
+					>
+			').'
+				)
+				}xs';
+
+		while (1) {
+			#
+			# Each loop iteration seach for either the next tag, the next 
+			# openning code span marker, or the next escaped character. 
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+			
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			}
+			else {
+				break;
+			}
+		}
+		
+		return $output;
+	}
+	
+	
+	function handleSpanToken($token, &$str) {
+	#
+	# Handle $token provided by parseSpan by determining its nature and 
+	# returning the corresponding value that should replace it.
+	#
+		switch ($token{0}) {
+			case "\\":
+				return $this->hashPart("&#". ord($token{1}). ";");
+			case "`":
+				# Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+					$str, $matches))
+				{
+					$str = $matches[2];
+					$codespan = $this->makeCodeSpan($matches[1]);
+					return $this->hashPart($codespan);
+				}
+				return $token; // return as text since no ending marker found.
+			default:
+				return $this->hashPart($token);
+		}
+	}
+
+
+	function outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+	}
+
+
+	# String length function for detab. `_initDetab` will create a function to 
+	# hanlde UTF-8 if the default function does not exist.
+	var $utf8_strlen = 'mb_strlen';
+	
+	function detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the 
+		# appropriate number of space between each blocks.
+		
+		$text = preg_replace_callback('/^.*\t.*$/m',
+			array(&$this, '_detab_callback'), $text);
+
+		return $text;
+	}
+	function _detab_callback($matches) {
+		$line = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+		
+		# Split in blocks.
+		$blocks = explode("\t", $line);
+		# Add each blocks to the line.
+		$line = $blocks[0];
+		unset($blocks[0]); # Do not add first block twice.
+		foreach ($blocks as $block) {
+			# Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width - 
+				$strlen($line, 'UTF-8') % $this->tab_width;
+			$line .= str_repeat(" ", $amount) . $block;
+		}
+		return $line;
+	}
+	function _initDetab() {
+	#
+	# Check for the availability of the function in the `utf8_strlen` property
+	# (initially `mb_strlen`). If the function is not available, create a 
+	# function that will loosely count the number of UTF-8 characters with a
+	# regular expression.
+	#
+		if (function_exists($this->utf8_strlen)) return;
+		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
+			$text, $m);');
+	}
+
+
+	function unhash($text) {
+	#
+	# Swap back in all the tags hashed by _HashHTMLBlocks.
+	#
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+			array(&$this, '_unhash_callback'), $text);
+	}
+	function _unhash_callback($matches) {
+		return $this->html_hashes[$matches[0]];
+	}
+
+}
+
+
+#
+# Markdown Extra Parser Class
+#
+
+class MarkdownExtra_Parser extends Markdown_Parser {
+
+	# Prefix for footnote ids.
+	var $fn_id_prefix = "";
+	
+	# Optional title attribute for footnote links and backlinks.
+	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+	
+	# Optional class attribute for footnote links and backlinks.
+	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+	
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+
+	function MarkdownExtra_Parser() {
+	#
+	# Constructor function. Initialize the parser object.
+	#
+		# Add extra escapable characters before parent constructor 
+		# initialize the table.
+		$this->escape_chars .= ':|';
+		
+		# Insert extra document, block, and span transformations. 
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+			);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+			);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+			);
+		
+		parent::Markdown_Parser();
+	}
+	
+	
+	# Extra variables used during extra transformations.
+	var $footnotes = array();
+	var $footnotes_ordered = array();
+	var $abbr_desciptions = array();
+	var $abbr_word_re = '';
+	
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+	
+	
+	function setup() {
+	#
+	# Setting up Extra-specific variables.
+	#
+		parent::setup();
+		
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		$this->footnote_counter = 1;
+		
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			if ($this->abbr_word_re)
+				$this->abbr_word_re .= '|';
+			$this->abbr_word_re .= preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+	
+	function teardown() {
+	#
+	# Clearing Extra-specific variables.
+	#
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		
+		parent::teardown();
+	}
+	
+	
+	### HTML Block Parser ###
+	
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+	
+	# Tags treated as block tags only if the opening tag is alone on it's line:
+	var $context_block_tags_re = 'script|noscript|math|ins|del';
+	
+	# Tags where markdown="1" default to span mode:
+	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+	
+	# Tags which must not have their contents modified, no matter where 
+	# they appear:
+	var $clean_tags_re = 'script|math';
+	
+	# Tags that do not need to be closed.
+	var $auto_close_tags_re = 'hr|img';
+	
+
+	function hashHTMLBlocks($text) {
+	#
+	# Hashify HTML Blocks and "clean tags".
+	#
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded.
+	#
+	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1" 
+	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	# These two functions are calling each other. It's recursive!
+	#
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		
+		return $text;
+	}
+	function _hashHTMLBlocks_inMarkdown($text, $indent = 0, 
+										$enclosing_tag_re = '', $span = false)
+	{
+	#
+	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	#
+	# *   $indent is the number of space to be ignored when checking for code 
+	#     blocks. This is important because if we don't take the indent into 
+	#     account, something like this (which looks right) won't work as expected:
+	#
+	#     <div>
+	#         <div markdown="1">
+	#         Hello World.  <-- Is this a Markdown code block or text?
+	#         </div>  <-- Is this a Markdown code block or a real tag?
+	#     <div>
+	#
+	#     If you don't like this, just don't indent the tag on which
+	#     you apply the markdown="1" attribute.
+	#
+	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing 
+	#     tag with that name. Nested tags supported.
+	#
+	# *   If $span is true, text inside must treated as span. So any double 
+	#     newline will be replaced by a single newline so that it does not create 
+	#     paragraphs.
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re = 
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*<!--.*?-->)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+		
+		# Regex to match any tag.
+		$block_tag_re =
+			'{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						(?>				# Tag name.
+							'.$this->block_tags_re.'			|
+							'.$this->context_block_tags_re.'	|
+							'.$this->clean_tags_re.'        	|
+							(?!\s)'.$enclosing_tag_re.'
+						)
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				|
+					# Code span marker
+					`+
+				'. ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?> ^[ ]*\n? | \n[ ]*\n )
+					[ ]{'.($indent+4).'}[^\n]* \n
+					(?>
+						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?> ^ | \n )
+					[ ]{'.($indent).'}~~~+[ ]*\n
+				' : '' ). ' # End (if not is span).
+				)
+			}xs';
+
+		
+		$depth = 0;		# Current depth inside the tag tree.
+		$parsed = "";	# Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($block_tag_re, $text, 2, 
+								PREG_SPLIT_DELIM_CAPTURE);
+			
+			# If in Markdown span mode, add a empty-string span-level hash 
+			# after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "$void\n";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+			
+			$parsed .= $parts[0]; # Text before current tag.
+			
+			# If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+			
+			$tag  = $parts[1]; # Tag to handle.
+			$text = $parts[2]; # Remaining text after current tag.
+			$tag_re = preg_quote($tag); # For use in a regular expression.
+			
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
+					$text, $matches))
+				{
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					# Unmatched marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Indented code block or fenced code block marker.
+			#
+			else if ($tag{0} == "\n" || $tag{0} == "~") {
+				if ($tag{1} == "\n" || $tag{1} == " ") {
+					# Indented code block: pass it unchanged, will be handled 
+					# later.
+					$parsed .= $tag;
+				}
+				else {
+					# Fenced code block marker: find matching end marker.
+					$tag_re = preg_quote(trim($tag));
+					if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text, 
+						$matches)) 
+					{
+						# End marker found: pass text unchanged until marker.
+						$parsed .= $tag . $matches[0];
+						$text = substr($text, strlen($matches[0]));
+					}
+					else {
+						# No end marker: just skip it.
+						$parsed .= $tag;
+					}
+				}
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            Opening Context Block tag (like ins and del) 
+			#               used as a block tag (tag is alone on it's line).
+			#
+			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
+				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+					preg_match($newline_before_re, $parsed) &&
+					preg_match($newline_after_re, $text)	)
+				)
+			{
+				# Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+				
+				# Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Need to parse tag and following text using the HTML parser.
+				# (don't check for markdown attribute)
+				list($block_text, $text) = 
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+				
+				$parsed .= $block_text;
+			}
+			#
+			# Check for: Tag with same name as enclosing tag.
+			#
+			else if ($enclosing_tag_re !== '' &&
+				# Same name as enclosing tag.
+				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
+			{
+				#
+				# Increase/decrease nested tag count.
+				#
+				if ($tag{1} == '/')						$depth--;
+				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+
+				if ($depth < 0) {
+					#
+					# Going out of parent element. Clean up and break so we
+					# return to the calling function.
+					#
+					$text = $tag . $text;
+					break;
+				}
+				
+				$parsed .= $tag;
+			}
+			else {
+				$parsed .= $tag;
+			}
+		} while ($depth >= 0);
+		
+		return array($parsed, $text);
+	}
+	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+	#
+	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	#
+	# *   Calls $hash_method to convert any blocks.
+	# *   Stops when the first opening tag closes.
+	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	#     (it is not inside clean tags)
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+		
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter		
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter	
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+		
+		# Regex to match any tag.
+		$tag_re = '{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						[\w:$]+			# Tag name.
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				)
+			}xs';
+		
+		$original_text = $text;		# Save original text in case of faliure.
+		
+		$depth		= 0;	# Current depth inside the tag tree.
+		$block_text	= "";	# Temporary text holder for current text.
+		$parsed		= "";	# Parsed text that will be returned.
+
+		#
+		# Get the name of the starting tag.
+		# (This pattern makes $base_tag_name_re safe without quoting.)
+		#
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+			$base_tag_name_re = $matches[1];
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made 
+			# by the pattern.
+			#
+			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			
+			if (count($parts) < 3) {
+				#
+				# End of $text reached with unbalenced tag(s).
+				# In that case, we return original text unchanged and pass the
+				# first character as filtered to prevent an infinite loop in the 
+				# parent function.
+				#
+				return array($original_text{0}, substr($original_text, 1));
+			}
+			
+			$block_text .= $parts[0]; # Text before current tag.
+			$tag         = $parts[1]; # Tag to handle.
+			$text        = $parts[2]; # Remaining text after current tag.
+			
+			#
+			# Check for: Auto-close tag (like <hr/>)
+			#			 Comments and Processing Instructions.
+			#
+			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				#
+				# Increase/decrease nested tag count. Only do so if
+				# the tag's name match base tag's.
+				#
+				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
+					if ($tag{1} == '/')						$depth--;
+					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				}
+				
+				#
+				# Check for `markdown="1"` attribute and handle it.
+				#
+				if ($md_attr && 
+					preg_match($markdown_attr_re, $tag, $attr_m) &&
+					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+				{
+					# Remove `markdown` attribute from opening tag.
+					$tag = preg_replace($markdown_attr_re, '', $tag);
+					
+					# Check if text inside this tag must be parsed in span mode.
+					$this->mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+					
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+					
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+					
+					# Get enclosing tag name for the ParseMarkdown function.
+					# (This pattern makes $tag_name_re safe without quoting.)
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name_re = $matches[1];
+					
+					# Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent, 
+							$tag_name_re, $span_mode);
+					
+					# Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "", 
+													$block_text);
+					}
+					
+					# Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+					
+					# Start over a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+			
+		} while ($depth > 0);
+		
+		#
+		# Hash last block text that wasn't processed inside the loop.
+		#
+		$parsed .= $this->$hash_method($block_text);
+		
+		return array($parsed, $text);
+	}
+
+
+	function hashClean($text) {
+	#
+	# Called whenever a tag must be hashed when a function insert a "clean" tag
+	# in $text, it pass through this function and is automaticaly escaped, 
+	# blocking invalid nested overlap.
+	#
+		return $this->hashPart($text, 'C');
+	}
+
+
+	function doHeaders($text) {
+	#
+	# Redefined to add id attribute support.
+	#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#  
+		#	  Header 2  {#header2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3}
+		#	...
+		#	###### Header 6   {#header2}
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
+				[ ]*
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_attr($attr) {
+		if (empty($attr))  return "";
+		return " id=\"$attr\"";
+	}
+	function _doHeaders_callback_setext($matches) {
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+			return $matches[0];
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doTables($text) {
+	#
+	# Form HTML tables.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_doTable_leadingPipe_callback'), $text);
+		
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+				
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+				
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+	function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+		
+		# Remove leading pipe for each row.
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+		
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+	function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+		
+		# Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+			else									$attr[$n] = '';
+		}
+		
+		# Parsing span elements, including code spans, character escapes, 
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+		
+		# Write column headers.
+		$text = "<table>\n";
+		$text .= "<thead>\n";
+		$text .= "<tr>\n";
+		foreach ($headers as $n => $header)
+			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		$text .= "</tr>\n";
+		$text .= "</thead>\n";
+		
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+		
+		$text .= "<tbody>\n";
+		foreach ($rows as $row) {
+			# Parsing span elements, including code spans, character escapes, 
+			# and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+			
+			# Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+			
+			$text .= "<tr>\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			$text .= "</tr>\n";
+		}
+		$text .= "</tbody>\n";
+		$text .= "</table>";
+		
+		return $this->hashBlock($text) . "\n";
+	}
+
+	
+	function doDefLists($text) {
+	#
+	# Form HTML definition lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,'.$less_than_tab.'}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,'.$less_than_tab.'}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				'.$whole_list_re.'
+			}mx',
+			array(&$this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+	function _doDefLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+		
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "<dl>\n" . $result . "\n</dl>";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+
+	function processDefListItems($list_str) {
+	#
+	#	Process the contents of a single definition list, splitting it
+	#	into individual term and definition list items.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)					# leading line
+			(								# definition terms = $1
+				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				(?![:][ ]|[ ])				# negative lookahead for a definition 
+											#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?				# actual term (not whitespace).	
+			)			
+			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed 
+											#   with a definition mark.
+			}xm',
+			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+
+		# Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?						# leading line = $1
+			(								# marker space = $2
+				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[:][ ]+						# definition mark (colon)
+			)
+			((?s:.+?))						# definition text = $3
+			(?= \n+ 						# stop at next definition mark,
+				(?:							# next term or end of text
+					[ ]{0,'.$less_than_tab.'} [:][ ]	|
+					<dt> | \z
+				)						
+			)					
+			}xm',
+			array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+	function _processDefListItems_callback_dt($matches) {
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		foreach ($terms as $term) {
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n<dt>" . $term . "</dt>";
+		}
+		return $text . "\n";
+	}
+	function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			# Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n<dd>" . $def . "</dd>\n";
+	}
+
+
+	function doFencedCodeBlocks($text) {
+	#
+	# Adding the fenced code block syntax to regular Markdown:
+	#
+	# ~~~
+	# Code block
+	# ~~~
+	#
+		$less_than_tab = $this->tab_width;
+		
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					~{3,} # Marker: three tilde or more.
+				)
+				[ ]* \n # Whitespace and newline following marker.
+				
+				# 2: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+				
+				# Closing marker.
+				\1 [ ]* \n
+			}xm',
+			array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doFencedCodeBlocks_callback($matches) {
+		$codeblock = $matches[2];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback('/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+		$codeblock = "<pre><code>$codeblock</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+	function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("<br$this->empty_element_suffix", 
+			strlen($matches[0]));
+	}
+
+
+	#
+	# Redefining emphasis markers so that emphasis by underscore does not
+	# work in the middle of a word.
+	#
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S)(?![.,:;]\s)',
+		'*' => '(?<=\S)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S)(?<!_)_(?![a-zA-Z0-9_])',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S)(?![.,:;]\s)',
+		'**' => '(?<=\S)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S)(?<!_)__(?![a-zA-Z0-9_])',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S)(?![.,:;]\s)',
+		'***' => '(?<=\S)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S)(?<!_)___(?![a-zA-Z0-9_])',
+		);
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+		
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+			
+			# Check if this should be enclosed in a paragraph.
+			# Clean tag hashes & block tag hashes are left alone.
+			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+			
+			if ($is_p) {
+				$value = "<p>$value</p>";
+			}
+			$grafs[$key] = $value;
+		}
+		
+		# Join grafs in one text, then unhash HTML tags. 
+		$text = implode("\n\n", $grafs);
+		
+		# Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+		
+		return $text;
+	}
+	
+	
+	### Footnotes
+	
+	function stripFootnotes($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:					
+					.+				# actual text
+				|
+					\n				# newlines but 
+					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed 
+									# by non-indented content
+				)*
+			)		
+			}xm',
+			array(&$this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+	function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; # String that will replace the block
+	}
+
+
+	function doFootnotes($text) {
+	#
+	# Replace footnote references in $text [^id] with a special text-token 
+	# which will be replaced by the actual footnote marker in appendFootnotes.
+	#
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+	
+	function appendFootnotes($text) {
+	#
+	# Append footnote list to text.
+	#
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+			array(&$this, '_appendFootnotes_callback'), $text);
+	
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "<div class=\"footnotes\">\n";
+			$text .= "<hr". MARKDOWN_EMPTY_ELEMENT_SUFFIX ."\n";
+			$text .= "<ol>\n\n";
+			
+			$attr = " rev=\"footnote\"";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$num = 0;
+			
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+				
+				$footnote .= "\n"; # Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");				
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}', 
+					array(&$this, '_appendFootnotes_callback'), $footnote);
+				
+				$attr = str_replace("%%", ++$num, $attr);
+				$note_id = $this->encodeAttribute($note_id);
+				
+				# Add backlink to last paragraph; create new paragraph if needed.
+				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
+				if (preg_match('{</p>$}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+				} else {
+					$footnote .= "\n\n<p>$backlink</p>";
+				}
+				
+				$text .= "<li id=\"fn:$note_id\">\n";
+				$text .= $footnote . "\n";
+				$text .= "</li>\n\n";
+			}
+			
+			$text .= "</ol>\n";
+			$text .= "</div>";
+		}
+		return $text;
+	}
+	function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+		
+		# Create footnote marker only if it has a corresponding footnote *and*
+		# the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			# Transfert footnote content to the ordered list.
+			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+			unset($this->footnotes[$node_id]);
+			
+			$num = $this->footnote_counter++;
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			
+			$attr = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+			
+			return
+				"<sup id=\"fnref:$node_id\">".
+				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"</sup>";
+		}
+		
+		return "[^".$matches[1]."]";
+	}
+		
+	
+	### Abbreviations ###
+	
+	function stripAbbreviations($text) {
+	#
+	# Strips abbreviations from text, stores titles in hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)	
+			}xm',
+			array(&$this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+	function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		if ($this->abbr_word_re)
+			$this->abbr_word_re .= '|';
+		$this->abbr_word_re .= preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; # String that will replace the block
+	}
+	
+	
+	function doAbbreviations($text) {
+	#
+	# Find defined abbreviations in text and wrap them in <abbr> elements.
+	#
+		if ($this->abbr_word_re) {
+			// cannot use the /x modifier because abbr_word_re may 
+			// contain significant spaces:
+			$text = preg_replace_callback('{'.
+				'(?<![\w\x1A])'.
+				'(?:'.$this->abbr_word_re.')'.
+				'(?![\w\x1A])'.
+				'}', 
+				array(&$this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+	function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("<abbr>$abbr</abbr>");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
+
+}
+
+
+/*
+
+PHP Markdown Extra
+==================
+
+Description
+-----------
+
+This is a PHP port of the original Markdown formatter written in Perl 
+by John Gruber. This special "Extra" version of PHP Markdown features 
+further enhancements to the syntax for making additional constructs 
+such as tables and definition list.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+<http://daringfireball.net/projects/markdown/>
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+<michel.fortin@michelf.com>
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+--------------- 
+
+See the readme file for detailed release notes for this version.
+
+
+Copyright and License
+---------------------
+
+PHP Markdown & Extra
+Copyright (c) 2004-2008 Michel Fortin  
+<http://www.michelf.com/>  
+All rights reserved.
+
+Based on Markdown  
+Copyright (c) 2003-2006 John Gruber   
+<http://daringfireball.net/>   
+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 "Markdown" 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.
+
+*/
+?>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/api/class.php b/includes/kohana/modules/userguide/views/userguide/api/class.php
new file mode 100644
index 0000000..0b54712
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/api/class.php
@@ -0,0 +1,103 @@
+<h1>
+	<?php echo $doc->modifiers, $doc->class->name ?>
+	<?php $parent = $doc->class; ?>
+	<?php while ($parent = $parent->getParentClass()): ?>
+	<br/><small>extends <?php echo HTML::anchor($route->uri(array('class' => $parent->name)), $parent->name, NULL, NULL, TRUE) ?></small>
+	<?php endwhile ?>
+</h1>
+
+<?php echo $doc->description ?>
+
+<?php if ($doc->tags): ?>
+<dl class="tags">
+<?php foreach ($doc->tags as $name => $set): ?>
+<dt><?php echo $name ?></dt>
+<?php foreach ($set as $tag): ?>
+<dd><?php echo $tag ?></dd>
+<?php endforeach ?>
+<?php endforeach ?>
+</dl>
+<?php endif; ?>
+
+<p class="note">
+<?php if ($path = $doc->class->getFilename()): ?>
+Class declared in <tt><?php echo Debug::path($path) ?></tt> on line <?php echo $doc->class->getStartLine() ?>.
+<?php else: ?>
+Class is not declared in a file, it is probably an internal <?php echo html::anchor('http://php.net/manual/class.'.strtolower($doc->class->name).'.php', 'PHP class') ?>.
+<?php endif ?>
+</p>
+
+<div class="toc">
+	<div class="constants">
+		<h3><?php echo __('Constants'); ?></h3>
+		<ul>
+		<?php if ($doc->constants): ?>
+		<?php foreach ($doc->constants as $name => $value): ?>
+			<li><a href="#constant:<?php echo $name ?>"><?php echo $name ?></a></li>
+		<?php endforeach ?>
+		<?php else: ?>
+			<li><em><?php echo __('None'); ?></em></li>
+		<?php endif ?>
+		</ul>
+	</div>
+	<div class="properties">
+		<h3><?php echo __('Properties'); ?></h3>
+		<ul>
+		<?php if ($properties = $doc->properties()): ?>
+		<?php foreach ($properties as $prop): ?>
+			<li><a href="#property:<?php echo $prop->property->name ?>">$<?php echo $prop->property->name ?></a></li>
+		<?php endforeach ?>
+		<?php else: ?>
+			<li><em><?php echo __('None'); ?></em></li>
+		<?php endif ?>
+		</ul>
+	</div>
+	<div class="methods">
+		<h3><?php echo __('Methods'); ?></h3>
+		<ul>
+		<?php if ($methods = $doc->methods()): ?>
+		<?php foreach ($methods as $method): ?>
+			<li><a href="#<?php echo $method->method->name ?>"><?php echo $method->method->name ?>()</a></li>
+		<?php endforeach ?>
+		<?php else: ?>
+			<li><em><?php echo __('None'); ?></em></li>
+		<?php endif ?>
+		</ul>
+	</div>
+</div>
+
+<div class="clearfix"></div>
+
+<?php if ($doc->constants): ?>
+<div class="constants">
+<h1 id="constants"><?php echo __('Constants'); ?></h1>
+<dl>
+<?php foreach ($doc->constants as $name => $value): ?>
+<dt><h4 id="constant:<?php echo $name ?>"><?php echo $name ?></h4></dt>
+<dd><?php echo $value ?></dd>
+<?php endforeach; ?>
+</dl>
+</div>
+<?php endif ?>
+
+<?php if ($properties = $doc->properties()): ?>
+<h1 id="properties"><?php echo __('Properties'); ?></h1>
+<div class="properties">
+<dl>
+<?php foreach ($properties as $prop): ?>
+<dt><h4 id="property:<?php echo $prop->property->name ?>"><?php echo $prop->modifiers ?> <code><?php echo $prop->type ?></code> $<?php echo $prop->property->name ?></h4></dt>
+<dd><?php echo $prop->description ?></dd>
+<dd><?php echo $prop->value ?></dd>
+<?php endforeach ?>
+</dl>
+</div>
+<?php endif ?>
+
+<?php if ($methods = $doc->methods()): ?>
+<h1 id="methods"><?php echo __('Methods'); ?></h1>
+<div class="methods">
+<?php foreach ($methods as $method): ?>
+<?php echo View::factory('userguide/api/method')->set('doc', $method)->set('route', $route) ?>
+<?php endforeach ?>
+</div>
+<?php endif ?>
diff --git a/includes/kohana/modules/userguide/views/userguide/api/menu.php b/includes/kohana/modules/userguide/views/userguide/api/menu.php
new file mode 100644
index 0000000..4f4f22f
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/api/menu.php
@@ -0,0 +1,18 @@
+
+<h2>Modules</h2>
+<ol class="menu">
+<?php foreach ($menu as $package => $categories): ksort($categories); ?>
+<li><span><strong><?php echo $package ?></strong></span>
+	<ol>
+	<?php foreach ($categories as $category => $classes): sort($classes); ?>
+		<li><?php if ($category !== 'Base'): ?><span><?php echo $category ?></span>
+			<ol><?php endif ?>
+			<?php foreach ($classes as $class): ?>
+				<li><?php echo $class ?></li>
+			<?php endforeach ?>
+			<?php if ($category !== 'Base'): ?></ol><?php endif ?>
+		</li>
+	<?php endforeach ?>
+	</ol>
+<?php endforeach ?>
+</ol>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/api/method.php b/includes/kohana/modules/userguide/views/userguide/api/method.php
new file mode 100644
index 0000000..521dfde
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/api/method.php
@@ -0,0 +1,45 @@
+<div class="method">
+
+<?php $declares = $doc->method->getDeclaringClass(); ?>
+<h3 id="<?php echo $doc->method->name ?>">
+	<?php echo $doc->modifiers, $doc->method->name ?>( <?php echo $doc->params ? $doc->params_short() : '' ?>)
+	<small>(defined in <?php echo html::anchor($route->uri(array('class' => $declares->name)), $declares->name, NULL, NULL, TRUE) ?>)</small>
+</h3>
+
+<div class="description">
+<?php echo $doc->description ?>
+</div>
+
+<?php if ($doc->params): ?>
+<h4>Parameters</h4>
+<ul>
+<?php foreach ($doc->params as $param): ?>
+<li>
+<code><?php echo ($param->reference?'byref ':'').($param->type?$param->type:'unknown') ?></code>
+<strong><?php echo '$'.$param->name ?></strong>
+<?php echo $param->default?'<small> = '.$param->default.'</small>':'<small>required</small>'  ?>
+<?php echo $param->description?' - '.$param->description:'' ?>
+</li>
+<?php endforeach; ?>
+</ul>
+<?php endif ?>
+
+<?php if ($doc->tags) echo View::factory('userguide/api/tags')->set('tags', $doc->tags) ?>
+
+<?php if ($doc->return): ?>
+<h4><?php echo __('Return Values'); ?></h4>
+<ul class="return">
+<?php foreach ($doc->return as $set): list($type, $text) = $set; ?>
+<li><code><?php echo HTML::chars($type) ?></code><?php if ($text) echo ' - '.HTML::chars(ucfirst($text)) ?></li>
+<?php endforeach ?>
+</ul>
+<?php endif ?>
+
+<?php if ($doc->source): ?>
+<div class="method-source">
+<h4><?php echo __('Source Code'); ?></h4>
+<pre><code><?php echo HTML::chars($doc->source) ?></code></pre>
+</div>
+<?php endif ?>
+
+</div>
diff --git a/includes/kohana/modules/userguide/views/userguide/api/tags.php b/includes/kohana/modules/userguide/views/userguide/api/tags.php
new file mode 100644
index 0000000..18779ac
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/api/tags.php
@@ -0,0 +1,6 @@
+<h4>Tags</h4>
+<ul class="tags">
+<?php foreach ($tags as $name => $set): ?>
+<li><?php echo ucfirst($name).($set?' - '.implode(', ',$set):''); ?>
+<?php endforeach ?>
+</ul>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/api/toc.php b/includes/kohana/modules/userguide/views/userguide/api/toc.php
new file mode 100644
index 0000000..2a69005
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/api/toc.php
@@ -0,0 +1,75 @@
+<h1><?php echo __('Available Classes') ?></h1>
+
+<label>Filter:</label>
+<input type="text" id="api-filter-box" />
+
+<script type="text/javascript">
+(function($) {
+	$.fn.extend({
+		filter_content: function(search){
+			var search_regex = new RegExp(search,'gi');
+			
+			// Run through each .class definition
+			$('.class', this).each(function(k, container){
+				if (search == '') {
+					// If search box is empty show everything without doing any regex
+					$(container).show();
+					$('li', container).show();
+					
+					// Continue
+					return true;
+				}
+				
+				// Run through every anchor
+				$('a', $(container)).each(function(k, anchor){
+					// Keep track of the li
+					var $parent = $(anchor).closest('li');
+					
+					if ($(anchor).text().match(search_regex)) {
+						// Show the li and .class parent if its a match
+						$parent.show();
+						$(container).show();
+					} else {
+						// Otherwise we can only assume to hide the li
+						$parent.hide();
+					}
+				});
+				
+				if ($('li:visible', $(container)).length == 0) {
+					// If there are not any visible li's, the entire .class section needs to hide
+					$(container).hide();
+				} else {
+					// Otherwise show the .class container
+					$(container).show();
+				}
+			});
+		},
+		
+		api_filter: function(api_container_selector){
+			$(this).keyup(function(){
+				// Run the filter method on this value
+				$(api_container_selector).filter_content($(this).val());
+			});
+		}
+	})
+})(jQuery);
+
+$(document).ready(function(){
+    $('#api-filter-box').api_filter('#kodoc-main');
+});
+</script>
+
+<div class="class-list">
+
+	<?php foreach ($classes as $class => $methods): $link = $route->uri(array('class' => $class)) ?>
+	<div class="class <?php echo Text::alternate('left', 'right') ?>">
+		<h2><?php echo HTML::anchor($link, $class, NULL, NULL, TRUE) ?></h2>
+		<ul class="methods">
+		<?php foreach ($methods as $method): ?>
+			<li><?php echo HTML::anchor("{$link}#{$method}", "{$class}::{$method}", NULL, NULL, TRUE) ?></li>
+		<?php endforeach ?>
+		</ul>
+	</div>
+	<?php endforeach ?>
+
+</div>
diff --git a/includes/kohana/modules/userguide/views/userguide/error.php b/includes/kohana/modules/userguide/views/userguide/error.php
new file mode 100644
index 0000000..1f7b97b
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/error.php
@@ -0,0 +1,3 @@
+<h1>Kodoc - <?php echo __('Error'); ?></h1>
+
+<p><?php echo $message ?></p>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/examples/error.php b/includes/kohana/modules/userguide/views/userguide/examples/error.php
new file mode 100644
index 0000000..81548ce
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/examples/error.php
@@ -0,0 +1,6 @@
+<?php
+
+// Should trigger an ErrorException with an E_NOTICE level
+echo $var_does_not_exist;
+
+?>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/examples/hello_world_error.php b/includes/kohana/modules/userguide/views/userguide/examples/hello_world_error.php
new file mode 100644
index 0000000..d5dcf44
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/examples/hello_world_error.php
@@ -0,0 +1,696 @@
+<style type="text/css">
+#kohana_error { background: #ddd; font-size: 1em; font-family:sans-serif; text-align: left; color: #111; }
+#kohana_error h1,
+#kohana_error h2 { margin: 0; padding: 1em; font-size: 1em; font-weight: normal; background: #911; color: #fff; }
+	#kohana_error h1 a,
+	#kohana_error h2 a { color: #fff; }
+#kohana_error h2 { background: #222; }
+#kohana_error h3 { margin: 0; padding: 0.4em 0 0; font-size: 1em; font-weight: normal; }
+#kohana_error p { margin: 0; padding: 0.2em 0; }
+#kohana_error a { color: #1b323b; }
+#kohana_error pre { overflow: auto; white-space: pre-wrap; }
+#kohana_error table { width: 100%; display: block; margin: 0 0 0.4em; padding: 0; border-collapse: collapse; background: #fff; }
+	#kohana_error table td { border: solid 1px #ddd; text-align: left; vertical-align: top; padding: 0.4em; }
+#kohana_error div.content { padding: 0.4em 1em 1em; overflow: hidden; }
+#kohana_error pre.source { margin: 0 0 1em; padding: 0.4em; background: #fff; border: dotted 1px #b7c680; line-height: 1.2em; }
+	#kohana_error pre.source span.line { display: block; }
+	#kohana_error pre.source span.highlight { background: #f0eb96; }
+		#kohana_error pre.source span.line span.number { color: #666; }
+#kohana_error ol.trace { display: block; margin: 0 0 0 2em; padding: 0; list-style: decimal; }
+	#kohana_error ol.trace li { margin: 0; padding: 0; }
+</style>
+<script type="text/javascript">
+document.write('<style type="text/css"> .collapsed { display: none; } </style>');
+function koggle(elem)
+{
+	elem = document.getElementById(elem);
+
+	if (elem.style && elem.style['display'])
+		// Only works with the "style" attr
+		var disp = elem.style['display'];
+	else if (elem.currentStyle)
+		// For MSIE, naturally
+		var disp = elem.currentStyle['display'];
+	else if (window.getComputedStyle)
+		// For most other browsers
+		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+
+	// Toggle the state of the "display" style
+	elem.style.display = disp == 'block' ? 'none' : 'block';
+	return false;
+}
+</script>
+<div id="kohana_error">
+	<h1><span class="type">Kohana_View_Exception [ 0 ]:</span> <span class="message">The requested view site could not be found</span></h1>
+	<div id="error4ac2453378034" class="content">
+		<p><span class="file">SYSPATH/classes/kohana/view.php [ 215 ]</span></p>
+		<pre class="source"><code><span class="line"><span class="number">210</span> 	 */
+
+</span><span class="line"><span class="number">211</span> 	public function set_filename($file)
+</span><span class="line"><span class="number">212</span> 	{
+</span><span class="line"><span class="number">213</span> 		if (($path = Kohana::find_file('views', $file)) === FALSE)
+</span><span class="line"><span class="number">214</span> 		{
+</span><span class="line highlight"><span class="number">215</span> 			throw new Kohana_View_Exception('The requested view :file could not be found', array(
+</span><span class="line"><span class="number">216</span> 				':file' =&gt; $file,
+
+</span><span class="line"><span class="number">217</span> 			));
+</span><span class="line"><span class="number">218</span> 		}
+</span><span class="line"><span class="number">219</span> 
+</span><span class="line"><span class="number">220</span> 		// Store the file path locally
+</span></code></pre>		<ol class="trace">
+					<li>
+				<p>
+
+					<span class="file">
+													<a href="#error4ac2453378034source0" onclick="return koggle('error4ac2453378034source0')">SYSPATH/classes/kohana/view.php [ 115 ]</a>
+											</span>
+					&raquo;
+					Kohana_View->set_filename(<a href="#error4ac2453378034args0" onclick="return koggle('error4ac2453378034args0')">arguments</a>)
+				</p>
+								<div id="error4ac2453378034args0" class="collapsed">
+					<table cellspacing="0">
+
+											<tr>
+							<td><code>file</code></td>
+							<td><pre><small>string</small><span>(4)</span> "site"</pre></td>
+						</tr>
+										</table>
+				</div>
+
+													<pre id="error4ac2453378034source0" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">110</span> 	 */
+</span><span class="line"><span class="number">111</span> 	public function __construct($file = NULL, array $data = NULL)
+</span><span class="line"><span class="number">112</span> 	{
+</span><span class="line"><span class="number">113</span> 		if ($file !== NULL)
+</span><span class="line"><span class="number">114</span> 		{
+</span><span class="line highlight"><span class="number">115</span> 			$this-&gt;set_filename($file);
+
+</span><span class="line"><span class="number">116</span> 		}
+</span><span class="line"><span class="number">117</span> 
+</span><span class="line"><span class="number">118</span> 		if ( $data !== NULL)
+</span><span class="line"><span class="number">119</span> 		{
+</span><span class="line"><span class="number">120</span> 			// Add the values to the current data
+</span></code></pre></code></pre>
+							</li>
+
+								<li>
+				<p>
+					<span class="file">
+													<a href="#error4ac2453378034source1" onclick="return koggle('error4ac2453378034source1')">SYSPATH/classes/kohana/view.php [ 26 ]</a>
+											</span>
+					&raquo;
+					Kohana_View->__construct(<a href="#error4ac2453378034args1" onclick="return koggle('error4ac2453378034args1')">arguments</a>)
+				</p>
+
+								<div id="error4ac2453378034args1" class="collapsed">
+					<table cellspacing="0">
+											<tr>
+							<td><code>file</code></td>
+							<td><pre><small>string</small><span>(4)</span> "site"</pre></td>
+						</tr>
+
+											<tr>
+							<td><code>data</code></td>
+							<td><pre><small>NULL</small></pre></td>
+						</tr>
+										</table>
+				</div>
+													<pre id="error4ac2453378034source1" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">21</span> 	 * @param   array   array of values
+
+</span><span class="line"><span class="number">22</span> 	 * @return  View
+</span><span class="line"><span class="number">23</span> 	 */
+</span><span class="line"><span class="number">24</span> 	public static function factory($file = NULL, array $data = NULL)
+</span><span class="line"><span class="number">25</span> 	{
+</span><span class="line highlight"><span class="number">26</span> 		return new View($file, $data);
+</span><span class="line"><span class="number">27</span> 	}
+
+</span><span class="line"><span class="number">28</span> 
+</span><span class="line"><span class="number">29</span> 	/**
+</span><span class="line"><span class="number">30</span> 	 * Captures the output that is generated when a view is included.
+</span><span class="line"><span class="number">31</span> 	 * The view data will be extracted to make local variables. This method
+</span></code></pre></code></pre>
+							</li>
+								<li>
+				<p>
+
+					<span class="file">
+													<a href="#error4ac2453378034source2" onclick="return koggle('error4ac2453378034source2')">SYSPATH/classes/kohana/controller/template.php [ 32 ]</a>
+											</span>
+					&raquo;
+					Kohana_View::factory(<a href="#error4ac2453378034args2" onclick="return koggle('error4ac2453378034args2')">arguments</a>)
+				</p>
+								<div id="error4ac2453378034args2" class="collapsed">
+					<table cellspacing="0">
+
+											<tr>
+							<td><code>file</code></td>
+							<td><pre><small>string</small><span>(4)</span> "site"</pre></td>
+						</tr>
+										</table>
+				</div>
+
+													<pre id="error4ac2453378034source2" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">27</span> 	public function before()
+</span><span class="line"><span class="number">28</span> 	{
+</span><span class="line"><span class="number">29</span> 		if ($this-&gt;auto_render === TRUE)
+</span><span class="line"><span class="number">30</span> 		{
+</span><span class="line"><span class="number">31</span> 			// Load the template
+
+</span><span class="line highlight"><span class="number">32</span> 			$this-&gt;template = View::factory($this-&gt;template);
+</span><span class="line"><span class="number">33</span> 		}
+</span><span class="line"><span class="number">34</span> 	}
+</span><span class="line"><span class="number">35</span> 
+</span><span class="line"><span class="number">36</span> 	/**
+</span><span class="line"><span class="number">37</span> 	 * Assigns the template as the request response.
+
+</span></code></pre></code></pre>
+							</li>
+								<li>
+				<p>
+					<span class="file">
+													{PHP internal call}
+											</span>
+					&raquo;
+					Kohana_Controller_Template->before()
+				</p>
+
+											</li>
+								<li>
+				<p>
+					<span class="file">
+													<a href="#error4ac2453378034source4" onclick="return koggle('error4ac2453378034source4')">SYSPATH/classes/kohana/request.php [ 840 ]</a>
+											</span>
+					&raquo;
+					ReflectionMethod->invoke(<a href="#error4ac2453378034args4" onclick="return koggle('error4ac2453378034args4')">arguments</a>)
+				</p>
+
+								<div id="error4ac2453378034args4" class="collapsed">
+					<table cellspacing="0">
+											<tr>
+							<td><code>object</code></td>
+							<td><pre><small>object</small> <span>Controller_Hello(3)</span> <code>{
+    <small>public</small> template => <small>string</small><span>(4)</span> "site"
+    <small>public</small> auto_render => <small>bool</small> TRUE
+    <small>public</small> request => <small>object</small> <span>Request(9)</span> <code>{
+        <small>public</small> route => <small>object</small> <span>Route(4)</span> <code>{
+            <small>protected</small> _uri => <small>string</small><span>(32)</span> "(&lt;controller&gt;(/&lt;action&gt;(/&lt;id&gt;)))"
+            <small>protected</small> _regex => <small>array</small><span>(0)</span> 
+            <small>protected</small> _defaults => <small>array</small><span>(2)</span> <span>(
+                "controller" => <small>string</small><span>(7)</span> "welcome"
+                "action" => <small>string</small><span>(5)</span> "index"
+            )</span>
+
+            <small>protected</small> _route_regex => <small>string</small><span>(87)</span> "#^(?:(?P&lt;controller&gt;[^/.,;?]++)(?:/(?P&lt;action&gt;[^/.,;?]++)(?:/(?P&lt;id&gt;[^/.,;?]++))?)?)?$#"
+        }</code>
+        <small>public</small> status => <small>integer</small> 500
+        <small>public</small> response => <small>string</small><span>(0)</span> ""
+        <small>public</small> headers => <small>array</small><span>(1)</span> <span>(
+            "Content-Type" => <small>string</small><span>(24)</span> "text/html; charset=utf-8"
+        )</span>
+
+        <small>public</small> directory => <small>string</small><span>(0)</span> ""
+        <small>public</small> controller => <small>string</small><span>(5)</span> "hello"
+        <small>public</small> action => <small>string</small><span>(5)</span> "index"
+        <small>public</small> uri => <small>string</small><span>(5)</span> "hello"
+        <small>protected</small> _params => <small>array</small><span>(0)</span> 
+    }</code>
+
+}</code></pre></td>
+						</tr>
+										</table>
+				</div>
+													<pre id="error4ac2453378034source4" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">835</span> 
+</span><span class="line"><span class="number">836</span> 			// Create a new instance of the controller
+</span><span class="line"><span class="number">837</span> 			$controller = $class-&gt;newInstance($this);
+
+</span><span class="line"><span class="number">838</span> 
+</span><span class="line"><span class="number">839</span> 			// Execute the "before action" method
+</span><span class="line highlight"><span class="number">840</span> 			$class-&gt;getMethod('before')-&gt;invoke($controller);
+</span><span class="line"><span class="number">841</span> 
+</span><span class="line"><span class="number">842</span> 			// Determine the action to use
+</span><span class="line"><span class="number">843</span> 			$action = empty($this-&gt;action) ? Route::$default_action : $this-&gt;action;
+
+</span><span class="line"><span class="number">844</span> 
+</span><span class="line"><span class="number">845</span> 			// Execute the main action with the parameters
+</span></code></pre></code></pre>
+							</li>
+								<li>
+				<p>
+					<span class="file">
+													<a href="#error4ac2453378034source5" onclick="return koggle('error4ac2453378034source5')">APPPATH/bootstrap.php [ 76 ]</a>
+
+											</span>
+					&raquo;
+					Kohana_Request->execute()
+				</p>
+													<pre id="error4ac2453378034source5" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">71</span> /**
+</span><span class="line"><span class="number">72</span>  * Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
+</span><span class="line"><span class="number">73</span>  * If no source is specified, the URI will be automatically detected.
+
+</span><span class="line"><span class="number">74</span>  */
+</span><span class="line"><span class="number">75</span> echo Request::instance()
+</span><span class="line highlight"><span class="number">76</span> 	-&gt;execute()
+</span><span class="line"><span class="number">77</span> 	-&gt;send_headers()
+</span><span class="line"><span class="number">78</span> 	-&gt;response;
+
+</span></code></pre></code></pre>
+							</li>
+								<li>
+				<p>
+					<span class="file">
+													<a href="#error4ac2453378034source6" onclick="return koggle('error4ac2453378034source6')">DOCROOT/index.php [ 106 ]</a>
+											</span>
+					&raquo;
+					require(<a href="#error4ac2453378034args6" onclick="return koggle('error4ac2453378034args6')">arguments</a>)
+				</p>
+
+								<div id="error4ac2453378034args6" class="collapsed">
+					<table cellspacing="0">
+											<tr>
+							<td><code>0</code></td>
+							<td><pre><small>string</small><span>(49)</span> "/var/www/kohana/testing/application/bootstrap.php"</pre></td>
+						</tr>
+
+										</table>
+				</div>
+													<pre id="error4ac2453378034source6" class="source collapsed"><code><pre class="source"><code><span class="line"><span class="number">101</span> 	// Load empty core extension
+</span><span class="line"><span class="number">102</span> 	require SYSPATH.'classes/kohana'.EXT;
+</span><span class="line"><span class="number">103</span> }
+</span><span class="line"><span class="number">104</span> 
+</span><span class="line"><span class="number">105</span> // Bootstrap the application
+
+</span><span class="line highlight"><span class="number">106</span> require APPPATH.'bootstrap'.EXT;
+</span></code></pre></code></pre>
+							</li>
+							</ol>
+	</div>
+	<h2><a href="#error4ac2453378034environment" onclick="return koggle('error4ac2453378034environment')">Environment</a></h2>
+	<div id="error4ac2453378034environment" class="content collapsed">
+				<h3><a href="#error4ac2453378034environment_included" onclick="return koggle('error4ac2453378034environment_included')">Included files</a> (31)</h3>
+
+		<div id="error4ac2453378034environment_included" class="collapsed">
+			<table cellspacing="0">
+								<tr>
+					<td><code>DOCROOT/index.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/base.php</code></td>
+				</tr>
+
+								<tr>
+					<td><code>SYSPATH/classes/kohana/core.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana.php</code></td>
+				</tr>
+								<tr>
+					<td><code>APPPATH/bootstrap.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/profiler.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/profiler.php</code></td>
+				</tr>
+								<tr>
+
+					<td><code>SYSPATH/classes/kohana/log.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/config.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/log/file.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/log/writer.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/config/file.php</code></td>
+				</tr>
+								<tr>
+
+					<td><code>SYSPATH/classes/kohana/config/reader.php</code></td>
+				</tr>
+								<tr>
+					<td><code>MODPATH/codebench/init.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/route.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/route.php</code></td>
+				</tr>
+								<tr>
+					<td><code>/var/www/kohana/userguide/init.php</code></td>
+				</tr>
+								<tr>
+
+					<td><code>SYSPATH/classes/request.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/request.php</code></td>
+				</tr>
+								<tr>
+					<td><code>APPPATH/classes/controller/hello.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/controller/template.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/controller/template.php</code></td>
+				</tr>
+								<tr>
+
+					<td><code>SYSPATH/classes/controller.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/controller.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/view.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/view.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/view/exception.php</code></td>
+				</tr>
+								<tr>
+
+					<td><code>SYSPATH/classes/kohana/exception.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/i18n.php</code></td>
+				</tr>
+								<tr>
+					<td><code>SYSPATH/classes/kohana/i18n.php</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SYSPATH/views/kohana/error.php</code></td>
+				</tr>
+							</table>
+		</div>
+				<h3><a href="#error4ac2453378034environment_loaded" onclick="return koggle('error4ac2453378034environment_loaded')">Loaded extensions</a> (41)</h3>
+
+		<div id="error4ac2453378034environment_loaded" class="collapsed">
+			<table cellspacing="0">
+								<tr>
+					<td><code>zip</code></td>
+				</tr>
+								<tr>
+					<td><code>xmlwriter</code></td>
+				</tr>
+
+								<tr>
+					<td><code>libxml</code></td>
+				</tr>
+								<tr>
+					<td><code>xml</code></td>
+				</tr>
+								<tr>
+					<td><code>wddx</code></td>
+
+				</tr>
+								<tr>
+					<td><code>tokenizer</code></td>
+				</tr>
+								<tr>
+					<td><code>sysvshm</code></td>
+				</tr>
+								<tr>
+
+					<td><code>sysvsem</code></td>
+				</tr>
+								<tr>
+					<td><code>sysvmsg</code></td>
+				</tr>
+								<tr>
+					<td><code>session</code></td>
+
+				</tr>
+								<tr>
+					<td><code>SimpleXML</code></td>
+				</tr>
+								<tr>
+					<td><code>sockets</code></td>
+				</tr>
+								<tr>
+
+					<td><code>soap</code></td>
+				</tr>
+								<tr>
+					<td><code>SPL</code></td>
+				</tr>
+								<tr>
+					<td><code>shmop</code></td>
+
+				</tr>
+								<tr>
+					<td><code>standard</code></td>
+				</tr>
+								<tr>
+					<td><code>Reflection</code></td>
+				</tr>
+								<tr>
+
+					<td><code>posix</code></td>
+				</tr>
+								<tr>
+					<td><code>mime_magic</code></td>
+				</tr>
+								<tr>
+					<td><code>mbstring</code></td>
+
+				</tr>
+								<tr>
+					<td><code>json</code></td>
+				</tr>
+								<tr>
+					<td><code>iconv</code></td>
+				</tr>
+								<tr>
+
+					<td><code>hash</code></td>
+				</tr>
+								<tr>
+					<td><code>gettext</code></td>
+				</tr>
+								<tr>
+					<td><code>ftp</code></td>
+
+				</tr>
+								<tr>
+					<td><code>filter</code></td>
+				</tr>
+								<tr>
+					<td><code>exif</code></td>
+				</tr>
+								<tr>
+
+					<td><code>dom</code></td>
+				</tr>
+								<tr>
+					<td><code>dba</code></td>
+				</tr>
+								<tr>
+					<td><code>date</code></td>
+
+				</tr>
+								<tr>
+					<td><code>ctype</code></td>
+				</tr>
+								<tr>
+					<td><code>calendar</code></td>
+				</tr>
+								<tr>
+
+					<td><code>bz2</code></td>
+				</tr>
+								<tr>
+					<td><code>bcmath</code></td>
+				</tr>
+								<tr>
+					<td><code>zlib</code></td>
+
+				</tr>
+								<tr>
+					<td><code>pcre</code></td>
+				</tr>
+								<tr>
+					<td><code>openssl</code></td>
+				</tr>
+								<tr>
+
+					<td><code>xmlreader</code></td>
+				</tr>
+								<tr>
+					<td><code>apache2handler</code></td>
+				</tr>
+								<tr>
+					<td><code>curl</code></td>
+
+				</tr>
+								<tr>
+					<td><code>PDO</code></td>
+				</tr>
+							</table>
+		</div>
+																<h3><a href="#error4ac2453378034environment_server" onclick="return koggle('error4ac2453378034environment_server')">$_SERVER</a></h3>
+		<div id="error4ac2453378034environment_server" class="collapsed">
+
+			<table cellspacing="0">
+								<tr>
+					<td><code>HTTP_HOST</code></td>
+					<td><pre><small>string</small><span>(9)</span> "localhost"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>HTTP_USER_AGENT</code></td>
+					<td><pre><small>string</small><span>(105)</span> "Mozilla/5.0 (X11; U; Linux i686; en-GB; rv:1.9.0.14) Gecko/2009090216 Ubuntu/9.04 (jaunty) Firefox/3.0.14"</pre></td>
+				</tr>
+								<tr>
+					<td><code>HTTP_ACCEPT</code></td>
+					<td><pre><small>string</small><span>(63)</span> "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>HTTP_ACCEPT_LANGUAGE</code></td>
+					<td><pre><small>string</small><span>(14)</span> "en-gb,en;q=0.5"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>HTTP_ACCEPT_ENCODING</code></td>
+					<td><pre><small>string</small><span>(12)</span> "gzip,deflate"</pre></td>
+				</tr>
+								<tr>
+					<td><code>HTTP_ACCEPT_CHARSET</code></td>
+					<td><pre><small>string</small><span>(30)</span> "ISO-8859-1,utf-8;q=0.7,*;q=0.7"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>HTTP_KEEP_ALIVE</code></td>
+					<td><pre><small>string</small><span>(3)</span> "300"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>HTTP_CONNECTION</code></td>
+					<td><pre><small>string</small><span>(10)</span> "keep-alive"</pre></td>
+				</tr>
+								<tr>
+					<td><code>PATH</code></td>
+					<td><pre><small>string</small><span>(28)</span> "/usr/local/bin:/usr/bin:/bin"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>SERVER_SIGNATURE</code></td>
+					<td><pre><small>string</small><span>(110)</span> "&lt;address&gt;Apache/2.2.11 (Ubuntu) PHP/5.2.6-3ubuntu4.2 with Suhosin-Patch Server at localhost Port 80&lt;/address&gt;
+"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>SERVER_SOFTWARE</code></td>
+					<td><pre><small>string</small><span>(62)</span> "Apache/2.2.11 (Ubuntu) PHP/5.2.6-3ubuntu4.2 with Suhosin-Patch"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>SERVER_NAME</code></td>
+					<td><pre><small>string</small><span>(9)</span> "localhost"</pre></td>
+				</tr>
+								<tr>
+					<td><code>SERVER_ADDR</code></td>
+					<td><pre><small>string</small><span>(3)</span> "::1"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>SERVER_PORT</code></td>
+					<td><pre><small>string</small><span>(2)</span> "80"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>REMOTE_ADDR</code></td>
+					<td><pre><small>string</small><span>(3)</span> "::1"</pre></td>
+				</tr>
+								<tr>
+					<td><code>DOCUMENT_ROOT</code></td>
+					<td><pre><small>string</small><span>(8)</span> "/var/www"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>SERVER_ADMIN</code></td>
+					<td><pre><small>string</small><span>(19)</span> "webmaster@localhost"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>SCRIPT_FILENAME</code></td>
+					<td><pre><small>string</small><span>(33)</span> "/var/www/kohana/testing/index.php"</pre></td>
+				</tr>
+								<tr>
+					<td><code>REMOTE_PORT</code></td>
+					<td><pre><small>string</small><span>(5)</span> "39409"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>GATEWAY_INTERFACE</code></td>
+					<td><pre><small>string</small><span>(7)</span> "CGI/1.1"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>SERVER_PROTOCOL</code></td>
+					<td><pre><small>string</small><span>(8)</span> "HTTP/1.1"</pre></td>
+				</tr>
+								<tr>
+					<td><code>REQUEST_METHOD</code></td>
+					<td><pre><small>string</small><span>(3)</span> "GET"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>QUERY_STRING</code></td>
+					<td><pre><small>string</small><span>(0)</span> ""</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>REQUEST_URI</code></td>
+					<td><pre><small>string</small><span>(31)</span> "/kohana/testing/index.php/hello"</pre></td>
+				</tr>
+								<tr>
+					<td><code>SCRIPT_NAME</code></td>
+					<td><pre><small>string</small><span>(25)</span> "/kohana/testing/index.php"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>PATH_INFO</code></td>
+					<td><pre><small>string</small><span>(6)</span> "/hello"</pre></td>
+				</tr>
+								<tr>
+
+					<td><code>PATH_TRANSLATED</code></td>
+					<td><pre><small>string</small><span>(14)</span> "/var/www/hello"</pre></td>
+				</tr>
+								<tr>
+					<td><code>PHP_SELF</code></td>
+					<td><pre><small>string</small><span>(31)</span> "/kohana/testing/index.php/hello"</pre></td>
+
+				</tr>
+								<tr>
+					<td><code>REQUEST_TIME</code></td>
+					<td><pre><small>integer</small> 1254245682</pre></td>
+				</tr>
+								<tr>
+					<td><code>argv</code></td>
+
+					<td><pre><small>array</small><span>(0)</span> </pre></td>
+				</tr>
+								<tr>
+					<td><code>argc</code></td>
+					<td><pre><small>integer</small> 0</pre></td>
+
+				</tr>
+							</table>
+		</div>
+			</div>
+</div>
diff --git a/includes/kohana/modules/userguide/views/userguide/index.php b/includes/kohana/modules/userguide/views/userguide/index.php
new file mode 100644
index 0000000..5764fcb
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/index.php
@@ -0,0 +1,20 @@
+<h1>User Guide</h1>
+
+<p>The following modules have userguide pages:</p>
+
+<?php if( ! empty($modules)): ?>
+
+	<?php foreach($modules as $url => $options): ?>
+	
+		<p>
+			<strong><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></strong> -
+			<?php echo $options['description'] ?>
+		</p>
+	
+	<?php endforeach; ?>
+	
+<?php else: ?>
+
+	<p class="error">I couldn't find any modules with userguide pages.</p>
+
+<?php endif; ?>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/menu.php b/includes/kohana/modules/userguide/views/userguide/menu.php
new file mode 100644
index 0000000..e6537c9
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/menu.php
@@ -0,0 +1,17 @@
+<h2>Modules</h2>
+
+<?php if( ! empty($modules)): ?>
+
+	<ul>
+	<?php foreach($modules as $url => $options): ?>
+	
+		<li><?php echo html::anchor(Route::get('docs/guide')->uri(array('module' => $url)), $options['name'], NULL, NULL, TRUE) ?></li>
+	
+	<?php endforeach; ?>
+	</ul>
+
+<?php else: ?>
+
+	<p class="error">No modules.</p>
+
+<?php endif; ?>
\ No newline at end of file
diff --git a/includes/kohana/modules/userguide/views/userguide/page-toc.php b/includes/kohana/modules/userguide/views/userguide/page-toc.php
new file mode 100644
index 0000000..4eefcc2
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/page-toc.php
@@ -0,0 +1,10 @@
+<?php if (is_array($array)): ?>
+<div class="page-toc">
+	<?php foreach ($array as $item): ?>
+		<?php if ($item['level'] > 1): ?>
+		<?php echo str_repeat('&nbsp;', ($item['level'] - 1) * 4) ?>
+		<?php endif ?>
+		<?php echo HTML::anchor('#'.$item['id'],$item['name'], NULL, NULL, TRUE); ?><br />
+	<?php endforeach; ?>
+</div>
+<?php endif ?>
diff --git a/includes/kohana/modules/userguide/views/userguide/template.php b/includes/kohana/modules/userguide/views/userguide/template.php
new file mode 100644
index 0000000..8868d80
--- /dev/null
+++ b/includes/kohana/modules/userguide/views/userguide/template.php
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $l = substr(I18n::$lang, 0, 2) ?>" lang="<?php echo $l ?>">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+<title><?php echo $title ?> | Kohana <?php echo __('User Guide'); ?></title>
+
+<?php foreach ($styles as $style => $media) echo HTML::style($style, array('media' => $media), NULL, TRUE), "\n" ?>
+
+<?php foreach ($scripts as $script) echo HTML::script($script, NULL, NULL, TRUE), "\n" ?>
+
+<!--[if lt IE 9]>
+<script src="http://ie7-js.googlecode.com/svn/version/2.1(beta4)/IE9.js"></script>
+<![endif]-->
+</head>
+<body>
+
+	<div id="header">
+		<div class="container">
+			<a href="http://kohanaframework.org/" id="logo">
+				<img src="<?php echo Route::url('docs/media', array('file' => 'img/kohana.png')) ?>" />
+			</a>
+			<div id="menu">
+				<ul>
+					<li class="guide first">
+						<a href="<?php echo Route::url('docs/guide') ?>"><?php echo __('User Guide') ?></a>
+					</li>
+					<li class="api">
+						<a href="<?php echo Route::url('docs/api') ?>"><?php echo __('API Browser') ?></a>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+
+	<div id="content">
+		<div class="wrapper">
+			<div class="container">
+				<div class="span-22 prefix-1 suffix-1">
+					<ul id="breadcrumb">
+						<?php foreach ($breadcrumb as $link => $title): ?>
+							<?php if (is_string($link)): ?>
+							<li><?php echo HTML::anchor($link, $title, NULL, NULL, TRUE) ?></li>
+							<?php else: ?>
+							<li class="last"><?php echo $title ?></li>
+							<?php endif ?>
+						<?php endforeach ?>
+					</ul>
+				</div>
+				<div class="span-6 prefix-1">
+					<div id="topics">
+						<?php echo $menu ?>
+					</div>
+				</div>
+				<div id="body" class="span-16 suffix-1 last">
+					<?php echo $content ?>
+
+					<?php if (Kohana::$environment === Kohana::PRODUCTION AND empty($hide_disqus)): ?>
+					<div id="disqus_thread" class="clear"></div>
+					<script type="text/javascript">
+						var disqus_identifier = '<?php echo HTML::chars(Request::current()->uri()) ?>';
+						(function() {
+							var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+							dsq.src = 'http://kohana.disqus.com/embed.js';
+							(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+							})();
+					</script>
+					<noscript><?php echo __('Please enable JavaScript to view the :anchor_open comments powered by Disqus.:anchor_close', array(':anchor_open' => '<a href="http://disqus.com/?ref_noscript=kohana">', ':anchor_close' => '</a>')); ?></noscript>
+					<a href="http://disqus.com" class="dsq-brlink">Documentation comments powered by <span class="logo-disqus">Disqus</span></a>
+					<?php endif ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div id="footer">
+		<div class="container">
+			<div class="span-12">
+			<?php if (isset($copyright)): ?>
+				<p><?php echo $copyright ?></p>
+			<?php else: ?>
+				&nbsp;
+			<?php endif ?>
+			</div>
+			<div class="span-12 last right">
+			<p>Powered by <?php echo HTML::anchor('http://kohanaframework.org/', 'Kohana') ?> v<?php echo Kohana::VERSION ?></p>
+			</div>
+		</div>
+	</div>
+
+<?php if (Kohana::$environment === Kohana::PRODUCTION): ?>
+<script type="text/javascript">
+//<![CDATA[
+(function() {
+	var links = document.getElementsByTagName('a');
+	var query = '?';
+	for(var i = 0; i < links.length; i++) {
+	if(links[i].href.indexOf('#disqus_thread') >= 0) {
+		query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
+	}
+	}
+	document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/kohana/get_num_replies.js' + query + '"></' + 'script>');
+})();
+//]]>
+</script>
+<?php endif ?>
+</body>
+</html>
diff --git a/includes/kohana/system/classes/arr.php b/includes/kohana/system/classes/arr.php
new file mode 100644
index 0000000..a279831
--- /dev/null
+++ b/includes/kohana/system/classes/arr.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Arr extends Kohana_Arr {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/cli.php b/includes/kohana/system/classes/cli.php
new file mode 100644
index 0000000..d6e8130
--- /dev/null
+++ b/includes/kohana/system/classes/cli.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class CLI extends Kohana_CLI {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/config.php b/includes/kohana/system/classes/config.php
new file mode 100644
index 0000000..e82acca
--- /dev/null
+++ b/includes/kohana/system/classes/config.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Config extends Kohana_Config {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/config/file.php b/includes/kohana/system/classes/config/file.php
new file mode 100644
index 0000000..5d84495
--- /dev/null
+++ b/includes/kohana/system/classes/config/file.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Config_File extends Kohana_Config_File {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/config/reader.php b/includes/kohana/system/classes/config/reader.php
new file mode 100644
index 0000000..c559602
--- /dev/null
+++ b/includes/kohana/system/classes/config/reader.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Config_Reader extends Kohana_Config_Reader {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/controller.php b/includes/kohana/system/classes/controller.php
new file mode 100644
index 0000000..553c3ed
--- /dev/null
+++ b/includes/kohana/system/classes/controller.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Controller extends Kohana_Controller {}
diff --git a/includes/kohana/system/classes/controller/rest.php b/includes/kohana/system/classes/controller/rest.php
new file mode 100644
index 0000000..7ced04f
--- /dev/null
+++ b/includes/kohana/system/classes/controller/rest.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Controller_REST extends Kohana_Controller_REST {}
diff --git a/includes/kohana/system/classes/controller/template.php b/includes/kohana/system/classes/controller/template.php
new file mode 100644
index 0000000..5041487
--- /dev/null
+++ b/includes/kohana/system/classes/controller/template.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Controller_Template extends Kohana_Controller_Template {}
diff --git a/includes/kohana/system/classes/cookie.php b/includes/kohana/system/classes/cookie.php
new file mode 100644
index 0000000..bd47d4f
--- /dev/null
+++ b/includes/kohana/system/classes/cookie.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Cookie extends Kohana_Cookie {}
diff --git a/includes/kohana/system/classes/date.php b/includes/kohana/system/classes/date.php
new file mode 100644
index 0000000..6da2703
--- /dev/null
+++ b/includes/kohana/system/classes/date.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Date extends Kohana_Date {}
diff --git a/includes/kohana/system/classes/debug.php b/includes/kohana/system/classes/debug.php
new file mode 100644
index 0000000..f9c1acf
--- /dev/null
+++ b/includes/kohana/system/classes/debug.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Debug extends Kohana_Debug {}
diff --git a/includes/kohana/system/classes/encrypt.php b/includes/kohana/system/classes/encrypt.php
new file mode 100644
index 0000000..0b7938c
--- /dev/null
+++ b/includes/kohana/system/classes/encrypt.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Encrypt extends Kohana_Encrypt {}
diff --git a/includes/kohana/system/classes/feed.php b/includes/kohana/system/classes/feed.php
new file mode 100644
index 0000000..23197a1
--- /dev/null
+++ b/includes/kohana/system/classes/feed.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Feed extends Kohana_Feed {}
diff --git a/includes/kohana/system/classes/file.php b/includes/kohana/system/classes/file.php
new file mode 100644
index 0000000..6b0d4af
--- /dev/null
+++ b/includes/kohana/system/classes/file.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class File extends Kohana_File {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/form.php b/includes/kohana/system/classes/form.php
new file mode 100644
index 0000000..8d23680
--- /dev/null
+++ b/includes/kohana/system/classes/form.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Form extends Kohana_Form {}
diff --git a/includes/kohana/system/classes/fragment.php b/includes/kohana/system/classes/fragment.php
new file mode 100644
index 0000000..2efc25f
--- /dev/null
+++ b/includes/kohana/system/classes/fragment.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Fragment extends Kohana_Fragment {}
diff --git a/includes/kohana/system/classes/html.php b/includes/kohana/system/classes/html.php
new file mode 100644
index 0000000..1417d60
--- /dev/null
+++ b/includes/kohana/system/classes/html.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTML extends Kohana_HTML {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http.php b/includes/kohana/system/classes/http.php
new file mode 100644
index 0000000..2b8ca50
--- /dev/null
+++ b/includes/kohana/system/classes/http.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class HTTP extends Kohana_HTTP {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception.php b/includes/kohana/system/classes/http/exception.php
new file mode 100644
index 0000000..00d881d
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception extends Kohana_HTTP_Exception {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/400.php b/includes/kohana/system/classes/http/exception/400.php
new file mode 100644
index 0000000..3931a60
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/400.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_400 extends Kohana_HTTP_Exception_400 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/401.php b/includes/kohana/system/classes/http/exception/401.php
new file mode 100644
index 0000000..4268005
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/401.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_401 extends Kohana_HTTP_Exception_401 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/402.php b/includes/kohana/system/classes/http/exception/402.php
new file mode 100644
index 0000000..a02cb79
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/402.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_402 extends Kohana_HTTP_Exception_402 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/403.php b/includes/kohana/system/classes/http/exception/403.php
new file mode 100644
index 0000000..8f4ec54
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/403.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_403 extends Kohana_HTTP_Exception_403 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/404.php b/includes/kohana/system/classes/http/exception/404.php
new file mode 100644
index 0000000..e8e8276
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/404.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/405.php b/includes/kohana/system/classes/http/exception/405.php
new file mode 100644
index 0000000..fd69680
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/405.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_405 extends Kohana_HTTP_Exception_405 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/406.php b/includes/kohana/system/classes/http/exception/406.php
new file mode 100644
index 0000000..4de37f5
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/406.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_406 extends Kohana_HTTP_Exception_406 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/407.php b/includes/kohana/system/classes/http/exception/407.php
new file mode 100644
index 0000000..5ed62ce
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/407.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_407 extends Kohana_HTTP_Exception_407 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/408.php b/includes/kohana/system/classes/http/exception/408.php
new file mode 100644
index 0000000..c8a8c4d
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/408.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_408 extends Kohana_HTTP_Exception_408 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/409.php b/includes/kohana/system/classes/http/exception/409.php
new file mode 100644
index 0000000..bd6591b
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/409.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_409 extends Kohana_HTTP_Exception_409 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/410.php b/includes/kohana/system/classes/http/exception/410.php
new file mode 100644
index 0000000..6f2fe80
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/410.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_410 extends Kohana_HTTP_Exception_410 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/411.php b/includes/kohana/system/classes/http/exception/411.php
new file mode 100644
index 0000000..8eed39f
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/411.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_411 extends Kohana_HTTP_Exception_411 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/412.php b/includes/kohana/system/classes/http/exception/412.php
new file mode 100644
index 0000000..c30d0f9
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/412.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_412 extends Kohana_HTTP_Exception_412 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/413.php b/includes/kohana/system/classes/http/exception/413.php
new file mode 100644
index 0000000..972b518
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/413.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_413 extends Kohana_HTTP_Exception_413 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/414.php b/includes/kohana/system/classes/http/exception/414.php
new file mode 100644
index 0000000..0258da4
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/414.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_414 extends Kohana_HTTP_Exception_414 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/415.php b/includes/kohana/system/classes/http/exception/415.php
new file mode 100644
index 0000000..6d40b01
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/415.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_415 extends Kohana_HTTP_Exception_415 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/416.php b/includes/kohana/system/classes/http/exception/416.php
new file mode 100644
index 0000000..5665421
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/416.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_416 extends Kohana_HTTP_Exception_416 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/417.php b/includes/kohana/system/classes/http/exception/417.php
new file mode 100644
index 0000000..0e8dfd7
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/417.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_417 extends Kohana_HTTP_Exception_417 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/500.php b/includes/kohana/system/classes/http/exception/500.php
new file mode 100644
index 0000000..4688e11
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/500.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_500 extends Kohana_HTTP_Exception_500 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/501.php b/includes/kohana/system/classes/http/exception/501.php
new file mode 100644
index 0000000..f113d23
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/501.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_501 extends Kohana_HTTP_Exception_501 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/502.php b/includes/kohana/system/classes/http/exception/502.php
new file mode 100644
index 0000000..b28961f
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/502.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_502 extends Kohana_HTTP_Exception_502 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/503.php b/includes/kohana/system/classes/http/exception/503.php
new file mode 100644
index 0000000..80fc2de
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/503.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_503 extends Kohana_HTTP_Exception_503 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/504.php b/includes/kohana/system/classes/http/exception/504.php
new file mode 100644
index 0000000..4e3fa0b
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/504.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_504 extends Kohana_HTTP_Exception_504 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/exception/505.php b/includes/kohana/system/classes/http/exception/505.php
new file mode 100644
index 0000000..57fcdeb
--- /dev/null
+++ b/includes/kohana/system/classes/http/exception/505.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Exception_505 extends Kohana_HTTP_Exception_505 {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/header.php b/includes/kohana/system/classes/http/header.php
new file mode 100644
index 0000000..e48a3ba
--- /dev/null
+++ b/includes/kohana/system/classes/http/header.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Header extends Kohana_HTTP_Header {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/header/value.php b/includes/kohana/system/classes/http/header/value.php
new file mode 100644
index 0000000..5a1527e
--- /dev/null
+++ b/includes/kohana/system/classes/http/header/value.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class HTTP_Header_Value extends Kohana_HTTP_Header_Value {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/interaction.php b/includes/kohana/system/classes/http/interaction.php
new file mode 100644
index 0000000..8b387f2
--- /dev/null
+++ b/includes/kohana/system/classes/http/interaction.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+interface HTTP_Interaction extends Kohana_HTTP_Interaction {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/request.php b/includes/kohana/system/classes/http/request.php
new file mode 100644
index 0000000..e7d60a7
--- /dev/null
+++ b/includes/kohana/system/classes/http/request.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+interface HTTP_Request extends Kohana_HTTP_Request {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/http/response.php b/includes/kohana/system/classes/http/response.php
new file mode 100644
index 0000000..69572cf
--- /dev/null
+++ b/includes/kohana/system/classes/http/response.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+interface HTTP_Response extends Kohana_HTTP_Response {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/i18n.php b/includes/kohana/system/classes/i18n.php
new file mode 100644
index 0000000..84a3b03
--- /dev/null
+++ b/includes/kohana/system/classes/i18n.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class I18n extends Kohana_I18n {}
diff --git a/includes/kohana/system/classes/inflector.php b/includes/kohana/system/classes/inflector.php
new file mode 100644
index 0000000..934f394
--- /dev/null
+++ b/includes/kohana/system/classes/inflector.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Inflector extends Kohana_Inflector {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana.php b/includes/kohana/system/classes/kohana.php
new file mode 100644
index 0000000..4ffbb11
--- /dev/null
+++ b/includes/kohana/system/classes/kohana.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana extends Kohana_Core {}
diff --git a/includes/kohana/system/classes/kohana/arr.php b/includes/kohana/system/classes/kohana/arr.php
new file mode 100644
index 0000000..8da2024
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/arr.php
@@ -0,0 +1,574 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Array helper.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Arr {
+
+	/**
+	 * @var  string  default delimiter for path()
+	 */
+	public static $delimiter = '.';
+
+	/**
+	 * Tests if an array is associative or not.
+	 *
+	 *     // Returns TRUE
+	 *     Arr::is_assoc(array('username' => 'john.doe'));
+	 *
+	 *     // Returns FALSE
+	 *     Arr::is_assoc('foo', 'bar');
+	 *
+	 * @param   array   array to check
+	 * @return  boolean
+	 */
+	public static function is_assoc(array $array)
+	{
+		// Keys of the array
+		$keys = array_keys($array);
+
+		// If the array keys of the keys match the keys, then the array must
+		// not be associative (e.g. the keys array looked like {0:0, 1:1...}).
+		return array_keys($keys) !== $keys;
+	}
+
+	/**
+	 * Test if a value is an array with an additional check for array-like objects.
+	 *
+	 *     // Returns TRUE
+	 *     Arr::is_array(array());
+	 *     Arr::is_array(new ArrayObject);
+	 *
+	 *     // Returns FALSE
+	 *     Arr::is_array(FALSE);
+	 *     Arr::is_array('not an array!');
+	 *     Arr::is_array(Database::instance());
+	 *
+	 * @param   mixed    value to check
+	 * @return  boolean
+	 */
+	public static function is_array($value)
+	{
+		if (is_array($value))
+		{
+			// Definitely an array
+			return TRUE;
+		}
+		else
+		{
+			// Possibly a Traversable object, functionally the same as an array
+			return (is_object($value) AND $value instanceof Traversable);
+		}
+	}
+
+	/**
+	 * Gets a value from an array using a dot separated path.
+	 *
+	 *     // Get the value of $array['foo']['bar']
+	 *     $value = Arr::path($array, 'foo.bar');
+	 *
+	 * Using a wildcard "*" will search intermediate arrays and return an array.
+	 *
+	 *     // Get the values of "color" in theme
+	 *     $colors = Arr::path($array, 'theme.*.color');
+	 *
+	 *     // Using an array of keys
+	 *     $colors = Arr::path($array, array('theme', '*', 'color'));
+	 *
+	 * @param   array   array to search
+	 * @param   mixed   key path string (delimiter separated) or array of keys
+	 * @param   mixed   default value if the path is not set
+	 * @param   string  key path delimiter
+	 * @return  mixed
+	 */
+	public static function path($array, $path, $default = NULL, $delimiter = NULL)
+	{
+		if ( ! Arr::is_array($array))
+		{
+			// This is not an array!
+			return $default;
+		}
+
+		if (is_array($path))
+		{
+			// The path has already been separated into keys
+			$keys = $path;
+		}
+		else
+		{
+			if (array_key_exists($path, $array))
+			{
+				// No need to do extra processing
+				return $array[$path];
+			}
+
+			if ($delimiter === NULL)
+			{
+				// Use the default delimiter
+				$delimiter = Arr::$delimiter;
+			}
+
+			// Remove starting delimiters and spaces
+			$path = ltrim($path, "{$delimiter} ");
+
+			// Remove ending delimiters, spaces, and wildcards
+			$path = rtrim($path, "{$delimiter} *");
+
+			// Split the keys by delimiter
+			$keys = explode($delimiter, $path);
+		}
+
+		do
+		{
+			$key = array_shift($keys);
+
+			if (ctype_digit($key))
+			{
+				// Make the key an integer
+				$key = (int) $key;
+			}
+
+			if (isset($array[$key]))
+			{
+				if ($keys)
+				{
+					if (Arr::is_array($array[$key]))
+					{
+						// Dig down into the next part of the path
+						$array = $array[$key];
+					}
+					else
+					{
+						// Unable to dig deeper
+						break;
+					}
+				}
+				else
+				{
+					// Found the path requested
+					return $array[$key];
+				}
+			}
+			elseif ($key === '*')
+			{
+				// Handle wildcards
+
+				$values = array();
+				foreach ($array as $arr)
+				{
+					if ($value = Arr::path($arr, implode('.', $keys)))
+					{
+						$values[] = $value;
+					}
+				}
+
+				if ($values)
+				{
+					// Found the values requested
+					return $values;
+				}
+				else
+				{
+					// Unable to dig deeper
+					break;
+				}
+			}
+			else
+			{
+				// Unable to dig deeper
+				break;
+			}
+		}
+		while ($keys);
+
+		// Unable to find the value requested
+		return $default;
+	}
+
+	/**
+	* Set a value on an array by path.
+	*
+	* @see Arr::path()
+	* @param array   $array     Array to update
+	* @param string  $path      Path
+	* @param mixed   $value     Value to set
+	* @param string  $delimiter Path delimiter
+	*/
+	public static function set_path( & $array, $path, $value, $delimiter = NULL)
+	{
+		if ( ! $delimiter)
+		{
+			// Use the default delimiter
+			$delimiter = Arr::$delimiter;
+		}
+
+		// Split the keys by delimiter
+		$keys = explode($delimiter, $path);
+
+		// Set current $array to inner-most array path
+		while (count($keys) > 1)
+		{
+			$key = array_shift($keys);
+
+			if (ctype_digit($key))
+			{
+				// Make the key an integer
+				$key = (int) $key;
+			}
+
+			if ( ! isset($array[$key]))
+			{
+				$array[$key] = array();
+			}
+
+			$array = & $array[$key];
+		}
+
+		// Set key on inner-most array
+		$array[array_shift($keys)] = $value;
+	}
+
+	/**
+	 * Fill an array with a range of numbers.
+	 *
+	 *     // Fill an array with values 5, 10, 15, 20
+	 *     $values = Arr::range(5, 20);
+	 *
+	 * @param   integer  stepping
+	 * @param   integer  ending number
+	 * @return  array
+	 */
+	public static function range($step = 10, $max = 100)
+	{
+		if ($step < 1)
+			return array();
+
+		$array = array();
+		for ($i = $step; $i <= $max; $i += $step)
+		{
+			$array[$i] = $i;
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Retrieve a single key from an array. If the key does not exist in the
+	 * array, the default value will be returned instead.
+	 *
+	 *     // Get the value "username" from $_POST, if it exists
+	 *     $username = Arr::get($_POST, 'username');
+	 *
+	 *     // Get the value "sorting" from $_GET, if it exists
+	 *     $sorting = Arr::get($_GET, 'sorting');
+	 *
+	 * @param   array   array to extract from
+	 * @param   string  key name
+	 * @param   mixed   default value
+	 * @return  mixed
+	 */
+	public static function get($array, $key, $default = NULL)
+	{
+		return isset($array[$key]) ? $array[$key] : $default;
+	}
+
+	/**
+	 * Retrieves multiple keys from an array. If the key does not exist in the
+	 * array, the default value will be added instead.
+	 *
+	 *     // Get the values "username", "password" from $_POST
+	 *     $auth = Arr::extract($_POST, array('username', 'password'));
+	 *
+	 * @param   array   array to extract keys from
+	 * @param   array   list of key names
+	 * @param   mixed   default value
+	 * @return  array
+	 */
+	public static function extract($array, array $keys, $default = NULL)
+	{
+		$found = array();
+		foreach ($keys as $key)
+		{
+			$found[$key] = isset($array[$key]) ? $array[$key] : $default;
+		}
+
+		return $found;
+	}
+
+	/**
+	 * Retrieves muliple single-key values from a list of arrays.
+	 *
+	 *     // Get all of the "id" values from a result
+	 *     $ids = Arr::pluck($result, 'id');
+	 *
+	 * [!!] A list of arrays is an array that contains arrays, eg: array(array $a, array $b, array $c, ...)
+	 *
+	 * @param   array   list of arrays to check
+	 * @param   string  key to pluck
+	 * @return  array
+	 */
+	public static function pluck($array, $key)
+	{
+		$values = array();
+
+		foreach ($array as $row)
+		{
+			if (isset($row[$key]))
+			{
+				// Found a value in this row
+				$values[] = $row[$key];
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Adds a value to the beginning of an associative array.
+	 *
+	 *     // Add an empty value to the start of a select list
+	 *     Arr::unshift($array, 'none', 'Select a value');
+	 *
+	 * @param   array   array to modify
+	 * @param   string  array key name
+	 * @param   mixed   array value
+	 * @return  array
+	 */
+	public static function unshift( array & $array, $key, $val)
+	{
+		$array = array_reverse($array, TRUE);
+		$array[$key] = $val;
+		$array = array_reverse($array, TRUE);
+
+		return $array;
+	}
+
+	/**
+	 * Recursive version of [array_map](http://php.net/array_map), applies the
+	 * same callback to all elements in an array, including sub-arrays.
+	 *
+	 *     // Apply "strip_tags" to every element in the array
+	 *     $array = Arr::map('strip_tags', $array);
+	 *
+	 * [!!] Unlike `array_map`, this method requires a callback and will only map
+	 * a single array.
+	 *
+	 * @param   mixed   callback applied to every element in the array
+	 * @param   array   array to map
+	 * @return  array
+	 */
+	public static function map($callback, $array)
+	{
+		foreach ($array as $key => $val)
+		{
+			if (is_array($val))
+			{
+				$array[$key] = Arr::map($callback, $val);
+			}
+			else
+			{
+				$array[$key] = call_user_func($callback, $val);
+			}
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Merges one or more arrays recursively and preserves all keys.
+	 * Note that this does not work the same as [array_merge_recursive](http://php.net/array_merge_recursive)!
+	 *
+	 *     $john = array('name' => 'john', 'children' => array('fred', 'paul', 'sally', 'jane'));
+	 *     $mary = array('name' => 'mary', 'children' => array('jane'));
+	 *
+	 *     // John and Mary are married, merge them together
+	 *     $john = Arr::merge($john, $mary);
+	 *
+	 *     // The output of $john will now be:
+	 *     array('name' => 'mary', 'children' => array('fred', 'paul', 'sally', 'jane'))
+	 *
+	 * @param   array  initial array
+	 * @param   array  array to merge
+	 * @param   array  ...
+	 * @return  array
+	 */
+	public static function merge(array $a1, array $a2)
+	{
+		$result = array();
+		for ($i = 0, $total = func_num_args(); $i < $total; $i++)
+		{
+			// Get the next array
+			$arr = func_get_arg($i);
+
+			// Is the array associative?
+			$assoc = Arr::is_assoc($arr);
+
+			foreach ($arr as $key => $val)
+			{
+				if (isset($result[$key]))
+				{
+					if (is_array($val) AND is_array($result[$key]))
+					{
+						if (Arr::is_assoc($val))
+						{
+							// Associative arrays are merged recursively
+							$result[$key] = Arr::merge($result[$key], $val);
+						}
+						else
+						{
+							// Find the values that are not already present
+							$diff = array_diff($val, $result[$key]);
+
+							// Indexed arrays are merged to prevent duplicates
+							$result[$key] = array_merge($result[$key], $diff);
+						}
+					}
+					else
+					{
+						if ($assoc)
+						{
+							// Associative values are replaced
+							$result[$key] = $val;
+						}
+						elseif ( ! in_array($val, $result, TRUE))
+						{
+							// Indexed values are added only if they do not yet exist
+							$result[] = $val;
+						}
+					}
+				}
+				else
+				{
+					// New values are added
+					$result[$key] = $val;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Overwrites an array with values from input arrays.
+	 * Keys that do not exist in the first array will not be added!
+	 *
+	 *     $a1 = array('name' => 'john', 'mood' => 'happy', 'food' => 'bacon');
+	 *     $a2 = array('name' => 'jack', 'food' => 'tacos', 'drink' => 'beer');
+	 *
+	 *     // Overwrite the values of $a1 with $a2
+	 *     $array = Arr::overwrite($a1, $a2);
+	 *
+	 *     // The output of $array will now be:
+	 *     array('name' => 'jack', 'mood' => 'happy', 'food' => 'tacos')
+	 *
+	 * @param   array   master array
+	 * @param   array   input arrays that will overwrite existing values
+	 * @return  array
+	 */
+	public static function overwrite($array1, $array2)
+	{
+		foreach (array_intersect_key($array2, $array1) as $key => $value)
+		{
+			$array1[$key] = $value;
+		}
+
+		if (func_num_args() > 2)
+		{
+			foreach (array_slice(func_get_args(), 2) as $array2)
+			{
+				foreach (array_intersect_key($array2, $array1) as $key => $value)
+				{
+					$array1[$key] = $value;
+				}
+			}
+		}
+
+		return $array1;
+	}
+
+	/**
+	 * Creates a callable function and parameter list from a string representation.
+	 * Note that this function does not validate the callback string.
+	 *
+	 *     // Get the callback function and parameters
+	 *     list($func, $params) = Arr::callback('Foo::bar(apple,orange)');
+	 *
+	 *     // Get the result of the callback
+	 *     $result = call_user_func_array($func, $params);
+	 *
+	 * @param   string  callback string
+	 * @return  array   function, params
+	 */
+	public static function callback($str)
+	{
+		// Overloaded as parts are found
+		$command = $params = NULL;
+
+		// command[param,param]
+		if (preg_match('/^([^\(]*+)\((.*)\)$/', $str, $match))
+		{
+			// command
+			$command = $match[1];
+
+			if ($match[2] !== '')
+			{
+				// param,param
+				$params = preg_split('/(?<!\\\\),/', $match[2]);
+				$params = str_replace('\,', ',', $params);
+			}
+		}
+		else
+		{
+			// command
+			$command = $str;
+		}
+
+		if (strpos($command, '::') !== FALSE)
+		{
+			// Create a static method callable command
+			$command = explode('::', $command, 2);
+		}
+
+		return array($command, $params);
+	}
+
+	/**
+	 * Convert a multi-dimensional array into a single-dimensional array.
+	 *
+	 *     $array = array('set' => array('one' => 'something'), 'two' => 'other');
+	 *
+	 *     // Flatten the array
+	 *     $array = Arr::flatten($array);
+	 *
+	 *     // The array will now be
+	 *     array('one' => 'something', 'two' => 'other');
+	 *
+	 * [!!] The keys of array values will be discarded.
+	 *
+	 * @param   array   array to flatten
+	 * @return  array
+	 * @since   3.0.6
+	 */
+	public static function flatten($array)
+	{
+		$flat = array();
+		foreach ($array as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$flat += Arr::flatten($value);
+			}
+			else
+			{
+				$flat[$key] = $value;
+			}
+		}
+		return $flat;
+	}
+
+} // End arr
diff --git a/includes/kohana/system/classes/kohana/cli.php b/includes/kohana/system/classes/kohana/cli.php
new file mode 100644
index 0000000..f8a3aee
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/cli.php
@@ -0,0 +1,75 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Helper functions for working in a command-line environment.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_CLI {
+
+	/**
+	 * Returns one or more command-line options. Options are specified using
+	 * standard CLI syntax:
+	 *
+	 *     php index.php --username=john.smith --password=secret --var="some value with spaces"
+	 *
+	 *     // Get the values of "username" and "password"
+	 *     $auth = CLI::options('username', 'password');
+	 *
+	 * @param   string  option name
+	 * @param   ...
+	 * @return  array
+	 */
+	public static function options($options)
+	{
+		// Get all of the requested options
+		$options = func_get_args();
+
+		// Found option values
+		$values = array();
+
+		// Skip the first option, it is always the file executed
+		for ($i = 1; $i < $_SERVER['argc']; $i++)
+		{
+			if ( ! isset($_SERVER['argv'][$i]))
+			{
+				// No more args left
+				break;
+			}
+
+			// Get the option
+			$opt = $_SERVER['argv'][$i];
+
+			if (substr($opt, 0, 2) !== '--')
+			{
+				// This is not an option argument
+				continue;
+			}
+
+			// Remove the "--" prefix
+			$opt = substr($opt, 2);
+
+			if (strpos($opt, '='))
+			{
+				// Separate the name and value
+				list ($opt, $value) = explode('=', $opt, 2);
+			}
+			else
+			{
+				$value = NULL;
+			}
+
+			if (in_array($opt, $options))
+			{
+				// Set the given value
+				$values[$opt] = $value;
+			}
+		}
+
+		return $values;
+	}
+
+} // End CLI
diff --git a/includes/kohana/system/classes/kohana/config.php b/includes/kohana/system/classes/kohana/config.php
new file mode 100644
index 0000000..f404257
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/config.php
@@ -0,0 +1,157 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Wrapper for configuration arrays. Multiple configuration readers can be
+ * attached to allow loading configuration from files, database, etc.
+ *
+ * @package    Kohana
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Config {
+
+	/**
+	 * @var  Kohana_Config  Singleton static instance
+	 */
+	protected static $_instance;
+
+	/**
+	 * Get the singleton instance of Config.
+	 *
+	 *     $config = Config::instance();
+	 *
+	 * @return  Config
+	 */
+	public static function instance()
+	{
+		if (Config::$_instance === NULL)
+		{
+			// Create a new instance
+			Config::$_instance = new Config;
+		}
+
+		return Config::$_instance;
+	}
+
+	/**
+	 * @var  array  Configuration readers
+	 */
+	protected $_readers = array();
+
+	/**
+	 * Attach a configuration reader. By default, the reader will be added as
+	 * the first used reader. However, if the reader should be used only when
+	 * all other readers fail, use `FALSE` for the second parameter.
+	 *
+	 *     $config->attach($reader);        // Try first
+	 *     $config->attach($reader, FALSE); // Try last
+	 *
+	 * @param   object   Config_Reader instance
+	 * @param   boolean  add the reader as the first used object
+	 * @return  $this
+	 */
+	public function attach(Config_Reader $reader, $first = TRUE)
+	{
+		if ($first === TRUE)
+		{
+			// Place the log reader at the top of the stack
+			array_unshift($this->_readers, $reader);
+		}
+		else
+		{
+			// Place the reader at the bottom of the stack
+			$this->_readers[] = $reader;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Detach a configuration reader.
+	 *
+	 *     $config->detach($reader);
+	 *
+	 * @param   object  Config_Reader instance
+	 * @return  $this
+	 */
+	public function detach(Config_Reader $reader)
+	{
+		if (($key = array_search($reader, $this->_readers)) !== FALSE)
+		{
+			// Remove the writer
+			unset($this->_readers[$key]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Load a configuration group. Searches the readers in order until the
+	 * group is found. If the group does not exist, an empty configuration
+	 * array will be loaded using the first reader.
+	 *
+	 *     $array = $config->load($name);
+	 *
+	 * @param   string  configuration group name
+	 * @return  Config_Reader
+	 * @throws  Kohana_Exception
+	 */
+	public function load($group)
+	{
+		foreach ($this->_readers as $reader)
+		{
+			if ($config = $reader->load($group))
+			{
+				// Found a reader for this configuration group
+				return $config;
+			}
+		}
+
+		// Reset the iterator
+		reset($this->_readers);
+
+		if ( ! is_object($config = current($this->_readers)))
+		{
+			throw new Kohana_Exception('No configuration readers attached');
+		}
+
+		// Load the reader as an empty array
+		return $config->load($group, array());
+	}
+
+	/**
+	 * Copy one configuration group to all of the other readers.
+	 * 
+	 *     $config->copy($name);
+	 *
+	 * @param   string   configuration group name
+	 * @return  $this
+	 */
+	public function copy($group)
+	{
+		// Load the configuration group
+		$config = $this->load($group);
+
+		foreach ($this->_readers as $reader)
+		{
+			if ($config instanceof $reader)
+			{
+				// Do not copy the config to the same group
+				continue;
+			}
+
+			// Load the configuration object
+			$object = $reader->load($group, array());
+
+			foreach ($config as $key => $value)
+			{
+				// Copy each value in the config
+				$object->offsetSet($key, $value);
+			}
+		}
+
+		return $this;
+	}
+
+} // End Kohana_Config
diff --git a/includes/kohana/system/classes/kohana/config/file.php b/includes/kohana/system/classes/kohana/config/file.php
new file mode 100644
index 0000000..8b792f8
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/config/file.php
@@ -0,0 +1,60 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * File-based configuration reader. Multiple configuration directories can be
+ * used by attaching multiple instances of this class to [Config].
+ *
+ * @package    Kohana
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Config_File extends Config_Reader {
+
+	/**
+	 * @var  string  Configuration group name
+	 */
+	protected $_configuration_group;
+
+	/**
+	 * @var  bool  Has the config group changed?
+	 */
+	protected $_configuration_modified = FALSE;
+
+	public function __construct($directory = 'config')
+	{
+		// Set the configuration directory name
+		$this->_directory = trim($directory, '/');
+
+		// Load the empty array
+		parent::__construct();
+	}
+
+	/**
+	 * Load and merge all of the configuration files in this group.
+	 *
+	 *     $config->load($name);
+	 *
+	 * @param   string  configuration group name
+	 * @param   array   configuration array
+	 * @return  $this   clone of the current object
+	 * @uses    Kohana::load
+	 */
+	public function load($group, array $config = NULL)
+	{
+		if ($files = Kohana::find_file($this->_directory, $group, NULL, TRUE))
+		{
+			// Initialize the config array
+			$config = array();
+
+			foreach ($files as $file)
+			{
+				// Merge each file to the configuration array
+				$config = Arr::merge($config, Kohana::load($file));
+			}
+		}
+
+		return parent::load($group, $config);
+	}
+
+} // End Kohana_Config_File
diff --git a/includes/kohana/system/classes/kohana/config/reader.php b/includes/kohana/system/classes/kohana/config/reader.php
new file mode 100644
index 0000000..eb4b126
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/config/reader.php
@@ -0,0 +1,115 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Abstract configuration reader. All configuration readers must extend
+ * this class.
+ *
+ * @package    Kohana
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Config_Reader extends ArrayObject {
+
+	/**
+	 * @var  string  Configuration group name
+	 */
+	protected $_configuration_group;
+
+	/**
+	 * Loads an empty array as the initial configuration and enables array
+	 * keys to be used as properties.
+	 *
+	 * @return  void
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(), ArrayObject::ARRAY_AS_PROPS);
+	}
+
+	/**
+	 * Return the current group in serialized form.
+	 *
+	 *     echo $config;
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return serialize($this->getArrayCopy());
+	}
+
+	/**
+	 * Loads a configuration group.
+	 *
+	 *     $config->load($name, $array);
+	 *
+	 * This method must be extended by all readers. After the group has been
+	 * loaded, call `parent::load($group, $config)` for final preparation.
+	 *
+	 * @param   string  configuration group name
+	 * @param   array   configuration array
+	 * @return  $this   a clone of this object
+	 */
+	public function load($group, array $config = NULL)
+	{
+		if ($config === NULL)
+		{
+			return FALSE;
+		}
+
+		// Clone the current object
+		$object = clone $this;
+
+		// Set the group name
+		$object->_configuration_group = $group;
+
+		// Swap the array with the actual configuration
+		$object->exchangeArray($config);
+
+		return $object;
+	}
+
+	/**
+	 * Return the raw array that is being used for this object.
+	 *
+	 *     $array = $config->as_array();
+	 *
+	 * @return  array
+	 */
+	public function as_array()
+	{
+		return $this->getArrayCopy();
+	}
+
+	/**
+	 * Get a variable from the configuration or return the default value.
+	 *
+	 *     $value = $config->get($key);
+	 *
+	 * @param   string   array key
+	 * @param   mixed    default value
+	 * @return  mixed
+	 */
+	public function get($key, $default = NULL)
+	{
+		return $this->offsetExists($key) ? $this->offsetGet($key) : $default;
+	}
+
+	/**
+	 * Sets a value in the configuration array.
+	 *
+	 *     $config->set($key, $new_value);
+	 *
+	 * @param   string   array key
+	 * @param   mixed    array value
+	 * @return  $this
+	 */
+	public function set($key, $value)
+	{
+		$this->offsetSet($key, $value);
+
+		return $this;
+	}
+
+} // End Kohana_Config_Reader
diff --git a/includes/kohana/system/classes/kohana/controller.php b/includes/kohana/system/classes/kohana/controller.php
new file mode 100644
index 0000000..c0b9f59
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/controller.php
@@ -0,0 +1,75 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Abstract controller class. Controllers should only be created using a [Request].
+ *
+ * Controllers methods will be automatically called in the following order by
+ * the request:
+ *
+ *     $controller = new Controller_Foo($request);
+ *     $controller->before();
+ *     $controller->action_bar();
+ *     $controller->after();
+ *
+ * The controller action should add the output it creates to
+ * `$this->response->body($output)`, typically in the form of a [View], during the
+ * "action" part of execution.
+ *
+ * @package    Kohana
+ * @category   Controller
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Controller {
+
+	/**
+	 * @var  Request  Request that created the controller
+	 */
+	public $request;
+
+	/**
+	 * @var  Response The response that will be returned from controller
+	 */
+	public $response;
+
+	/**
+	 * Creates a new controller instance. Each controller must be constructed
+	 * with the request object that created it.
+	 *
+	 * @param   Request   $request  Request that created the controller
+	 * @param   Response  $response The request's response
+	 * @return  void
+	 */
+	public function __construct(Request $request, Response $response)
+	{
+		// Assign the request to the controller
+		$this->request = $request;
+
+		// Assign a response to the controller
+		$this->response = $response;
+	}
+
+	/**
+	 * Automatically executed before the controller action. Can be used to set
+	 * class properties, do authorization checks, and execute other custom code.
+	 *
+	 * @return  void
+	 */
+	public function before()
+	{
+		// Nothing by default
+	}
+
+	/**
+	 * Automatically executed after the controller action. Can be used to apply
+	 * transformation to the request response, add extra output, and execute
+	 * other custom code.
+	 *
+	 * @return  void
+	 */
+	public function after()
+	{
+		// Nothing by default
+	}
+
+} // End Controller
diff --git a/includes/kohana/system/classes/kohana/controller/rest.php b/includes/kohana/system/classes/kohana/controller/rest.php
new file mode 100644
index 0000000..2caaec6
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/controller/rest.php
@@ -0,0 +1,96 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Abstract Controller class for RESTful controller mapping. Supports GET, PUT,
+ * POST, and DELETE. By default, these methods will be mapped to these actions:
+ *
+ * GET
+ * :  Mapped to the "index" action, lists all objects
+ *
+ * POST
+ * :  Mapped to the "create" action, creates a new object
+ *
+ * PUT
+ * :  Mapped to the "update" action, update an existing object
+ *
+ * DELETE
+ * :  Mapped to the "delete" action, delete an existing object
+ *
+ * Additional methods can be supported by adding the method and action to
+ * the `$_action_map` property.
+ *
+ * [!!] Using this class within a website will require heavy modification,
+ * due to most web browsers only supporting the GET and POST methods.
+ * Generally, this class should only be used for web services and APIs.
+ *
+ * @package    Kohana
+ * @category   Controller
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Controller_REST extends Controller {
+
+	/**
+	 * @var  array  REST types
+	 */
+	protected $_action_map = array
+	(
+		HTTP_Request::GET    => 'index',
+		HTTP_Request::PUT    => 'update',
+		HTTP_Request::POST   => 'create',
+		HTTP_Request::DELETE => 'delete',
+	);
+
+	/**
+	 * @var  string  requested action
+	 */
+	protected $_action_requested = '';
+
+	/**
+	 * Checks the requested method against the available methods. If the method
+	 * is supported, sets the request action from the map. If not supported,
+	 * the "invalid" action will be called.
+	 */
+	public function before()
+	{
+		$this->_action_requested = $this->request->action();
+
+		$method = Arr::get($_SERVER, 'HTTP_X_HTTP_METHOD_OVERRIDE', $this->request->method());
+
+		if ( ! isset($this->_action_map[$method]))
+		{
+			$this->request->action('invalid');
+		}
+		else
+		{
+			$this->request->action($this->_action_map[$method]);
+		}
+
+		return parent::before();
+	}
+
+	/**
+	 * undocumented function
+	 */
+	public function after()
+	{
+		if (in_array(Arr::get($_SERVER, 'HTTP_X_HTTP_METHOD_OVERRIDE', $this->request->method()), array(
+			HTTP_Request::PUT,
+			HTTP_Request::POST,
+			HTTP_Request::DELETE)))
+		{
+			$this->response->headers('cache-control', 'no-cache, no-store, max-age=0, must-revalidate');
+		}
+	}
+
+	/**
+	 * Sends a 405 "Method Not Allowed" response and a list of allowed actions.
+	 */
+	public function action_invalid()
+	{
+		// Send the "Method Not Allowed" response
+		$this->response->status(405)
+			->headers('Allow', implode(', ', array_keys($this->_action_map)));
+	}
+
+} // End REST
diff --git a/includes/kohana/system/classes/kohana/controller/template.php b/includes/kohana/system/classes/kohana/controller/template.php
new file mode 100644
index 0000000..ca19fdf
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/controller/template.php
@@ -0,0 +1,50 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Abstract controller class for automatic templating.
+ *
+ * @package    Kohana
+ * @category   Controller
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Controller_Template extends Controller {
+
+	/**
+	 * @var  View  page template
+	 */
+	public $template = 'template';
+
+	/**
+	 * @var  boolean  auto render template
+	 **/
+	public $auto_render = TRUE;
+
+	/**
+	 * Loads the template [View] object.
+	 */
+	public function before()
+	{
+		if ($this->auto_render === TRUE)
+		{
+			// Load the template
+			$this->template = View::factory($this->template);
+		}
+
+		return parent::before();
+	}
+
+	/**
+	 * Assigns the template [View] as the request response.
+	 */
+	public function after()
+	{
+		if ($this->auto_render === TRUE)
+		{
+			$this->response->body($this->template->render());
+		}
+
+		return parent::after();
+	}
+
+} // End Controller_Template
diff --git a/includes/kohana/system/classes/kohana/cookie.php b/includes/kohana/system/classes/kohana/cookie.php
new file mode 100644
index 0000000..e3772ab
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/cookie.php
@@ -0,0 +1,161 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Cookie helper.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Cookie {
+
+	/**
+	 * @var  string  Magic salt to add to the cookie
+	 */
+	public static $salt = NULL;
+
+	/**
+	 * @var  integer  Number of seconds before the cookie expires
+	 */
+	public static $expiration = 0;
+
+	/**
+	 * @var  string  Restrict the path that the cookie is available to
+	 */
+	public static $path = '/';
+
+	/**
+	 * @var  string  Restrict the domain that the cookie is available to
+	 */
+	public static $domain = NULL;
+
+	/**
+	 * @var  boolean  Only transmit cookies over secure connections
+	 */
+	public static $secure = FALSE;
+
+	/**
+	 * @var  boolean  Only transmit cookies over HTTP, disabling Javascript access
+	 */
+	public static $httponly = FALSE;
+
+	/**
+	 * Gets the value of a signed cookie. Cookies without signatures will not
+	 * be returned. If the cookie signature is present, but invalid, the cookie
+	 * will be deleted.
+	 *
+	 *     // Get the "theme" cookie, or use "blue" if the cookie does not exist
+	 *     $theme = Cookie::get('theme', 'blue');
+	 *
+	 * @param   string  cookie name
+	 * @param   mixed   default value to return
+	 * @return  string
+	 */
+	public static function get($key, $default = NULL)
+	{
+		if ( ! isset($_COOKIE[$key]))
+		{
+			// The cookie does not exist
+			return $default;
+		}
+
+		// Get the cookie value
+		$cookie = $_COOKIE[$key];
+
+		// Find the position of the split between salt and contents
+		$split = strlen(Cookie::salt($key, NULL));
+
+		if (isset($cookie[$split]) AND $cookie[$split] === '~')
+		{
+			// Separate the salt and the value
+			list ($hash, $value) = explode('~', $cookie, 2);
+
+			if (Cookie::salt($key, $value) === $hash)
+			{
+				// Cookie signature is valid
+				return $value;
+			}
+
+			// The cookie signature is invalid, delete it
+			Cookie::delete($key);
+		}
+
+		return $default;
+	}
+
+	/**
+	 * Sets a signed cookie. Note that all cookie values must be strings and no
+	 * automatic serialization will be performed!
+	 *
+	 *     // Set the "theme" cookie
+	 *     Cookie::set('theme', 'red');
+	 *
+	 * @param   string   name of cookie
+	 * @param   string   value of cookie
+	 * @param   integer  lifetime in seconds
+	 * @return  boolean
+	 * @uses    Cookie::salt
+	 */
+	public static function set($name, $value, $expiration = NULL)
+	{
+		if ($expiration === NULL)
+		{
+			// Use the default expiration
+			$expiration = Cookie::$expiration;
+		}
+
+		if ($expiration !== 0)
+		{
+			// The expiration is expected to be a UNIX timestamp
+			$expiration += time();
+		}
+
+		// Add the salt to the cookie value
+		$value = Cookie::salt($name, $value).'~'.$value;
+
+		return setcookie($name, $value, $expiration, Cookie::$path, Cookie::$domain, Cookie::$secure, Cookie::$httponly);
+	}
+
+	/**
+	 * Deletes a cookie by making the value NULL and expiring it.
+	 *
+	 *     Cookie::delete('theme');
+	 *
+	 * @param   string   cookie name
+	 * @return  boolean
+	 * @uses    Cookie::set
+	 */
+	public static function delete($name)
+	{
+		// Remove the cookie
+		unset($_COOKIE[$name]);
+
+		// Nullify the cookie and make it expire
+		return setcookie($name, NULL, -86400, Cookie::$path, Cookie::$domain, Cookie::$secure, Cookie::$httponly);
+	}
+
+	/**
+	 * Generates a salt string for a cookie based on the name and value.
+	 *
+	 *     $salt = Cookie::salt('theme', 'red');
+	 *
+	 * @param   string   name of cookie
+	 * @param   string   value of cookie
+	 * @return  string
+	 */
+	public static function salt($name, $value)
+	{
+		// Require a valid salt
+		if ( ! Cookie::$salt)
+		{
+			throw new Kohana_Exception('A valid cookie salt is required. Please set Cookie::$salt.');
+		}
+
+		// Determine the user agent
+		$agent = isset($_SERVER['HTTP_USER_AGENT']) ? strtolower($_SERVER['HTTP_USER_AGENT']) : 'unknown';
+
+		return sha1($agent.$name.$value.Cookie::$salt);
+	}
+
+} // End cookie
diff --git a/includes/kohana/system/classes/kohana/core.php b/includes/kohana/system/classes/kohana/core.php
new file mode 100644
index 0000000..be3314a
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/core.php
@@ -0,0 +1,1040 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Contains the most low-level helpers methods in Kohana:
+ *
+ * - Environment initialization
+ * - Locating files within the cascading filesystem
+ * - Auto-loading and transparent extension of classes
+ * - Variable and path debugging
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Core {
+
+	// Release version and codename
+	const VERSION  = '3.1.3.1';
+	const CODENAME = 'araea';
+
+	// Common environment type constants for consistency and convenience
+	const PRODUCTION  = 1;
+	const STAGING     = 2;
+	const TESTING     = 3;
+	const DEVELOPMENT = 4;
+
+	// Security check that is added to all generated PHP files
+	const FILE_SECURITY = '<?php defined(\'SYSPATH\') or die(\'No direct script access.\');';
+
+	// Format of cache files: header, cache name, and data
+	const FILE_CACHE = ":header \n\n// :name\n\n:data\n";
+
+	/**
+	 * @var  string  Current environment name
+	 */
+	public static $environment = Kohana::DEVELOPMENT;
+
+	/**
+	 * @var  boolean  True if Kohana is running from the command line
+	 */
+	public static $is_cli = FALSE;
+
+	/**
+	 * @var  boolean  True if Kohana is running on windows
+	 */
+	public static $is_windows = FALSE;
+
+	/**
+	 * @var  boolean  True if [magic quotes](http://php.net/manual/en/security.magicquotes.php) is enabled.
+	 */
+	public static $magic_quotes = FALSE;
+
+	/**
+	 * @var  boolean  Should errors and exceptions be logged
+	 */
+	public static $log_errors = FALSE;
+
+	/**
+	 * @var  boolean  TRUE if PHP safe mode is on
+	 */
+	public static $safe_mode = FALSE;
+
+	/**
+	 * @var  string
+	 */
+	public static $content_type = 'text/html';
+
+	/**
+	 * @var  string  character set of input and output
+	 */
+	public static $charset = 'utf-8';
+
+	/**
+	 * @var  string  the name of the server Kohana is hosted upon
+	 */
+	public static $server_name = '';
+
+	/**
+	 * @var  array   list of valid host names for this instance
+	 */
+	public static $hostnames = array();
+
+	/**
+	 * @var  string  base URL to the application
+	 */
+	public static $base_url = '/';
+
+	/**
+	 * @var  string  Application index file, added to links generated by Kohana. Set by [Kohana::init]
+	 */
+	public static $index_file = 'index.php';
+
+	/**
+	 * @var  string  Cache directory, used by [Kohana::cache]. Set by [Kohana::init]
+	 */
+	public static $cache_dir;
+
+	/**
+	 * @var  integer  Default lifetime for caching, in seconds, used by [Kohana::cache]. Set by [Kohana::init]
+	 */
+	public static $cache_life = 60;
+
+	/**
+	 * @var  boolean  Whether to use internal caching for [Kohana::find_file], does not apply to [Kohana::cache]. Set by [Kohana::init]
+	 */
+	public static $caching = FALSE;
+
+	/**
+	 * @var  boolean  Whether to enable [profiling](kohana/profiling). Set by [Kohana::init]
+	 */
+	public static $profiling = TRUE;
+
+	/**
+	 * @var  boolean  Enable Kohana catching and displaying PHP errors and exceptions. Set by [Kohana::init]
+	 */
+	public static $errors = TRUE;
+
+	/**
+	 * @var  array  Types of errors to display at shutdown
+	 */
+	public static $shutdown_errors = array(E_PARSE, E_ERROR, E_USER_ERROR);
+
+	/**
+	 * @var  boolean  set the X-Powered-By header
+	 */
+	public static $expose = FALSE;
+
+	/**
+	 * @var  Log  logging object
+	 */
+	public static $log;
+
+	/**
+	 * @var  Config  config object
+	 */
+	public static $config;
+
+	/**
+	 * @var  boolean  Has [Kohana::init] been called?
+	 */
+	protected static $_init = FALSE;
+
+	/**
+	 * @var  array   Currently active modules
+	 */
+	protected static $_modules = array();
+
+	/**
+	 * @var  array   Include paths that are used to find files
+	 */
+	protected static $_paths = array(APPPATH, SYSPATH);
+
+	/**
+	 * @var  array   File path cache, used when caching is true in [Kohana::init]
+	 */
+	protected static $_files = array();
+
+	/**
+	 * @var  boolean  Has the file path cache changed during this execution?  Used internally when when caching is true in [Kohana::init]
+	 */
+	protected static $_files_changed = FALSE;
+
+	/**
+	 * Initializes the environment:
+	 *
+	 * - Disables register_globals and magic_quotes_gpc
+	 * - Determines the current environment
+	 * - Set global settings
+	 * - Sanitizes GET, POST, and COOKIE variables
+	 * - Converts GET, POST, and COOKIE variables to the global character set
+	 *
+	 * The following settings can be set:
+	 *
+	 * Type      | Setting    | Description                                    | Default Value
+	 * ----------|------------|------------------------------------------------|---------------
+	 * `string`  | base_url   | The base URL for your application.  This should be the *relative* path from your DOCROOT to your `index.php` file, in other words, if Kohana is in a subfolder, set this to the subfolder name, otherwise leave it as the default.  **The leading slash is required**, trailing slash is optional.   | `"/"`
+	 * `string`  | index_file | The name of the [front controller](http://en.wikipedia.org/wiki/Front_Controller_pattern).  This is used by Kohana to generate relative urls like [HTML::anchor()] and [URL::base()]. This is usually `index.php`.  To [remove index.php from your urls](tutorials/clean-urls), set this to `FALSE`. | `"index.php"`
+	 * `string`  | charset    | Character set used for all input and output    | `"utf-8"`
+	 * `string`  | cache_dir  | Kohana's cache directory.  Used by [Kohana::cache] for simple internal caching, like [Fragments](kohana/fragments) and **\[caching database queries](this should link somewhere)**.  This has nothing to do with the [Cache module](cache). | `APPPATH."cache"`
+	 * `integer` | cache_life | Lifetime, in seconds, of items cached by [Kohana::cache]         | `60`
+	 * `boolean` | errors     | Should Kohana catch PHP errors and uncaught Exceptions and show the `error_view`. See [Error Handling](kohana/errors) for more info. <br /> <br /> Recommended setting: `TRUE` while developing, `FALSE` on production servers. | `TRUE`
+	 * `boolean` | profile    | Whether to enable the [Profiler](kohana/profiling). <br /> <br />Recommended setting: `TRUE` while developing, `FALSE` on production servers. | `TRUE`	 * `boolean` | caching    | Cache file locations to speed up [Kohana::find_file].  This has nothing to do with [Kohana::cache], [Fragments](kohana/fragments) or the [Cache module](cache).  <br /> <br />  Recommended setting: `FALSE` while developing, `TRUE` on production servers. | `FALSE`
+	 *
+	 * @throws  Kohana_Exception
+	 * @param   array   Array of settings.  See above.
+	 * @return  void
+	 * @uses    Kohana::globals
+	 * @uses    Kohana::sanitize
+	 * @uses    Kohana::cache
+	 * @uses    Profiler
+	 */
+	public static function init(array $settings = NULL)
+	{
+		if (Kohana::$_init)
+		{
+			// Do not allow execution twice
+			return;
+		}
+
+		// Kohana is now initialized
+		Kohana::$_init = TRUE;
+
+		if (isset($settings['profile']))
+		{
+			// Enable profiling
+			Kohana::$profiling = (bool) $settings['profile'];
+		}
+
+		// Start an output buffer
+		ob_start();
+
+		if (isset($settings['errors']))
+		{
+			// Enable error handling
+			Kohana::$errors = (bool) $settings['errors'];
+		}
+
+		if (Kohana::$errors === TRUE)
+		{
+			// Enable Kohana exception handling, adds stack traces and error source.
+			set_exception_handler(array('Kohana_Exception', 'handler'));
+
+			// Enable Kohana error handling, converts all PHP errors to exceptions.
+			set_error_handler(array('Kohana', 'error_handler'));
+		}
+
+		// Enable the Kohana shutdown handler, which catches E_FATAL errors.
+		register_shutdown_function(array('Kohana', 'shutdown_handler'));
+
+		if (ini_get('register_globals'))
+		{
+			// Reverse the effects of register_globals
+			Kohana::globals();
+		}
+
+		if (isset($settings['expose']))
+		{
+			Kohana::$expose = (bool) $settings['expose'];
+		}
+
+		// Determine if we are running in a command line environment
+		Kohana::$is_cli = (PHP_SAPI === 'cli');
+
+		// Determine if we are running in a Windows environment
+		Kohana::$is_windows = (DIRECTORY_SEPARATOR === '\\');
+
+		// Determine if we are running in safe mode
+		Kohana::$safe_mode = (bool) ini_get('safe_mode');
+
+		if (isset($settings['cache_dir']))
+		{
+			if ( ! is_dir($settings['cache_dir']))
+			{
+				try
+				{
+					// Create the cache directory
+					mkdir($settings['cache_dir'], 0755, TRUE);
+
+					// Set permissions (must be manually set to fix umask issues)
+					chmod($settings['cache_dir'], 0755);
+				}
+				catch (Exception $e)
+				{
+					throw new Kohana_Exception('Could not create cache directory :dir',
+						array(':dir' => Debug::path($settings['cache_dir'])));
+				}
+			}
+
+			// Set the cache directory path
+			Kohana::$cache_dir = realpath($settings['cache_dir']);
+		}
+		else
+		{
+			// Use the default cache directory
+			Kohana::$cache_dir = APPPATH.'cache';
+		}
+
+		if ( ! is_writable(Kohana::$cache_dir))
+		{
+			throw new Kohana_Exception('Directory :dir must be writable',
+				array(':dir' => Debug::path(Kohana::$cache_dir)));
+		}
+
+		if (isset($settings['cache_life']))
+		{
+			// Set the default cache lifetime
+			Kohana::$cache_life = (int) $settings['cache_life'];
+		}
+
+		if (isset($settings['caching']))
+		{
+			// Enable or disable internal caching
+			Kohana::$caching = (bool) $settings['caching'];
+		}
+
+		if (Kohana::$caching === TRUE)
+		{
+			// Load the file path cache
+			Kohana::$_files = Kohana::cache('Kohana::find_file()');
+		}
+
+		if (isset($settings['charset']))
+		{
+			// Set the system character set
+			Kohana::$charset = strtolower($settings['charset']);
+		}
+
+		if (function_exists('mb_internal_encoding'))
+		{
+			// Set the MB extension encoding to the same character set
+			mb_internal_encoding(Kohana::$charset);
+		}
+
+		if (isset($settings['base_url']))
+		{
+			// Set the base URL
+			Kohana::$base_url = rtrim($settings['base_url'], '/').'/';
+		}
+
+		if (isset($settings['index_file']))
+		{
+			// Set the index file
+			Kohana::$index_file = trim($settings['index_file'], '/');
+		}
+
+		// Determine if the extremely evil magic quotes are enabled
+		Kohana::$magic_quotes = (bool) get_magic_quotes_gpc();
+
+		// Sanitize all request variables
+		$_GET    = Kohana::sanitize($_GET);
+		$_POST   = Kohana::sanitize($_POST);
+		$_COOKIE = Kohana::sanitize($_COOKIE);
+
+		// Load the logger
+		Kohana::$log = Log::instance();
+
+		// Load the config
+		Kohana::$config = Config::instance();
+	}
+
+	/**
+	 * Cleans up the environment:
+	 *
+	 * - Restore the previous error and exception handlers
+	 * - Destroy the Kohana::$log and Kohana::$config objects
+	 *
+	 * @return  void
+	 */
+	public static function deinit()
+	{
+		if (Kohana::$_init)
+		{
+			// Removed the autoloader
+			spl_autoload_unregister(array('Kohana', 'auto_load'));
+
+			if (Kohana::$errors)
+			{
+				// Go back to the previous error handler
+				restore_error_handler();
+
+				// Go back to the previous exception handler
+				restore_exception_handler();
+			}
+
+			// Destroy objects created by init
+			Kohana::$log = Kohana::$config = NULL;
+
+			// Reset internal storage
+			Kohana::$_modules = Kohana::$_files = array();
+			Kohana::$_paths   = array(APPPATH, SYSPATH);
+
+			// Reset file cache status
+			Kohana::$_files_changed = FALSE;
+
+			// Kohana is no longer initialized
+			Kohana::$_init = FALSE;
+		}
+	}
+
+	/**
+	 * Reverts the effects of the `register_globals` PHP setting by unsetting
+	 * all global varibles except for the default super globals (GPCS, etc),
+	 * which is a [potential security hole.][ref-wikibooks]
+	 *
+	 * This is called automatically by [Kohana::init] if `register_globals` is
+	 * on.
+	 *
+	 *
+	 * [ref-wikibooks]: http://en.wikibooks.org/wiki/PHP_Programming/Register_Globals
+	 *
+	 * @return  void
+	 */
+	public static function globals()
+	{
+		if (isset($_REQUEST['GLOBALS']) OR isset($_FILES['GLOBALS']))
+		{
+			// Prevent malicious GLOBALS overload attack
+			echo "Global variable overload attack detected! Request aborted.\n";
+
+			// Exit with an error status
+			exit(1);
+		}
+
+		// Get the variable names of all globals
+		$global_variables = array_keys($GLOBALS);
+
+		// Remove the standard global variables from the list
+		$global_variables = array_diff($global_variables, array(
+			'_COOKIE',
+			'_ENV',
+			'_GET',
+			'_FILES',
+			'_POST',
+			'_REQUEST',
+			'_SERVER',
+			'_SESSION',
+			'GLOBALS',
+		));
+
+		foreach ($global_variables as $name)
+		{
+			// Unset the global variable, effectively disabling register_globals
+			unset($GLOBALS[$name]);
+		}
+	}
+
+	/**
+	 * Recursively sanitizes an input variable:
+	 *
+	 * - Strips slashes if magic quotes are enabled
+	 * - Normalizes all newlines to LF
+	 *
+	 * @param   mixed  any variable
+	 * @return  mixed  sanitized variable
+	 */
+	public static function sanitize($value)
+	{
+		if (is_array($value) OR is_object($value))
+		{
+			foreach ($value as $key => $val)
+			{
+				// Recursively clean each value
+				$value[$key] = Kohana::sanitize($val);
+			}
+		}
+		elseif (is_string($value))
+		{
+			if (Kohana::$magic_quotes === TRUE)
+			{
+				// Remove slashes added by magic quotes
+				$value = stripslashes($value);
+			}
+
+			if (strpos($value, "\r") !== FALSE)
+			{
+				// Standardize newlines
+				$value = str_replace(array("\r\n", "\r"), "\n", $value);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Provides auto-loading support of classes that follow Kohana's [class
+	 * naming conventions](kohana/conventions#class-names-and-file-location).
+	 * See [Loading Classes](kohana/autoloading) for more information.
+	 *
+	 * Class names are converted to file names by making the class name
+	 * lowercase and converting underscores to slashes:
+	 *
+	 *     // Loads classes/my/class/name.php
+	 *     Kohana::auto_load('My_Class_Name');
+	 *
+	 * You should never have to call this function, as simply calling a class
+	 * will cause it to be called.
+	 *
+	 * This function must be enabled as an autoloader in the bootstrap:
+	 *
+	 *     spl_autoload_register(array('Kohana', 'auto_load'));
+	 *
+	 * @param   string   class name
+	 * @return  boolean
+	 */
+	public static function auto_load($class)
+	{
+		try
+		{
+			// Transform the class name into a path
+			$file = str_replace('_', '/', strtolower($class));
+
+			if ($path = Kohana::find_file('classes', $file))
+			{
+				// Load the class file
+				require $path;
+
+				// Class has been found
+				return TRUE;
+			}
+
+			// Class is not in the filesystem
+			return FALSE;
+		}
+		catch (Exception $e)
+		{
+			Kohana_Exception::handler($e);
+			die;
+		}
+	}
+
+	/**
+	 * Changes the currently enabled modules. Module paths may be relative
+	 * or absolute, but must point to a directory:
+	 *
+	 *     Kohana::modules(array('modules/foo', MODPATH.'bar'));
+	 *
+	 * @param   array  list of module paths
+	 * @return  array  enabled modules
+	 */
+	public static function modules(array $modules = NULL)
+	{
+		if ($modules === NULL)
+		{
+			// Not changing modules, just return the current set
+			return Kohana::$_modules;
+		}
+
+		// Start a new list of include paths, APPPATH first
+		$paths = array(APPPATH);
+
+		foreach ($modules as $name => $path)
+		{
+			if (is_dir($path))
+			{
+				// Add the module to include paths
+				$paths[] = $modules[$name] = realpath($path).DIRECTORY_SEPARATOR;
+			}
+			else
+			{
+				// This module is invalid, remove it
+				unset($modules[$name]);
+			}
+		}
+
+		// Finish the include paths by adding SYSPATH
+		$paths[] = SYSPATH;
+
+		// Set the new include paths
+		Kohana::$_paths = $paths;
+
+		// Set the current module list
+		Kohana::$_modules = $modules;
+
+		foreach (Kohana::$_modules as $path)
+		{
+			$init = $path.'init'.EXT;
+
+			if (is_file($init))
+			{
+				// Include the module initialization file once
+				require_once $init;
+			}
+		}
+
+		return Kohana::$_modules;
+	}
+
+	/**
+	 * Returns the the currently active include paths, including the
+	 * application, system, and each module's path.
+	 *
+	 * @return  array
+	 */
+	public static function include_paths()
+	{
+		return Kohana::$_paths;
+	}
+
+	/**
+	 * Searches for a file in the [Cascading Filesystem](kohana/files), and
+	 * returns the path to the file that has the highest precedence, so that it
+	 * can be included.
+	 *
+	 * When searching the "config", "messages", or "i18n" directories, or when
+	 * the `$array` flag is set to true, an array of all the files that match
+	 * that path in the [Cascading Filesystem](kohana/files) will be returned.
+	 * These files will return arrays which must be merged together.
+	 *
+	 * If no extension is given, the default extension (`EXT` set in
+	 * `index.php`) will be used.
+	 *
+	 *     // Returns an absolute path to views/template.php
+	 *     Kohana::find_file('views', 'template');
+	 *
+	 *     // Returns an absolute path to media/css/style.css
+	 *     Kohana::find_file('media', 'css/style', 'css');
+	 *
+	 *     // Returns an array of all the "mimes" configuration files
+	 *     Kohana::find_file('config', 'mimes');
+	 *
+	 * @param   string   directory name (views, i18n, classes, extensions, etc.)
+	 * @param   string   filename with subdirectory
+	 * @param   string   extension to search for
+	 * @param   boolean  return an array of files?
+	 * @return  array    a list of files when $array is TRUE
+	 * @return  string   single file path
+	 */
+	public static function find_file($dir, $file, $ext = NULL, $array = FALSE)
+	{
+		if ($ext === NULL)
+		{
+			// Use the default extension
+			$ext = EXT;
+		}
+		elseif ($ext)
+		{
+			// Prefix the extension with a period
+			$ext = ".{$ext}";
+		}
+		else
+		{
+			// Use no extension
+			$ext = '';
+		}
+
+		// Create a partial path of the filename
+		$path = $dir.DIRECTORY_SEPARATOR.$file.$ext;
+
+		if (Kohana::$caching === TRUE AND isset(Kohana::$_files[$path.($array ? '_array' : '_path')]))
+		{
+			// This path has been cached
+			return Kohana::$_files[$path.($array ? '_array' : '_path')];
+		}
+
+		if (Kohana::$profiling === TRUE AND class_exists('Profiler', FALSE))
+		{
+			// Start a new benchmark
+			$benchmark = Profiler::start('Kohana', __FUNCTION__);
+		}
+
+		if ($array OR $dir === 'config' OR $dir === 'i18n' OR $dir === 'messages')
+		{
+			// Include paths must be searched in reverse
+			$paths = array_reverse(Kohana::$_paths);
+
+			// Array of files that have been found
+			$found = array();
+
+			foreach ($paths as $dir)
+			{
+				if (is_file($dir.$path))
+				{
+					// This path has a file, add it to the list
+					$found[] = $dir.$path;
+				}
+			}
+		}
+		else
+		{
+			// The file has not been found yet
+			$found = FALSE;
+
+			foreach (Kohana::$_paths as $dir)
+			{
+				if (is_file($dir.$path))
+				{
+					// A path has been found
+					$found = $dir.$path;
+
+					// Stop searching
+					break;
+				}
+			}
+		}
+
+		if (Kohana::$caching === TRUE)
+		{
+			// Add the path to the cache
+			Kohana::$_files[$path.($array ? '_array' : '_path')] = $found;
+
+			// Files have been changed
+			Kohana::$_files_changed = TRUE;
+		}
+
+		if (isset($benchmark))
+		{
+			// Stop the benchmark
+			Profiler::stop($benchmark);
+		}
+
+		return $found;
+	}
+
+	/**
+	 * Recursively finds all of the files in the specified directory at any
+	 * location in the [Cascading Filesystem](kohana/files), and returns an
+	 * array of all the files found, sorted alphabetically.
+	 *
+	 *     // Find all view files.
+	 *     $views = Kohana::list_files('views');
+	 *
+	 * @param   string  directory name
+	 * @param   array   list of paths to search
+	 * @return  array
+	 */
+	public static function list_files($directory = NULL, array $paths = NULL)
+	{
+		if ($directory !== NULL)
+		{
+			// Add the directory separator
+			$directory .= DIRECTORY_SEPARATOR;
+		}
+
+		if ($paths === NULL)
+		{
+			// Use the default paths
+			$paths = Kohana::$_paths;
+		}
+
+		// Create an array for the files
+		$found = array();
+
+		foreach ($paths as $path)
+		{
+			if (is_dir($path.$directory))
+			{
+				// Create a new directory iterator
+				$dir = new DirectoryIterator($path.$directory);
+
+				foreach ($dir as $file)
+				{
+					// Get the file name
+					$filename = $file->getFilename();
+
+					if ($filename[0] === '.' OR $filename[strlen($filename)-1] === '~')
+					{
+						// Skip all hidden files and UNIX backup files
+						continue;
+					}
+
+					// Relative filename is the array key
+					$key = $directory.$filename;
+
+					if ($file->isDir())
+					{
+						if ($sub_dir = Kohana::list_files($key, $paths))
+						{
+							if (isset($found[$key]))
+							{
+								// Append the sub-directory list
+								$found[$key] += $sub_dir;
+							}
+							else
+							{
+								// Create a new sub-directory list
+								$found[$key] = $sub_dir;
+							}
+						}
+					}
+					else
+					{
+						if ( ! isset($found[$key]))
+						{
+							// Add new files to the list
+							$found[$key] = realpath($file->getPathName());
+						}
+					}
+				}
+			}
+		}
+
+		// Sort the results alphabetically
+		ksort($found);
+
+		return $found;
+	}
+
+	/**
+	 * Loads a file within a totally empty scope and returns the output:
+	 *
+	 *     $foo = Kohana::load('foo.php');
+	 *
+	 * @param   string
+	 * @return  mixed
+	 */
+	public static function load($file)
+	{
+		return include $file;
+	}
+
+	/**
+	 * Returns the configuration array for the requested group.  See
+	 * [configuration files](kohana/files/config) for more information.
+	 *
+	 *     // Get all the configuration in config/database.php
+	 *     $config = Kohana::config('database');
+	 *
+	 *     // Get only the default connection configuration
+	 *     $default = Kohana::config('database.default')
+	 *
+	 *     // Get only the hostname of the default connection
+	 *     $host = Kohana::config('database.default.connection.hostname')
+	 *
+	 * @param   string   group name
+	 * @return  Config
+	 */
+	public static function config($group)
+	{
+		static $config;
+
+		if (strpos($group, '.') !== FALSE)
+		{
+			// Split the config group and path
+			list ($group, $path) = explode('.', $group, 2);
+		}
+
+		if ( ! isset($config[$group]))
+		{
+			// Load the config group into the cache
+			$config[$group] = Kohana::$config->load($group);
+		}
+
+		if (isset($path))
+		{
+			return Arr::path($config[$group], $path, NULL, '.');
+		}
+		else
+		{
+			return $config[$group];
+		}
+	}
+
+	/**
+	 * Provides simple file-based caching for strings and arrays:
+	 *
+	 *     // Set the "foo" cache
+	 *     Kohana::cache('foo', 'hello, world');
+	 *
+	 *     // Get the "foo" cache
+	 *     $foo = Kohana::cache('foo');
+	 *
+	 * All caches are stored as PHP code, generated with [var_export][ref-var].
+	 * Caching objects may not work as expected. Storing references or an
+	 * object or array that has recursion will cause an E_FATAL.
+	 *
+	 * The cache directory and default cache lifetime is set by [Kohana::init]
+	 *
+	 * [ref-var]: http://php.net/var_export
+	 *
+	 * @throws  Kohana_Exception
+	 * @param   string   name of the cache
+	 * @param   mixed    data to cache
+	 * @param   integer  number of seconds the cache is valid for
+	 * @return  mixed    for getting
+	 * @return  boolean  for setting
+	 */
+	public static function cache($name, $data = NULL, $lifetime = NULL)
+	{
+		// Cache file is a hash of the name
+		$file = sha1($name).'.txt';
+
+		// Cache directories are split by keys to prevent filesystem overload
+		$dir = Kohana::$cache_dir.DIRECTORY_SEPARATOR.$file[0].$file[1].DIRECTORY_SEPARATOR;
+
+		if ($lifetime === NULL)
+		{
+			// Use the default lifetime
+			$lifetime = Kohana::$cache_life;
+		}
+
+		if ($data === NULL)
+		{
+			if (is_file($dir.$file))
+			{
+				if ((time() - filemtime($dir.$file)) < $lifetime)
+				{
+					// Return the cache
+					try
+					{
+						return unserialize(file_get_contents($dir.$file));
+					}
+					catch (Exception $e)
+					{
+						// Cache is corrupt, let return happen normally.
+					}
+				}
+				else
+				{
+					try
+					{
+						// Cache has expired
+						unlink($dir.$file);
+					}
+					catch (Exception $e)
+					{
+						// Cache has mostly likely already been deleted,
+						// let return happen normally.
+					}
+				}
+			}
+
+			// Cache not found
+			return NULL;
+		}
+
+		if ( ! is_dir($dir))
+		{
+			// Create the cache directory
+			mkdir($dir, 0777, TRUE);
+
+			// Set permissions (must be manually set to fix umask issues)
+			chmod($dir, 0777);
+		}
+
+		// Force the data to be a string
+		$data = serialize($data);
+
+		try
+		{
+			// Write the cache
+			return (bool) file_put_contents($dir.$file, $data, LOCK_EX);
+		}
+		catch (Exception $e)
+		{
+			// Failed to write cache
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Get a message from a file. Messages are arbitary strings that are stored
+	 * in the `messages/` directory and reference by a key. Translation is not
+	 * performed on the returned values.  See [message files](kohana/files/messages)
+	 * for more information.
+	 *
+	 *     // Get "username" from messages/text.php
+	 *     $username = Kohana::message('text', 'username');
+	 *
+	 * @param   string  file name
+	 * @param   string  key path to get
+	 * @param   mixed   default value if the path does not exist
+	 * @return  string  message string for the given path
+	 * @return  array   complete message list, when no path is specified
+	 * @uses    Arr::merge
+	 * @uses    Arr::path
+	 */
+	public static function message($file, $path = NULL, $default = NULL)
+	{
+		static $messages;
+
+		if ( ! isset($messages[$file]))
+		{
+			// Create a new message list
+			$messages[$file] = array();
+
+			if ($files = Kohana::find_file('messages', $file))
+			{
+				foreach ($files as $f)
+				{
+					// Combine all the messages recursively
+					$messages[$file] = Arr::merge($messages[$file], Kohana::load($f));
+				}
+			}
+		}
+
+		if ($path === NULL)
+		{
+			// Return all of the messages
+			return $messages[$file];
+		}
+		else
+		{
+			// Get a message using the path
+			return Arr::path($messages[$file], $path, $default);
+		}
+	}
+
+	/**
+	 * PHP error handler, converts all errors into ErrorExceptions. This handler
+	 * respects error_reporting settings.
+	 *
+	 * @throws  ErrorException
+	 * @return  TRUE
+	 */
+	public static function error_handler($code, $error, $file = NULL, $line = NULL)
+	{
+		if (error_reporting() & $code)
+		{
+			// This error is not suppressed by current error reporting settings
+			// Convert the error into an ErrorException
+			throw new ErrorException($error, $code, 0, $file, $line);
+		}
+
+		// Do not execute the PHP error handler
+		return TRUE;
+	}
+
+	/**
+	 * Catches errors that are not caught by the error handler, such as E_PARSE.
+	 *
+	 * @uses    Kohana_Exception::handler
+	 * @return  void
+	 */
+	public static function shutdown_handler()
+	{
+		if ( ! Kohana::$_init)
+		{
+			// Do not execute when not active
+			return;
+		}
+
+		try
+		{
+			if (Kohana::$caching === TRUE AND Kohana::$_files_changed === TRUE)
+			{
+				// Write the file path cache
+				Kohana::cache('Kohana::find_file()', Kohana::$_files);
+			}
+		}
+		catch (Exception $e)
+		{
+			// Pass the exception to the handler
+			Kohana_Exception::handler($e);
+		}
+
+		if (Kohana::$errors AND $error = error_get_last() AND in_array($error['type'], Kohana::$shutdown_errors))
+		{
+			// Clean the output buffer
+			ob_get_level() and ob_clean();
+
+			// Fake an exception for nice debugging
+			Kohana_Exception::handler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
+
+			// Shutdown now to avoid a "death loop"
+			exit(1);
+		}
+	}
+
+} // End Kohana
diff --git a/includes/kohana/system/classes/kohana/date.php b/includes/kohana/system/classes/kohana/date.php
new file mode 100644
index 0000000..870d3d1
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/date.php
@@ -0,0 +1,598 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Date helper.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Date {
+
+	// Second amounts for various time increments
+	const YEAR   = 31556926;
+	const MONTH  = 2629744;
+	const WEEK   = 604800;
+	const DAY    = 86400;
+	const HOUR   = 3600;
+	const MINUTE = 60;
+
+	// Available formats for Date::months()
+	const MONTHS_LONG  = '%B';
+	const MONTHS_SHORT = '%b';
+
+	/**
+	 * Default timestamp format for formatted_time
+	 * @var  string
+	 */
+	public static $timestamp_format = 'Y-m-d H:i:s';
+
+	/**
+	 * Timezone for formatted_time
+	 * @link http://uk2.php.net/manual/en/timezones.php
+	 * @var  string
+	 */
+	public static $timezone;
+
+	/**
+	 * Returns the offset (in seconds) between two time zones. Use this to
+	 * display dates to users in different time zones.
+	 *
+	 *     $seconds = Date::offset('America/Chicago', 'GMT');
+	 *
+	 * [!!] A list of time zones that PHP supports can be found at
+	 * <http://php.net/timezones>.
+	 *
+	 * @param   string   timezone that to find the offset of
+	 * @param   string   timezone used as the baseline
+	 * @param   mixed    UNIX timestamp or date string
+	 * @return  integer
+	 */
+	public static function offset($remote, $local = NULL, $now = NULL)
+	{
+		if ($local === NULL)
+		{
+			// Use the default timezone
+			$local = date_default_timezone_get();
+		}
+
+		if (is_int($now))
+		{
+			// Convert the timestamp into a string
+			$now = date(DateTime::RFC2822, $now);
+		}
+
+		// Create timezone objects
+		$zone_remote = new DateTimeZone($remote);
+		$zone_local  = new DateTimeZone($local);
+
+		// Create date objects from timezones
+		$time_remote = new DateTime($now, $zone_remote);
+		$time_local  = new DateTime($now, $zone_local);
+
+		// Find the offset
+		$offset = $zone_remote->getOffset($time_remote) - $zone_local->getOffset($time_local);
+
+		return $offset;
+	}
+
+	/**
+	 * Number of seconds in a minute, incrementing by a step. Typically used as
+	 * a shortcut for generating a list that can used in a form.
+	 *
+	 *     $seconds = Date::seconds(); // 01, 02, 03, ..., 58, 59, 60
+	 *
+	 * @param   integer  amount to increment each step by, 1 to 30
+	 * @param   integer  start value
+	 * @param   integer  end value
+	 * @return  array    A mirrored (foo => foo) array from 1-60.
+	 */
+	public static function seconds($step = 1, $start = 0, $end = 60)
+	{
+		// Always integer
+		$step = (int) $step;
+
+		$seconds = array();
+
+		for ($i = $start; $i < $end; $i += $step)
+		{
+			$seconds[$i] = sprintf('%02d', $i);
+		}
+
+		return $seconds;
+	}
+
+	/**
+	 * Number of minutes in an hour, incrementing by a step. Typically used as
+	 * a shortcut for generating a list that can be used in a form.
+	 *
+	 *     $minutes = Date::minutes(); // 05, 10, 15, ..., 50, 55, 60
+	 *
+	 * @uses    Date::seconds
+	 * @param   integer  amount to increment each step by, 1 to 30
+	 * @return  array    A mirrored (foo => foo) array from 1-60.
+	 */
+	public static function minutes($step = 5)
+	{
+		// Because there are the same number of minutes as seconds in this set,
+		// we choose to re-use seconds(), rather than creating an entirely new
+		// function. Shhhh, it's cheating! ;) There are several more of these
+		// in the following methods.
+		return Date::seconds($step);
+	}
+
+	/**
+	 * Number of hours in a day. Typically used as a shortcut for generating a
+	 * list that can be used in a form.
+	 *
+	 *     $hours = Date::hours(); // 01, 02, 03, ..., 10, 11, 12
+	 *
+	 * @param   integer  amount to increment each step by
+	 * @param   boolean  use 24-hour time
+	 * @param   integer  the hour to start at
+	 * @return  array    A mirrored (foo => foo) array from start-12 or start-23.
+	 */
+	public static function hours($step = 1, $long = FALSE, $start = NULL)
+	{
+		// Default values
+		$step = (int) $step;
+		$long = (bool) $long;
+		$hours = array();
+
+		// Set the default start if none was specified.
+		if ($start === NULL)
+		{
+			$start = ($long === FALSE) ? 1 : 0;
+		}
+
+		$hours = array();
+
+		// 24-hour time has 24 hours, instead of 12
+		$size = ($long === TRUE) ? 23 : 12;
+
+		for ($i = $start; $i <= $size; $i += $step)
+		{
+			$hours[$i] = (string) $i;
+		}
+
+		return $hours;
+	}
+
+	/**
+	 * Returns AM or PM, based on a given hour (in 24 hour format).
+	 *
+	 *     $type = Date::ampm(12); // PM
+	 *     $type = Date::ampm(1);  // AM
+	 *
+	 * @param   integer  number of the hour
+	 * @return  string
+	 */
+	public static function ampm($hour)
+	{
+		// Always integer
+		$hour = (int) $hour;
+
+		return ($hour > 11) ? 'PM' : 'AM';
+	}
+
+	/**
+	 * Adjusts a non-24-hour number into a 24-hour number.
+	 *
+	 *     $hour = Date::adjust(3, 'pm'); // 15
+	 *
+	 * @param   integer  hour to adjust
+	 * @param   string   AM or PM
+	 * @return  string
+	 */
+	public static function adjust($hour, $ampm)
+	{
+		$hour = (int) $hour;
+		$ampm = strtolower($ampm);
+
+		switch ($ampm)
+		{
+			case 'am':
+				if ($hour == 12)
+				{
+					$hour = 0;
+				}
+			break;
+			case 'pm':
+				if ($hour < 12)
+				{
+					$hour += 12;
+				}
+			break;
+		}
+
+		return sprintf('%02d', $hour);
+	}
+
+	/**
+	 * Number of days in a given month and year. Typically used as a shortcut
+	 * for generating a list that can be used in a form.
+	 *
+	 *     Date::days(4, 2010); // 1, 2, 3, ..., 28, 29, 30
+	 *
+	 * @param   integer  number of month
+	 * @param   integer  number of year to check month, defaults to the current year
+	 * @return  array    A mirrored (foo => foo) array of the days.
+	 */
+	public static function days($month, $year = FALSE)
+	{
+		static $months;
+
+		if ($year === FALSE)
+		{
+			// Use the current year by default
+			$year = date('Y');
+		}
+
+		// Always integers
+		$month = (int) $month;
+		$year  = (int) $year;
+
+		// We use caching for months, because time functions are used
+		if (empty($months[$year][$month]))
+		{
+			$months[$year][$month] = array();
+
+			// Use date to find the number of days in the given month
+			$total = date('t', mktime(1, 0, 0, $month, 1, $year)) + 1;
+
+			for ($i = 1; $i < $total; $i++)
+			{
+				$months[$year][$month][$i] = (string) $i;
+			}
+		}
+
+		return $months[$year][$month];
+	}
+
+	/**
+	 * Number of months in a year. Typically used as a shortcut for generating
+	 * a list that can be used in a form.
+	 *
+	 * By default a mirrored array of $month_number => $month_number is returned
+	 *
+	 *     Date::months();
+	 *     // aray(1 => 1, 2 => 2, 3 => 3, ..., 12 => 12)
+	 *
+	 * But you can customise this by passing in either Date::MONTHS_LONG
+	 *
+	 *     Date::months(Date::MONTHS_LONG);
+	 *     // array(1 => 'January', 2 => 'February', ..., 12 => 'December')
+	 *
+	 * Or Date::MONTHS_SHORT
+	 *
+	 *     Date::months(Date::MONTHS_SHORT);
+	 *     // array(1 => 'Jan', 2 => 'Feb', ..., 12 => 'Dec')
+	 *
+	 * @uses    Date::hours
+	 * @param   string The format to use for months
+	 * @return  array  An array of months based on the specified format
+	 */
+	public static function months($format = NULL)
+	{
+		$months = array();
+
+		if ($format === DATE::MONTHS_LONG OR $format === DATE::MONTHS_SHORT)
+		{
+			for ($i = 1; $i <= 12; ++$i)
+			{
+				$months[$i] = strftime($format, mktime(0, 0, 0, $i, 1));
+			}
+		}
+		else
+		{
+			$months = Date::hours();
+		}
+
+		return $months;
+	}
+
+	/**
+	 * Returns an array of years between a starting and ending year. By default,
+	 * the the current year - 5 and current year + 5 will be used. Typically used
+	 * as a shortcut for generating a list that can be used in a form.
+	 *
+	 *     $years = Date::years(2000, 2010); // 2000, 2001, ..., 2009, 2010
+	 *
+	 * @param   integer  starting year (default is current year - 5)
+	 * @param   integer  ending year (default is current year + 5)
+	 * @return  array
+	 */
+	public static function years($start = FALSE, $end = FALSE)
+	{
+		// Default values
+		$start = ($start === FALSE) ? (date('Y') - 5) : (int) $start;
+		$end   = ($end   === FALSE) ? (date('Y') + 5) : (int) $end;
+
+		$years = array();
+
+		for ($i = $start; $i <= $end; $i++)
+		{
+			$years[$i] = (string) $i;
+		}
+
+		return $years;
+	}
+
+	/**
+	 * Returns time difference between two timestamps, in human readable format.
+	 * If the second timestamp is not given, the current time will be used.
+	 * Also consider using [Date::fuzzy_span] when displaying a span.
+	 *
+	 *     $span = Date::span(60, 182, 'minutes,seconds'); // array('minutes' => 2, 'seconds' => 2)
+	 *     $span = Date::span(60, 182, 'minutes'); // 2
+	 *
+	 * @param   integer  timestamp to find the span of
+	 * @param   integer  timestamp to use as the baseline
+	 * @param   string   formatting string
+	 * @return  string   when only a single output is requested
+	 * @return  array    associative list of all outputs requested
+	 */
+	public static function span($remote, $local = NULL, $output = 'years,months,weeks,days,hours,minutes,seconds')
+	{
+		// Normalize output
+		$output = trim(strtolower( (string) $output));
+
+		if ( ! $output)
+		{
+			// Invalid output
+			return FALSE;
+		}
+
+		// Array with the output formats
+		$output = preg_split('/[^a-z]+/', $output);
+
+		// Convert the list of outputs to an associative array
+		$output = array_combine($output, array_fill(0, count($output), 0));
+
+		// Make the output values into keys
+		extract(array_flip($output), EXTR_SKIP);
+
+		if ($local === NULL)
+		{
+			// Calculate the span from the current time
+			$local = time();
+		}
+
+		// Calculate timespan (seconds)
+		$timespan = abs($remote - $local);
+
+		if (isset($output['years']))
+		{
+			$timespan -= Date::YEAR * ($output['years'] = (int) floor($timespan / Date::YEAR));
+		}
+
+		if (isset($output['months']))
+		{
+			$timespan -= Date::MONTH * ($output['months'] = (int) floor($timespan / Date::MONTH));
+		}
+
+		if (isset($output['weeks']))
+		{
+			$timespan -= Date::WEEK * ($output['weeks'] = (int) floor($timespan / Date::WEEK));
+		}
+
+		if (isset($output['days']))
+		{
+			$timespan -= Date::DAY * ($output['days'] = (int) floor($timespan / Date::DAY));
+		}
+
+		if (isset($output['hours']))
+		{
+			$timespan -= Date::HOUR * ($output['hours'] = (int) floor($timespan / Date::HOUR));
+		}
+
+		if (isset($output['minutes']))
+		{
+			$timespan -= Date::MINUTE * ($output['minutes'] = (int) floor($timespan / Date::MINUTE));
+		}
+
+		// Seconds ago, 1
+		if (isset($output['seconds']))
+		{
+			$output['seconds'] = $timespan;
+		}
+
+		if (count($output) === 1)
+		{
+			// Only a single output was requested, return it
+			return array_pop($output);
+		}
+
+		// Return array
+		return $output;
+	}
+
+	/**
+	 * Returns the difference between a time and now in a "fuzzy" way.
+	 * Displaying a fuzzy time instead of a date is usually faster to read and understand.
+	 *
+	 *     $span = Date::fuzzy_span(time() - 10); // "moments ago"
+	 *     $span = Date::fuzzy_span(time() + 20); // "in moments"
+	 *
+	 * A second parameter is available to manually set the "local" timestamp,
+	 * however this parameter shouldn't be needed in normal usage and is only
+	 * included for unit tests
+	 *
+	 * @param   integer  "remote" timestamp
+	 * @param   integer  "local" timestamp, defaults to time()
+	 * @return  string
+	 */
+	public static function fuzzy_span($timestamp, $local_timestamp = NULL)
+	{
+		$local_timestamp = ($local_timestamp === NULL) ? time() : (int) $local_timestamp;
+
+		// Determine the difference in seconds
+		$offset = abs($local_timestamp - $timestamp);
+
+		if ($offset <= Date::MINUTE)
+		{
+			$span = 'moments';
+		}
+		elseif ($offset < (Date::MINUTE * 20))
+		{
+			$span = 'a few minutes';
+		}
+		elseif ($offset < Date::HOUR)
+		{
+			$span = 'less than an hour';
+		}
+		elseif ($offset < (Date::HOUR * 4))
+		{
+			$span = 'a couple of hours';
+		}
+		elseif ($offset < Date::DAY)
+		{
+			$span = 'less than a day';
+		}
+		elseif ($offset < (Date::DAY * 2))
+		{
+			$span = 'about a day';
+		}
+		elseif ($offset < (Date::DAY * 4))
+		{
+			$span = 'a couple of days';
+		}
+		elseif ($offset < Date::WEEK)
+		{
+			$span = 'less than a week';
+		}
+		elseif ($offset < (Date::WEEK * 2))
+		{
+			$span = 'about a week';
+		}
+		elseif ($offset < Date::MONTH)
+		{
+			$span = 'less than a month';
+		}
+		elseif ($offset < (Date::MONTH * 2))
+		{
+			$span = 'about a month';
+		}
+		elseif ($offset < (Date::MONTH * 4))
+		{
+			$span = 'a couple of months';
+		}
+		elseif ($offset < Date::YEAR)
+		{
+			$span = 'less than a year';
+		}
+		elseif ($offset < (Date::YEAR * 2))
+		{
+			$span = 'about a year';
+		}
+		elseif ($offset < (Date::YEAR * 4))
+		{
+			$span = 'a couple of years';
+		}
+		elseif ($offset < (Date::YEAR * 8))
+		{
+			$span = 'a few years';
+		}
+		elseif ($offset < (Date::YEAR * 12))
+		{
+			$span = 'about a decade';
+		}
+		elseif ($offset < (Date::YEAR * 24))
+		{
+			$span = 'a couple of decades';
+		}
+		elseif ($offset < (Date::YEAR * 64))
+		{
+			$span = 'several decades';
+		}
+		else
+		{
+			$span = 'a long time';
+		}
+
+		if ($timestamp <= $local_timestamp)
+		{
+			// This is in the past
+			return $span.' ago';
+		}
+		else
+		{
+			// This in the future
+			return 'in '.$span;
+		}
+	}
+
+	/**
+	 * Converts a UNIX timestamp to DOS format. There are very few cases where
+	 * this is needed, but some binary formats use it (eg: zip files.)
+	 * Converting the other direction is done using {@link Date::dos2unix}.
+	 *
+	 *     $dos = Date::unix2dos($unix);
+	 *
+	 * @param   integer  UNIX timestamp
+	 * @return  integer
+	 */
+	public static function unix2dos($timestamp = FALSE)
+	{
+		$timestamp = ($timestamp === FALSE) ? getdate() : getdate($timestamp);
+
+		if ($timestamp['year'] < 1980)
+		{
+			return (1 << 21 | 1 << 16);
+		}
+
+		$timestamp['year'] -= 1980;
+
+		// What voodoo is this? I have no idea... Geert can explain it though,
+		// and that's good enough for me.
+		return ($timestamp['year']    << 25 | $timestamp['mon']     << 21 |
+		        $timestamp['mday']    << 16 | $timestamp['hours']   << 11 |
+		        $timestamp['minutes'] << 5  | $timestamp['seconds'] >> 1);
+	}
+
+	/**
+	 * Converts a DOS timestamp to UNIX format.There are very few cases where
+	 * this is needed, but some binary formats use it (eg: zip files.)
+	 * Converting the other direction is done using {@link Date::unix2dos}.
+	 *
+	 *     $unix = Date::dos2unix($dos);
+	 *
+	 * @param   integer  DOS timestamp
+	 * @return  integer
+	 */
+	public static function dos2unix($timestamp = FALSE)
+	{
+		$sec  = 2 * ($timestamp & 0x1f);
+		$min  = ($timestamp >>  5) & 0x3f;
+		$hrs  = ($timestamp >> 11) & 0x1f;
+		$day  = ($timestamp >> 16) & 0x1f;
+		$mon  = ($timestamp >> 21) & 0x0f;
+		$year = ($timestamp >> 25) & 0x7f;
+
+		return mktime($hrs, $min, $sec, $mon, $day, $year + 1980);
+	}
+
+	/**
+	 * Returns a date/time string with the specified timestamp format
+	 *
+	 *     $time = Date::formatted_time('5 minutes ago');
+	 *
+	 * @see     http://php.net/manual/en/datetime.construct.php
+	 * @param   string  datetime_str     datetime string
+	 * @param   string  timestamp_format timestamp format
+	 * @return  string
+	 */
+	public static function formatted_time($datetime_str = 'now', $timestamp_format = NULL, $timezone = NULL)
+	{
+		$timestamp_format = ($timestamp_format == NULL) ? Date::$timestamp_format : $timestamp_format;
+		$timezone         = ($timezone === NULL) ? Date::$timezone : $timezone;
+
+		$time = new DateTime($datetime_str, new DateTimeZone(
+			$timezone ? $timezone : date_default_timezone_get()
+		));
+
+		return $time->format($timestamp_format);
+	}
+
+} // End date
diff --git a/includes/kohana/system/classes/kohana/debug.php b/includes/kohana/system/classes/kohana/debug.php
new file mode 100644
index 0000000..6f1f8a2
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/debug.php
@@ -0,0 +1,468 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Contains debugging and dumping tools.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Debug {
+
+	/**
+	 * Returns an HTML string of debugging information about any number of
+	 * variables, each wrapped in a "pre" tag:
+	 *
+	 *     // Displays the type and value of each variable
+	 *     echo Debug::vars($foo, $bar, $baz);
+	 *
+	 * @param   mixed   variable to debug
+	 * @param   ...
+	 * @return  string
+	 */
+	public static function vars()
+	{
+		if (func_num_args() === 0)
+			return;
+
+		// Get all passed variables
+		$variables = func_get_args();
+
+		$output = array();
+		foreach ($variables as $var)
+		{
+			$output[] = Debug::_dump($var, 1024);
+		}
+
+		return '<pre class="debug">'.implode("\n", $output).'</pre>';
+	}
+
+	/**
+	 * Returns an HTML string of information about a single variable.
+	 *
+	 * Borrows heavily on concepts from the Debug class of [Nette](http://nettephp.com/).
+	 *
+	 * @param   mixed    variable to dump
+	 * @param   integer  maximum length of strings
+	 * @return  string
+	 */
+	public static function dump($value, $length = 128)
+	{
+		return Debug::_dump($value, $length);
+	}
+
+	/**
+	 * Helper for Debug::dump(), handles recursion in arrays and objects.
+	 *
+	 * @param   mixed    variable to dump
+	 * @param   integer  maximum length of strings
+	 * @param   integer  recursion level (internal)
+	 * @return  string
+	 */
+	protected static function _dump( & $var, $length = 128, $level = 0)
+	{
+		if ($var === NULL)
+		{
+			return '<small>NULL</small>';
+		}
+		elseif (is_bool($var))
+		{
+			return '<small>bool</small> '.($var ? 'TRUE' : 'FALSE');
+		}
+		elseif (is_float($var))
+		{
+			return '<small>float</small> '.$var;
+		}
+		elseif (is_resource($var))
+		{
+			if (($type = get_resource_type($var)) === 'stream' AND $meta = stream_get_meta_data($var))
+			{
+				$meta = stream_get_meta_data($var);
+
+				if (isset($meta['uri']))
+				{
+					$file = $meta['uri'];
+
+					if (function_exists('stream_is_local'))
+					{
+						// Only exists on PHP >= 5.2.4
+						if (stream_is_local($file))
+						{
+							$file = Debug::path($file);
+						}
+					}
+
+					return '<small>resource</small><span>('.$type.')</span> '.htmlspecialchars($file, ENT_NOQUOTES, Kohana::$charset);
+				}
+			}
+			else
+			{
+				return '<small>resource</small><span>('.$type.')</span>';
+			}
+		}
+		elseif (is_string($var))
+		{
+			// Clean invalid multibyte characters. iconv is only invoked
+			// if there are non ASCII characters in the string, so this
+			// isn't too much of a hit.
+			$var = UTF8::clean($var, Kohana::$charset);
+
+			if (UTF8::strlen($var) > $length)
+			{
+				// Encode the truncated string
+				$str = htmlspecialchars(UTF8::substr($var, 0, $length), ENT_NOQUOTES, Kohana::$charset).'&nbsp;&hellip;';
+			}
+			else
+			{
+				// Encode the string
+				$str = htmlspecialchars($var, ENT_NOQUOTES, Kohana::$charset);
+			}
+
+			return '<small>string</small><span>('.strlen($var).')</span> "'.$str.'"';
+		}
+		elseif (is_array($var))
+		{
+			$output = array();
+
+			// Indentation for this variable
+			$space = str_repeat($s = '    ', $level);
+
+			static $marker;
+
+			if ($marker === NULL)
+			{
+				// Make a unique marker
+				$marker = uniqid("\x00");
+			}
+
+			if (empty($var))
+			{
+				// Do nothing
+			}
+			elseif (isset($var[$marker]))
+			{
+				$output[] = "(\n$space$s*RECURSION*\n$space)";
+			}
+			elseif ($level < 5)
+			{
+				$output[] = "<span>(";
+
+				$var[$marker] = TRUE;
+				foreach ($var as $key => & $val)
+				{
+					if ($key === $marker) continue;
+					if ( ! is_int($key))
+					{
+						$key = '"'.htmlspecialchars($key, ENT_NOQUOTES, Kohana::$charset).'"';
+					}
+
+					$output[] = "$space$s$key => ".Debug::_dump($val, $length, $level + 1);
+				}
+				unset($var[$marker]);
+
+				$output[] = "$space)</span>";
+			}
+			else
+			{
+				// Depth too great
+				$output[] = "(\n$space$s...\n$space)";
+			}
+
+			return '<small>array</small><span>('.count($var).')</span> '.implode("\n", $output);
+		}
+		elseif (is_object($var))
+		{
+			// Copy the object as an array
+			$array = (array) $var;
+
+			$output = array();
+
+			// Indentation for this variable
+			$space = str_repeat($s = '    ', $level);
+
+			$hash = spl_object_hash($var);
+
+			// Objects that are being dumped
+			static $objects = array();
+
+			if (empty($var))
+			{
+				// Do nothing
+			}
+			elseif (isset($objects[$hash]))
+			{
+				$output[] = "{\n$space$s*RECURSION*\n$space}";
+			}
+			elseif ($level < 10)
+			{
+				$output[] = "<code>{";
+
+				$objects[$hash] = TRUE;
+				foreach ($array as $key => & $val)
+				{
+					if ($key[0] === "\x00")
+					{
+						// Determine if the access is protected or protected
+						$access = '<small>'.(($key[1] === '*') ? 'protected' : 'private').'</small>';
+
+						// Remove the access level from the variable name
+						$key = substr($key, strrpos($key, "\x00") + 1);
+					}
+					else
+					{
+						$access = '<small>public</small>';
+					}
+
+					$output[] = "$space$s$access $key => ".Debug::_dump($val, $length, $level + 1);
+				}
+				unset($objects[$hash]);
+
+				$output[] = "$space}</code>";
+			}
+			else
+			{
+				// Depth too great
+				$output[] = "{\n$space$s...\n$space}";
+			}
+
+			return '<small>object</small> <span>'.get_class($var).'('.count($array).')</span> '.implode("\n", $output);
+		}
+		else
+		{
+			return '<small>'.gettype($var).'</small> '.htmlspecialchars(print_r($var, TRUE), ENT_NOQUOTES, Kohana::$charset);
+		}
+	}
+
+	/**
+	 * Removes application, system, modpath, or docroot from a filename,
+	 * replacing them with the plain text equivalents. Useful for debugging
+	 * when you want to display a shorter path.
+	 *
+	 *     // Displays SYSPATH/classes/kohana.php
+	 *     echo Debug::path(Kohana::find_file('classes', 'kohana'));
+	 *
+	 * @param   string  path to debug
+	 * @return  string
+	 */
+	public static function path($file)
+	{
+		if (strpos($file, APPPATH) === 0)
+		{
+			$file = 'APPPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(APPPATH));
+		}
+		elseif (strpos($file, MODPATH) === 0)
+		{
+			$file = 'MODPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(MODPATH));
+		}
+		elseif (strpos($file, SYSPATH) === 0)
+		{
+			$file = 'SYSPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SYSPATH));
+		}
+		elseif (strpos($file, SMDPATH) === 0)
+		{
+			$file = 'SMDPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SMDPATH));
+		}
+		elseif (strpos($file, DOCROOT) === 0)
+		{
+			$file = 'DOCROOT'.DIRECTORY_SEPARATOR.substr($file, strlen(DOCROOT));
+		}
+
+		return $file;
+	}
+
+	/**
+	 * Returns an HTML string, highlighting a specific line of a file, with some
+	 * number of lines padded above and below.
+	 *
+	 *     // Highlights the current line of the current file
+	 *     echo Debug::source(__FILE__, __LINE__);
+	 *
+	 * @param   string   file to open
+	 * @param   integer  line number to highlight
+	 * @param   integer  number of padding lines
+	 * @return  string   source of file
+	 * @return  FALSE    file is unreadable
+	 */
+	public static function source($file, $line_number, $padding = 5)
+	{
+		if ( ! $file OR ! is_readable($file))
+		{
+			// Continuing will cause errors
+			return FALSE;
+		}
+
+		// Open the file and set the line position
+		$file = fopen($file, 'r');
+		$line = 0;
+
+		// Set the reading range
+		$range = array('start' => $line_number - $padding, 'end' => $line_number + $padding);
+
+		// Set the zero-padding amount for line numbers
+		$format = '% '.strlen($range['end']).'d';
+
+		$source = '';
+		while (($row = fgets($file)) !== FALSE)
+		{
+			// Increment the line number
+			if (++$line > $range['end'])
+				break;
+
+			if ($line >= $range['start'])
+			{
+				// Make the row safe for output
+				$row = htmlspecialchars($row, ENT_NOQUOTES, Kohana::$charset);
+
+				// Trim whitespace and sanitize the row
+				$row = '<span class="number">'.sprintf($format, $line).'</span> '.$row;
+
+				if ($line === $line_number)
+				{
+					// Apply highlighting to this row
+					$row = '<span class="line highlight">'.$row.'</span>';
+				}
+				else
+				{
+					$row = '<span class="line">'.$row.'</span>';
+				}
+
+				// Add to the captured source
+				$source .= $row;
+			}
+		}
+
+		// Close the file
+		fclose($file);
+
+		return '<pre class="source"><code>'.$source.'</code></pre>';
+	}
+
+	/**
+	 * Returns an array of HTML strings that represent each step in the backtrace.
+	 *
+	 *     // Displays the entire current backtrace
+	 *     echo implode('<br/>', Debug::trace());
+	 *
+	 * @param   string  path to debug
+	 * @return  string
+	 */
+	public static function trace(array $trace = NULL)
+	{
+		if ($trace === NULL)
+		{
+			// Start a new trace
+			$trace = debug_backtrace();
+		}
+
+		// Non-standard function calls
+		$statements = array('include', 'include_once', 'require', 'require_once');
+
+		$output = array();
+		foreach ($trace as $step)
+		{
+			if ( ! isset($step['function']))
+			{
+				// Invalid trace step
+				continue;
+			}
+
+			if (isset($step['file']) AND isset($step['line']))
+			{
+				// Include the source of this step
+				$source = Debug::source($step['file'], $step['line']);
+			}
+
+			if (isset($step['file']))
+			{
+				$file = $step['file'];
+
+				if (isset($step['line']))
+				{
+					$line = $step['line'];
+				}
+			}
+
+			// function()
+			$function = $step['function'];
+
+			if (in_array($step['function'], $statements))
+			{
+				if (empty($step['args']))
+				{
+					// No arguments
+					$args = array();
+				}
+				else
+				{
+					// Sanitize the file path
+					$args = array($step['args'][0]);
+				}
+			}
+			elseif (isset($step['args']))
+			{
+				if ( ! function_exists($step['function']) OR strpos($step['function'], '{closure}') !== FALSE)
+				{
+					// Introspection on closures or language constructs in a stack trace is impossible
+					$params = NULL;
+				}
+				else
+				{
+					if (isset($step['class']))
+					{
+						if (method_exists($step['class'], $step['function']))
+						{
+							$reflection = new ReflectionMethod($step['class'], $step['function']);
+						}
+						else
+						{
+							$reflection = new ReflectionMethod($step['class'], '__call');
+						}
+					}
+					else
+					{
+						$reflection = new ReflectionFunction($step['function']);
+					}
+
+					// Get the function parameters
+					$params = $reflection->getParameters();
+				}
+
+				$args = array();
+
+				foreach ($step['args'] as $i => $arg)
+				{
+					if (isset($params[$i]))
+					{
+						// Assign the argument by the parameter name
+						$args[$params[$i]->name] = $arg;
+					}
+					else
+					{
+						// Assign the argument by number
+						$args[$i] = $arg;
+					}
+				}
+			}
+
+			if (isset($step['class']))
+			{
+				// Class->method() or Class::method()
+				$function = $step['class'].$step['type'].$step['function'];
+			}
+
+			$output[] = array(
+				'function' => $function,
+				'args'     => isset($args)   ? $args : NULL,
+				'file'     => isset($file)   ? $file : NULL,
+				'line'     => isset($line)   ? $line : NULL,
+				'source'   => isset($source) ? $source : NULL,
+			);
+
+			unset($function, $args, $file, $line, $source);
+		}
+
+		return $output;
+	}
+
+}
diff --git a/includes/kohana/system/classes/kohana/encrypt.php b/includes/kohana/system/classes/kohana/encrypt.php
new file mode 100644
index 0000000..6516f8c
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/encrypt.php
@@ -0,0 +1,213 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * The Encrypt library provides two-way encryption of text and binary strings
+ * using the [Mcrypt](http://php.net/mcrypt) extension, which consists of three
+ * parts: the key, the cipher, and the mode.
+ *
+ * The Key
+ * :  A secret passphrase that is used for encoding and decoding
+ *
+ * The Cipher
+ * :  A [cipher](http://php.net/mcrypt.ciphers) determines how the encryption
+ *    is mathematically calculated. By default, the "rijndael-128" cipher
+ *    is used. This is commonly known as "AES-128" and is an industry standard.
+ *
+ * The Mode
+ * :  The [mode](http://php.net/mcrypt.constants) determines how the encrypted
+ *    data is written in binary form. By default, the "nofb" mode is used,
+ *    which produces short output with high entropy.
+ *
+ * @package    Kohana
+ * @category   Security
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Encrypt {
+
+	/**
+	 * @var  string  default instance name
+	 */
+	public static $default = 'default';
+
+	/**
+	 * @var  array  Encrypt class instances
+	 */
+	public static $instances = array();
+
+	/**
+	 * @var  string  OS-dependent RAND type to use
+	 */
+	protected static $_rand;
+
+	/**
+	 * Returns a singleton instance of Encrypt. An encryption key must be
+	 * provided in your "encrypt" configuration file.
+	 *
+	 *     $encrypt = Encrypt::instance();
+	 *
+	 * @param   string  configuration group name
+	 * @return  Encrypt
+	 */
+	public static function instance($name = NULL)
+	{
+		if ($name === NULL)
+		{
+			// Use the default instance name
+			$name = Encrypt::$default;
+		}
+
+		if ( ! isset(Encrypt::$instances[$name]))
+		{
+			// Load the configuration data
+			$config = Kohana::config('encrypt')->$name;
+
+			if ( ! isset($config['key']))
+			{
+				// No default encryption key is provided!
+				throw new Kohana_Exception('No encryption key is defined in the encryption configuration group: :group',
+					array(':group' => $name));
+			}
+
+			if ( ! isset($config['mode']))
+			{
+				// Add the default mode
+				$config['mode'] = MCRYPT_MODE_NOFB;
+			}
+
+			if ( ! isset($config['cipher']))
+			{
+				// Add the default cipher
+				$config['cipher'] = MCRYPT_RIJNDAEL_128;
+			}
+
+			// Create a new instance
+			Encrypt::$instances[$name] = new Encrypt($config['key'], $config['mode'], $config['cipher']);
+		}
+
+		return Encrypt::$instances[$name];
+	}
+
+	/**
+	 * Creates a new mcrypt wrapper.
+	 *
+	 * @param   string   encryption key
+	 * @param   string   mcrypt mode
+	 * @param   string   mcrypt cipher
+	 */
+	public function __construct($key, $mode, $cipher)
+	{
+		// Find the max length of the key, based on cipher and mode
+		$size = mcrypt_get_key_size($cipher, $mode);
+
+		if (isset($key[$size]))
+		{
+			// Shorten the key to the maximum size
+			$key = substr($key, 0, $size);
+		}
+
+		// Store the key, mode, and cipher
+		$this->_key    = $key;
+		$this->_mode   = $mode;
+		$this->_cipher = $cipher;
+
+		// Store the IV size
+		$this->_iv_size = mcrypt_get_iv_size($this->_cipher, $this->_mode);
+	}
+
+	/**
+	 * Encrypts a string and returns an encrypted string that can be decoded.
+	 *
+	 *     $data = $encrypt->encode($data);
+	 *
+	 * The encrypted binary data is encoded using [base64](http://php.net/base64_encode)
+	 * to convert it to a string. This string can be stored in a database,
+	 * displayed, and passed using most other means without corruption.
+	 *
+	 * @param   string  data to be encrypted
+	 * @return  string
+	 */
+	public function encode($data)
+	{
+		// Set the rand type if it has not already been set
+		if (Encrypt::$_rand === NULL)
+		{
+			if (Kohana::$is_windows)
+			{
+				// Windows only supports the system random number generator
+				Encrypt::$_rand = MCRYPT_RAND;
+			}
+			else
+			{
+				if (defined('MCRYPT_DEV_URANDOM'))
+				{
+					// Use /dev/urandom
+					Encrypt::$_rand = MCRYPT_DEV_URANDOM;
+				}
+				elseif (defined('MCRYPT_DEV_RANDOM'))
+				{
+					// Use /dev/random
+					Encrypt::$_rand = MCRYPT_DEV_RANDOM;
+				}
+				else
+				{
+					// Use the system random number generator
+					Encrypt::$_rand = MCRYPT_RAND;
+				}
+			}
+		}
+
+		if (Encrypt::$_rand === MCRYPT_RAND)
+		{
+			// The system random number generator must always be seeded each
+			// time it is used, or it will not produce true random results
+			mt_srand();
+		}
+
+		// Create a random initialization vector of the proper size for the current cipher
+		$iv = mcrypt_create_iv($this->_iv_size, Encrypt::$_rand);
+
+		// Encrypt the data using the configured options and generated iv
+		$data = mcrypt_encrypt($this->_cipher, $this->_key, $data, $this->_mode, $iv);
+
+		// Use base64 encoding to convert to a string
+		return base64_encode($iv.$data);
+	}
+
+	/**
+	 * Decrypts an encoded string back to its original value.
+	 *
+	 *     $data = $encrypt->decode($data);
+	 *
+	 * @param   string  encoded string to be decrypted
+	 * @return  FALSE   if decryption fails
+	 * @return  string
+	 */
+	public function decode($data)
+	{
+		// Convert the data back to binary
+		$data = base64_decode($data, TRUE);
+
+		if ( ! $data)
+		{
+			// Invalid base64 data
+			return FALSE;
+		}
+
+		// Extract the initialization vector from the data
+		$iv = substr($data, 0, $this->_iv_size);
+
+		if ($this->_iv_size !== strlen($iv))
+		{
+			// The iv is not the expected size
+			return FALSE;
+		}
+
+		// Remove the iv from the data
+		$data = substr($data, $this->_iv_size);
+
+		// Return the decrypted data, trimming the \0 padding bytes from the end of the data
+		return rtrim(mcrypt_decrypt($this->_cipher, $this->_key, $data, $this->_mode, $iv), "\0");
+	}
+
+} // End Encrypt
diff --git a/includes/kohana/system/classes/kohana/exception.php b/includes/kohana/system/classes/kohana/exception.php
new file mode 100644
index 0000000..33d694b
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/exception.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_Exception extends Kohana_Kohana_Exception {}
diff --git a/includes/kohana/system/classes/kohana/feed.php b/includes/kohana/system/classes/kohana/feed.php
new file mode 100644
index 0000000..2ce852e
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/feed.php
@@ -0,0 +1,176 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * RSS and Atom feed helper.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Feed {
+
+	/**
+	 * Parses a remote feed into an array.
+	 *
+	 * @param   string   remote feed URL
+	 * @param   integer  item limit to fetch
+	 * @return  array
+	 */
+	public static function parse($feed, $limit = 0)
+	{
+		// Check if SimpleXML is installed
+		if ( ! function_exists('simplexml_load_file'))
+			throw new Kohana_Exception('SimpleXML must be installed!');
+
+		// Make limit an integer
+		$limit = (int) $limit;
+
+		// Disable error reporting while opening the feed
+		$error_level = error_reporting(0);
+
+		// Allow loading by filename or raw XML string
+		$load = (is_file($feed) OR Valid::url($feed)) ? 'simplexml_load_file' : 'simplexml_load_string';
+
+		// Load the feed
+		$feed = $load($feed, 'SimpleXMLElement', LIBXML_NOCDATA);
+
+		// Restore error reporting
+		error_reporting($error_level);
+
+		// Feed could not be loaded
+		if ($feed === FALSE)
+			return array();
+
+		$namespaces = $feed->getNamespaces(true);
+
+		// Detect the feed type. RSS 1.0/2.0 and Atom 1.0 are supported.
+		$feed = isset($feed->channel) ? $feed->xpath('//item') : $feed->entry;
+
+		$i = 0;
+		$items = array();
+
+		foreach ($feed as $item)
+		{
+			if ($limit > 0 AND $i++ === $limit)
+				break;
+			$item_fields = (array) $item;
+
+			// get namespaced tags
+			foreach ($namespaces as $ns)
+			{
+				$item_fields += (array) $item->children($ns);
+			}
+			$items[] = $item_fields;
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Creates a feed from the given parameters.
+	 *
+	 * @param   array   feed information
+	 * @param   array   items to add to the feed
+	 * @param   string  define which format to use (only rss2 is supported)
+	 * @param   string  define which encoding to use
+	 * @return  string
+	 */
+	public static function create($info, $items, $format = 'rss2', $encoding = 'UTF-8')
+	{
+		$info += array('title' => 'Generated Feed', 'link' => '', 'generator' => 'KohanaPHP');
+
+		$feed = '<?xml version="1.0" encoding="'.$encoding.'"?><rss version="2.0"><channel></channel></rss>';
+		$feed = simplexml_load_string($feed);
+
+		foreach ($info as $name => $value)
+		{
+			if ($name === 'image')
+			{
+				// Create an image element
+				$image = $feed->channel->addChild('image');
+
+				if ( ! isset($value['link'], $value['url'], $value['title']))
+				{
+					throw new Kohana_Exception('Feed images require a link, url, and title');
+				}
+
+				if (strpos($value['link'], '://') === FALSE)
+				{
+					// Convert URIs to URLs
+					$value['link'] = URL::site($value['link'], 'http');
+				}
+
+				if (strpos($value['url'], '://') === FALSE)
+				{
+					// Convert URIs to URLs
+					$value['url'] = URL::site($value['url'], 'http');
+				}
+
+				// Create the image elements
+				$image->addChild('link', $value['link']);
+				$image->addChild('url', $value['url']);
+				$image->addChild('title', $value['title']);
+			}
+			else
+			{
+				if (($name === 'pubDate' OR $name === 'lastBuildDate') AND (is_int($value) OR ctype_digit($value)))
+				{
+					// Convert timestamps to RFC 822 formatted dates
+					$value = date('r', $value);
+				}
+				elseif (($name === 'link' OR $name === 'docs') AND strpos($value, '://') === FALSE)
+				{
+					// Convert URIs to URLs
+					$value = URL::site($value, 'http');
+				}
+
+				// Add the info to the channel
+				$feed->channel->addChild($name, $value);
+			}
+		}
+
+		foreach ($items as $item)
+		{
+			// Add the item to the channel
+			$row = $feed->channel->addChild('item');
+
+			foreach ($item as $name => $value)
+			{
+				if ($name === 'pubDate' AND (is_int($value) OR ctype_digit($value)))
+				{
+					// Convert timestamps to RFC 822 formatted dates
+					$value = date('r', $value);
+				}
+				elseif (($name === 'link' OR $name === 'guid') AND strpos($value, '://') === FALSE)
+				{
+					// Convert URIs to URLs
+					$value = URL::site($value, 'http');
+				}
+
+				// Add the info to the row
+				$row->addChild($name, $value);
+			}
+		}
+
+		if (function_exists('dom_import_simplexml'))
+		{
+			// Convert the feed object to a DOM object
+			$feed = dom_import_simplexml($feed)->ownerDocument;
+
+			// DOM generates more readable XML
+			$feed->formatOutput = TRUE;
+
+			// Export the document as XML
+			$feed = $feed->saveXML();
+		}
+		else
+		{
+			// Export the document as XML
+			$feed = $feed->asXML();
+		}
+
+		return $feed;
+	}
+
+} // End Feed
diff --git a/includes/kohana/system/classes/kohana/file.php b/includes/kohana/system/classes/kohana/file.php
new file mode 100644
index 0000000..4bfaeb3
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/file.php
@@ -0,0 +1,243 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * File helper class.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_File {
+
+	/**
+	 * Attempt to get the mime type from a file. This method is horribly
+	 * unreliable, due to PHP being horribly unreliable when it comes to
+	 * determining the mime type of a file.
+	 *
+	 *     $mime = File::mime($file);
+	 *
+	 * @param   string  file name or path
+	 * @return  string  mime type on success
+	 * @return  FALSE   on failure
+	 */
+	public static function mime($filename)
+	{
+		// Get the complete path to the file
+		$filename = realpath($filename);
+
+		// Get the extension from the filename
+		$extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+
+		if (preg_match('/^(?:jpe?g|png|[gt]if|bmp|swf)$/', $extension))
+		{
+			// Use getimagesize() to find the mime type on images
+			$file = getimagesize($filename);
+
+			if (isset($file['mime']))
+				return $file['mime'];
+		}
+
+		if (class_exists('finfo', FALSE))
+		{
+			if ($info = new finfo(defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME))
+			{
+				return $info->file($filename);
+			}
+		}
+
+		if (ini_get('mime_magic.magicfile') AND function_exists('mime_content_type'))
+		{
+			// The mime_content_type function is only useful with a magic file
+			return mime_content_type($filename);
+		}
+
+		if ( ! empty($extension))
+		{
+			return File::mime_by_ext($extension);
+		}
+
+		// Unable to find the mime-type
+		return FALSE;
+	}
+
+	/**
+	 * Return the mime type of an extension.
+	 *
+	 *     $mime = File::mime_by_ext('png'); // "image/png"
+	 *
+	 * @param   string  extension: php, pdf, txt, etc
+	 * @return  string  mime type on success
+	 * @return  FALSE   on failure
+	 */
+	public static function mime_by_ext($extension)
+	{
+		// Load all of the mime types
+		$mimes = Kohana::config('mimes');
+
+		return isset($mimes[$extension]) ? $mimes[$extension][0] : FALSE;
+	}
+
+	/**
+	 * Lookup MIME types for a file
+	 *
+	 * @see Kohana_File::mime_by_ext()
+	 * @param string $extension Extension to lookup
+	 * @return array Array of MIMEs associated with the specified extension
+	 */
+	public static function mimes_by_ext($extension)
+	{
+		// Load all of the mime types
+		$mimes = Kohana::config('mimes');
+
+		return isset($mimes[$extension]) ? ( (array) $mimes[$extension]) : array();
+	}
+
+	/**
+	 * Lookup file extensions by MIME type
+	 *
+	 * @param   string  $type File MIME type
+	 * @return  array   File extensions matching MIME type
+	 */
+	public static function exts_by_mime($type)
+	{
+		static $types = array();
+
+		// Fill the static array
+		if (empty($types))
+		{
+			foreach (Kohana::config('mimes') as $ext => $mimes)
+			{
+				foreach ($mimes as $mime)
+				{
+					if ($mime == 'application/octet-stream')
+					{
+						// octet-stream is a generic binary
+						continue;
+					}
+
+					if ( ! isset($types[$mime]))
+					{
+						$types[$mime] = array( (string) $ext);
+					}
+					elseif ( ! in_array($ext, $types[$mime]))
+					{
+						$types[$mime][] = (string) $ext;
+					}
+				}
+			}
+		}
+
+		return isset($types[$type]) ? $types[$type] : FALSE;
+	}
+
+	/**
+	 * Lookup a single file extension by MIME type.
+	 *
+	 * @param   string  $type  MIME type to lookup
+	 * @return  mixed          First file extension matching or false
+	 */
+	public static function ext_by_mime($type)
+	{
+		return current(File::exts_by_mime($type));
+	}
+
+	/**
+	 * Split a file into pieces matching a specific size. Used when you need to
+	 * split large files into smaller pieces for easy transmission.
+	 *
+	 *     $count = File::split($file);
+	 *
+	 * @param   string   file to be split
+	 * @param   string   directory to output to, defaults to the same directory as the file
+	 * @param   integer  size, in MB, for each piece to be
+	 * @return  integer  The number of pieces that were created
+	 */
+	public static function split($filename, $piece_size = 10)
+	{
+		// Open the input file
+		$file = fopen($filename, 'rb');
+
+		// Change the piece size to bytes
+		$piece_size = floor($piece_size * 1024 * 1024);
+
+		// Write files in 8k blocks
+		$block_size = 1024 * 8;
+
+		// Total number of peices
+		$peices = 0;
+
+		while ( ! feof($file))
+		{
+			// Create another piece
+			$peices += 1;
+
+			// Create a new file piece
+			$piece = str_pad($peices, 3, '0', STR_PAD_LEFT);
+			$piece = fopen($filename.'.'.$piece, 'wb+');
+
+			// Number of bytes read
+			$read = 0;
+
+			do
+			{
+				// Transfer the data in blocks
+				fwrite($piece, fread($file, $block_size));
+
+				// Another block has been read
+				$read += $block_size;
+			}
+			while ($read < $piece_size);
+
+			// Close the piece
+			fclose($piece);
+		}
+
+		// Close the file
+		fclose($file);
+
+		return $peices;
+	}
+
+	/**
+	 * Join a split file into a whole file. Does the reverse of [File::split].
+	 *
+	 *     $count = File::join($file);
+	 *
+	 * @param   string   split filename, without .000 extension
+	 * @param   string   output filename, if different then an the filename
+	 * @return  integer  The number of pieces that were joined.
+	 */
+	public static function join($filename)
+	{
+		// Open the file
+		$file = fopen($filename, 'wb+');
+
+		// Read files in 8k blocks
+		$block_size = 1024 * 8;
+
+		// Total number of peices
+		$pieces = 0;
+
+		while (is_file($piece = $filename.'.'.str_pad($pieces + 1, 3, '0', STR_PAD_LEFT)))
+		{
+			// Read another piece
+			$pieces += 1;
+
+			// Open the piece for reading
+			$piece = fopen($piece, 'rb');
+
+			while ( ! feof($piece))
+			{
+				// Transfer the data in blocks
+				fwrite($file, fread($piece, $block_size));
+			}
+
+			// Close the peice
+			fclose($piece);
+		}
+
+		return $pieces;
+	}
+
+} // End file
diff --git a/includes/kohana/system/classes/kohana/form.php b/includes/kohana/system/classes/kohana/form.php
new file mode 100644
index 0000000..5979040
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/form.php
@@ -0,0 +1,434 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Form helper class. Unless otherwise noted, all generated HTML will be made
+ * safe using the [HTML::chars] method. This prevents against simple XSS
+ * attacks that could otherwise be trigged by inserting HTML characters into
+ * form fields.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Form {
+
+	/**
+	 * Generates an opening HTML form tag.
+	 *
+	 *     // Form will submit back to the current page using POST
+	 *     echo Form::open();
+	 *
+	 *     // Form will submit to 'search' using GET
+	 *     echo Form::open('search', array('method' => 'get'));
+	 *
+	 *     // When "file" inputs are present, you must include the "enctype"
+	 *     echo Form::open(NULL, array('enctype' => 'multipart/form-data'));
+	 *
+	 * @param   mixed   form action, defaults to the current request URI, or [Request] class to use
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    Request::instance
+	 * @uses    URL::site
+	 * @uses    HTML::attributes
+	 */
+	public static function open($action = NULL, array $attributes = NULL)
+	{
+		if ($action instanceof Request)
+		{
+			// Use the current URI
+			$action = $action->uri();
+		}
+
+		if ($action === '')
+		{
+			// Use only the base URI
+			$action = Kohana::$base_url;
+		}
+		elseif (strpos($action, '://') === FALSE)
+		{
+			// Make the URI absolute
+			$action = URL::site($action);
+		}
+
+		// Add the form action to the attributes
+		$attributes['action'] = $action;
+
+		// Only accept the default character set
+		$attributes['accept-charset'] = Kohana::$charset;
+
+		if ( ! isset($attributes['method']))
+		{
+			// Use POST method
+			$attributes['method'] = 'post';
+		}
+
+		return '<form'.HTML::attributes($attributes).'>';
+	}
+
+	/**
+	 * Creates the closing form tag.
+	 *
+	 *     echo Form::close();
+	 *
+	 * @return  string
+	 */
+	public static function close()
+	{
+		return '</form>';
+	}
+
+	/**
+	 * Creates a form input. If no type is specified, a "text" type input will
+	 * be returned.
+	 *
+	 *     echo Form::input('username', $username);
+	 *
+	 * @param   string  input name
+	 * @param   string  input value
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    HTML::attributes
+	 */
+	public static function input($name, $value = NULL, array $attributes = NULL)
+	{
+		// Set the input name
+		$attributes['name'] = $name;
+
+		// Set the input value
+		$attributes['value'] = $value;
+
+		if ( ! isset($attributes['type']))
+		{
+			// Default type is text
+			$attributes['type'] = 'text';
+		}
+
+		return '<input'.HTML::attributes($attributes).' />';
+	}
+
+	/**
+	 * Creates a hidden form input.
+	 *
+	 *     echo Form::hidden('csrf', $token);
+	 *
+	 * @param   string  input name
+	 * @param   string  input value
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function hidden($name, $value = NULL, array $attributes = NULL)
+	{
+		$attributes['type'] = 'hidden';
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a password form input.
+	 *
+	 *     echo Form::password('password');
+	 *
+	 * @param   string  input name
+	 * @param   string  input value
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function password($name, $value = NULL, array $attributes = NULL)
+	{
+		$attributes['type'] = 'password';
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a file upload form input. No input value can be specified.
+	 *
+	 *     echo Form::file('image');
+	 *
+	 * @param   string  input name
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function file($name, array $attributes = NULL)
+	{
+		$attributes['type'] = 'file';
+
+		return Form::input($name, NULL, $attributes);
+	}
+
+	/**
+	 * Creates a checkbox form input.
+	 *
+	 *     echo Form::checkbox('remember_me', 1, (bool) $remember);
+	 *
+	 * @param   string   input name
+	 * @param   string   input value
+	 * @param   boolean  checked status
+	 * @param   array    html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function checkbox($name, $value = NULL, $checked = FALSE, array $attributes = NULL)
+	{
+		$attributes['type'] = 'checkbox';
+
+		if ($checked === TRUE)
+		{
+			// Make the checkbox active
+			$attributes['checked'] = 'checked';
+		}
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a radio form input.
+	 *
+	 *     echo Form::radio('like_cats', 1, $cats);
+	 *     echo Form::radio('like_cats', 0, ! $cats);
+	 *
+	 * @param   string   input name
+	 * @param   string   input value
+	 * @param   boolean  checked status
+	 * @param   array    html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function radio($name, $value = NULL, $checked = FALSE, array $attributes = NULL)
+	{
+		$attributes['type'] = 'radio';
+
+		if ($checked === TRUE)
+		{
+			// Make the radio active
+			$attributes['checked'] = 'checked';
+		}
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a textarea form input.
+	 *
+	 *     echo Form::textarea('about', $about);
+	 *
+	 * @param   string   textarea name
+	 * @param   string   textarea body
+	 * @param   array    html attributes
+	 * @param   boolean  encode existing HTML characters
+	 * @return  string
+	 * @uses    HTML::attributes
+	 * @uses    HTML::chars
+	 */
+	public static function textarea($name, $body = '', array $attributes = NULL, $double_encode = TRUE)
+	{
+		// Set the input name
+		$attributes['name'] = $name;
+
+		// Add default rows and cols attributes (required)
+		$attributes += array('rows' => 10, 'cols' => 50);
+
+		return '<textarea'.HTML::attributes($attributes).'>'.HTML::chars($body, $double_encode).'</textarea>';
+	}
+
+	/**
+	 * Creates a select form input.
+	 *
+	 *     echo Form::select('country', $countries, $country);
+	 *
+	 * [!!] Support for multiple selected options was added in v3.0.7.
+	 *
+	 * @param   string   input name
+	 * @param   array    available options
+	 * @param   mixed    selected option string, or an array of selected options
+	 * @param   array    html attributes
+	 * @return  string
+	 * @uses    HTML::attributes
+	 */
+	public static function select($name, array $options = NULL, $selected = NULL, array $attributes = NULL)
+	{
+		// Set the input name
+		$attributes['name'] = $name;
+
+		if (is_array($selected))
+		{
+			// This is a multi-select, god save us!
+			$attributes['multiple'] = 'multiple';
+		}
+
+		if ( ! is_array($selected))
+		{
+			if ($selected === NULL)
+			{
+				// Use an empty array
+				$selected = array();
+			}
+			else
+			{
+				// Convert the selected options to an array
+				$selected = array( (string) $selected);
+			}
+		}
+
+		if (empty($options))
+		{
+			// There are no options
+			$options = '';
+		}
+		else
+		{
+			foreach ($options as $value => $name)
+			{
+				if (is_array($name))
+				{
+					// Create a new optgroup
+					$group = array('label' => $value);
+
+					// Create a new list of options
+					$_options = array();
+
+					foreach ($name as $_value => $_name)
+					{
+						// Force value to be string
+						$_value = (string) $_value;
+
+						// Create a new attribute set for this option
+						$option = array('value' => $_value);
+
+						if (in_array($_value, $selected))
+						{
+							// This option is selected
+							$option['selected'] = 'selected';
+						}
+
+						// Change the option to the HTML string
+						$_options[] = '<option'.HTML::attributes($option).'>'.HTML::chars($_name, FALSE).'</option>';
+					}
+
+					// Compile the options into a string
+					$_options = "\n".implode("\n", $_options)."\n";
+
+					$options[$value] = '<optgroup'.HTML::attributes($group).'>'.$_options.'</optgroup>';
+				}
+				else
+				{
+					// Force value to be string
+					$value = (string) $value;
+
+					// Create a new attribute set for this option
+					$option = array('value' => $value);
+
+					if (in_array($value, $selected))
+					{
+						// This option is selected
+						$option['selected'] = 'selected';
+					}
+
+					// Change the option to the HTML string
+					$options[$value] = '<option'.HTML::attributes($option).'>'.HTML::chars($name, FALSE).'</option>';
+				}
+			}
+
+			// Compile the options into a single string
+			$options = "\n".implode("\n", $options)."\n";
+		}
+
+		return '<select'.HTML::attributes($attributes).'>'.$options.'</select>';
+	}
+
+	/**
+	 * Creates a submit form input.
+	 *
+	 *     echo Form::submit(NULL, 'Login');
+	 *
+	 * @param   string  input name
+	 * @param   string  input value
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function submit($name, $value, array $attributes = NULL)
+	{
+		$attributes['type'] = 'submit';
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a image form input.
+	 *
+	 *     echo Form::image(NULL, NULL, array('src' => 'media/img/login.png'));
+	 *
+	 * @param   string   input name
+	 * @param   string   input value
+	 * @param   array    html attributes
+	 * @param   boolean  add index file to URL?
+	 * @return  string
+	 * @uses    Form::input
+	 */
+	public static function image($name, $value, array $attributes = NULL, $index = FALSE)
+	{
+		if ( ! empty($attributes['src']))
+		{
+			if (strpos($attributes['src'], '://') === FALSE)
+			{
+				// Add the base URL
+				$attributes['src'] = URL::base($index).$attributes['src'];
+			}
+		}
+
+		$attributes['type'] = 'image';
+
+		return Form::input($name, $value, $attributes);
+	}
+
+	/**
+	 * Creates a button form input. Note that the body of a button is NOT escaped,
+	 * to allow images and other HTML to be used.
+	 *
+	 *     echo Form::button('save', 'Save Profile', array('type' => 'submit'));
+	 *
+	 * @param   string  input name
+	 * @param   string  input value
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    HTML::attributes
+	 */
+	public static function button($name, $body, array $attributes = NULL)
+	{
+		// Set the input name
+		$attributes['name'] = $name;
+
+		return '<button'.HTML::attributes($attributes).'>'.$body.'</button>';
+	}
+
+	/**
+	 * Creates a form label. Label text is not automatically translated.
+	 *
+	 *     echo Form::label('username', 'Username');
+	 *
+	 * @param   string  target input
+	 * @param   string  label text
+	 * @param   array   html attributes
+	 * @return  string
+	 * @uses    HTML::attributes
+	 */
+	public static function label($input, $text = NULL, array $attributes = NULL)
+	{
+		if ($text === NULL)
+		{
+			// Use the input name as the text
+			$text = ucwords(preg_replace('/[\W_]+/', ' ', $input));
+		}
+
+		// Set the label target
+		$attributes['for'] = $input;
+
+		return '<label'.HTML::attributes($attributes).'>'.$text.'</label>';
+	}
+
+} // End form
diff --git a/includes/kohana/system/classes/kohana/fragment.php b/includes/kohana/system/classes/kohana/fragment.php
new file mode 100644
index 0000000..fc6f074
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/fragment.php
@@ -0,0 +1,147 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * View fragment caching. This is primarily used to cache small parts of a view
+ * that rarely change. For instance, you may want to cache the footer of your
+ * template because it has very little dynamic content. Or you could cache a
+ * user profile page and delete the fragment when the user updates.
+ *
+ * For obvious reasons, fragment caching should not be applied to any
+ * content that contains forms.
+ *
+ * [!!] Multiple language (I18n) support was added in v3.0.4.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @uses       Kohana::cache
+ */
+class Kohana_Fragment {
+
+	/**
+	 * @var  integer  default number of seconds to cache for
+	 */
+	public static $lifetime = 30;
+
+	/**
+	 * @var  boolean  use multilingual fragment support?
+	 */
+	public static $i18n = FALSE;
+
+	/**
+	 * @var  array  list of buffer => cache key
+	 */
+	protected static $_caches = array();
+
+	/**
+	 * Generate the cache key name for a fragment.
+	 *
+	 *     $key = Fragment::_cache_key('footer', TRUE);
+	 *
+	 * @param   string   fragment name
+	 * @param   boolean  multilingual fragment support
+	 * @return  string
+	 * @uses    I18n::lang
+	 * @since   3.0.4
+	 */
+	protected static function _cache_key($name, $i18n = NULL)
+	{
+		if ($i18n === NULL)
+		{
+			// Use the default setting
+			$i18n = Fragment::$i18n;
+		}
+
+		// Language prefix for cache key
+		$i18n = ($i18n === TRUE) ? I18n::lang() : '';
+
+		// Note: $i18n and $name need to be delimited to prevent naming collisions
+		return 'Fragment::cache('.$i18n.'+'.$name.')';
+	}
+
+	/**
+	 * Load a fragment from cache and display it. Multiple fragments can
+	 * be nested with different life times.
+	 *
+	 *     if ( ! Fragment::load('footer')) {
+	 *         // Anything that is echo'ed here will be saved
+	 *         Fragment::save();
+	 *     }
+	 *
+	 * @param   string   fragment name
+	 * @param   integer  fragment cache lifetime
+	 * @param   boolean  multilingual fragment support
+	 * @return  boolean
+	 */
+	public static function load($name, $lifetime = NULL, $i18n = NULL)
+	{
+		// Set the cache lifetime
+		$lifetime = ($lifetime === NULL) ? Fragment::$lifetime : (int) $lifetime;
+
+		// Get the cache key name
+		$cache_key = Fragment::_cache_key($name, $i18n);
+
+		if ($fragment = Kohana::cache($cache_key, NULL, $lifetime))
+		{
+			// Display the cached fragment now
+			echo $fragment;
+
+			return TRUE;
+		}
+		else
+		{
+			// Start the output buffer
+			ob_start();
+
+			// Store the cache key by the buffer level
+			Fragment::$_caches[ob_get_level()] = $cache_key;
+
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Saves the currently open fragment in the cache.
+	 *
+	 *     Fragment::save();
+	 *
+	 * @return  void
+	 */
+	public static function save()
+	{
+		// Get the buffer level
+		$level = ob_get_level();
+
+		if (isset(Fragment::$_caches[$level]))
+		{
+			// Get the cache key based on the level
+			$cache_key = Fragment::$_caches[$level];
+
+			// Delete the cache key, we don't need it anymore
+			unset(Fragment::$_caches[$level]);
+
+			// Get the output buffer and display it at the same time
+			$fragment = ob_get_flush();
+
+			// Cache the fragment
+			Kohana::cache($cache_key, $fragment);
+		}
+	}
+
+	/**
+	 * Delete a cached fragment.
+	 *
+	 *     Fragment::delete($key);
+	 *
+	 * @param   string   fragment name
+	 * @param   boolean  multilingual fragment support
+	 * @return  void
+	 */
+	public static function delete($name, $i18n = NULL)
+	{
+		// Invalid the cache
+		Kohana::cache(Fragment::_cache_key($name, $i18n), NULL, -3600);
+	}
+
+} // End Fragment
diff --git a/includes/kohana/system/classes/kohana/html.php b/includes/kohana/system/classes/kohana/html.php
new file mode 100644
index 0000000..66fb40a
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/html.php
@@ -0,0 +1,386 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * HTML helper class. Provides generic methods for generating various HTML
+ * tags and making output HTML safe.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_HTML {
+
+	/**
+	 * @var  array  preferred order of attributes
+	 */
+	public static $attribute_order = array
+	(
+		'action',
+		'method',
+		'type',
+		'id',
+		'name',
+		'value',
+		'href',
+		'src',
+		'width',
+		'height',
+		'cols',
+		'rows',
+		'size',
+		'maxlength',
+		'rel',
+		'media',
+		'accept-charset',
+		'accept',
+		'tabindex',
+		'accesskey',
+		'alt',
+		'title',
+		'class',
+		'style',
+		'selected',
+		'checked',
+		'readonly',
+		'disabled',
+	);
+
+	/**
+	 * @var  boolean  automatically target external URLs to a new window?
+	 */
+	public static $windowed_urls = FALSE;
+
+	/**
+	 * Convert special characters to HTML entities. All untrusted content
+	 * should be passed through this method to prevent XSS injections.
+	 *
+	 *     echo HTML::chars($username);
+	 *
+	 * @param   string   string to convert
+	 * @param   boolean  encode existing entities
+	 * @return  string
+	 */
+	public static function chars($value, $double_encode = TRUE)
+	{
+		return htmlspecialchars( (string) $value, ENT_QUOTES, Kohana::$charset, $double_encode);
+	}
+
+	/**
+	 * Convert all applicable characters to HTML entities. All characters
+	 * that cannot be represented in HTML with the current character set
+	 * will be converted to entities.
+	 *
+	 *     echo HTML::entities($username);
+	 *
+	 * @param   string   string to convert
+	 * @param   boolean  encode existing entities
+	 * @return  string
+	 */
+	public static function entities($value, $double_encode = TRUE)
+	{
+		return htmlentities( (string) $value, ENT_QUOTES, Kohana::$charset, $double_encode);
+	}
+
+	/**
+	 * Create HTML link anchors. Note that the title is not escaped, to allow
+	 * HTML elements within links (images, etc).
+	 *
+	 *     echo HTML::anchor('/user/profile', 'My Profile');
+	 *
+	 * @param   string   URL or URI string
+	 * @param   string   link text
+	 * @param   array    HTML anchor attributes
+	 * @param   mixed    protocol to pass to URL::base()
+	 * @param   boolean  include the index page
+	 * @return  string
+	 * @uses    URL::base
+	 * @uses    URL::site
+	 * @uses    HTML::attributes
+	 */
+	public static function anchor($uri, $title = NULL, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		if ($title === NULL)
+		{
+			// Use the URI as the title
+			$title = $uri;
+		}
+
+		if ($uri === '')
+		{
+			// Only use the base URL
+			$uri = URL::base($protocol, $index);
+		}
+		else
+		{
+			if (strpos($uri, '://') !== FALSE)
+			{
+				if (HTML::$windowed_urls === TRUE AND empty($attributes['target']))
+				{
+					// Make the link open in a new window
+					$attributes['target'] = '_blank';
+				}
+			}
+			elseif ($uri[0] !== '#')
+			{
+				// Make the URI absolute for non-id anchors
+				$uri = URL::site($uri, $protocol, $index);
+			}
+		}
+
+		// Add the sanitized link to the attributes
+		$attributes['href'] = $uri;
+
+		return '<a'.HTML::attributes($attributes).'>'.$title.'</a>';
+	}
+
+	/**
+	 * Creates an HTML anchor to a file. Note that the title is not escaped,
+	 * to allow HTML elements within links (images, etc).
+	 *
+	 *     echo HTML::file_anchor('media/doc/user_guide.pdf', 'User Guide');
+	 *
+	 * @param   string  name of file to link to
+	 * @param   string  link text
+	 * @param   array   HTML anchor attributes
+	 * @param   mixed    protocol to pass to URL::base()
+	 * @param   boolean  include the index page
+	 * @return  string
+	 * @uses    URL::base
+	 * @uses    HTML::attributes
+	 */
+	public static function file_anchor($file, $title = NULL, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		if ($title === NULL)
+		{
+			// Use the file name as the title
+			$title = basename($file);
+		}
+
+		// Add the file link to the attributes
+		$attributes['href'] = URL::base($protocol, $index).$file;
+
+		return '<a'.HTML::attributes($attributes).'>'.$title.'</a>';
+	}
+
+	/**
+	 * Generates an obfuscated version of a string. Text passed through this
+	 * method is less likely to be read by web crawlers and robots, which can
+	 * be helpful for spam prevention, but can prevent legitimate robots from
+	 * reading your content.
+	 *
+	 *     echo HTML::obfuscate($text);
+	 *
+	 * @param   string  string to obfuscate
+	 * @return  string
+	 * @since   3.0.3
+	 */
+	public static function obfuscate($string)
+	{
+		$safe = '';
+		foreach (str_split($string) as $letter)
+		{
+			switch (rand(1, 3))
+			{
+				// HTML entity code
+				case 1:
+					$safe .= '&#'.ord($letter).';';
+				break;
+
+				// Hex character code
+				case 2:
+					$safe .= '&#x'.dechex(ord($letter)).';';
+				break;
+
+				// Raw (no) encoding
+				case 3:
+					$safe .= $letter;
+			}
+		}
+
+		return $safe;
+	}
+
+	/**
+	 * Generates an obfuscated version of an email address. Helps prevent spam
+	 * robots from finding email addresses.
+	 *
+	 *     echo HTML::email($address);
+	 *
+	 * @param   string  email address
+	 * @return  string
+	 * @uses    HTML::obfuscate
+	 */
+	public static function email($email)
+	{
+		// Make sure the at sign is always obfuscated
+		return str_replace('@', '&#64;', HTML::obfuscate($email));
+	}
+
+	/**
+	 * Creates an email (mailto:) anchor. Note that the title is not escaped,
+	 * to allow HTML elements within links (images, etc).
+	 *
+	 *     echo HTML::mailto($address);
+	 *
+	 * @param   string  email address to send to
+	 * @param   string  link text
+	 * @param   array   HTML anchor attributes
+	 * @return  string
+	 * @uses    HTML::email
+	 * @uses    HTML::attributes
+	 */
+	public static function mailto($email, $title = NULL, array $attributes = NULL)
+	{
+		// Obfuscate email address
+		$email = HTML::email($email);
+
+		if ($title === NULL)
+		{
+			// Use the email address as the title
+			$title = $email;
+		}
+
+		return '<a href="&#109;&#097;&#105;&#108;&#116;&#111;&#058;'.$email.'"'.HTML::attributes($attributes).'>'.$title.'</a>';
+	}
+
+	/**
+	 * Creates a style sheet link element.
+	 *
+	 *     echo HTML::style('media/css/screen.css');
+	 *
+	 * @param   string   file name
+	 * @param   array    default attributes
+	 * @param   mixed    protocol to pass to URL::base()
+	 * @param   boolean  include the index page
+	 * @return  string
+	 * @uses    URL::base
+	 * @uses    HTML::attributes
+	 */
+	public static function style($file, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		if (strpos($file, '://') === FALSE)
+		{
+			// Add the base URL
+			$file = URL::base($protocol, $index).$file;
+		}
+
+		// Set the stylesheet link
+		$attributes['href'] = $file;
+
+		// Set the stylesheet rel
+		$attributes['rel'] = 'stylesheet';
+
+		// Set the stylesheet type
+		$attributes['type'] = 'text/css';
+
+		return '<link'.HTML::attributes($attributes).' />';
+	}
+
+	/**
+	 * Creates a script link.
+	 *
+	 *     echo HTML::script('media/js/jquery.min.js');
+	 *
+	 * @param   string   file name
+	 * @param   array    default attributes
+	 * @param   mixed    protocol to pass to URL::base()
+	 * @param   boolean  include the index page
+	 * @return  string
+	 * @uses    URL::base
+	 * @uses    HTML::attributes
+	 */
+	public static function script($file, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		if (strpos($file, '://') === FALSE)
+		{
+			// Add the base URL
+			$file = URL::base($protocol, $index).$file;
+		}
+
+		// Set the script link
+		$attributes['src'] = $file;
+
+		// Set the script type
+		$attributes['type'] = 'text/javascript';
+
+		return '<script'.HTML::attributes($attributes).'></script>';
+	}
+
+	/**
+	 * Creates a image link.
+	 *
+	 *     echo HTML::image('media/img/logo.png', array('alt' => 'My Company'));
+	 *
+	 * @param   string   file name
+	 * @param   array    default attributes
+	 * @param   mixed    protocol to pass to URL::base()
+	 * @param   boolean  include the index page
+	 * @return  string
+	 * @uses    URL::base
+	 * @uses    HTML::attributes
+	 */
+	public static function image($file, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		if (strpos($file, '://') === FALSE)
+		{
+			// Add the base URL
+			$file = URL::base($protocol, $index).$file;
+		}
+
+		// Add the image link
+		$attributes['src'] = $file;
+
+		return '<img'.HTML::attributes($attributes).' />';
+	}
+
+	/**
+	 * Compiles an array of HTML attributes into an attribute string.
+	 * Attributes will be sorted using HTML::$attribute_order for consistency.
+	 *
+	 *     echo '<div'.HTML::attributes($attrs).'>'.$content.'</div>';
+	 *
+	 * @param   array   attribute list
+	 * @return  string
+	 */
+	public static function attributes(array $attributes = NULL)
+	{
+		if (empty($attributes))
+			return '';
+
+		$sorted = array();
+		foreach (HTML::$attribute_order as $key)
+		{
+			if (isset($attributes[$key]))
+			{
+				// Add the attribute to the sorted list
+				$sorted[$key] = $attributes[$key];
+			}
+		}
+
+		// Combine the sorted attributes
+		$attributes = $sorted + $attributes;
+
+		$compiled = '';
+		foreach ($attributes as $key => $value)
+		{
+			if ($value === NULL)
+			{
+				// Skip attributes that have NULL values
+				continue;
+			}
+
+			if (is_int($key))
+			{
+				// Assume non-associative keys are mirrored attributes
+				$key = $value;
+			}
+
+			// Add the attribute value
+			$compiled .= ' '.$key.'="'.HTML::chars($value).'"';
+		}
+
+		return $compiled;
+	}
+
+} // End html
diff --git a/includes/kohana/system/classes/kohana/http.php b/includes/kohana/system/classes/kohana/http.php
new file mode 100644
index 0000000..966c704
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http.php
@@ -0,0 +1,160 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Contains the most low-level helpers methods in Kohana:
+ *
+ * - Environment initialization
+ * - Locating files within the cascading filesystem
+ * - Auto-loading and transparent extension of classes
+ * - Variable and path debugging
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+abstract class Kohana_HTTP {
+
+	/**
+	 * @var  The default protocol to use if it cannot be detected
+	 */
+	public static $protocol = 'http';
+
+	/**
+	 * @var  The default protocol version to use if cannot be detected
+	 */
+	public static $version = '1.1';
+
+	/**
+	 * Parses a HTTP header string into an associative array
+	 *
+	 * @param   string   $header_string  Header string to parse
+	 * @return  HTTP_Header
+	 */
+	public static function parse_header_string($header_string)
+	{
+		// If the PECL HTTP extension is loaded
+		if (extension_loaded('http'))
+		{
+			// Use the fast method to parse header string
+			return new HTTP_Header(http_parse_headers($header_string));
+		}
+
+		// Otherwise we use the slower PHP parsing
+		$headers = array();
+
+		// Match all HTTP headers
+		if (preg_match_all('/(\w[^\s:]*):[ ]*([^\r\n]*(?:\r\n[ \t][^\r\n]*)*)/', $header_string, $matches))
+		{
+			// Parse each matched header
+			foreach ($matches[0] as $key => $value)
+			{
+				// If the header has not already been set
+				if ( ! isset($headers[$matches[1][$key]]))
+				{
+					// Apply the header directly
+					$headers[$matches[1][$key]] = $matches[2][$key];
+				}
+				// Otherwise there is an existing entry
+				else
+				{
+					// If the entry is an array
+					if (is_array($headers[$matches[1][$key]]))
+					{
+						// Apply the new entry to the array
+						$headers[$matches[1][$key]][] = $matches[2][$key];
+					}
+					// Otherwise create a new array with the entries
+					else
+					{
+						$headers[$matches[1][$key]] = array(
+							$headers[$matches[1][$key]],
+							$matches[2][$key],
+						);
+					}
+				}
+			}
+		}
+
+		// Return the headers
+		return new HTTP_Header($headers);
+	}
+
+	/**
+	 * Parses the the HTTP request headers and returns an array containing
+	 * key value pairs. This method is slow, but provides an accurate
+	 * representation of the HTTP request.
+	 *
+	 *      // Get http headers into the request
+	 *      $request->headers = HTTP::request_headers();
+	 *
+	 * @return  HTTP_Header
+	 */
+	public static function request_headers()
+	{
+		// If running on apache server
+		if (function_exists('apache_request_headers'))
+		{
+			// Return the much faster method
+			return new HTTP_Header(apache_request_headers());
+		}
+		// If the PECL HTTP tools are installed
+		elseif (extension_loaded('http'))
+		{
+			// Return the much faster method
+			return new HTTP_Header(http_get_request_headers());
+		}
+
+		// Setup the output
+		$headers = array();
+
+		// Parse the content type
+		if ( ! empty($_SERVER['CONTENT_TYPE']))
+		{
+			$headers['content-type'] = $_SERVER['CONTENT_TYPE'];
+		}
+
+		// Parse the content length
+		if ( ! empty($_SERVER['CONTENT_LENGTH']))
+		{
+			$headers['content-length'] = $_SERVER['CONTENT_LENGTH'];
+		}
+
+		foreach ($_SERVER as $key => $value)
+		{
+			// If there is no HTTP header here, skip
+			if (strpos($key, 'HTTP_') !== 0)
+			{
+				continue;
+			}
+
+			// This is a dirty hack to ensure HTTP_X_FOO_BAR becomes x-foo-bar
+			$headers[str_replace(array('HTTP_', '_'), array('', '-'), $key)] = $value;
+		}
+
+		return new HTTP_Header($headers);
+	}
+
+	/**
+	 * Processes an array of key value pairs and encodes
+	 * the values to meet RFC 3986
+	 *
+	 * @param   array   $params  Params
+	 * @return  string
+	 */
+	public static function www_form_urlencode(array $params = array())
+	{
+		if ( ! $params)
+			return;
+
+		$encoded = array();
+
+		foreach ($params as $key => $value)
+		{
+			$encoded[] = $key.'='.rawurlencode($value);
+		}
+
+		return implode('&', $encoded);
+	}
+} // End Kohana_HTTP
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception.php b/includes/kohana/system/classes/kohana/http/exception.php
new file mode 100644
index 0000000..85e12da
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception.php
@@ -0,0 +1,34 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception extends Kohana_Exception {
+
+	/**
+	 * @var     int      http status code
+	 */
+	protected $_code = 0;
+
+	/**
+	 * Creates a new translated exception.
+	 *
+	 *     throw new Kohana_Exception('Something went terrible wrong, :user',
+	 *         array(':user' => $user));
+	 *
+	 * @param   string   status message, custom content to display with error
+	 * @param   array    translation variables
+	 * @param   integer  the http status code
+	 * @return  void
+	 */
+	public function __construct($message = NULL, array $variables = NULL, $code = 0)
+	{
+		if ($code == 0)
+		{
+			$code = $this->_code;
+		}
+
+		if ( ! isset(Response::$messages[$code]))
+			throw new Kohana_Exception('Unrecognized HTTP status code: :code . Only valid HTTP status codes are acceptable, see RFC 2616.', array(':code' => $code));
+
+		parent::__construct($message, $variables, $code);
+	}
+
+} // End Kohana_HTTP_Exception
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/400.php b/includes/kohana/system/classes/kohana/http/exception/400.php
new file mode 100644
index 0000000..935d74f
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/400.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_400 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 400 Bad Request
+	 */
+	protected $_code = 400;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/401.php b/includes/kohana/system/classes/kohana/http/exception/401.php
new file mode 100644
index 0000000..bf35dbd
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/401.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_401 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 401 Unauthorized
+	 */
+	protected $_code = 401;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/402.php b/includes/kohana/system/classes/kohana/http/exception/402.php
new file mode 100644
index 0000000..5539c78
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/402.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_402 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 402 Payment Required
+	 */
+	protected $_code = 402;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/403.php b/includes/kohana/system/classes/kohana/http/exception/403.php
new file mode 100644
index 0000000..0b47f05
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/403.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_403 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 403 Forbidden
+	 */
+	protected $_code = 403;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/404.php b/includes/kohana/system/classes/kohana/http/exception/404.php
new file mode 100644
index 0000000..26ccaf2
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/404.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_404 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 404 Not Found
+	 */
+	protected $_code = 404;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/405.php b/includes/kohana/system/classes/kohana/http/exception/405.php
new file mode 100644
index 0000000..faa5ed0
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/405.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_405 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 405 Method Not Allowed
+	 */
+	protected $_code = 405;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/406.php b/includes/kohana/system/classes/kohana/http/exception/406.php
new file mode 100644
index 0000000..74a98da
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/406.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_406 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 406 Not Acceptable
+	 */
+	protected $_code = 406;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/407.php b/includes/kohana/system/classes/kohana/http/exception/407.php
new file mode 100644
index 0000000..173f0c8
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/407.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_407 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 407 Proxy Authentication Required
+	 */
+	protected $_code = 407;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/408.php b/includes/kohana/system/classes/kohana/http/exception/408.php
new file mode 100644
index 0000000..d5cd15b
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/408.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_408 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 408 Request Timeout
+	 */
+	protected $_code = 408;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/409.php b/includes/kohana/system/classes/kohana/http/exception/409.php
new file mode 100644
index 0000000..6923232
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/409.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_409 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 409 Conflict
+	 */
+	protected $_code = 409;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/410.php b/includes/kohana/system/classes/kohana/http/exception/410.php
new file mode 100644
index 0000000..eb15612
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/410.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_410 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 410 Gone
+	 */
+	protected $_code = 410;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/411.php b/includes/kohana/system/classes/kohana/http/exception/411.php
new file mode 100644
index 0000000..cdb7c63
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/411.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_411 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 411 Length Required
+	 */
+	protected $_code = 411;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/412.php b/includes/kohana/system/classes/kohana/http/exception/412.php
new file mode 100644
index 0000000..1fb100a
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/412.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_412 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 412 Precondition Failed
+	 */
+	protected $_code = 412;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/413.php b/includes/kohana/system/classes/kohana/http/exception/413.php
new file mode 100644
index 0000000..4504168
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/413.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_413 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 413 Request Entity Too Large
+	 */
+	protected $_code = 413;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/414.php b/includes/kohana/system/classes/kohana/http/exception/414.php
new file mode 100644
index 0000000..2f62e51
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/414.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_414 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 414 Request-URI Too Long
+	 */
+	protected $_code = 414;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/415.php b/includes/kohana/system/classes/kohana/http/exception/415.php
new file mode 100644
index 0000000..5400565
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/415.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_415 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 415 Unsupported Media Type
+	 */
+	protected $_code = 415;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/416.php b/includes/kohana/system/classes/kohana/http/exception/416.php
new file mode 100644
index 0000000..ebd290e
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/416.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_416 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 416 Request Range Not Satisfiable
+	 */
+	protected $_code = 416;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/417.php b/includes/kohana/system/classes/kohana/http/exception/417.php
new file mode 100644
index 0000000..a75adbc
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/417.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_417 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 417 Expectation Failed
+	 */
+	protected $_code = 417;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/500.php b/includes/kohana/system/classes/kohana/http/exception/500.php
new file mode 100644
index 0000000..be7dd9d
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/500.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_500 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 500 Internal Server Error
+	 */
+	protected $_code = 500;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/501.php b/includes/kohana/system/classes/kohana/http/exception/501.php
new file mode 100644
index 0000000..9fa9f9c
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/501.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_501 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 501 Not Implemented
+	 */
+	protected $_code = 501;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/502.php b/includes/kohana/system/classes/kohana/http/exception/502.php
new file mode 100644
index 0000000..1c4eb0b
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/502.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_502 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 502 Bad Gateway
+	 */
+	protected $_code = 502;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/503.php b/includes/kohana/system/classes/kohana/http/exception/503.php
new file mode 100644
index 0000000..7d9ab7e
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/503.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_503 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 503 Service Unavailable
+	 */
+	protected $_code = 503;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/504.php b/includes/kohana/system/classes/kohana/http/exception/504.php
new file mode 100644
index 0000000..69d7c6d
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/504.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_504 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 504 Gateway Timeout
+	 */
+	protected $_code = 504;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/exception/505.php b/includes/kohana/system/classes/kohana/http/exception/505.php
new file mode 100644
index 0000000..13fc397
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/exception/505.php
@@ -0,0 +1,10 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Kohana_HTTP_Exception_505 extends HTTP_Exception {
+
+	/**
+	 * @var   integer    HTTP 505 HTTP Version Not Supported
+	 */
+	protected $_code = 505;
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/header.php b/includes/kohana/system/classes/kohana/http/header.php
new file mode 100644
index 0000000..fa82b37
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/header.php
@@ -0,0 +1,310 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * The Kohana_HTTP_Header class provides an Object-Orientated interface
+ * to HTTP headers. This can parse header arrays returned from the
+ * PHP functions `apache_request_headers()` or the `http_parse_headers()`
+ * function available within the PECL HTTP library.
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_HTTP_Header extends ArrayObject {
+
+	/**
+	 * @var     boolean   Controls whether to automatically sort headers by quality value
+	 */
+	public static $sort_by_quality = FALSE;
+
+	/**
+	 * @var     array     Default positive filter for sorting header values
+	 */
+	public static $default_sort_filter = array('accept','accept-charset','accept-encoding','accept-language');
+
+	/**
+	 * Parses HTTP Header values and creating an appropriate object
+	 * depending on type; i.e. accept-type, accept-char, cache-control etc.
+	 *
+	 *     $header_values_array = HTTP_Header::parse_header_values(array('cache-control' => 'max-age=200; public'));
+	 *
+	 * @param   array    $header_values          Values to parse
+	 * @param   array    $header_commas_allowed  Header values where commas are not delimiters (usually date)
+	 * @return  array
+	 */
+	public static function parse_header_values(array $header_values, array $header_commas_allowed = array('user-agent', 'date', 'expires', 'last-modified'))
+	{
+		/**
+		 * @see http://www.w3.org/Protocols/rfc2616/rfc2616.html
+		 *
+		 * HTTP header declarations should be treated as case-insensitive
+		 */
+		$header_values = array_change_key_case($header_values, CASE_LOWER);
+
+		// Foreach of the header values applied
+		foreach ($header_values as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$values = array();
+
+				if (Arr::is_assoc($value))
+				{
+
+					foreach ($value as $k => $v)
+					{
+						$values[] = HTTP_Header::parse_header_values($v);
+					}
+				}
+				else
+				{
+					// RFC 2616 allows multiple headers with same name if they can be
+					// concatinated using commas without altering the original message.
+					// This usually occurs with multiple Set-Cookie: headers
+					$array = array();
+					foreach ($value as $k => $v)
+					{
+						// Break value into component parts
+						$v = explode(';', $v);
+
+						// Do some nasty parsing to flattern the array into components,
+						// parsing key values
+						$array = Arr::flatten(array_map('HTTP_Header_Value::parse_key_value', $v));
+
+						// Get the K/V component and extract the first element
+						$key_value_component = array_slice($array, 0, 1, TRUE);
+						array_shift($array);
+
+						// Create the HTTP_Header_Value component array
+						$http_header['key']        = key($key_value_component);
+						$http_header['value']      = current($key_value_component);
+						$http_header['properties'] = $array;
+
+						// Create the HTTP_Header_Value
+						$values[] = new HTTP_Header_Value($http_header);
+					}
+				}
+
+				// Assign HTTP_Header_Value array to the header
+				$header_values[$key] = $values;
+				continue;
+			}
+
+			// If the key allows commas or no commas are found
+			if (in_array($key, $header_commas_allowed) or (strpos($value, ',') === FALSE))
+			{
+				// If the key is user-agent, we don't want to parse the string
+				if ($key === 'user-agent')
+				{
+					$header_values[$key] = new HTTP_Header_Value($value, TRUE);
+				}
+				// Else, behave normally
+				else
+				{
+					$header_values[$key] = new HTTP_Header_Value($value);
+				}
+
+				// Move to next header
+				continue;
+			}
+
+			// Create an array of the values and clear any whitespace
+			$value = array_map('trim', explode(',', $value));
+
+			$parsed_values = array();
+
+			// Foreach value
+			foreach ($value as $v)
+			{
+				$v = new HTTP_Header_Value($v);
+
+				// Convert the value string into an object
+				if ($v->key === NULL)
+				{
+					$parsed_values[] = $v;
+				}
+				else
+				{
+					$parsed_values[$v->key] = $v;
+				}
+			}
+
+			// Apply parsed value to the header
+			$header_values[$key] = $parsed_values;
+		}
+
+		// Return the parsed header values
+		return $header_values;
+	}
+
+	/**
+	 * Constructor method for [Kohana_HTTP_Header]. Uses the standard constructor
+	 * of the parent `ArrayObject` class.
+	 *
+	 *     $header_object = new HTTP_Header(array('x-powered-by' => 'Kohana 3.1.x', 'expires' => '...'));
+	 *
+	 * @param   mixed    Input array
+	 * @param   int      Flags
+	 * @param   string   The iterator class to use
+	 */
+	public function __construct($input, $flags = NULL, $iterator_class = 'ArrayIterator')
+	{
+		// Parse the values into [HTTP_Header_Values]
+		parent::__construct(HTTP_Header::parse_header_values($input), $flags, $iterator_class);
+
+		// If sort by quality is set, sort the fields by q=0.0 value
+		if (HTTP_Header::$sort_by_quality)
+		{
+			$this->sort_values_by_quality();
+		}
+	}
+
+	/**
+	 * Returns the header object as a string, including
+	 * the terminating new line
+	 *
+	 *     // Return the header as a string
+	 *     echo (string) $request->headers();
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		$header = '';
+
+		foreach ($this as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$header .= $key.': '.(implode(', ', $value))."\r\n";
+			}
+			else
+			{
+				$header .= $key.': '.$value."\r\n";
+			}
+		}
+
+		return $header."\n";
+	}
+
+	/**
+	 * Overloads the `ArrayObject::exchangeArray()` method to ensure all
+	 * values passed are parsed correctly into a [Kohana_HTTP_Header_Value].
+	 *
+	 *     // Input new headers
+	 *     $headers->exchangeArray(array(
+	 *          'date'          => 'Wed, 24 Nov 2010 21:09:23 GMT',
+	 *          'cache-control' => 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
+	 *     ));
+	 *
+	 * @param   array    $array Array to exchange
+	 * @return  array
+	 */
+	public function exchangeArray($array)
+	{
+		return parent::exchangeArray(HTTP_Header::parse_header_values($array));
+	}
+
+	/**
+	 * Overloads the `ArrayObject::offsetSet` method to ensure any
+	 * access is correctly converted to the correct object type.
+	 *
+	 *     // Add a new header from encoded string
+	 *     $headers['cache-control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
+	 *
+	 * @param   mixed    $index   Key
+	 * @param   mixed    $newval  Value
+	 * @return  void
+	 */
+	public function offsetSet($index, $newval)
+	{
+		if (is_array($newval) AND (current($newval) instanceof HTTP_Header_Value))
+			return parent::offsetSet(strtolower($index), $newval);
+		elseif ( ! $newval instanceof HTTP_Header_Value)
+		{
+			$newval = new HTTP_Header_Value($newval);
+		}
+
+		parent::offsetSet(strtolower($index), $newval);
+	}
+
+	/**
+	 * Sort the headers by quality property if the header matches the
+	 * [Kohana_HTTP_Header::$default_sort_filter] definition.
+	 *
+	 * #### Default sort values
+	 *
+	 *  - Accept
+	 *  - Accept-Chars
+	 *  - Accept-Encoding
+	 *  - Accept-Lang
+	 *
+	 * @param   array    $filter  Header fields to parse
+	 * @return  self
+	 */
+	public function sort_values_by_quality(array $filter = array())
+	{
+		// If a filter argument is supplied
+		if ($filter)
+		{
+			// Apply filter and store previous
+			$previous_filter = HTTP_Header::$default_sort_filter;
+			HTTP_Header::$default_sort_filter = $filter;
+		}
+
+		// Get a copy of this ArrayObject
+		$values = $this->getArrayCopy();
+
+		foreach ($values as $key => $value)
+		{
+			if ( ! is_array($value) or ! in_array($key, HTTP_Header::$default_sort_filter))
+			{
+				unset($values[$key]);
+				continue;
+			}
+
+			// Sort them by comparison
+			uasort($value, array($this, '_sort_by_comparison'));
+
+			$values[$key] = $value;
+		}
+
+		// Return filter to previous state if required
+		if ($filter)
+		{
+			HTTP_Header::$default_sort_filter = $previous_filter;
+		}
+
+		foreach ($values as $key => $value)
+		{
+			$this[$key] = $value;
+		}
+
+		// Return this
+		return $this;
+	}
+
+	protected function _sort_by_comparison($value_a, $value_b)
+	{
+		// Test for correct instance type
+		if ( ! $value_a instanceof HTTP_Header_Value OR ! $value_b instanceof HTTP_Header_Value)
+		{
+			// Return neutral if cannot test value
+			return 0;
+		}
+
+		// Extract the qualities
+		$a = (float) Arr::get($value_a->properties, 'q', HTTP_Header_Value::$default_quality);
+		$b = (float) Arr::get($value_b->properties, 'q', HTTP_Header_Value::$default_quality);
+
+		if ($a == $b)
+			return 0;
+		elseif ($a < $b)
+			return 1;
+		elseif ($a > $b)
+			return -1;
+	}
+
+} // End Kohana_HTTP_Header
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/header/value.php b/includes/kohana/system/classes/kohana/http/header/value.php
new file mode 100644
index 0000000..7ddef8e
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/header/value.php
@@ -0,0 +1,219 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Kohana_HTTP_Header_Value represents a value assigned to an HTTP header, i.e.
+ *
+ *      Accept: [key=]value[; property[=property_value][; ...]]
+ *
+ * Values are either single values,
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_HTTP_Header_Value {
+
+	/**
+	 * @var     float    The default quality header property value
+	 */
+	public static $default_quality = 1.0;
+
+	/**
+	 * Detects and returns key/value pairs
+	 *
+	 * @param   string   $string String to parse
+	 * @param   string   $separator
+	 * @return  array
+	 */
+	public static function parse_key_value($string, $separator = '=')
+	{
+		$parts = explode($separator, trim($string), 2);
+
+		if (count($parts) == 1)
+		{
+			return $parts;
+		}
+		else
+		{
+			return array($parts[0] => $parts[1]);
+		}
+	}
+
+	/**
+	 * @var     array
+	 */
+	public $properties = array();
+
+	/**
+	 * @var     void|string
+	 */
+	public $key;
+
+	/**
+	 * @var     array
+	 */
+	public $value = array();
+
+	/**
+	 * Builds the header field
+	 *
+	 * @param   mixed    value  configuration array passed
+	 * @param   boolean  no_parse  skip parsing of the string (i.e. user-agent)
+	 * @throws  Kohana_HTTP_Exception
+	 */
+	public function __construct($value, $no_parse = FALSE)
+	{
+		// If no parse is set, set the value and get out of here (user-agent)
+		if ($no_parse)
+		{
+			$this->key = NULL;
+			$this->value = $value;
+			return;
+		}
+
+		// If configuration array passed
+		if (is_array($value))
+		{
+			// Parse each value
+			foreach ($value as $k => $v)
+			{
+				// If the key is a property
+				if (property_exists($this, $k))
+				{
+					// Map values
+					$this->$k = $v;
+				}
+			}
+
+		}
+		// If value is a string
+		elseif (is_string($value))
+		{
+			// Detect properties
+			if (strpos($value, ';') !== FALSE)
+			{
+				// Remove properties from the string
+				$parts = explode(';', $value);
+				$value = array_shift($parts);
+
+				// Parse the properties
+				$properties = array();
+
+				// Foreach part
+				foreach ($parts as $part)
+				{
+					// Merge the parsed values
+					$properties = array_merge(HTTP_Header_Value::parse_key_value($part), $properties);
+				}
+
+				// Apply the parsed values
+				$this->properties = $properties;
+			}
+
+			// Parse the value and get key
+			$value = HTTP_Header_Value::parse_key_value($value);
+			$key = key($value);
+
+			// If the key is a string
+			if (is_string($key))
+			{
+				// Apply the key as a property
+				$this->key = $key;
+			}
+
+			// Apply the value
+			$this->value = current($value);
+		}
+		// Unrecognised value type
+		else
+		{
+			throw new HTTP_Exception_500(__METHOD__.' unknown header value type: :type. array or string allowed.', array(':type' => gettype($value)));
+		}
+	}
+
+	/**
+	 * Provides direct access to the key of this header value
+	 *
+	 * @param   string   $key  Key value to set
+	 * @return  mixed
+	 */
+	public function key($key = NULL)
+	{
+		if ($key === NULL)
+		{
+			return $this->key;
+		}
+		else
+		{
+			$this->key = $key;
+			return $this;
+		}
+	}
+
+	/**
+	 * Provides direct access to the value of this header value
+	 *
+	 * @param   string   $value Value to set
+	 * @return  mixed
+	 */
+	public function value($value = NULL)
+	{
+		if ($value === NULL)
+		{
+			return $this->value;
+		}
+		else
+		{
+			$this->value = $value;
+			return $this;
+		}
+	}
+
+	/**
+	 * Provides direct access to the properties of this header value
+	 *
+	 * @param   array    $properties Properties to set to this value
+	 * @return  mixed
+	 */
+	public function properties(array $properties = array())
+	{
+		if ( ! $properties)
+		{
+			return $this->properties;
+		}
+		else
+		{
+			$this->properties = $properties;
+			return $this;
+		}
+	}
+
+	/**
+	 * Magic method to handle object being cast to
+	 * string. Produces the following header value syntax
+	 *
+	 *      [key=]value[; property[=property_value][; ... ]]
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+
+		$string = ($this->key !== NULL) ? ($this->key.'='.$this->value) : $this->value;
+
+		if ($this->properties)
+		{
+			$props = array($string);
+			foreach ($this->properties as $k => $v)
+			{
+				$props[] = is_int($k) ? $v : ($k.'='.$v);
+			}
+			$string = implode('; ', $props);
+		}
+
+		return $string;
+	}
+
+} // End Kohana_HTTP_Header_Value
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/interaction.php b/includes/kohana/system/classes/kohana/http/interaction.php
new file mode 100644
index 0000000..064aaa7
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/interaction.php
@@ -0,0 +1,56 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * The HTTP Interaction interface providing the core HTTP methods that
+ * should be implemented by any HTTP request or response class.
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+interface Kohana_HTTP_Interaction {
+
+	/**
+	 * Gets or sets the HTTP protocol. The standard protocol to use
+	 * is `HTTP/1.1`.
+	 *
+	 * @param   string   $protocol  Protocol to set to the request/response
+	 * @return  mixed
+	 */
+	public function protocol($protocol = NULL);
+
+	/**
+	 * Gets or sets HTTP headers to the request or response. All headers
+	 * are included immediately after the HTTP protocol definition during
+	 * transmission. This method provides a simple array or key/value
+	 * interface to the headers.
+	 *
+	 * @param   mixed   $key    Key or array of key/value pairs to set
+	 * @param   string  $value  Value to set to the supplied key
+	 * @return  mixed
+	 */
+	public function headers($key = NULL, $value = NULL);
+
+	/**
+	 * Gets or sets the HTTP body to the request or response. The body is
+	 * included after the header, separated by a single empty new line.
+	 *
+	 * @param   string    $content  Content to set to the object
+	 * @return  string
+	 * @return  void
+	 */
+	public function body($content = NULL);
+
+	/**
+	 * Renders the HTTP_Interaction to a string, producing
+	 *
+	 *  - Protocol
+	 *  - Headers
+	 *  - Body
+	 *
+	 * @return  string
+	 */
+	public function render();
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/request.php b/includes/kohana/system/classes/kohana/http/request.php
new file mode 100644
index 0000000..426a868
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/request.php
@@ -0,0 +1,64 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * A HTTP Request specific interface that adds the methods required
+ * by HTTP requests. Over and above [Kohana_HTTP_Interaction], this
+ * interface provides method, uri, get and post methods.
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+interface Kohana_HTTP_Request extends HTTP_Interaction {
+
+	// HTTP Methods
+	const GET       = 'GET';
+	const POST      = 'POST';
+	const PUT       = 'PUT';
+	const DELETE    = 'DELETE';
+	const HEAD      = 'HEAD';
+	const OPTIONS   = 'OPTIONS';
+	const TRACE     = 'TRACE';
+	const CONNECT   = 'CONNECT';
+
+	/**
+	 * Gets or sets the HTTP method. Usually GET, POST, PUT or DELETE in
+	 * traditional CRUD applications.
+	 *
+	 * @param   string   $method  Method to use for this request
+	 * @return  mixed
+	 */
+	public function method($method = NULL);
+
+	/**
+	 * Gets the URI of this request, optionally allows setting
+	 * of [Route] specific parameters during the URI generation.
+	 * If no parameters are passed, the request will use the
+	 * default values defined in the Route.
+	 *
+	 * @param   array    $params  Optional parameters to include in uri generation
+	 * @return  string
+	 */
+	public function uri(array $params = array());
+
+	/**
+	 * Gets or sets HTTP query string.
+	 *
+	 * @param   mixed   $key    Key or key value pairs to set
+	 * @param   string  $value  Value to set to a key
+	 * @return  mixed
+	 */
+	public function query($key = NULL, $value = NULL);
+
+	/**
+	 * Gets or sets HTTP POST parameters to the request.
+	 *
+	 * @param   mixed   $key   Key or key value pairs to set
+	 * @param   string  $value Value to set to a key
+	 * @return  mixed
+	 */
+	public function post($key = NULL, $value = NULL);
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/http/response.php b/includes/kohana/system/classes/kohana/http/response.php
new file mode 100644
index 0000000..9849155
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/http/response.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * A HTTP Reponse specific interface that adds the methods required
+ * by HTTP responses. Over and above [Kohana_HTTP_Interaction], this
+ * interface provides status.
+ *
+ * @package    Kohana
+ * @category   HTTP
+ * @author     Kohana Team
+ * @since      3.1.0
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+interface Kohana_HTTP_Response extends HTTP_Interaction {
+
+	/**
+	 * Sets or gets the HTTP status from this response.
+	 *
+	 *      // Set the HTTP status to 404 Not Found
+	 *      $response = Response::factory()
+	 *              ->status(404);
+	 *
+	 *      // Get the current status
+	 *      $status = $response->status();
+	 *
+	 * @param   integer  $code  Status to set to this response
+	 * @return  mixed
+	 */
+	public function status($code = NULL);
+
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/i18n.php b/includes/kohana/system/classes/kohana/i18n.php
new file mode 100644
index 0000000..673dea4
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/i18n.php
@@ -0,0 +1,166 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Internationalization (i18n) class. Provides language loading and translation
+ * methods without dependencies on [gettext](http://php.net/gettext).
+ *
+ * Typically this class would never be used directly, but used via the __()
+ * function, which loads the message and replaces parameters:
+ *
+ *     // Display a translated message
+ *     echo __('Hello, world');
+ *
+ *     // With parameter replacement
+ *     echo __('Hello, :user', array(':user' => $username));
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_I18n {
+
+	/**
+	 * @var  string   target language: en-us, es-es, zh-cn, etc
+	 */
+	public static $lang = 'en-us';
+
+	/**
+	 * @var  string  source language: en-us, es-es, zh-cn, etc
+	 */
+	public static $source = 'en-us';
+
+	/**
+	 * @var  array  cache of loaded languages
+	 */
+	protected static $_cache = array();
+
+	/**
+	 * Get and set the target language.
+	 *
+	 *     // Get the current language
+	 *     $lang = I18n::lang();
+	 *
+	 *     // Change the current language to Spanish
+	 *     I18n::lang('es-es');
+	 *
+	 * @param   string   new language setting
+	 * @return  string
+	 * @since   3.0.2
+	 */
+	public static function lang($lang = NULL)
+	{
+		if ($lang)
+		{
+			// Normalize the language
+			I18n::$lang = strtolower(str_replace(array(' ', '_'), '-', $lang));
+		}
+
+		return I18n::$lang;
+	}
+
+	/**
+	 * Returns translation of a string. If no translation exists, the original
+	 * string will be returned. No parameters are replaced.
+	 *
+	 *     $hello = I18n::get('Hello friends, my name is :name');
+	 *
+	 * @param   string   text to translate
+	 * @param   string   target language
+	 * @return  string
+	 */
+	public static function get($string, $lang = NULL)
+	{
+		if ( ! $lang)
+		{
+			// Use the global target language
+			$lang = I18n::$lang;
+		}
+
+		// Load the translation table for this language
+		$table = I18n::load($lang);
+
+		// Return the translated string if it exists
+		return isset($table[$string]) ? $table[$string] : $string;
+	}
+
+	/**
+	 * Returns the translation table for a given language.
+	 *
+	 *     // Get all defined Spanish messages
+	 *     $messages = I18n::load('es-es');
+	 *
+	 * @param   string   language to load
+	 * @return  array
+	 */
+	public static function load($lang)
+	{
+		if (isset(I18n::$_cache[$lang]))
+		{
+			return I18n::$_cache[$lang];
+		}
+
+		// New translation table
+		$table = array();
+
+		// Split the language: language, region, locale, etc
+		$parts = explode('-', $lang);
+
+		do
+		{
+			// Create a path for this set of parts
+			$path = implode(DIRECTORY_SEPARATOR, $parts);
+
+			if ($files = Kohana::find_file('i18n', $path, NULL, TRUE))
+			{
+				$t = array();
+				foreach ($files as $file)
+				{
+					// Merge the language strings into the sub table
+					$t = array_merge($t, Kohana::load($file));
+				}
+
+				// Append the sub table, preventing less specific language
+				// files from overloading more specific files
+				$table += $t;
+			}
+
+			// Remove the last part
+			array_pop($parts);
+		}
+		while ($parts);
+
+		// Cache the translation table locally
+		return I18n::$_cache[$lang] = $table;
+	}
+
+} // End I18n
+
+if ( ! function_exists('__'))
+{
+	/**
+	 * Kohana translation/internationalization function. The PHP function
+	 * [strtr](http://php.net/strtr) is used for replacing parameters.
+	 *
+	 *    __('Welcome back, :user', array(':user' => $username));
+	 *
+	 * [!!] The target language is defined by [I18n::$lang].
+	 * 
+	 * @uses    I18n::get
+	 * @param   string  text to translate
+	 * @param   array   values to replace in the translated text
+	 * @param   string  source language
+	 * @return  string
+	 */
+	function __($string, array $values = NULL, $lang = 'en-us')
+	{
+		if ($lang !== I18n::$lang)
+		{
+			// The message and target languages are different
+			// Get the translation for this message
+			$string = I18n::get($string);
+		}
+
+		return empty($values) ? $string : strtr($string, $values);
+	}
+}
diff --git a/includes/kohana/system/classes/kohana/inflector.php b/includes/kohana/system/classes/kohana/inflector.php
new file mode 100644
index 0000000..1fb937a
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/inflector.php
@@ -0,0 +1,269 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Inflector helper class. Inflection is changing the form of a word based on
+ * the context it is used in. For example, changing a word into a plural form.
+ *
+ * [!!] Inflection is only tested with English, and is will not work with other languages.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Inflector {
+
+	/**
+	 * @var  array  cached inflections
+	 */
+	protected static $cache = array();
+
+	/**
+	 * @var  array  uncountable words
+	 */
+	protected static $uncountable;
+
+	/**
+	 * @var  array  irregular words
+	 */
+	protected static $irregular;
+
+	/**
+	 * Checks if a word is defined as uncountable. An uncountable word has a
+	 * single form. For instance, one "fish" and many "fish", not "fishes".
+	 *
+	 *     Inflector::uncountable('fish'); // TRUE
+	 *     Inflector::uncountable('cat');  // FALSE
+	 *
+	 * If you find a word is being pluralized improperly, it has probably not
+	 * been defined as uncountable in `config/inflector.php`. If this is the
+	 * case, please report [an issue](http://dev.kohanaphp.com/projects/kohana3/issues).
+	 *
+	 * @param   string   word to check
+	 * @return  boolean
+	 */
+	public static function uncountable($str)
+	{
+		if (Inflector::$uncountable === NULL)
+		{
+			// Cache uncountables
+			Inflector::$uncountable = Kohana::config('inflector')->uncountable;
+
+			// Make uncountables mirrored
+			Inflector::$uncountable = array_combine(Inflector::$uncountable, Inflector::$uncountable);
+		}
+
+		return isset(Inflector::$uncountable[strtolower($str)]);
+	}
+
+	/**
+	 * Makes a plural word singular.
+	 *
+	 *     echo Inflector::singular('cats'); // "cat"
+	 *     echo Inflector::singular('fish'); // "fish", uncountable
+	 *
+	 * You can also provide the count to make inflection more intelligent.
+	 * In this case, it will only return the singular value if the count is
+	 * greater than one and not zero.
+	 *
+	 *     echo Inflector::singular('cats', 2); // "cats"
+	 *
+	 * [!!] Special inflections are defined in `config/inflector.php`.
+	 *
+	 * @param   string   word to singularize
+	 * @param   integer  count of thing
+	 * @return  string
+	 * @uses    Inflector::uncountable
+	 */
+	public static function singular($str, $count = NULL)
+	{
+		// $count should always be a float
+		$count = ($count === NULL) ? 1.0 : (float) $count;
+
+		// Do nothing when $count is not 1
+		if ($count != 1)
+			return $str;
+
+		// Remove garbage
+		$str = strtolower(trim($str));
+
+		// Cache key name
+		$key = 'singular_'.$str.$count;
+
+		if (isset(Inflector::$cache[$key]))
+			return Inflector::$cache[$key];
+
+		if (Inflector::uncountable($str))
+			return Inflector::$cache[$key] = $str;
+
+		if (empty(Inflector::$irregular))
+		{
+			// Cache irregular words
+			Inflector::$irregular = Kohana::config('inflector')->irregular;
+		}
+
+		if ($irregular = array_search($str, Inflector::$irregular))
+		{
+			$str = $irregular;
+		}
+		elseif (preg_match('/us$/', $str))
+		{
+			// http://en.wikipedia.org/wiki/Plural_form_of_words_ending_in_-us
+			// Already singular, do nothing
+		}
+		elseif (preg_match('/[sxz]es$/', $str) OR preg_match('/[^aeioudgkprt]hes$/', $str))
+		{
+			// Remove "es"
+			$str = substr($str, 0, -2);
+		}
+		elseif (preg_match('/[^aeiou]ies$/', $str))
+		{
+			// Replace "ies" with "y"
+			$str = substr($str, 0, -3).'y';
+		}
+		elseif (substr($str, -1) === 's' AND substr($str, -2) !== 'ss')
+		{
+			// Remove singular "s"
+			$str = substr($str, 0, -1);
+		}
+
+		return Inflector::$cache[$key] = $str;
+	}
+
+	/**
+	 * Makes a singular word plural.
+	 *
+	 *     echo Inflector::plural('fish'); // "fish", uncountable
+	 *     echo Inflector::plural('cat');  // "cats"
+	 *
+	 * You can also provide the count to make inflection more intelligent.
+	 * In this case, it will only return the plural value if the count is
+	 * not one.
+	 *
+	 *     echo Inflector::singular('cats', 3); // "cats"
+	 *
+	 * [!!] Special inflections are defined in `config/inflector.php`.
+	 *
+	 * @param   string   word to pluralize
+	 * @param   integer  count of thing
+	 * @return  string
+	 * @uses    Inflector::uncountable
+	 */
+	public static function plural($str, $count = NULL)
+	{
+		// $count should always be a float
+		$count = ($count === NULL) ? 0.0 : (float) $count;
+
+		// Do nothing with singular
+		if ($count == 1)
+			return $str;
+
+		// Remove garbage
+		$str = trim($str);
+
+		// Cache key name
+		$key = 'plural_'.$str.$count;
+
+		// Check uppercase
+		$is_uppercase = ctype_upper($str);
+
+		if (isset(Inflector::$cache[$key]))
+			return Inflector::$cache[$key];
+
+		if (Inflector::uncountable($str))
+			return Inflector::$cache[$key] = $str;
+
+		if (empty(Inflector::$irregular))
+		{
+			// Cache irregular words
+			Inflector::$irregular = Kohana::config('inflector')->irregular;
+		}
+
+		if (isset(Inflector::$irregular[$str]))
+		{
+			$str = Inflector::$irregular[$str];
+		}
+		elseif (preg_match('/[sxz]$/', $str) OR preg_match('/[^aeioudgkprt]h$/', $str))
+		{
+			$str .= 'es';
+		}
+		elseif (preg_match('/[^aeiou]y$/', $str))
+		{
+			// Change "y" to "ies"
+			$str = substr_replace($str, 'ies', -1);
+		}
+		else
+		{
+			$str .= 's';
+		}
+
+		// Convert to uppsecase if nessasary
+		if ($is_uppercase)
+		{
+			$str = strtoupper($str);
+		}
+
+		// Set the cache and return
+		return Inflector::$cache[$key] = $str;
+	}
+
+	/**
+	 * Makes a phrase camel case. Spaces and underscores will be removed.
+	 *
+	 *     $str = Inflector::camelize('mother cat');     // "motherCat"
+	 *     $str = Inflector::camelize('kittens in bed'); // "kittensInBed"
+	 *
+	 * @param   string  phrase to camelize
+	 * @return  string
+	 */
+	public static function camelize($str)
+	{
+		$str = 'x'.strtolower(trim($str));
+		$str = ucwords(preg_replace('/[\s_]+/', ' ', $str));
+
+		return substr(str_replace(' ', '', $str), 1);
+	}
+
+	/**
+	 * Converts a camel case phrase into a spaced phrase.
+	 *
+	 *     $str = Inflector::decamelize('houseCat');    // "house cat"
+	 *     $str = Inflector::decamelize('kingAllyCat'); // "king ally cat"
+	 *
+	 * @param   string   phrase to camelize
+	 * @param   string   word separator
+	 * @return  string
+	 */
+	public static function decamelize($str, $sep = ' ')
+	{
+		return strtolower(preg_replace('/([a-z])([A-Z])/', '$1'.$sep.'$2', trim($str)));
+	}
+
+	/**
+	 * Makes a phrase underscored instead of spaced.
+	 *
+	 *     $str = Inflector::underscore('five cats'); // "five_cats";
+	 *
+	 * @param   string  phrase to underscore
+	 * @return  string
+	 */
+	public static function underscore($str)
+	{
+		return preg_replace('/\s+/', '_', trim($str));
+	}
+
+	/**
+	 * Makes an underscored or dashed phrase human-readable.
+	 *
+	 *     $str = Inflector::humanize('kittens-are-cats'); // "kittens are cats"
+	 *     $str = Inflector::humanize('dogs_as_well');     // "dogs as well"
+	 *
+	 * @param   string  phrase to make human-readable
+	 * @return  string
+	 */
+	public static function humanize($str)
+	{
+		return preg_replace('/[_-]+/', ' ', trim($str));
+	}
+
+} // End Inflector
diff --git a/includes/kohana/system/classes/kohana/kohana/exception.php b/includes/kohana/system/classes/kohana/kohana/exception.php
new file mode 100644
index 0000000..101c839
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/kohana/exception.php
@@ -0,0 +1,206 @@
+<?php defined('SYSPATH') or die('No direct access');
+/**
+ * Kohana exception class. Translates exceptions using the [I18n] class.
+ *
+ * @package    Kohana
+ * @category   Exceptions
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Kohana_Exception extends Exception {
+
+	/**
+	 * @var  array  PHP error code => human readable name
+	 */
+	public static $php_errors = array(
+		E_ERROR              => 'Fatal Error',
+		E_USER_ERROR         => 'User Error',
+		E_PARSE              => 'Parse Error',
+		E_WARNING            => 'Warning',
+		E_USER_WARNING       => 'User Warning',
+		E_STRICT             => 'Strict',
+		E_NOTICE             => 'Notice',
+		E_RECOVERABLE_ERROR  => 'Recoverable Error',
+	);
+
+	/**
+	 * @var  string  error rendering view
+	 */
+	public static $error_view = 'kohana/error';
+
+	/**
+	 * Creates a new translated exception.
+	 *
+	 *     throw new Kohana_Exception('Something went terrible wrong, :user',
+	 *         array(':user' => $user));
+	 *
+	 * @param   string          error message
+	 * @param   array           translation variables
+	 * @param   integer|string  the exception code
+	 * @return  void
+	 */
+	public function __construct($message, array $variables = NULL, $code = 0)
+	{
+		if (defined('E_DEPRECATED'))
+		{
+			// E_DEPRECATED only exists in PHP >= 5.3.0
+			Kohana_Exception::$php_errors[E_DEPRECATED] = 'Deprecated';
+		}
+
+		// Save the unmodified code
+		// @link http://bugs.php.net/39615
+		$this->code = $code;
+
+		// Set the message
+		$message = __($message, $variables);
+
+		// Pass the message and integer code to the parent
+		parent::__construct($message, (int) $code);
+	}
+
+	/**
+	 * Magic object-to-string method.
+	 *
+	 *     echo $exception;
+	 *
+	 * @uses    Kohana_Exception::text
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return Kohana_Exception::text($this);
+	}
+
+	/**
+	 * Inline exception handler, displays the error message, source of the
+	 * exception, and the stack trace of the error.
+	 *
+	 * @uses    Kohana_Exception::text
+	 * @param   object   exception object
+	 * @return  boolean
+	 */
+	public static function handler(Exception $e)
+	{
+		try
+		{
+			// Get the exception information
+			$type    = get_class($e);
+			$code    = $e->getCode();
+			$message = $e->getMessage();
+			$file    = $e->getFile();
+			$line    = $e->getLine();
+
+			// Get the exception backtrace
+			$trace = $e->getTrace();
+
+			if ($e instanceof ErrorException)
+			{
+				if (isset(Kohana_Exception::$php_errors[$code]))
+				{
+					// Use the human-readable error name
+					$code = Kohana_Exception::$php_errors[$code];
+				}
+
+				if (version_compare(PHP_VERSION, '5.3', '<'))
+				{
+					// Workaround for a bug in ErrorException::getTrace() that exists in
+					// all PHP 5.2 versions. @see http://bugs.php.net/bug.php?id=45895
+					for ($i = count($trace) - 1; $i > 0; --$i)
+					{
+						if (isset($trace[$i - 1]['args']))
+						{
+							// Re-position the args
+							$trace[$i]['args'] = $trace[$i - 1]['args'];
+
+							// Remove the args
+							unset($trace[$i - 1]['args']);
+						}
+					}
+				}
+			}
+
+			// Create a text version of the exception
+			$error = Kohana_Exception::text($e);
+
+			if (is_object(Kohana::$log))
+			{
+				// Add this exception to the log
+				Kohana::$log->add(Log::ERROR, $error);
+
+				// Make sure the logs are written
+				Kohana::$log->write();
+			}
+
+			if (Kohana::$is_cli)
+			{
+				// Just display the text of the exception
+				echo "\n{$error}\n";
+
+				exit(1);
+			}
+
+			if ( ! headers_sent())
+			{
+				// Make sure the proper http header is sent
+				$http_header_status = ($e instanceof HTTP_Exception) ? $code : 500;
+
+				header('Content-Type: text/html; charset='.Kohana::$charset, TRUE, $http_header_status);
+			}
+
+			if (Request::$current !== NULL AND Request::current()->is_ajax() === TRUE)
+			{
+				// Just display the text of the exception
+				echo "\n{$error}\n";
+
+				exit(1);
+			}
+
+			// Start an output buffer
+			ob_start();
+
+			// Include the exception HTML
+			if ($view_file = Kohana::find_file('views', Kohana_Exception::$error_view))
+			{
+				include $view_file;
+			}
+			else
+			{
+				throw new Kohana_Exception('Error view file does not exist: views/:file', array(
+					':file' => Kohana_Exception::$error_view,
+				));
+			}
+
+			// Display the contents of the output buffer
+			echo ob_get_clean();
+
+			exit(1);
+		}
+		catch (Exception $e)
+		{
+			// Clean the output buffer if one exists
+			ob_get_level() and ob_clean();
+
+			// Display the exception text
+			echo Kohana_Exception::text($e), "\n";
+
+			// Exit with an error status
+			exit(1);
+		}
+	}
+
+	/**
+	 * Get a single line of text representing the exception:
+	 *
+	 * Error [ Code ]: Message ~ File [ Line ]
+	 *
+	 * @param   object  Exception
+	 * @return  string
+	 */
+	public static function text(Exception $e)
+	{
+		return sprintf('%s [ %s ]: %s ~ %s [ %d ]',
+			get_class($e), $e->getCode(), strip_tags($e->getMessage()), Debug::path($e->getFile()), $e->getLine());
+	}
+
+} // End Kohana_Exception
diff --git a/includes/kohana/system/classes/kohana/log.php b/includes/kohana/system/classes/kohana/log.php
new file mode 100644
index 0000000..46240ef
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log.php
@@ -0,0 +1,205 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Message logging with observer-based log writing.
+ *
+ * [!!] This class does not support extensions, only additional writers.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log {
+
+	// Log message levels - Windows users see PHP Bug #18090
+	const EMERGENCY = LOG_EMERG;    // 0
+	const ALERT     = LOG_ALERT;    // 1
+	const CRITICAL  = LOG_CRIT;     // 2
+	const ERROR     = LOG_ERR;      // 3
+	const WARNING   = LOG_WARNING;  // 4
+	const NOTICE    = LOG_NOTICE;   // 5
+	const INFO      = LOG_INFO;     // 6
+	const DEBUG     = LOG_DEBUG;    // 7
+
+	/**
+	 * @var  string  timestamp format for log entries
+	 */
+	public static $timestamp = 'Y-m-d H:i:s';
+
+	/**
+	 * @var  string  timezone for log entries
+	 */
+	public static $timezone;
+
+	/**
+	 * @var  boolean  immediately write when logs are added
+	 */
+	public static $write_on_add = FALSE;
+
+	/**
+	 * @var  Log  Singleton instance container
+	 */
+	protected static $_instance;
+
+	/**
+	 * Get the singleton instance of this class and enable writing at shutdown.
+	 *
+	 *     $log = Log::instance();
+	 *
+	 * @return  Log
+	 */
+	public static function instance()
+	{
+		if (Log::$_instance === NULL)
+		{
+			// Create a new instance
+			Log::$_instance = new Log;
+
+			// Write the logs at shutdown
+			register_shutdown_function(array(Log::$_instance, 'write'));
+		}
+
+		return Log::$_instance;
+	}
+
+	/**
+	 * @var  array  list of added messages
+	 */
+	protected $_messages = array();
+
+	/**
+	 * @var  array  list of log writers
+	 */
+	protected $_writers = array();
+
+	/**
+	 * Attaches a log writer, and optionally limits the levels of messages that
+	 * will be written by the writer.
+	 *
+	 *     $log->attach($writer);
+	 *
+	 * @param   object   Log_Writer instance
+	 * @param   mixed    array of messages levels to write OR max level to write
+	 * @param   integer  min level to write IF $levels is not an array
+	 * @return  Log
+	 */
+	public function attach(Log_Writer $writer, $levels = array(), $min_level = 0)
+	{
+		if ( ! is_array($levels))
+		{
+			$levels = range($min_level, $levels);
+		}
+		
+		$this->_writers["{$writer}"] = array
+		(
+			'object' => $writer,
+			'levels' => $levels
+		);
+
+		return $this;
+	}
+
+	/**
+	 * Detaches a log writer. The same writer object must be used.
+	 *
+	 *     $log->detach($writer);
+	 *
+	 * @param   object  Log_Writer instance
+	 * @return  Log
+	 */
+	public function detach(Log_Writer $writer)
+	{
+		// Remove the writer
+		unset($this->_writers["{$writer}"]);
+
+		return $this;
+	}
+
+	/**
+	 * Adds a message to the log. Replacement values must be passed in to be
+	 * replaced using [strtr](http://php.net/strtr).
+	 *
+	 *     $log->add(Log::ERROR, 'Could not locate user: :user', array(
+	 *         ':user' => $username,
+	 *     ));
+	 *
+	 * @param   string  level of message
+	 * @param   string  message body
+	 * @param   array   values to replace in the message
+	 * @return  Log
+	 */
+	public function add($level, $message, array $values = NULL)
+	{
+		if ($values)
+		{
+			// Insert the values into the message
+			$message = strtr($message, $values);
+		}
+
+		// Create a new message and timestamp it
+		$this->_messages[] = array
+		(
+			'time'  => Date::formatted_time('now', Log::$timestamp, Log::$timezone),
+			'level' => $level,
+			'body'  => $message,
+		);
+
+		if (Log::$write_on_add)
+		{
+			// Write logs as they are added
+			$this->write();
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Write and clear all of the messages.
+	 *
+	 *     $log->write();
+	 *
+	 * @return  void
+	 */
+	public function write()
+	{
+		if (empty($this->_messages))
+		{
+			// There is nothing to write, move along
+			return;
+		}
+
+		// Import all messages locally
+		$messages = $this->_messages;
+
+		// Reset the messages array
+		$this->_messages = array();
+
+		foreach ($this->_writers as $writer)
+		{
+			if (empty($writer['levels']))
+			{
+				// Write all of the messages
+				$writer['object']->write($messages);
+			}
+			else
+			{
+				// Filtered messages
+				$filtered = array();
+
+				foreach ($messages as $message)
+				{
+					if (in_array($message['level'], $writer['levels']))
+					{
+						// Writer accepts this kind of message
+						$filtered[] = $message;
+					}
+				}
+
+				// Write the filtered messages
+				$writer['object']->write($filtered);
+			}
+		}
+	}
+
+} // End Kohana_Log
diff --git a/includes/kohana/system/classes/kohana/log/file.php b/includes/kohana/system/classes/kohana/log/file.php
new file mode 100644
index 0000000..9bb2750
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log/file.php
@@ -0,0 +1,95 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * File log writer. Writes out messages and stores them in a YYYY/MM directory.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_File extends Log_Writer {
+
+	/**
+	 * @var  string  Directory to place log files in
+	 */
+	protected $_directory;
+
+	/**
+	 * Creates a new file logger. Checks that the directory exists and
+	 * is writable.
+	 *
+	 *     $writer = new Log_File($directory);
+	 *
+	 * @param   string  log directory
+	 * @return  void
+	 */
+	public function __construct($directory)
+	{
+		if ( ! is_dir($directory) OR ! is_writable($directory))
+		{
+			throw new Kohana_Exception('Directory :dir must be writable',
+				array(':dir' => Debug::path($directory)));
+		}
+
+		// Determine the directory path
+		$this->_directory = realpath($directory).DIRECTORY_SEPARATOR;
+	}
+
+	/**
+	 * Writes each of the messages into the log file. The log file will be
+	 * appended to the `YYYY/MM/DD.log.php` file, where YYYY is the current
+	 * year, MM is the current month, and DD is the current day.
+	 *
+	 *     $writer->write($messages);
+	 *
+	 * @param   array   messages
+	 * @return  void
+	 */
+	public function write(array $messages)
+	{
+		// Set the yearly directory name
+		$directory = $this->_directory.date('Y');
+
+		if ( ! is_dir($directory))
+		{
+			// Create the yearly directory
+			mkdir($directory, 02777);
+
+			// Set permissions (must be manually set to fix umask issues)
+			chmod($directory, 02777);
+		}
+
+		// Add the month to the directory
+		$directory .= DIRECTORY_SEPARATOR.date('m');
+
+		if ( ! is_dir($directory))
+		{
+			// Create the yearly directory
+			mkdir($directory, 02777);
+
+			// Set permissions (must be manually set to fix umask issues)
+			chmod($directory, 02777);
+		}
+
+		// Set the name of the log file
+		$filename = $directory.DIRECTORY_SEPARATOR.date('d').EXT;
+
+		if ( ! file_exists($filename))
+		{
+			// Create the log file
+			file_put_contents($filename, Kohana::FILE_SECURITY.' ?>'.PHP_EOL);
+
+			// Allow anyone to write to log files
+			chmod($filename, 0666);
+		}
+
+		foreach ($messages as $message)
+		{
+			// Write each message into the log file
+			// Format: time --- level: body
+			file_put_contents($filename, PHP_EOL.$message['time'].' --- '.$this->_log_levels[$message['level']].': '.$message['body'], FILE_APPEND);
+		}
+	}
+
+} // End Kohana_Log_File
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/log/stderr.php b/includes/kohana/system/classes/kohana/log/stderr.php
new file mode 100644
index 0000000..f75b9ee
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log/stderr.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * STDERR log writer. Writes out messages to STDERR.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Log_StdErr extends Kohana_Log_Writer {
+	/**
+	 * Writes each of the messages to STDERR.
+	 *
+	 *     $writer->write($messages);
+	 *
+	 * @param   array   messages
+	 * @return  void
+	 */
+	public function write(array $messages)
+	{
+		// Set the log line format
+		$format = 'time --- type: body';
+
+		foreach ($messages as $message)
+		{
+			// Writes out each message
+			fwrite(STDERR, PHP_EOL.strtr($format, $message));
+		}
+	}
+} // End Kohana_Log_StdErr
diff --git a/includes/kohana/system/classes/kohana/log/stdout.php b/includes/kohana/system/classes/kohana/log/stdout.php
new file mode 100644
index 0000000..2e7e801
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log/stdout.php
@@ -0,0 +1,31 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * STDOUT log writer. Writes out messages to STDOUT.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_Log_StdOut extends Kohana_Log_Writer {
+	/**
+	 * Writes each of the messages to STDOUT.
+	 *
+	 *     $writer->write($messages);
+	 *
+	 * @param   array   messages
+	 * @return  void
+	 */
+	public function write(array $messages)
+	{
+		// Set the log line format
+		$format = 'time --- type: body';
+
+		foreach ($messages as $message)
+		{
+			// Writes out each message
+			fwrite(STDOUT, PHP_EOL.strtr($format, $message));
+		}
+	}
+} // End Kohana_Log_StdOut
diff --git a/includes/kohana/system/classes/kohana/log/syslog.php b/includes/kohana/system/classes/kohana/log/syslog.php
new file mode 100644
index 0000000..459c7b6
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log/syslog.php
@@ -0,0 +1,70 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Syslog log writer.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Jeremy Bush
+ * @copyright  (c) 2010 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Log_Syslog extends Log_Writer {
+
+	/**
+	 * @var  string  The syslog identifier
+	 */
+	protected $_ident;
+
+	/**
+	 * @var  array  log levels
+	 */
+	protected $_syslog_levels = array('ERROR'    => LOG_ERR,
+	                                  'CRITICAL' => LOG_CRIT,
+	                                  'STRACE'   => LOG_ALERT,
+	                                  'ALERT'    => LOG_WARNING,
+	                                  'INFO'     => LOG_INFO,
+	                                  'DEBUG'    => LOG_DEBUG);
+
+	/**
+	 * Creates a new syslog logger.
+	 *
+	 * @see http://us2.php.net/openlog
+	 *
+	 * @param   string  syslog identifier
+	 * @param   int     facility to log to
+	 * @return  void
+	 */
+	public function __construct($ident = 'KohanaPHP', $facility = LOG_USER)
+	{
+		$this->_ident = $ident;
+
+		// Open the connection to syslog
+		openlog($this->_ident, LOG_CONS, $facility);
+	}
+
+	/**
+	 * Writes each of the messages into the syslog.
+	 *
+	 * @param   array   messages
+	 * @return  void
+	 */
+	public function write(array $messages)
+	{
+		foreach ($messages as $message)
+		{
+			syslog($message['level'], $message['body']);
+		}
+	}
+
+	/**
+	 * Closes the syslog connection
+	 *
+	 * @return  void
+	 */
+	public function __destruct()
+	{
+		// Close connection to syslog
+		closelog();
+	}
+
+} // End Kohana_Log_Syslog
diff --git a/includes/kohana/system/classes/kohana/log/writer.php b/includes/kohana/system/classes/kohana/log/writer.php
new file mode 100644
index 0000000..2b46b1c
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/log/writer.php
@@ -0,0 +1,49 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Log writer abstract class. All [Log] writers must extend this class.
+ *
+ * @package    Kohana
+ * @category   Logging
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Log_Writer {
+
+	/**
+	 * Numeric log level to string lookup table.
+	 * @var array 
+	 */
+	protected $_log_levels = array(
+		LOG_EMERG   => 'EMERGENCY',
+		LOG_CRIT    => 'CRITICAL',
+		LOG_ERR     => 'ERROR',
+		LOG_WARNING => 'WARNING',
+		LOG_NOTICE  => 'NOTICE',
+		LOG_INFO    => 'INFO',
+		LOG_DEBUG   => 'DEBUG',
+	);
+
+	/**
+	 * Write an array of messages.
+	 *
+	 *     $writer->write($messages);
+	 *
+	 * @param   array  messages
+	 * @return  void
+	 */
+	abstract public function write(array $messages);
+
+	/**
+	 * Allows the writer to have a unique key when stored.
+	 *
+	 *     echo $writer;
+	 *
+	 * @return  string
+	 */
+	final public function __toString()
+	{
+		return spl_object_hash($this);
+	}
+
+} // End Kohana_Log_Writer
diff --git a/includes/kohana/system/classes/kohana/model.php b/includes/kohana/system/classes/kohana/model.php
new file mode 100644
index 0000000..e41aefc
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/model.php
@@ -0,0 +1,29 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Model base class. All models should extend this class.
+ *
+ * @package    Kohana
+ * @category   Models
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Model {
+
+	/**
+	 * Create a new model instance.
+	 *
+	 *     $model = Model::factory($name);
+	 *
+	 * @param   string   model name
+	 * @return  Model
+	 */
+	public static function factory($name)
+	{
+		// Add the model prefix
+		$class = 'Model_'.$name;
+
+		return new $class;
+	}
+
+} // End Model
diff --git a/includes/kohana/system/classes/kohana/num.php b/includes/kohana/system/classes/kohana/num.php
new file mode 100644
index 0000000..f90bcee
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/num.php
@@ -0,0 +1,234 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Number helper class. Provides additional formatting methods that for working
+ * with numbers.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Num {
+
+	const ROUND_HALF_UP		= 1;
+	const ROUND_HALF_DOWN	= 2;
+	const ROUND_HALF_EVEN	= 3;
+	const ROUND_HALF_ODD	= 4;
+
+	/**
+	 * @var  array  Valid byte units => power of 2 that defines the unit's size
+	 */
+	public static $byte_units = array
+	(
+		'B'   => 0,
+		'K'   => 10,
+		'Ki'  => 10,
+		'KB'  => 10,
+		'KiB' => 10,
+		'M'   => 20,
+		'Mi'  => 20,
+		'MB'  => 20,
+		'MiB' => 20,
+		'G'   => 30,
+		'Gi'  => 30,
+		'GB'  => 30,
+		'GiB' => 30,
+		'T'   => 40,
+		'Ti'  => 40,
+		'TB'  => 40,
+		'TiB' => 40,
+		'P'   => 50,
+		'Pi'  => 50,
+		'PB'  => 50,
+		'PiB' => 50,
+		'E'   => 60,
+		'Ei'  => 60,
+		'EB'  => 60,
+		'EiB' => 60,
+		'Z'   => 70,
+		'Zi'  => 70,
+		'ZB'  => 70,
+		'ZiB' => 70,
+		'Y'   => 80,
+		'Yi'  => 80,
+		'YB'  => 80,
+		'YiB' => 80,
+	);
+
+	/**
+	 * Returns the English ordinal suffix (th, st, nd, etc) of a number.
+	 *
+	 *     echo 2, Num::ordinal(2);   // "2nd"
+	 *     echo 10, Num::ordinal(10); // "10th"
+	 *     echo 33, Num::ordinal(33); // "33rd"
+	 *
+	 * @param   integer  number
+	 * @return  string
+	 */
+	public static function ordinal($number)
+	{
+		if ($number % 100 > 10 AND $number % 100 < 14)
+		{
+			return 'th';
+		}
+
+		switch ($number % 10)
+		{
+			case 1:
+				return 'st';
+			case 2:
+				return 'nd';
+			case 3:
+				return 'rd';
+			default:
+				return 'th';
+		}
+	}
+
+	/**
+	 * Locale-aware number and monetary formatting.
+	 *
+	 *     // In English, "1,200.05"
+	 *     // In Spanish, "1200,05"
+	 *     // In Portuguese, "1 200,05"
+	 *     echo Num::format(1200.05, 2);
+	 *
+	 *     // In English, "1,200.05"
+	 *     // In Spanish, "1.200,05"
+	 *     // In Portuguese, "1.200.05"
+	 *     echo Num::format(1200.05, 2, TRUE);
+	 *
+	 * @param   float    number to format
+	 * @param   integer  decimal places
+	 * @param   boolean  monetary formatting?
+	 * @return  string
+	 * @since   3.0.2
+	 */
+	public static function format($number, $places, $monetary = FALSE)
+	{
+		$info = localeconv();
+
+		if ($monetary)
+		{
+			$decimal   = $info['mon_decimal_point'];
+			$thousands = $info['mon_thousands_sep'];
+		}
+		else
+		{
+			$decimal   = $info['decimal_point'];
+			$thousands = $info['thousands_sep'];
+		}
+
+		return number_format($number, $places, $decimal, $thousands);
+	}
+
+	/**
+	 * Round a number to a specified precision, using a specified tie breaking technique
+	 *
+	 * @param float $value Number to round
+	 * @param integer $precision Desired precision
+	 * @param integer $mode Tie breaking mode, accepts the PHP_ROUND_HALF_* constants
+	 * @param boolean $native Set to false to force use of the userland implementation
+	 * @return float Rounded number
+	 */
+	public static function round($value, $precision = 0, $mode = self::ROUND_HALF_UP, $native = true)
+	{
+		if (version_compare(PHP_VERSION, '5.3', '>=') AND $native)
+		{
+			return round($value, $precision, $mode);
+		}
+
+		if ($mode === self::ROUND_HALF_UP)
+		{
+			return round($value, $precision);
+		}
+		else
+		{
+			$factor = ($precision === 0) ? 1 : pow(10, $precision);
+
+			switch ($mode)
+			{
+				case self::ROUND_HALF_DOWN:
+				case self::ROUND_HALF_EVEN:
+				case self::ROUND_HALF_ODD:
+					// Check if we have a rounding tie, otherwise we can just call round()
+					if (($value * $factor) - floor($value * $factor) === 0.5)
+					{
+						if ($mode === self::ROUND_HALF_DOWN)
+						{
+							// Round down operation, so we round down unless the value
+							// is -ve because up is down and down is up down there. ;)
+							$up = ($value < 0);
+						}
+						else
+						{
+							// Round up if the integer is odd and the round mode is set to even
+							// or the integer is even and the round mode is set to odd.
+							// Any other instance round down.
+							$up = ( ! ( ! (floor($value * $factor) & 1)) === ($mode === self::ROUND_HALF_EVEN));
+						}
+
+						if ($up)
+						{
+							$value = ceil($value * $factor);
+						}
+						else
+						{
+							$value = floor($value * $factor);
+						}
+						return $value / $factor;
+					}
+					else
+					{
+						return round($value, $precision);
+					}
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Converts a file size number to a byte value. File sizes are defined in
+	 * the format: SB, where S is the size (1, 8.5, 300, etc.) and B is the
+	 * byte unit (K, MiB, GB, etc.). All valid byte units are defined in
+	 * Num::$byte_units
+	 *
+	 *     echo Num::bytes('200K');  // 204800
+	 *     echo Num::bytes('5MiB');  // 5242880
+	 *     echo Num::bytes('1000');  // 1000
+	 *     echo Num::bytes('2.5GB'); // 2684354560
+	 *
+	 * @param   string   file size in SB format
+	 * @return  float
+	 */
+	public static function bytes($size)
+	{
+		// Prepare the size
+		$size = trim( (string) $size);
+
+		// Construct an OR list of byte units for the regex
+		$accepted = implode('|', array_keys(Num::$byte_units));
+
+		// Construct the regex pattern for verifying the size format
+		$pattern = '/^([0-9]+(?:\.[0-9]+)?)('.$accepted.')?$/Di';
+
+		// Verify the size format and store the matching parts
+		if ( ! preg_match($pattern, $size, $matches))
+			throw new Kohana_Exception('The byte unit size, ":size", is improperly formatted.', array(
+				':size' => $size,
+			));
+
+		// Find the float value of the size
+		$size = (float) $matches[1];
+
+		// Find the actual unit, assume B if no unit specified
+		$unit = Arr::get($matches, 2, 'B');
+
+		// Convert the size into bytes
+		$bytes = $size * pow(2, Num::$byte_units[$unit]);
+
+		return $bytes;
+	}
+
+} // End num
diff --git a/includes/kohana/system/classes/kohana/profiler.php b/includes/kohana/system/classes/kohana/profiler.php
new file mode 100644
index 0000000..2ca24d3
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/profiler.php
@@ -0,0 +1,385 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Provides simple benchmarking and profiling. To display the statistics that
+ * have been collected, load the `profiler/stats` [View]:
+ *
+ *     echo View::factory('profiler/stats');
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Profiler {
+
+	/**
+	 * @var  integer   maximium number of application stats to keep
+	 */
+	public static $rollover = 1000;
+
+	/**
+	 * @var  array  collected benchmarks
+	 */
+	protected static $_marks = array();
+
+	/**
+	 * Starts a new benchmark and returns a unique token. The returned token
+	 * _must_ be used when stopping the benchmark.
+	 *
+	 *     $token = Profiler::start('test', 'profiler');
+	 *
+	 * @param   string  group name
+	 * @param   string  benchmark name
+	 * @return  string
+	 */
+	public static function start($group, $name)
+	{
+		static $counter = 0;
+
+		// Create a unique token based on the counter
+		$token = 'kp/'.base_convert($counter++, 10, 32);
+
+		Profiler::$_marks[$token] = array
+		(
+			'group' => strtolower($group),
+			'name'  => (string) $name,
+
+			// Start the benchmark
+			'start_time'   => microtime(TRUE),
+			'start_memory' => memory_get_usage(),
+
+			// Set the stop keys without values
+			'stop_time'    => FALSE,
+			'stop_memory'  => FALSE,
+		);
+
+		return $token;
+	}
+
+	/**
+	 * Stops a benchmark.
+	 *
+	 *     Profiler::stop($token);
+	 *
+	 * @param   string  token
+	 * @return  void
+	 */
+	public static function stop($token)
+	{
+		// Stop the benchmark
+		Profiler::$_marks[$token]['stop_time']   = microtime(TRUE);
+		Profiler::$_marks[$token]['stop_memory'] = memory_get_usage();
+	}
+
+	/**
+	 * Deletes a benchmark. If an error occurs during the benchmark, it is
+	 * recommended to delete the benchmark to prevent statistics from being
+	 * adversely affected.
+	 *
+	 *     Profiler::delete($token);
+	 *
+	 * @param   string  token
+	 * @return  void
+	 */
+	public static function delete($token)
+	{
+		// Remove the benchmark
+		unset(Profiler::$_marks[$token]);
+	}
+
+	/**
+	 * Returns all the benchmark tokens by group and name as an array.
+	 *
+	 *     $groups = Profiler::groups();
+	 *
+	 * @return  array
+	 */
+	public static function groups()
+	{
+		$groups = array();
+
+		foreach (Profiler::$_marks as $token => $mark)
+		{
+			// Sort the tokens by the group and name
+			$groups[$mark['group']][$mark['name']][] = $token;
+		}
+
+		return $groups;
+	}
+
+	/**
+	 * Gets the min, max, average and total of a set of tokens as an array.
+	 *
+	 *     $stats = Profiler::stats($tokens);
+	 *
+	 * @param   array  profiler tokens
+	 * @return  array  min, max, average, total
+	 * @uses    Profiler::total
+	 */
+	public static function stats(array $tokens)
+	{
+		// Min and max are unknown by default
+		$min = $max = array(
+			'time' => NULL,
+			'memory' => NULL);
+
+		// Total values are always integers
+		$total = array(
+			'time' => 0,
+			'memory' => 0);
+
+		foreach ($tokens as $token)
+		{
+			// Get the total time and memory for this benchmark
+			list($time, $memory) = Profiler::total($token);
+
+			if ($max['time'] === NULL OR $time > $max['time'])
+			{
+				// Set the maximum time
+				$max['time'] = $time;
+			}
+
+			if ($min['time'] === NULL OR $time < $min['time'])
+			{
+				// Set the minimum time
+				$min['time'] = $time;
+			}
+
+			// Increase the total time
+			$total['time'] += $time;
+
+			if ($max['memory'] === NULL OR $memory > $max['memory'])
+			{
+				// Set the maximum memory
+				$max['memory'] = $memory;
+			}
+
+			if ($min['memory'] === NULL OR $memory < $min['memory'])
+			{
+				// Set the minimum memory
+				$min['memory'] = $memory;
+			}
+
+			// Increase the total memory
+			$total['memory'] += $memory;
+		}
+
+		// Determine the number of tokens
+		$count = count($tokens);
+
+		// Determine the averages
+		$average = array(
+			'time' => $total['time'] / $count,
+			'memory' => $total['memory'] / $count);
+
+		return array(
+			'min' => $min,
+			'max' => $max,
+			'total' => $total,
+			'average' => $average);
+	}
+
+	/**
+	 * Gets the min, max, average and total of profiler groups as an array.
+	 *
+	 *     $stats = Profiler::group_stats('test');
+	 *
+	 * @param   mixed  single group name string, or array with group names; all groups by default
+	 * @return  array  min, max, average, total
+	 * @uses    Profiler::groups
+	 * @uses    Profiler::stats
+	 */
+	public static function group_stats($groups = NULL)
+	{
+		// Which groups do we need to calculate stats for?
+		$groups = ($groups === NULL)
+			? Profiler::groups()
+			: array_intersect_key(Profiler::groups(), array_flip( (array) $groups));
+
+		// All statistics
+		$stats = array();
+
+		foreach ($groups as $group => $names)
+		{
+			foreach ($names as $name => $tokens)
+			{
+				// Store the stats for each subgroup.
+				// We only need the values for "total".
+				$_stats = Profiler::stats($tokens);
+				$stats[$group][$name] = $_stats['total'];
+			}
+		}
+
+		// Group stats
+		$groups = array();
+
+		foreach ($stats as $group => $names)
+		{
+			// Min and max are unknown by default
+			$groups[$group]['min'] = $groups[$group]['max'] = array(
+				'time' => NULL,
+				'memory' => NULL);
+
+			// Total values are always integers
+			$groups[$group]['total'] = array(
+				'time' => 0,
+				'memory' => 0);
+
+			foreach ($names as $total)
+			{
+				if ( ! isset($groups[$group]['min']['time']) OR $groups[$group]['min']['time'] > $total['time'])
+				{
+					// Set the minimum time
+					$groups[$group]['min']['time'] = $total['time'];
+				}
+				if ( ! isset($groups[$group]['min']['memory']) OR $groups[$group]['min']['memory'] > $total['memory'])
+				{
+					// Set the minimum memory
+					$groups[$group]['min']['memory'] = $total['memory'];
+				}
+
+				if ( ! isset($groups[$group]['max']['time']) OR $groups[$group]['max']['time'] < $total['time'])
+				{
+					// Set the maximum time
+					$groups[$group]['max']['time'] = $total['time'];
+				}
+				if ( ! isset($groups[$group]['max']['memory']) OR $groups[$group]['max']['memory'] < $total['memory'])
+				{
+					// Set the maximum memory
+					$groups[$group]['max']['memory'] = $total['memory'];
+				}
+
+				// Increase the total time and memory
+				$groups[$group]['total']['time']   += $total['time'];
+				$groups[$group]['total']['memory'] += $total['memory'];
+			}
+
+			// Determine the number of names (subgroups)
+			$count = count($names);
+
+			// Determine the averages
+			$groups[$group]['average']['time']   = $groups[$group]['total']['time'] / $count;
+			$groups[$group]['average']['memory'] = $groups[$group]['total']['memory'] / $count;
+		}
+
+		return $groups;
+	}
+
+	/**
+	 * Gets the total execution time and memory usage of a benchmark as a list.
+	 *
+	 *     list($time, $memory) = Profiler::total($token);
+	 *
+	 * @param   string  token
+	 * @return  array   execution time, memory
+	 */
+	public static function total($token)
+	{
+		// Import the benchmark data
+		$mark = Profiler::$_marks[$token];
+
+		if ($mark['stop_time'] === FALSE)
+		{
+			// The benchmark has not been stopped yet
+			$mark['stop_time']   = microtime(TRUE);
+			$mark['stop_memory'] = memory_get_usage();
+		}
+
+		return array
+		(
+			// Total time in seconds
+			$mark['stop_time'] - $mark['start_time'],
+
+			// Amount of memory in bytes
+			$mark['stop_memory'] - $mark['start_memory'],
+		);
+	}
+
+	/**
+	 * Gets the total application run time and memory usage. Caches the result
+	 * so that it can be compared between requests.
+	 *
+	 *     list($time, $memory) = Profiler::application();
+	 *
+	 * @return  array  execution time, memory
+	 * @uses    Kohana::cache
+	 */
+	public static function application()
+	{
+		// Load the stats from cache, which is valid for 1 day
+		$stats = Kohana::cache('profiler_application_stats', NULL, 3600 * 24);
+
+		if ( ! is_array($stats) OR $stats['count'] > Profiler::$rollover)
+		{
+			// Initialize the stats array
+			$stats = array(
+				'min'   => array(
+					'time'   => NULL,
+					'memory' => NULL),
+				'max'   => array(
+					'time'   => NULL,
+					'memory' => NULL),
+				'total' => array(
+					'time'   => NULL,
+					'memory' => NULL),
+				'count' => 0);
+		}
+
+		// Get the application run time
+		$time = microtime(TRUE) - KOHANA_START_TIME;
+
+		// Get the total memory usage
+		$memory = memory_get_usage() - KOHANA_START_MEMORY;
+
+		// Calculate max time
+		if ($stats['max']['time'] === NULL OR $time > $stats['max']['time'])
+		{
+			$stats['max']['time'] = $time;
+		}
+
+		// Calculate min time
+		if ($stats['min']['time'] === NULL OR $time < $stats['min']['time'])
+		{
+			$stats['min']['time'] = $time;
+		}
+
+		// Add to total time
+		$stats['total']['time'] += $time;
+
+		// Calculate max memory
+		if ($stats['max']['memory'] === NULL OR $memory > $stats['max']['memory'])
+		{
+			$stats['max']['memory'] = $memory;
+		}
+
+		// Calculate min memory
+		if ($stats['min']['memory'] === NULL OR $memory < $stats['min']['memory'])
+		{
+			$stats['min']['memory'] = $memory;
+		}
+
+		// Add to total memory
+		$stats['total']['memory'] += $memory;
+
+		// Another mark has been added to the stats
+		$stats['count']++;
+
+		// Determine the averages
+		$stats['average'] = array(
+			'time'   => $stats['total']['time'] / $stats['count'],
+			'memory' => $stats['total']['memory'] / $stats['count']);
+
+		// Cache the new stats
+		Kohana::cache('profiler_application_stats', $stats);
+
+		// Set the current application execution time and memory
+		// Do NOT cache these, they are specific to the current request only
+		$stats['current']['time']   = $time;
+		$stats['current']['memory'] = $memory;
+
+		// Return the total application run time and memory usage
+		return $stats;
+	}
+
+} // End Profiler
diff --git a/includes/kohana/system/classes/kohana/request.php b/includes/kohana/system/classes/kohana/request.php
new file mode 100644
index 0000000..eddd2d7
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/request.php
@@ -0,0 +1,1501 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Request and response wrapper. Uses the [Route] class to determine what
+ * [Controller] to send the request to.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Request implements HTTP_Request {
+
+	/**
+	 * @var  string  client user agent
+	 */
+	public static $user_agent = '';
+
+	/**
+	 * @var  string  client IP address
+	 */
+	public static $client_ip = '0.0.0.0';
+
+	/**
+	 * @var  Request  main request instance
+	 */
+	public static $initial;
+
+	/**
+	 * @var  Request  currently executing request instance
+	 */
+	public static $current;
+
+	/**
+	 * Creates a new request object for the given URI. New requests should be
+	 * created using the [Request::instance] or [Request::factory] methods.
+	 *
+	 *     $request = Request::factory($uri);
+	 *
+	 * If $cache parameter is set, the response for the request will attempt to
+	 * be retrieved from the cache.
+	 *
+	 * @param   string  $uri URI of the request
+	 * @param   Cache   $cache
+	 * @param   array   $injected_routes an array of routes to use, for testing
+	 * @return  void
+	 * @throws  Kohana_Request_Exception
+	 * @uses    Route::all
+	 * @uses    Route::matches
+	 */
+	public static function factory($uri = TRUE, Cache $cache = NULL, $injected_routes = array())
+	{
+		// If this is the initial request
+		if ( ! Request::$initial)
+		{
+			if (Kohana::$is_cli)
+			{
+				// Default protocol for command line is cli://
+				$protocol = 'cli';
+
+				// Get the command line options
+				$options = CLI::options('uri', 'method', 'get', 'post', 'referrer');
+
+				if (isset($options['uri']))
+				{
+					// Use the specified URI
+					$uri = $options['uri'];
+				}
+				elseif ($uri === TRUE)
+				{
+					$uri = '';
+				}
+
+				if (isset($options['method']))
+				{
+					// Use the specified method
+					$method = strtoupper($options['method']);
+				}
+				else
+				{
+					// Default to GET requests
+					$method = HTTP_Request::GET;
+				}
+
+				if (isset($options['get']))
+				{
+					// Overload the global GET data
+					parse_str($options['get'], $_GET);
+				}
+
+				if (isset($options['post']))
+				{
+					// Overload the global POST data
+					parse_str($options['post'], $_POST);
+				}
+
+				if (isset($options['referrer']))
+				{
+					$referrer = $options['referrer'];
+				}
+			}
+			else
+			{
+				if (isset($_SERVER['REQUEST_METHOD']))
+				{
+					// Use the server request method
+					$method = $_SERVER['REQUEST_METHOD'];
+				}
+				else
+				{
+					// Default to GET requests
+					$method = HTTP_Request::GET;
+				}
+
+				if ( ! empty($_SERVER['HTTPS']) AND filter_var($_SERVER['HTTPS'], FILTER_VALIDATE_BOOLEAN))
+				{
+					// This request is secure
+					$protocol = 'https';
+				}
+				else
+				{
+					$protocol = 'http';
+				}
+
+				if (isset($_SERVER['HTTP_REFERER']))
+				{
+					// There is a referrer for this request
+					$referrer = $_SERVER['HTTP_REFERER'];
+				}
+
+				if (isset($_SERVER['HTTP_USER_AGENT']))
+				{
+					// Browser type
+					Request::$user_agent = $_SERVER['HTTP_USER_AGENT'];
+				}
+
+				if (isset($_SERVER['HTTP_X_REQUESTED_WITH']))
+				{
+					// Typically used to denote AJAX requests
+					$requested_with = $_SERVER['HTTP_X_REQUESTED_WITH'];
+				}
+
+				if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+				{
+					// Use the forwarded IP address, typically set when the
+					// client is using a proxy server.
+					Request::$client_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+				}
+				elseif (isset($_SERVER['HTTP_CLIENT_IP']))
+				{
+					// Use the forwarded IP address, typically set when the
+					// client is using a proxy server.
+					Request::$client_ip = $_SERVER['HTTP_CLIENT_IP'];
+				}
+				elseif (isset($_SERVER['REMOTE_ADDR']))
+				{
+					// The remote IP address
+					Request::$client_ip = $_SERVER['REMOTE_ADDR'];
+				}
+
+				if ($method !== 'GET')
+				{
+					// Ensure the raw body is saved for future use
+					$body = file_get_contents('php://input');
+				}
+
+				if ($uri === TRUE)
+				{
+					// Attempt to guess the proper URI
+					$uri = Request::detect_uri();
+				}
+			}
+
+			// Create the instance singleton
+			Request::$initial = $request = new Request($uri, $cache);
+
+			// Store global GET and POST data in the initial request only
+			$request->query($_GET);
+			$request->post($_POST);
+
+			if (isset($protocol))
+			{
+				// Set the request protocol
+				$request->protocol($protocol);
+			}
+
+			if (isset($method))
+			{
+				// Set the request method
+				$request->method($method);
+			}
+
+			if (isset($referrer))
+			{
+				// Set the referrer
+				$request->referrer($referrer);
+			}
+
+			if (isset($requested_with))
+			{
+				// Apply the requested with variable
+				$request->requested_with($requested_with);
+			}
+
+			if (isset($body))
+			{
+				// Set the request body (probably a PUT type)
+				$request->body($body);
+			}
+		}
+		else
+		{
+			$request = new Request($uri, $cache, $injected_routes);
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Automatically detects the URI of the main request using PATH_INFO,
+	 * REQUEST_URI, PHP_SELF or REDIRECT_URL.
+	 *
+	 *     $uri = Request::detect_uri();
+	 *
+	 * @return  string  URI of the main request
+	 * @throws  Kohana_Exception
+	 * @since   3.0.8
+	 */
+	public static function detect_uri()
+	{
+		if ( ! empty($_SERVER['PATH_INFO']))
+		{
+			// PATH_INFO does not contain the docroot or index
+			$uri = $_SERVER['PATH_INFO'];
+		}
+		else
+		{
+			// REQUEST_URI and PHP_SELF include the docroot and index
+
+			if (isset($_SERVER['REQUEST_URI']))
+			{
+				/**
+				 * We use REQUEST_URI as the fallback value. The reason
+				 * for this is we might have a malformed URL such as:
+				 *
+				 *  http://localhost/http://example.com/judge.php
+				 *
+				 * which parse_url can't handle. So rather than leave empty
+				 * handed, we'll use this.
+				 */
+				$uri = $_SERVER['REQUEST_URI'];
+
+				if ($request_uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH))
+				{
+					// Valid URL path found, set it.
+					$uri = $request_uri;
+				}
+
+				// Decode the request URI
+				$uri = rawurldecode($uri);
+			}
+			elseif (isset($_SERVER['PHP_SELF']))
+			{
+				$uri = $_SERVER['PHP_SELF'];
+			}
+			elseif (isset($_SERVER['REDIRECT_URL']))
+			{
+				$uri = $_SERVER['REDIRECT_URL'];
+			}
+			else
+			{
+				// If you ever see this error, please report an issue at http://dev.kohanaphp.com/projects/kohana3/issues
+				// along with any relevant information about your web server setup. Thanks!
+				throw new Kohana_Exception('Unable to detect the URI using PATH_INFO, REQUEST_URI, PHP_SELF or REDIRECT_URL');
+			}
+
+			// Get the path from the base URL, including the index file
+			$base_url = parse_url(Kohana::$base_url, PHP_URL_PATH);
+
+			if (strpos($uri, $base_url) === 0)
+			{
+				// Remove the base URL from the URI
+				$uri = (string) substr($uri, strlen($base_url));
+			}
+
+			if (Kohana::$index_file AND strpos($uri, Kohana::$index_file) === 0)
+			{
+				// Remove the index file from the URI
+				$uri = (string) substr($uri, strlen(Kohana::$index_file));
+			}
+		}
+
+		return $uri;
+	}
+
+	/**
+	 * Return the currently executing request. This is changed to the current
+	 * request when [Request::execute] is called and restored when the request
+	 * is completed.
+	 *
+	 *     $request = Request::current();
+	 *
+	 * @return  Request
+	 * @since   3.0.5
+	 */
+	public static function current()
+	{
+		return Request::$current;
+	}
+
+	/**
+	 * Returns the first request encountered by this framework. This will should
+	 * only be set once during the first [Request::factory] invocation.
+	 *
+	 *     // Get the first request
+	 *     $request = Request::initial();
+	 *
+	 *     // Test whether the current request is the first request
+	 *     if (Request::initial() === Request::current())
+	 *          // Do something useful
+	 *
+	 * @return  Request
+	 * @since   3.1.0
+	 */
+	public static function initial()
+	{
+		return Request::$initial;
+	}
+
+	/**
+	 * Returns information about the client user agent.
+	 *
+	 *     // Returns "Chrome" when using Google Chrome
+	 *     $browser = Request::user_agent('browser');
+	 *
+	 * Multiple values can be returned at once by using an array:
+	 *
+	 *     // Get the browser and platform with a single call
+	 *     $info = Request::user_agent(array('browser', 'platform'));
+	 *
+	 * When using an array for the value, an associative array will be returned.
+	 *
+	 * @param   mixed   $value String to return: browser, version, robot, mobile, platform; or array of values
+	 * @return  mixed   requested information, FALSE if nothing is found
+	 * @uses    Kohana::config
+	 * @uses    Request::$user_agent
+	 */
+	public static function user_agent($value)
+	{
+		if (is_array($value))
+		{
+			$agent = array();
+			foreach ($value as $v)
+			{
+				// Add each key to the set
+				$agent[$v] = Request::user_agent($v);
+			}
+
+			return $agent;
+		}
+
+		static $info;
+
+		if (isset($info[$value]))
+		{
+			// This value has already been found
+			return $info[$value];
+		}
+
+		if ($value === 'browser' OR $value == 'version')
+		{
+			// Load browsers
+			$browsers = Kohana::config('user_agents')->browser;
+
+			foreach ($browsers as $search => $name)
+			{
+				if (stripos(Request::$user_agent, $search) !== FALSE)
+				{
+					// Set the browser name
+					$info['browser'] = $name;
+
+					if (preg_match('#'.preg_quote($search).'[^0-9.]*+([0-9.][0-9.a-z]*)#i', Request::$user_agent, $matches))
+					{
+						// Set the version number
+						$info['version'] = $matches[1];
+					}
+					else
+					{
+						// No version number found
+						$info['version'] = FALSE;
+					}
+
+					return $info[$value];
+				}
+			}
+		}
+		else
+		{
+			// Load the search group for this type
+			$group = Kohana::config('user_agents')->$value;
+
+			foreach ($group as $search => $name)
+			{
+				if (stripos(Request::$user_agent, $search) !== FALSE)
+				{
+					// Set the value name
+					return $info[$value] = $name;
+				}
+			}
+		}
+
+		// The value requested could not be found
+		return $info[$value] = FALSE;
+	}
+
+	/**
+	 * Returns the accepted content types. If a specific type is defined,
+	 * the quality of that type will be returned.
+	 *
+	 *     $types = Request::accept_type();
+	 *
+	 * @param   string  $type Content MIME type
+	 * @return  mixed   An array of all types or a specific type as a string
+	 * @uses    Request::_parse_accept
+	 */
+	public static function accept_type($type = NULL)
+	{
+		static $accepts;
+
+		if ($accepts === NULL)
+		{
+			// Parse the HTTP_ACCEPT header
+			$accepts = Request::_parse_accept($_SERVER['HTTP_ACCEPT'], array('*/*' => 1.0));
+		}
+
+		if (isset($type))
+		{
+			// Return the quality setting for this type
+			return isset($accepts[$type]) ? $accepts[$type] : $accepts['*/*'];
+		}
+
+		return $accepts;
+	}
+
+	/**
+	 * Returns the accepted languages. If a specific language is defined,
+	 * the quality of that language will be returned. If the language is not
+	 * accepted, FALSE will be returned.
+	 *
+	 *     $langs = Request::accept_lang();
+	 *
+	 * @param   string  $lang  Language code
+	 * @return  mixed   An array of all types or a specific type as a string
+	 * @uses    Request::_parse_accept
+	 */
+	public static function accept_lang($lang = NULL)
+	{
+		static $accepts;
+
+		if ($accepts === NULL)
+		{
+			// Parse the HTTP_ACCEPT_LANGUAGE header
+			$accepts = Request::_parse_accept($_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		}
+
+		if (isset($lang))
+		{
+			// Return the quality setting for this lang
+			return isset($accepts[$lang]) ? $accepts[$lang] : FALSE;
+		}
+
+		return $accepts;
+	}
+
+	/**
+	 * Returns the accepted encodings. If a specific encoding is defined,
+	 * the quality of that encoding will be returned. If the encoding is not
+	 * accepted, FALSE will be returned.
+	 *
+	 *     $encodings = Request::accept_encoding();
+	 *
+	 * @param   string  $type Encoding type
+	 * @return  mixed   An array of all types or a specific type as a string
+	 * @uses    Request::_parse_accept
+	 */
+	public static function accept_encoding($type = NULL)
+	{
+		static $accepts;
+
+		if ($accepts === NULL)
+		{
+			// Parse the HTTP_ACCEPT_LANGUAGE header
+			$accepts = Request::_parse_accept($_SERVER['HTTP_ACCEPT_ENCODING']);
+		}
+
+		if (isset($type))
+		{
+			// Return the quality setting for this type
+			return isset($accepts[$type]) ? $accepts[$type] : FALSE;
+		}
+
+		return $accepts;
+	}
+
+	/**
+	 * Determines if a file larger than the post_max_size has been uploaded. PHP
+	 * does not handle this situation gracefully on its own, so this method
+	 * helps to solve that problem.
+	 *
+	 * @return  boolean
+	 * @uses    Num::bytes
+	 * @uses    Arr::get
+	 */
+	public static function post_max_size_exceeded()
+	{
+		// Make sure the request method is POST
+		if (Request::$initial->method() !== HTTP_Request::POST)
+			return FALSE;
+
+		// Get the post_max_size in bytes
+		$max_bytes = Num::bytes(ini_get('post_max_size'));
+
+		// Error occurred if method is POST, and content length is too long
+		return (Arr::get($_SERVER, 'CONTENT_LENGTH') > $max_bytes);
+	}
+
+	/**
+	 * Process URI
+	 *
+	 * @param   string  $uri     URI
+	 * @param   array   $routes  Route
+	 * @return  array
+	 */
+	public static function process_uri($uri, $routes = NULL)
+	{
+		// Load routes
+		$routes = (empty($routes)) ? Route::all() : $routes;
+		$params = NULL;
+
+		foreach ($routes as $name => $route)
+		{
+			// We found something suitable
+			if ($params = $route->matches($uri))
+			{
+				return array(
+					'params' => $params,
+					'route' => $route,
+				);
+			}
+		}
+
+		return NULL;
+	}
+
+	/**
+	 * Parses an accept header and returns an array (type => quality) of the
+	 * accepted types, ordered by quality.
+	 *
+	 *     $accept = Request::_parse_accept($header, $defaults);
+	 *
+	 * @param   string   $header   Header to parse
+	 * @param   array    $accepts  Default values
+	 * @return  array
+	 */
+	protected static function _parse_accept( & $header, array $accepts = NULL)
+	{
+		if ( ! empty($header))
+		{
+			// Get all of the types
+			$types = explode(',', $header);
+
+			foreach ($types as $type)
+			{
+				// Split the type into parts
+				$parts = explode(';', $type);
+
+				// Make the type only the MIME
+				$type = trim(array_shift($parts));
+
+				// Default quality is 1.0
+				$quality = 1.0;
+
+				foreach ($parts as $part)
+				{
+					// Prevent undefined $value notice below
+					if (strpos($part, '=') === FALSE)
+						continue;
+
+					// Separate the key and value
+					list ($key, $value) = explode('=', trim($part));
+
+					if ($key === 'q')
+					{
+						// There is a quality for this type
+						$quality = (float) trim($value);
+					}
+				}
+
+				// Add the accept type and quality
+				$accepts[$type] = $quality;
+			}
+		}
+
+		// Make sure that accepts is an array
+		$accepts = (array) $accepts;
+
+		// Order by quality
+		arsort($accepts);
+
+		return $accepts;
+	}
+
+	/**
+	 * @var  string  the x-requested-with header which most likely
+	 *               will be xmlhttprequest
+	 */
+	protected $_requested_with;
+
+	/**
+	 * @var  string  method: GET, POST, PUT, DELETE, HEAD, etc
+	 */
+	protected $_method = 'GET';
+
+	/**
+	 * @var  string  protocol: HTTP/1.1, FTP, CLI, etc
+	 */
+	protected $_protocol;
+
+	/**
+	 * @var  string  referring URL
+	 */
+	protected $_referrer;
+
+	/**
+	 * @var  Route       route matched for this request
+	 */
+	protected $_route;
+
+	/**
+	 * @var  Route       array of routes to manually look at instead of the global namespace
+	 */
+	protected $_routes;
+
+	/**
+	 * @var  Kohana_Response  response
+	 */
+	protected $_response;
+
+	/**
+	 * @var  Kohana_HTTP_Header  headers to sent as part of the request
+	 */
+	protected $_header;
+
+	/**
+	 * @var  string the body
+	 */
+	protected $_body;
+
+	/**
+	 * @var  string  controller directory
+	 */
+	protected $_directory = '';
+
+	/**
+	 * @var  string  controller to be executed
+	 */
+	protected $_controller;
+
+	/**
+	 * @var  string  action to be executed in the controller
+	 */
+	protected $_action;
+
+	/**
+	 * @var  string  the URI of the request
+	 */
+	protected $_uri;
+
+	/**
+	 * @var  boolean  external request
+	 */
+	protected $_external = FALSE;
+
+	/**
+	 * @var  array   parameters from the route
+	 */
+	protected $_params = array();
+
+	/**
+	 * @var array    query parameters
+	 */
+	protected $_get = array();
+
+	/**
+	 * @var array    post parameters
+	 */
+	protected $_post = array();
+
+	/**
+	 * @var array    cookies to send with the request
+	 */
+	protected $_cookies = array();
+
+	/**
+	 * @var Kohana_Request_Client
+	 */
+	protected $_client;
+
+	/**
+	 * Creates a new request object for the given URI. New requests should be
+	 * created using the [Request::instance] or [Request::factory] methods.
+	 *
+	 *     $request = new Request($uri);
+	 *
+	 * If $cache parameter is set, the response for the request will attempt to
+	 * be retrieved from the cache.
+	 *
+	 * @param   string  $uri URI of the request
+	 * @param   Cache   $cache
+	 * @param   array   $injected_routes an array of routes to use, for testing
+	 * @return  void
+	 * @throws  Kohana_Request_Exception
+	 * @uses    Route::all
+	 * @uses    Route::matches
+	 */
+	public function __construct($uri, Cache $cache = NULL, $injected_routes = array())
+	{
+		// Initialise the header
+		$this->_header = new HTTP_Header(array());
+
+		// Assign injected routes
+		$this->_injected_routes = $injected_routes;
+
+		// Cleanse query parameters from URI (faster that parse_url())
+		$split_uri = explode('?', $uri);
+		$uri = array_shift($split_uri);
+
+		// Initial request has global $_GET already applied
+		if (Request::$initial !== NULL)
+		{
+			if ($split_uri)
+			{
+				parse_str($split_uri[0], $this->_get);
+			}
+		}
+
+		// Detect protocol (if present)
+		// Always default to an internal request if we don't have an initial.
+		// This prevents the default index.php from being able to proxy
+		// external pages.
+		if (Request::$initial === NULL OR strpos($uri, '://') === FALSE)
+		{
+			// Remove trailing slashes from the URI
+			$uri = trim($uri, '/');
+
+			$processed_uri = Request::process_uri($uri, $this->_injected_routes);
+
+			if ($processed_uri === NULL)
+			{
+				throw new HTTP_Exception_404('Unable to find a route to match the URI: :uri', array(
+					':uri' => $uri,
+				));
+			}
+
+			// Store the URI
+			$this->_uri = $uri;
+
+			// Store the matching route
+			$this->_route = $processed_uri['route'];
+			$params = $processed_uri['params'];
+
+			// Is this route external?
+			$this->_external = $this->_route->is_external();
+
+			if (isset($params['directory']))
+			{
+				// Controllers are in a sub-directory
+				$this->_directory = $params['directory'];
+			}
+
+			// Store the controller
+			$this->_controller = $params['controller'];
+
+			if (isset($params['action']))
+			{
+				// Store the action
+				$this->_action = $params['action'];
+			}
+			else
+			{
+				// Use the default action
+				$this->_action = Route::$default_action;
+			}
+
+			// These are accessible as public vars and can be overloaded
+			unset($params['controller'], $params['action'], $params['directory']);
+
+			// Params cannot be changed once matched
+			$this->_params = $params;
+
+			// Apply the client
+			$this->_client = new Request_Client_Internal(array('cache' => $cache));
+		}
+		else
+		{
+			// Create a route
+			$this->_route = new Route($uri);
+
+			// Store the URI
+			$this->_uri = $uri;
+
+			// Set external state
+			$this->_external = TRUE;
+
+			// Setup the client
+			$this->_client = new Request_Client_External(array('cache' => $cache));
+		}
+	}
+
+	/**
+	 * Returns the response as the string representation of a request.
+	 *
+	 *     echo $request;
+	 *
+	 * @return  string
+	 */
+	public function __toString()
+	{
+		return $this->render();
+	}
+
+	/**
+	 * Generates a relative URI for the current route.
+	 *
+	 *     $request->uri($params);
+	 *
+	 * @param   array   $params  Additional route parameters
+	 * @return  string
+	 * @uses    Route::uri
+	 */
+	public function uri(array $params = NULL)
+	{
+		if ( ! isset($params['directory']))
+		{
+			// Add the current directory
+			$params['directory'] = $this->directory();
+		}
+
+		if ( ! isset($params['controller']))
+		{
+			// Add the current controller
+			$params['controller'] = $this->controller();
+		}
+
+		if ( ! isset($params['action']))
+		{
+			// Add the current action
+			$params['action'] = $this->action();
+		}
+
+		// Add the current parameters
+		$params += $this->_params;
+
+		$uri = $this->_route->uri($params);
+
+		return $uri;
+	}
+
+	/**
+	 * Create a URL from the current request. This is a shortcut for:
+	 *
+	 *     echo URL::site($this->request->uri($params), $protocol);
+	 *
+	 * @param   array    $params    URI parameters
+	 * @param   mixed    $protocol  protocol string or Request object
+	 * @return  string
+	 * @since   3.0.7
+	 * @uses    URL::site
+	 */
+	public function url(array $params = NULL, $protocol = NULL)
+	{
+		// Create a URI with the current route and convert it to a URL
+		$url = URL::site($this->uri($params), $protocol);
+
+		return $url;
+	}
+
+	/**
+	 * Retrieves a value from the route parameters.
+	 *
+	 *     $id = $request->param('id');
+	 *
+	 * @param   string   $key      Key of the value
+	 * @param   mixed    $default  Default value if the key is not set
+	 * @return  mixed
+	 */
+	public function param($key = NULL, $default = NULL)
+	{
+		if ($key === NULL)
+		{
+			// Return the full array
+			return $this->_params;
+		}
+
+		return isset($this->_params[$key]) ? $this->_params[$key] : $default;
+	}
+
+	/**
+	 * Sends the response status and all set headers. The current server
+	 * protocol (HTTP/1.0 or HTTP/1.1) will be used when available. If not
+	 * available, HTTP/1.1 will be used.
+	 *
+	 *     $request->send_headers();
+	 *
+	 * @return  $this
+	 * @uses    Request::$messages
+	 * @deprecated This should not be here, it belongs in\n
+	 * Response::send_headers() where it is implemented correctly.
+	 */
+	public function send_headers()
+	{
+		if ( ! ($response = $this->response()) instanceof Response)
+			return $this;
+
+		$response->send_headers();
+		return $this;
+	}
+
+	/**
+	 * Redirects as the request response. If the URL does not include a
+	 * protocol, it will be converted into a complete URL.
+	 *
+	 *     $request->redirect($url);
+	 *
+	 * [!!] No further processing can be done after this method is called!
+	 *
+	 * @param   string   $url   Redirect location
+	 * @param   integer  $code  Status code: 301, 302, etc
+	 * @return  void
+	 * @uses    URL::site
+	 * @uses    Request::send_headers
+	 */
+	public function redirect($url = '', $code = 302)
+	{
+		if (strpos($url, '://') === FALSE)
+		{
+			// Make the URI into a URL
+			$url = URL::site($url, TRUE);
+		}
+
+		// Redirect
+		$response = $this->create_response();
+
+		// Set the response status
+		$response->status($code);
+
+		// Set the location header
+		$response->headers('Location', $url);
+
+		// Send headers
+		$response->send_headers();
+
+		// Stop execution
+		exit;
+	}
+
+	/**
+	 * Sets and gets the referrer from the request.
+	 *
+	 * @param   string $referrer
+	 * @return  mixed
+	 */
+	public function referrer($referrer = NULL)
+	{
+		if ($referrer === NULL)
+		{
+			// Act as a getter
+			return $this->_referrer;
+		}
+
+		// Act as a setter
+		$this->_referrer = (string) $referrer;
+
+		return $this;
+	}
+
+	/**
+	 * Sets and gets the route from the request.
+	 *
+	 * @param   string $route
+	 * @return  mixed
+	 */
+	public function route(Route $route = NULL)
+	{
+		if ($route === NULL)
+		{
+			// Act as a getter
+			return $this->_route;
+		}
+
+		// Act as a setter
+		$this->_route = $route;
+
+		return $this;
+	}
+
+	/**
+	 * Sets and gets the directory for the controller.
+	 *
+	 * @param   string   $directory  Directory to execute the controller from
+	 * @return  mixed
+	 */
+	public function directory($directory = NULL)
+	{
+		if ($directory === NULL)
+		{
+			// Act as a getter
+			return $this->_directory;
+		}
+
+		// Act as a setter
+		$this->_directory = (string) $directory;
+
+		return $this;
+	}
+
+	/**
+	 * Sets and gets the controller for the matched route.
+	 *
+	 * @param   string   $controller  Controller to execute the action
+	 * @return  mixed
+	 */
+	public function controller($controller = NULL)
+	{
+		if ($controller === NULL)
+		{
+			// Act as a getter
+			return $this->_controller;
+		}
+
+		// Act as a setter
+		$this->_controller = (string) $controller;
+
+		return $this;
+	}
+
+	/**
+	 * Sets and gets the action for the controller.
+	 *
+	 * @param   string   $action  Action to execute the controller from
+	 * @return  mixed
+	 */
+	public function action($action = NULL)
+	{
+		if ($action === NULL)
+		{
+			// Act as a getter
+			return $this->_action;
+		}
+
+		// Act as a setter
+		$this->_action = (string) $action;
+
+		return $this;
+	}
+
+	/**
+	 * Provides readonly access to the [Request_Client],
+	 * useful for accessing the caching methods within the
+	 * request client.
+	 *
+	 * @return  Request_Client
+	 */
+	public function get_client()
+	{
+		return $this->_client;
+	}
+
+	/**
+	 * Gets and sets the requested with property, which should
+	 * be relative to the x-requested-with pseudo header.
+	 *
+	 * @param   string    $requested_with Requested with value
+	 * @return  mixed
+	 */
+	public function requested_with($requested_with = NULL)
+	{
+		if ($requested_with === NULL)
+		{
+			// Act as a getter
+			return $this->_requested_with;
+		}
+
+		// Act as a setter
+		$this->_requested_with = strtolower($requested_with);
+
+		return $this;
+	}
+
+	/**
+	 * Processes the request, executing the controller action that handles this
+	 * request, determined by the [Route].
+	 *
+	 * 1. Before the controller action is called, the [Controller::before] method
+	 * will be called.
+	 * 2. Next the controller action will be called.
+	 * 3. After the controller action is called, the [Controller::after] method
+	 * will be called.
+	 *
+	 * By default, the output from the controller is captured and returned, and
+	 * no headers are sent.
+	 *
+	 *     $request->execute();
+	 *
+	 * @return  Response
+	 * @throws  Kohana_Exception
+	 * @uses    [Kohana::$profiling]
+	 * @uses    [Profiler]
+	 */
+	public function execute()
+	{
+		if ( ! $this->_client instanceof Kohana_Request_Client)
+		{
+			throw new Kohana_Request_Exception('Unable to execute :uri without a Kohana_Request_Client', array(
+				':uri' => $this->_uri,
+			));
+		}
+
+		return $this->_client->execute($this);
+	}
+
+	/**
+	 * Returns whether this request is the initial request Kohana received.
+	 * Can be used to test for sub requests.
+	 *
+	 *     if ( ! $request->is_initial())
+	 *         // This is a sub request
+	 *
+	 * @return  boolean
+	 */
+	public function is_initial()
+	{
+		return ($this === Request::$initial);
+	}
+
+	/**
+	 * Returns whether this is an ajax request (as used by JS frameworks)
+	 *
+	 * @return  boolean
+	 */
+	public function is_ajax()
+	{
+		return ($this->requested_with() === 'xmlhttprequest');
+	}
+
+	/**
+	 * Generates an [ETag](http://en.wikipedia.org/wiki/HTTP_ETag) from the
+	 * request response.
+	 *
+	 *     $etag = $request->generate_etag();
+	 *
+	 * [!!] If the request response is empty when this method is called, an
+	 * exception will be thrown!
+	 *
+	 * @return string
+	 * @throws Kohana_Request_Exception
+	 */
+	public function generate_etag()
+	{
+	    if ($this->_response === NULL)
+		{
+			throw new Kohana_Request_Exception('No response yet associated with request - cannot auto generate resource ETag');
+		}
+
+		// Generate a unique hash for the response
+		return '"'.sha1($this->_response).'"';
+	}
+
+	/**
+	 * Set or get the response for this request
+	 *
+	 * @param   Response  $response  Response to apply to this request
+	 * @return  Response
+	 * @return  void
+	 */
+	public function response(Response $response = NULL)
+	{
+		if ($response === NULL)
+		{
+			// Act as a getter
+			return $this->_response;
+		}
+
+		// Act as a setter
+		$this->_response = $response;
+
+		return $this;
+	}
+
+	/**
+	 * Creates a response based on the type of request, i.e. an
+	 * Request_HTTP will produce a Response_HTTP, and the same applies
+	 * to CLI.
+	 *
+	 *      // Create a response to the request
+	 *      $response = $request->create_response();
+	 *
+	 * @param   boolean  $bind  Bind to this request
+	 * @return  Response
+	 * @since   3.1.0
+	 */
+	public function create_response($bind = TRUE)
+	{
+		$response = new Response(array('_protocol' => $this->protocol()));
+
+		if ($bind)
+		{
+			// Bind a new response to the request
+			$this->_response = $response;
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Gets or sets the HTTP method. Usually GET, POST, PUT or DELETE in
+	 * traditional CRUD applications.
+	 *
+	 * @param   string   $method  Method to use for this request
+	 * @return  mixed
+	 */
+	public function method($method = NULL)
+	{
+		if ($method === NULL)
+		{
+			// Act as a getter
+			return $this->_method;
+		}
+
+		// Act as a setter
+		$this->_method = strtoupper($method);
+
+		return $this;
+	}
+
+	/**
+	 * Gets or sets the HTTP protocol. The standard protocol to use
+	 * is `http`.
+	 *
+	 * @param   string   $protocol  Protocol to set to the request/response
+	 * @return  mixed
+	 */
+	public function protocol($protocol = NULL)
+	{
+		if ($protocol === NULL)
+		{
+			if ($this->_protocol)
+			{
+				// Act as a getter
+				return $this->_protocol;
+			}
+			else
+			{
+				// Get the default protocol
+				return HTTP::$protocol;
+			}
+		}
+
+		// Act as a setter
+		$this->_protocol = strtolower($protocol);
+
+		return $this;
+	}
+
+	/**
+	 * Gets or sets HTTP headers to the request or response. All headers
+	 * are included immediately after the HTTP protocol definition during
+	 * transmission. This method provides a simple array or key/value
+	 * interface to the headers.
+	 *
+	 * @param   mixed   $key   Key or array of key/value pairs to set
+	 * @param   string  $value Value to set to the supplied key
+	 * @return  mixed
+	 */
+	public function headers($key = NULL, $value = NULL)
+	{
+		if ($key instanceof HTTP_Header)
+		{
+			// Act a setter, replace all headers
+			$this->_header = $key;
+
+			return $this;
+		}
+
+		if (is_array($key))
+		{
+			// Act as a setter, replace all headers
+			$this->_header->exchangeArray($key);
+
+			return $this;
+		}
+
+		if ($this->_header->count() === 0 AND $this->is_initial())
+		{
+			// Lazy load the request headers
+			$this->_header = HTTP::request_headers();
+		}
+
+		if ($key === NULL)
+		{
+			// Act as a getter, return all headers
+			return $this->_header;
+		}
+		elseif ($value === NULL)
+		{
+			// Act as a getter, single header
+			return ($this->_header->offsetExists($key)) ? $this->_header->offsetGet($key) : NULL;
+		}
+
+		// Act as a setter for a single header
+		$this->_header[$key] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Set and get cookies values for this request.
+	 *
+	 * @param   mixed    $key    Cookie name, or array of cookie values
+	 * @param   string   $value  Value to set to cookie
+	 * @return  string
+	 * @return  mixed
+	 */
+	public function cookie($key = NULL, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			// Act as a setter, replace all cookies
+			$this->_cookies = $key;
+		}
+
+		if ($key === NULL)
+		{
+			// Act as a getter, all cookies
+			return $this->_cookies;
+		}
+		elseif ($value === NULL)
+		{
+			// Act as a getting, single cookie
+			return isset($this->_cookies[$key]) ? $this->_cookies[$key] : NULL;
+		}
+
+		// Act as a setter for a single cookie
+		$this->_cookies[$key] = (string) $value;
+
+		return $this;
+	}
+
+	/**
+	 * Gets or sets the HTTP body to the request or response. The body is
+	 * included after the header, separated by a single empty new line.
+	 *
+	 * @param   string  $content Content to set to the object
+	 * @return  mixed
+	 */
+	public function body($content = NULL)
+	{
+		if ($content === NULL)
+		{
+			// Act as a getter
+			return $this->_body;
+		}
+
+		// Act as a setter
+		$this->_body = $content;
+
+		return $this;
+	}
+
+	/**
+	 * Renders the HTTP_Interaction to a string, producing
+	 *
+	 *  - Protocol
+	 *  - Headers
+	 *  - Body
+	 *
+	 *  If there are variables set to the `Kohana_Request::$_post`
+	 *  they will override any values set to body.
+	 *
+	 * @param   boolean  $response  Return the rendered response, else returns the rendered request
+	 * @return  string
+	 */
+	public function render($response = TRUE)
+	{
+		if ($response)
+		{
+			// Act as a getter
+			return (string) $this->_response;
+		}
+
+		if ( ! $post = $this->post())
+		{
+			$body = $this->body();
+		}
+		else
+		{
+			$this->headers('content-type', 'application/x-www-form-urlencoded');
+			$body = http_build_query($post, NULL, '&');
+		}
+
+		// Prepare cookies
+		if ($this->_cookies)
+		{
+			$cookie_string = array();
+
+			// Parse each
+			foreach ($this->_cookies as $key => $value)
+			{
+				$cookie_string[] = $key.'='.$value;
+			}
+
+			// Create the cookie string
+			$this->_header['cookie'] = implode('; ', $cookie_string);
+		}
+
+		$output = $this->method().' '.$this->uri($this->param()).' '.strtoupper($this->protocol()).'/'.HTTP::$version."\n";
+		$output .= (string) $this->_header;
+		$output .= $body;
+
+		return $output;
+	}
+
+	/**
+	 * Gets or sets HTTP query string.
+	 *
+	 * @param   mixed   $key    Key or key value pairs to set
+	 * @param   string  $value  Value to set to a key
+	 * @return  mixed
+	 */
+	public function query($key = NULL, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			// Act as a setter, replace all query strings
+			$this->_get = $key;
+
+			return $this;
+		}
+
+		if ($key === NULL)
+		{
+			// Act as a getter, all query strings
+			return $this->_get;
+		}
+		elseif ($value === NULL)
+		{
+			// Act as a getter, single query string
+			return Arr::get($this->_get, $key);
+		}
+
+		// Act as a setter, single query string
+		$this->_get[$key] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Gets or sets HTTP POST parameters to the request.
+	 *
+	 * @param   mixed  $key    Key or key value pairs to set
+	 * @param   string $value  Value to set to a key
+	 * @return  mixed
+	 */
+	public function post($key = NULL, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			// Act as a setter, replace all fields
+			$this->_post = $key;
+
+			return $this;
+		}
+
+		if ($key === NULL)
+		{
+			// Act as a getter, all fields
+			return $this->_post;
+		}
+		elseif ($value === NULL)
+		{
+			// Act as a getter, single field
+			return Arr::get($this->_post, $key);
+		}
+
+		// Act as a setter, single field
+		$this->_post[$key] = $value;
+
+		return $this;
+	}
+
+} // End Request
diff --git a/includes/kohana/system/classes/kohana/request/client.php b/includes/kohana/system/classes/kohana/request/client.php
new file mode 100644
index 0000000..ae4facb
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/request/client.php
@@ -0,0 +1,328 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Request Client
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.1.0
+ */
+abstract class Kohana_Request_Client {
+
+	/**
+	 * @var    Cache  Caching library for request caching
+	 */
+	protected $_cache;
+
+	/**
+	 * @var    boolean   Defines whether this client should cache `private` cache directives
+	 * @see    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	 */
+	protected $_allow_private_cache = FALSE;
+
+	/**
+	 * @var    int       The timestamp of the request
+	 */
+	protected $_request_time;
+
+	/**
+	 * @var    int       The timestamp of the response
+	 */
+	protected $_response_time;
+
+	/**
+	 * Creates a new `Request_Client` object,
+	 * allows for dependency injection.
+	 *
+	 * @param   array    $params Params
+	 */
+	public function __construct(array $params = array())
+	{
+		if ($params)
+		{
+			foreach ($params as $key => $value)
+			{
+				if (method_exists($this, $key))
+				{
+					if (property_exists($this, $key) OR property_exists($this, '_'.$key))
+					{
+						$method = trim($key, '_');
+						$this->$method($value);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Processes the request, executing the controller action that handles this
+	 * request, determined by the [Route].
+	 *
+	 * 1. Before the controller action is called, the [Controller::before] method
+	 * will be called.
+	 * 2. Next the controller action will be called.
+	 * 3. After the controller action is called, the [Controller::after] method
+	 * will be called.
+	 *
+	 * By default, the output from the controller is captured and returned, and
+	 * no headers are sent.
+	 *
+	 *     $request->execute();
+	 *
+	 * @param   Request $request
+	 * @return  Response
+	 * @throws  Kohana_Exception
+	 * @uses    [Kohana::$profiling]
+	 * @uses    [Profiler]
+	 */
+	abstract public function execute(Request $request);
+
+	/**
+	 * Invalidate a cached response for the [Request] supplied.
+	 * This has the effect of deleting the response from the
+	 * [Cache] entry.
+	 *
+	 * @param   Request  $request Response to remove from cache
+	 * @return  void
+	 */
+	public function invalidate_cache(Request $request)
+	{
+		if ( ! $this->_cache instanceof Cache)
+			return;
+
+		$this->_cache->delete($this->_create_cache_key($request));
+
+		return;
+	}
+
+	/**
+	 * Getter and setter for the internal caching engine,
+	 * used to cache responses if available and valid.
+	 *
+	 * @param   Kohana_Cache  cache engine to use for caching
+	 * @return  Kohana_Cache
+	 * @return  Kohana_Request_Client
+	 */
+	public function cache(Cache $cache = NULL)
+	{
+		if ($cache === NULL)
+			return $this->_cache;
+
+		$this->_cache = $cache;
+		return $this;
+	}
+
+	/**
+	 * Gets or sets the [Request_Client::allow_private_cache] setting.
+	 * If set to `TRUE`, the client will also cache cache-control directives
+	 * that have the `private` setting.
+	 *
+	 * @see     http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+	 * @param   boolean  allow caching of privately marked responses
+	 * @return  boolean
+	 * @return  [Request_Client]
+	 */
+	public function allow_private_cache($setting = NULL)
+	{
+		if ($setting === NULL)
+			return $this->_allow_private_cache;
+
+		$this->_allow_private_cache = (bool) $setting;
+		return $this;
+	}
+
+	/**
+	 * Creates a cache key for the request to use for caching
+	 * [Kohana_Response] returned by [Request::execute].
+	 *
+	 * @param   Request  request
+	 * @return  string
+	 * @return  boolean
+	 */
+	public function create_cache_key(Request $request)
+	{
+		return sha1($request->url());
+	}
+
+	/**
+	 * Controls whether the response can be cached. Uses HTTP
+	 * protocol to determine whether the response can be cached.
+	 *
+	 * @see     RFC 2616 http://www.w3.org/Protocols/rfc2616/
+	 * @param   Response  $response The Response
+	 * @return  boolean
+	 */
+	public function set_cache(Response $response)
+	{
+		$headers = (array) $response->headers();
+		if ($cache_control = arr::get($headers, 'cache-control'))
+		{
+			// Parse the cache control
+			$cache_control = Response::parse_cache_control( (string) $cache_control);
+
+			// If the no-cache or no-store directive is set, return
+			if (array_intersect_key($cache_control, array('no-cache' => NULL, 'no-store' => NULL)))
+				return FALSE;
+
+			// Get the directives
+			$directives = array_keys($cache_control);
+
+			// Check for private cache and get out of here if invalid
+			if ( ! $this->_allow_private_cache and in_array('private', $directives))
+			{
+				if ( ! isset($cache_control['s-maxage']))
+					return FALSE;
+
+				// If there is a s-maxage directive we can use that
+				$cache_control['max-age'] = $cache_control['s-maxage'];
+			}
+
+			// Check that max-age has been set and if it is valid for caching
+			if (isset($cache_control['max-age']) and (int) $cache_control['max-age'] < 1)
+				return FALSE;
+		}
+
+		if ($expires = arr::get($headers, 'expires') and ! isset($cache_control['max-age']))
+		{
+			// Can't cache things that have expired already
+			if (strtotime( (string) $expires) <= time())
+				return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Caches a [Response] using the supplied [Cache]
+	 * and the key generated by [Request_Client::_create_cache_key].
+	 *
+	 * If not response is supplied, the cache will be checked for an existing
+	 * one that is available.
+	 *
+	 * @param   Request   $request  The request
+	 * @param   Response  $response Response
+	 * @return  mixed
+	 */
+	public function cache_response(Request $request, Response $response = NULL)
+	{
+		if ( ! $this->_cache instanceof Cache)
+			return FALSE;
+
+		// Check for Pragma: no-cache
+		if ($pragma = $request->headers('pragma'))
+		{
+			if ($pragma instanceof HTTP_Header_Value and $pragma->key == 'no-cache')
+				return FALSE;
+			elseif (is_array($pragma) and isset($pragma['no-cache']))
+				return FALSE;
+		}
+
+		if ( ! $response)
+		{
+			$response = $this->_cache->get($this->create_cache_key($request));
+			return ($response !== NULL) ? $response : FALSE;
+		}
+		else
+		{
+			if (($ttl = $this->cache_lifetime($response)) === FALSE)
+				return FALSE;
+
+			return $this->_cache->set($this->create_cache_key($request), $response, $ttl);
+		}
+	}
+
+	/**
+	 * Calculates the total Time To Live based on the specification
+	 * RFC 2616 cache lifetime rules.
+	 *
+	 * @param   Response  $response  Response to evaluate
+	 * @return  mixed  TTL value or false if the response should not be cached
+	 */
+	public function cache_lifetime(Response $response)
+	{
+		// Get out of here if this cannot be cached
+		if ( ! $this->set_cache($response))
+			return FALSE;
+
+		// Calculate apparent age
+		if ($date = $response->headers('date'))
+		{
+			$apparent_age = max(0, $this->_response_time - strtotime( (string) $date));
+		}
+		else
+		{
+			$apparent_age = max(0, $this->_response_time);
+		}
+
+		// Calculate corrected received age
+		if ($age = $response->headers('age'))
+		{
+			$corrected_received_age = max($apparent_age, intval( (string) $age));
+		}
+		else
+		{
+			$corrected_received_age = $apparent_age;
+		}
+
+		// Corrected initial age
+		$corrected_initial_age = $corrected_received_age + $this->request_execution_time();
+
+		// Resident time
+		$resident_time = time() - $this->_response_time;
+
+		// Current age
+		$current_age = $corrected_initial_age + $resident_time;
+
+		// Prepare the cache freshness lifetime
+		$ttl = NULL;
+
+		// Cache control overrides
+		if ($cache_control = $response->headers('cache-control'))
+		{
+			// Parse the cache control header
+			$cache_control = Response::parse_cache_control( (string) $cache_control);
+
+			if (isset($cache_control['max-age']))
+			{
+				$ttl = (int) $cache_control['max-age'];
+			}
+
+			if (isset($cache_control['s-maxage']) AND isset($cache_control['private']) AND $this->_allow_private_cache)
+			{
+				$ttl = (int) $cache_control['s-maxage'];
+			}
+
+			if (isset($cache_control['max-stale']) AND ! isset($cache_control['must-revalidate']))
+			{
+				$ttl = $current_age + (int) $cache_control['max-stale'];
+			}
+		}
+
+		// If we have a TTL at this point, return
+		if ($ttl !== NULL)
+			return $ttl;
+
+		if ($expires = $response->headers('expires'))
+			return strtotime( (string) $expires) - $current_age;
+
+		return FALSE;
+	}
+
+	/**
+	 * Returns the duration of the last request execution.
+	 * Either returns the time of completed requests or
+	 * `FALSE` if the request hasn't finished executing, or
+	 * is yet to be run.
+	 *
+	 * @return  mixed
+	 */
+	public function request_execution_time()
+	{
+		if ($this->_request_time === NULL OR $this->_response_time === NULL)
+			return FALSE;
+
+		return $this->_response_time - $this->_request_time;
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/request/client/external.php b/includes/kohana/system/classes/kohana/request/client/external.php
new file mode 100644
index 0000000..86fb5ef
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/request/client/external.php
@@ -0,0 +1,427 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Request_Client_External extends Request_Client {
+
+	/**
+	 * @var     array     internal header cache for curl processing
+	 * @todo    remove in PHP 5.3, use Lambda instead
+	 */
+	protected static $_processed_headers = array();
+
+	/**
+	 * Parses the returned headers from the remote
+	 * request
+	 *
+	 * @param   resource $remote  The curl resource
+	 * @param   string   $header  The full header string
+	 * @return  int
+	 */
+	protected static function _parse_headers($remote, $header)
+	{
+		$headers = array();
+
+		if (preg_match_all('/(\w[^\s:]*):[ ]*([^\r\n]*(?:\r\n[ \t][^\r\n]*)*)/', $header, $matches))
+		{
+			foreach ($matches[0] as $key => $value)
+				$headers[$matches[1][$key]] = $matches[2][$key];
+		}
+
+		// If there are headers to apply
+		if ($headers)
+		{
+			Request_Client_External::$_processed_headers += $headers;
+		}
+
+		return strlen($header);
+	}
+
+	/**
+	 * @var     array     additional curl options to use on execution
+	 */
+	protected $_options = array();
+
+	/**
+	 * Processes the request, executing the controller action that handles this
+	 * request, determined by the [Route].
+	 *
+	 * 1. Before the controller action is called, the [Controller::before] method
+	 * will be called.
+	 * 2. Next the controller action will be called.
+	 * 3. After the controller action is called, the [Controller::after] method
+	 * will be called.
+	 *
+	 * By default, the output from the controller is captured and returned, and
+	 * no headers are sent.
+	 *
+	 *     $request->execute();
+	 *
+	 * @param   Request $request A request object
+	 * @return  Response
+	 * @throws  Kohana_Exception
+	 * @uses    [Kohana::$profiling]
+	 * @uses    [Profiler]
+	 */
+	public function execute(Request $request)
+	{
+		// Check for cache existance
+		if ($this->_cache instanceof Cache AND ($response = $this->cache_response($request)) instanceof Response)
+			return $response;
+
+		if (Kohana::$profiling)
+		{
+			// Set the benchmark name
+			$benchmark = '"'.$request->uri().'"';
+
+			if ($request !== Request::$initial AND Request::$current)
+			{
+				// Add the parent request uri
+				$benchmark .= ' « "'.Request::$current->uri().'"';
+			}
+
+			// Start benchmarking
+			$benchmark = Profiler::start('Requests', $benchmark);
+		}
+
+		// Store the current active request and replace current with new request
+		$previous = Request::$current;
+		Request::$current = $request;
+
+		// Resolve the POST fields
+		if ($post = $request->post())
+		{
+			$request->body(http_build_query($post, NULL, '&'))
+				->headers('content-type', 'application/x-www-form-urlencoded');
+		}
+
+		try
+		{
+			// If PECL_HTTP is present, use extension to complete request
+			if (extension_loaded('http'))
+			{
+				$this->_http_execute($request);
+			}
+			// Else if CURL is present, use extension to complete request
+			elseif (extension_loaded('curl'))
+			{
+				$this->_curl_execute($request);
+			}
+			// Else use the sloooow method
+			else
+			{
+				$this->_native_execute($request);
+			}
+		}
+		catch (Exception $e)
+		{
+			// Restore the previous request
+			Request::$current = $previous;
+
+			if (isset($benchmark))
+			{
+				// Delete the benchmark, it is invalid
+				Profiler::delete($benchmark);
+			}
+
+			// Re-throw the exception
+			throw $e;
+		}
+
+		// Restore the previous request
+		Request::$current = $previous;
+
+		if (isset($benchmark))
+		{
+			// Stop the benchmark
+			Profiler::stop($benchmark);
+		}
+
+		// Cache the response if cache is available
+		if ($this->_cache instanceof Cache)
+		{
+			$this->cache_response($request, $request->response());
+		}
+
+		// Return the response
+		return $request->response();
+	}
+
+	/**
+	 * Set and get options for this request.
+	 *
+	 * @param   mixed    $key    Option name, or array of options
+	 * @param   mixed    $value  Option value
+	 * @return  mixed
+	 * @return  Request_Client_External
+	 */
+	public function options($key = NULL, $value = NULL)
+	{
+		if ($key === NULL)
+			return $this->_options;
+
+		if (is_array($key))
+		{
+			$this->_options = $key;
+		}
+		elseif ( ! $value)
+		{
+			return Arr::get($this->_options, $key);
+		}
+		else
+		{
+			$this->_options[$key] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Execute the request using the PECL HTTP extension. (recommended)
+	 *
+	 * @param   Request   $request Request to execute
+	 * @return  Response
+	 */
+	protected function _http_execute(Request $request)
+	{
+		$http_method_mapping = array(
+			HTTP_Request::GET     => HTTPRequest::METH_GET,
+			HTTP_Request::HEAD    => HTTPRequest::METH_HEAD,
+			HTTP_Request::POST    => HTTPRequest::METH_POST,
+			HTTP_Request::PUT     => HTTPRequest::METH_PUT,
+			HTTP_Request::DELETE  => HTTPRequest::METH_DELETE,
+			HTTP_Request::OPTIONS => HTTPRequest::METH_OPTIONS,
+			HTTP_Request::TRACE   => HTTPRequest::METH_TRACE,
+			HTTP_Request::CONNECT => HTTPRequest::METH_CONNECT,
+		);
+
+		// Create an http request object
+		$http_request = new HTTPRequest($request->uri(), $http_method_mapping[$request->method()]);
+
+		if ($this->_options)
+		{
+			// Set custom options
+			$http_request->setOptions($this->_options);
+		}
+
+		// Set headers
+		$http_request->setHeaders($request->headers()->getArrayCopy());
+
+		// Set cookies
+		$http_request->setCookies($request->cookie());
+
+		// Set the body
+		$http_request->setBody($request->body());
+
+		// Set the query
+		$http_request->setQueryData($request->query());
+
+		try
+		{
+			$http_request->send();
+		}
+		catch (HTTPRequestException $e)
+		{
+			throw new Kohana_Request_Exception($e->getMessage());
+		}
+		catch (HTTPMalformedHeaderException $e)
+		{
+			throw new Kohana_Request_Exception($e->getMessage());
+		}
+		catch (HTTPEncodingException $e)
+		{
+			throw new Kohana_Request_Exception($e->getMessage());
+		}
+
+		// Create the response
+		$response = $request->create_response();
+
+		// Build the response
+		$response->status($http_request->getResponseCode())
+			->headers($http_request->getResponseHeader())
+			->cookie($http_request->getResponseCookies())
+			->body($http_request->getResponseBody());
+
+		return $response;
+	}
+
+	/**
+	 * Execute the request using the CURL extension. (recommended)
+	 *
+	 * @param   Request   $request  Request to execute
+	 * @return  Response
+	 */
+	protected function _curl_execute(Request $request)
+	{
+		// Reset the headers
+		Request_Client_External::$_processed_headers = array();
+
+		// Set the request method
+		$options[CURLOPT_CUSTOMREQUEST] = $request->method();
+
+		// Set the request body. This is perfectly legal in CURL even
+		// if using a request other than POST. PUT does support this method
+		// and DOES NOT require writing data to disk before putting it, if
+		// reading the PHP docs you may have got that impression. SdF
+		$options[CURLOPT_POSTFIELDS] = $request->body();
+
+		// Process headers
+		if ($headers = $request->headers())
+		{
+			$http_headers = array();
+
+			foreach ($headers as $key => $value)
+			{
+				$http_headers[] = $key.': '.$value;
+			}
+
+			$options[CURLOPT_HTTPHEADER] = $http_headers;
+		}
+
+		// Process cookies
+		if ($cookies = $request->cookie())
+		{
+			$options[CURLOPT_COOKIE] = http_build_query($cookies, NULL, '; ');
+		}
+
+		// The transfer must always be returned
+		$options[CURLOPT_RETURNTRANSFER] = TRUE;
+
+		// Apply any additional options set to Request_Client_External::$_options
+		$options += $this->_options;
+
+		$uri = $request->uri();
+
+		if ($query = $request->query())
+		{
+			$uri .= '?'.http_build_query($query, NULL, '&');
+		}
+
+		// Open a new remote connection
+		$curl = curl_init($uri);
+
+		// Set connection options
+		if ( ! curl_setopt_array($curl, $options))
+		{
+			throw new Kohana_Request_Exception('Failed to set CURL options, check CURL documentation: :url',
+				array(':url' => 'http://php.net/curl_setopt_array'));
+		}
+
+		// Get the response body
+		$body = curl_exec($curl);
+
+		// Get the response information
+		$code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+		if ($body === FALSE)
+		{
+			$error = curl_error($curl);
+		}
+
+		// Close the connection
+		curl_close($curl);
+
+		if (isset($error))
+		{
+			throw new Kohana_Request_Exception('Error fetching remote :url [ status :code ] :error',
+				array(':url' => $request->url(), ':code' => $code, ':error' => $error));
+		}
+
+		// Create response
+		$response = $request->create_response();
+
+		$response->status($code)
+			->headers(Request_Client_External::$_processed_headers)
+			->body($body);
+
+		return $response;
+	}
+
+	/**
+	 * Execute the request using PHP stream. (not recommended)
+	 *
+	 * @param   Request   $request  Request to execute
+	 * @return  Response
+	 */
+	protected function _native_execute(Request $request)
+	{
+		// Reset the headers
+		Request_Client_External::$_processed_headers = array();
+
+		// Calculate stream mode
+		$mode = ($request->method() === HTTP_Request::GET) ? 'r' : 'r+';
+
+		// Process cookies
+		if ($cookies = $request->cookie())
+		{
+			$request->headers('cookie', http_build_query($cookies, NULL, '; '));
+		}
+
+		// Get the message body
+		$body = $request->body();
+
+		// Set the content length
+		$request->headers('content-length', strlen($body));
+
+		// Create the context
+		$options = array(
+			$request->protocol() => array(
+				'method'     => $request->method(),
+				'header'     => (string) $request->headers(),
+				'content'    => $body,
+				'user-agent' => 'Kohana Framework '.Kohana::VERSION.' ('.Kohana::CODENAME.')'
+			)
+		);
+
+		// Create the context stream
+		$context = stream_context_create($options);
+
+		stream_context_set_option($context, $this->_options);
+
+		$uri = $request->uri();
+
+		if ($query = $request->query())
+		{
+			$uri .= '?'.http_build_query($query, NULL, '&');
+		}
+
+		$stream = fopen($uri, $mode, FALSE, $context);
+
+		$meta_data = stream_get_meta_data($stream);
+
+		// Get the HTTP response code
+		$http_response = array_shift($meta_data['wrapper_data']);
+
+		if (preg_match_all('/(\w+\/\d\.\d) (\d{3})/', $http_response, $matches) !== FALSE)
+		{
+			$protocol = $matches[1][0];
+			$status   = (int) $matches[2][0];
+		}
+		else
+		{
+			$protocol = NULL;
+			$status   = NULL;
+		}
+
+		// Process headers
+		array_map(array('Request_Client_External', '_parse_headers'), array(), $meta_data['wrapper_data']);
+
+		// Create a response
+		$response = $request->create_response();
+
+		$response->status($status)
+			->protocol($protocol)
+			->headers(Request_Client_External::$_processed_headers)
+			->body(stream_get_contents($stream));
+
+		// Close the stream after use
+		fclose($stream);
+
+		return $response;
+	}
+} // End Kohana_Request_Client_External
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/request/client/internal.php b/includes/kohana/system/classes/kohana/request/client/internal.php
new file mode 100644
index 0000000..07632ec
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/request/client/internal.php
@@ -0,0 +1,179 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Request Client for internal execution
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.1.0
+ */
+class Kohana_Request_Client_Internal extends Request_Client {
+
+	/**
+	 * @var    array
+	 */
+	protected $_previous_environment;
+
+	/**
+	 * Processes the request, executing the controller action that handles this
+	 * request, determined by the [Route].
+	 *
+	 * 1. Before the controller action is called, the [Controller::before] method
+	 * will be called.
+	 * 2. Next the controller action will be called.
+	 * 3. After the controller action is called, the [Controller::after] method
+	 * will be called.
+	 *
+	 * By default, the output from the controller is captured and returned, and
+	 * no headers are sent.
+	 *
+	 *     $request->execute();
+	 *
+	 * @param   Request $request
+	 * @return  Response
+	 * @throws  Kohana_Exception
+	 * @uses    [Kohana::$profiling]
+	 * @uses    [Profiler]
+	 * @deprecated passing $params to controller methods deprecated since version 3.1
+	 *             will be removed in 3.2
+	 */
+	public function execute(Request $request)
+	{
+		// Check for cache existance
+		if ($this->_cache instanceof Cache AND ($response = $this->cache_response($request)) instanceof Response)
+			return $response;
+
+		// Create the class prefix
+		$prefix = 'controller_';
+
+		// Directory
+		$directory = $request->directory();
+
+		// Controller
+		$controller = $request->controller();
+
+		if ($directory)
+		{
+			// Add the directory name to the class prefix
+			$prefix .= str_replace(array('\\', '/'), '_', trim($directory, '/')).'_';
+		}
+
+		if (Kohana::$profiling)
+		{
+			// Set the benchmark name
+			$benchmark = '"'.$request->uri().'"';
+
+			if ($request !== Request::$initial AND Request::$current)
+			{
+				// Add the parent request uri
+				$benchmark .= ' « "'.Request::$current->uri().'"';
+			}
+
+			// Start benchmarking
+			$benchmark = Profiler::start('Requests', $benchmark);
+		}
+
+		// Store the currently active request
+		$previous = Request::$current;
+
+		// Change the current request to this request
+		Request::$current = $request;
+
+		// Is this the initial request
+		$initial_request = ($request === Request::$initial);
+
+		try
+		{
+			// Initiate response time
+			$this->_response_time = time();
+
+			if ( ! class_exists($prefix.$controller))
+			{
+				throw new HTTP_Exception_404('The requested URL :uri was not found on this server.',
+													array(':uri' => $request->uri()));
+			}
+
+			// Load the controller using reflection
+			$class = new ReflectionClass($prefix.$controller);
+
+			if ($class->isAbstract())
+			{
+				throw new Kohana_Exception('Cannot create instances of abstract :controller',
+					array(':controller' => $prefix.$controller));
+			}
+
+			// Create a new instance of the controller
+			$controller = $class->newInstance($request, $request->response() ? $request->response() : $request->create_response());
+
+			$class->getMethod('before')->invoke($controller);
+
+			// Determine the action to use
+			$action = $request->action();
+
+			$params = $request->param();
+
+			// If the action doesn't exist, it's a 404
+			if ( ! $class->hasMethod('action_'.$action))
+			{
+				throw new HTTP_Exception_404('The requested URL :uri was not found on this server.',
+													array(':uri' => $request->uri()));
+			}
+
+			$method = $class->getMethod('action_'.$action);
+
+			/**
+			 * Execute the main action with the parameters
+			 *
+			 * @deprecated $params passing is deprecated since version 3.1
+			 *             will be removed in 3.2.
+			 */
+			$method->invokeArgs($controller, $params);
+
+			// Execute the "after action" method
+			$class->getMethod('after')->invoke($controller);
+
+			// Stop response time
+			$this->_response_time = (time() - $this->_response_time);
+
+			// Add the default Content-Type header to initial request if not present
+			if ($initial_request AND ! $request->headers('content-type'))
+			{
+				$request->headers('content-type', Kohana::$content_type.'; charset='.Kohana::$charset);
+			}
+		}
+		catch (Exception $e)
+		{
+			// Restore the previous request
+			Request::$current = $previous;
+
+			if (isset($benchmark))
+			{
+				// Delete the benchmark, it is invalid
+				Profiler::delete($benchmark);
+			}
+
+			// Re-throw the exception
+			throw $e;
+		}
+
+		// Restore the previous request
+		Request::$current = $previous;
+
+		if (isset($benchmark))
+		{
+			// Stop the benchmark
+			Profiler::stop($benchmark);
+		}
+
+		// Cache the response if cache is available
+		if ($this->_cache instanceof Cache)
+		{
+			$this->cache_response($request, $request->response());
+		}
+
+		// Return the response
+		return $request->response();
+	}
+} // End Kohana_Request_Client_Internal
diff --git a/includes/kohana/system/classes/kohana/request/exception.php b/includes/kohana/system/classes/kohana/request/exception.php
new file mode 100644
index 0000000..e24ccf8
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/request/exception.php
@@ -0,0 +1,9 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana
+ * @category   Exceptions
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Request_Exception extends Kohana_Exception {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/response.php b/includes/kohana/system/classes/kohana/response.php
new file mode 100644
index 0000000..b54c8f3
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/response.php
@@ -0,0 +1,933 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Response wrapper. Created as the result of any [Request] execution
+ * or utility method (i.e. Redirect). Implements standard HTTP
+ * response format.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ * @since      3.1.0
+ */
+class Kohana_Response implements HTTP_Response, Serializable {
+
+	/**
+	 * Factory method to create a new [Response]. Pass properties
+	 * in using an associative array.
+	 *
+	 *      // Create a new response
+	 *      $response = Response::factory();
+	 *
+	 *      // Create a new response with headers
+	 *      $response = Response::factory(array('status' => 200));
+	 *
+	 * @param   array    $config Setup the response object
+	 * @return  Response
+	 */
+	public static function factory(array $config = array())
+	{
+		return new Response($config);
+	}
+
+	/**
+	 * Generates a [Cache-Control HTTP](http://en.wikipedia.org/wiki/List_of_HTTP_headers)
+	 * header based on the supplied array.
+	 *
+	 *     // Set the cache control headers you want to use
+	 *     $cache_control = array(
+	 *         'max-age'          => 3600,
+	 *         'must-revalidate'  => NULL,
+	 *         'public'           => NULL
+	 *     );
+	 *
+	 *     // Create the cache control header, creates :
+	 *     // cache-control: max-age=3600, must-revalidate, public
+	 *     $response->header['cache-control'] = Response::create_cache_control($cache_control);
+	 *
+	 * @param   array    $cache_control Cache_control parts to render
+	 * @return  string
+	 */
+	public static function create_cache_control(array $cache_control)
+	{
+		// Create a buffer
+		$parts = array();
+
+		// Foreach cache control entry
+		foreach ($cache_control as $key => $value)
+		{
+			// Create a cache control fragment
+			$parts[] = empty($value) ? $key : ($key.'='.$value);
+		}
+		// Return the rendered parts
+		return implode(', ', $parts);
+	}
+
+	/**
+	 * Parses the Cache-Control header and returning an array representation of the Cache-Control
+	 * header.
+	 *
+	 *     // Create the cache control header
+	 *     $response->header['cache-control'] = 'max-age=3600, must-revalidate, public';
+	 *
+	 *     // Parse the cache control header
+	 *     if ($cache_control = Request::parse_cache_control($response->header['cache-control']))
+	 *     {
+	 *          // Cache-Control header was found
+	 *          $maxage = $cache_control['max-age'];
+	 *     }
+	 *
+	 * @param   array   $cache_control Array of headers
+	 * @return  mixed
+	 */
+	public static function parse_cache_control($cache_control)
+	{
+		// If no Cache-Control parts are detected
+		if ( (bool) preg_match_all('/(?<key>[a-z\-]+)=?(?<value>\w+)?/', $cache_control, $matches))
+		{
+			// Return combined cache-control key/value pairs
+			return array_combine($matches['key'], $matches['value']);
+		}
+		else
+		{
+			// Return
+			return FALSE;
+		}
+	}
+
+	// HTTP status codes and messages
+	public static $messages = array(
+		// Informational 1xx
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+
+		// Success 2xx
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+
+		// Redirection 3xx
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found', // 1.1
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		// 306 is deprecated but reserved
+		307 => 'Temporary Redirect',
+
+		// Client Error 4xx
+		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',
+
+		// Server Error 5xx
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		509 => 'Bandwidth Limit Exceeded'
+	);
+
+	/**
+	 * @var  integer     The response http status
+	 */
+	protected $_status = 200;
+
+	/**
+	 * @var  HTTP_Header  Headers returned in the response
+	 */
+	protected $_header;
+
+	/**
+	 * @var  string      The response body
+	 */
+	protected $_body = '';
+
+	/**
+	 * @var  array       Cookies to be returned in the response
+	 */
+	protected $_cookies = array();
+
+	/**
+	 * @var  string      The response protocol
+	 */
+	protected $_protocol;
+
+	/**
+	 * Sets up the response object
+	 *
+	 * @param   array $config Setup the response object
+	 * @return  void
+	 */
+	public function __construct(array $config = array())
+	{
+		$this->_header = new HTTP_Header(array());
+
+		foreach ($config as $key => $value)
+		{
+			if (property_exists($this, $key))
+			{
+				if ($key == '_header')
+				{
+					$this->headers($value);
+				}
+				else
+				{
+					$this->$key = $value;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Outputs the body when cast to string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->_body;
+	}
+
+	/**
+	 * Gets or sets the body of the response
+	 *
+	 * @return  mixed
+	 */
+	public function body($content = NULL)
+	{
+		if ($content === NULL)
+			return $this->_body;
+
+		$this->_body = (string) $content;
+		return $this;
+	}
+
+	/**
+	 * Gets or sets the HTTP protocol. The standard protocol to use
+	 * is `HTTP/1.1`.
+	 *
+	 * @param   string   $protocol Protocol to set to the request/response
+	 * @return  mixed
+	 */
+	public function protocol($protocol = NULL)
+	{
+		if ($protocol)
+		{
+			$this->_protocol = $protocol;
+			return $this;
+		}
+
+		return $this->_protocol;
+	}
+
+	/**
+	 * Sets or gets the HTTP status from this response.
+	 *
+	 *      // Set the HTTP status to 404 Not Found
+	 *      $response = Response::factory()
+	 *              ->status(404);
+	 *
+	 *      // Get the current status
+	 *      $status = $response->status();
+	 *
+	 * @param   integer  $status Status to set to this response
+	 * @return  mixed
+	 */
+	public function status($status = NULL)
+	{
+		if ($status === NULL)
+		{
+			return $this->_status;
+		}
+		elseif (array_key_exists($status, Response::$messages))
+		{
+			$this->_status = (int) $status;
+			return $this;
+		}
+		else
+		{
+			throw new Kohana_Exception(__METHOD__.' unknown status value : :value', array(':value' => $status));
+		}
+	}
+
+	/**
+	 * Gets and sets headers to the [Response], allowing chaining
+	 * of response methods. If chaining isn't required, direct
+	 * access to the property should be used instead.
+	 *
+	 *       // Get a header
+	 *       $accept = $response->headers('Content-Type');
+	 *
+	 *       // Set a header
+	 *       $response->headers('Content-Type', 'text/html');
+	 *
+	 *       // Get all headers
+	 *       $headers = $response->headers();
+	 *
+	 *       // Set multiple headers
+	 *       $response->headers(array('Content-Type' => 'text/html', 'Cache-Control' => 'no-cache'));
+	 *
+	 * @param mixed $key
+	 * @param string $value
+	 * @return mixed
+	 */
+	public function headers($key = NULL, $value = NULL)
+	{
+		if ($key === NULL)
+		{
+			return $this->_header;
+		}
+		elseif (is_array($key))
+		{
+			$this->_header->exchangeArray($key);
+			return $this;
+		}
+		elseif ($value === NULL)
+		{
+			return Arr::get($this->_header, $key);
+		}
+		else
+		{
+			$this->_header[$key] = $value;
+			return $this;
+		}
+	}
+
+	/**
+	 * Returns the length of the body for use with
+	 * content header
+	 *
+	 * @return  integer
+	 */
+	public function content_length()
+	{
+		return strlen($this->_body);
+	}
+
+	/**
+	 * Set and get cookies values for this response.
+	 * 
+	 *     // Get the cookies set to the response
+	 *     $cookies = $response->cookie();
+	 *     
+	 *     // Set a cookie to the response
+	 *     $response->cookie('session', array(
+	 *          'value' => $value,
+	 *          'expiration' => 12352234
+	 *     ));
+	 *
+	 * @param   mixed     cookie name, or array of cookie values
+	 * @param   string    value to set to cookie
+	 * @return  string
+	 * @return  void
+	 * @return  [Response]
+	 */
+	public function cookie($key = NULL, $value = NULL)
+	{
+		// Handle the get cookie calls
+		if ($key === NULL)
+			return $this->_cookies;
+		elseif ( ! is_array($key) AND ! $value)
+			return Arr::get($this->_cookies, $key);
+
+		// Handle the set cookie calls
+		if (is_array($key))
+		{
+			reset($key);
+			while (list($_key, $_value) = each($key))
+			{
+				$this->cookie($_key, $_value);
+			}
+		}
+		else
+		{
+			if ( ! is_array($value))
+			{
+				$value = array(
+					'value' => $value,
+					'expiration' => Cookie::$expiration
+				);
+			}
+			elseif ( ! isset($value['expiration']))
+			{
+				$value['expiration'] = Cookie::$expiration;
+			}
+
+			$this->_cookies[$key] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Deletes a cookie set to the response
+	 *
+	 * @param   string   name
+	 * @return  Response
+	 */
+	public function delete_cookie($name)
+	{
+		unset($this->_cookies[$name]);
+		return $this;
+	}
+
+	/**
+	 * Deletes all cookies from this response
+	 *
+	 * @return  Response
+	 */
+	public function delete_cookies()
+	{
+		$this->_cookies = array();
+		return $this;
+	}
+
+	/**
+	 * Sends the response status and all set headers.
+	 *
+	 * @return  Response
+	 */
+	public function send_headers()
+	{
+		if ( ! headers_sent())
+		{
+			if (isset($_SERVER['SERVER_PROTOCOL']))
+			{
+				// Use the default server protocol
+				$protocol = $_SERVER['SERVER_PROTOCOL'];
+			}
+			else
+			{
+				// Default to using newer protocol
+				$protocol = strtoupper(HTTP::$protocol).'/'.HTTP::$version;
+			}
+
+			// Default to text/html; charset=utf8 if no content type set
+			if ( ! $this->_header->offsetExists('content-type'))
+			{
+				$this->_header['content-type'] = Kohana::$content_type.'; charset='.Kohana::$charset;
+			}
+
+			// Add the X-Powered-By header
+			if (Kohana::$expose)
+			{
+				$this->_header['x-powered-by'] = 'Kohana Framework '.Kohana::VERSION.' ('.Kohana::CODENAME.')';
+			}
+
+			if ( ! Kohana::$is_cli)
+			{
+				// HTTP status line
+				header($protocol.' '.$this->_status.' '.Response::$messages[$this->_status]);
+
+				foreach ($this->_header as $name => $value)
+				{
+					if (is_string($name))
+					{
+						// Combine the name and value to make a raw header
+						$value = $name.': '.$value;
+					}
+
+					// Send the raw header
+					header($value, TRUE);
+				}
+			}
+
+			// Send cookies
+			foreach ($this->_cookies as $name => $value)
+			{
+				Cookie::set($name, $value['value'], $value['expiration']);
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Send file download as the response. All execution will be halted when
+	 * this method is called! Use TRUE for the filename to send the current
+	 * response as the file content. The third parameter allows the following
+	 * options to be set:
+	 *
+	 * Type      | Option    | Description                        | Default Value
+	 * ----------|-----------|------------------------------------|--------------
+	 * `boolean` | inline    | Display inline instead of download | `FALSE`
+	 * `string`  | mime_type | Manual mime type                   | Automatic
+	 * `boolean` | delete    | Delete the file after sending      | `FALSE`
+	 *
+	 * Download a file that already exists:
+	 *
+	 *     $request->send_file('media/packages/kohana.zip');
+	 *
+	 * Download generated content as a file:
+	 *
+	 *     $request->response($content);
+	 *     $request->send_file(TRUE, $filename);
+	 *
+	 * [!!] No further processing can be done after this method is called!
+	 *
+	 * @param   string   filename with path, or TRUE for the current response
+	 * @param   string   downloaded file name
+	 * @param   array    additional options
+	 * @return  void
+	 * @throws  Kohana_Exception
+	 * @uses    File::mime_by_ext
+	 * @uses    File::mime
+	 * @uses    Request::send_headers
+	 */
+	public function send_file($filename, $download = NULL, array $options = NULL)
+	{
+		if ( ! empty($options['mime_type']))
+		{
+			// The mime-type has been manually set
+			$mime = $options['mime_type'];
+		}
+
+		if ($filename === TRUE)
+		{
+			if (empty($download))
+			{
+				throw new Kohana_Exception('Download name must be provided for streaming files');
+			}
+
+			// Temporary files will automatically be deleted
+			$options['delete'] = FALSE;
+
+			if ( ! isset($mime))
+			{
+				// Guess the mime using the file extension
+				$mime = File::mime_by_ext(strtolower(pathinfo($download, PATHINFO_EXTENSION)));
+			}
+
+			// Force the data to be rendered if
+			$file_data = (string) $this->_body;
+
+			// Get the content size
+			$size = strlen($file_data);
+
+			// Create a temporary file to hold the current response
+			$file = tmpfile();
+
+			// Write the current response into the file
+			fwrite($file, $file_data);
+
+			// File data is no longer needed
+			unset($file_data);
+		}
+		else
+		{
+			// Get the complete file path
+			$filename = realpath($filename);
+
+			if (empty($download))
+			{
+				// Use the file name as the download file name
+				$download = pathinfo($filename, PATHINFO_BASENAME);
+			}
+
+			// Get the file size
+			$size = filesize($filename);
+
+			if ( ! isset($mime))
+			{
+				// Get the mime type
+				$mime = File::mime($filename);
+			}
+
+			// Open the file for reading
+			$file = fopen($filename, 'rb');
+		}
+
+		if ( ! is_resource($file))
+		{
+			throw new Kohana_Exception('Could not read file to send: :file', array(
+				':file' => $download,
+			));
+		}
+
+		// Inline or download?
+		$disposition = empty($options['inline']) ? 'attachment' : 'inline';
+
+		// Calculate byte range to download.
+		list($start, $end) = $this->_calculate_byte_range($size);
+
+		if ( ! empty($options['resumable']))
+		{
+			if ($start > 0 OR $end < ($size - 1))
+			{
+				// Partial Content
+				$this->_status = 206;
+			}
+
+			// Range of bytes being sent
+			$this->_header['content-range'] = 'bytes '.$start.'-'.$end.'/'.$size;
+			$this->_header['accept-ranges'] = 'bytes';
+		}
+
+		// Set the headers for a download
+		$this->_header['content-disposition'] = $disposition.'; filename="'.$download.'"';
+		$this->_header['content-type']        = $mime;
+		$this->_header['content-length']      = (string) (($end - $start) + 1);
+
+		if (Request::user_agent('browser') === 'Internet Explorer')
+		{
+			// Naturally, IE does not act like a real browser...
+			if (Request::$initial->protocol() === 'https')
+			{
+				// http://support.microsoft.com/kb/316431
+				$this->_header['pragma'] = $this->_header['cache-control'] = 'public';
+			}
+
+			if (version_compare(Request::user_agent('version'), '8.0', '>='))
+			{
+				// http://ajaxian.com/archives/ie-8-security
+				$this->_header['x-content-type-options'] = 'nosniff';
+			}
+		}
+
+		// Send all headers now
+		$this->send_headers();
+
+		while (ob_get_level())
+		{
+			// Flush all output buffers
+			ob_end_flush();
+		}
+
+		// Manually stop execution
+		ignore_user_abort(TRUE);
+
+		if ( ! Kohana::$safe_mode)
+		{
+			// Keep the script running forever
+			set_time_limit(0);
+		}
+
+		// Send data in 16kb blocks
+		$block = 1024 * 16;
+
+		fseek($file, $start);
+
+		while ( ! feof($file) AND ($pos = ftell($file)) <= $end)
+		{
+			if (connection_aborted())
+				break;
+
+			if ($pos + $block > $end)
+			{
+				// Don't read past the buffer.
+				$block = $end - $pos + 1;
+			}
+
+			// Output a block of the file
+			echo fread($file, $block);
+
+			// Send the data now
+			flush();
+		}
+
+		// Close the file
+		fclose($file);
+
+		if ( ! empty($options['delete']))
+		{
+			try
+			{
+				// Attempt to remove the file
+				unlink($filename);
+			}
+			catch (Exception $e)
+			{
+				// Create a text version of the exception
+				$error = Kohana_Exception::text($e);
+
+				if (is_object(Kohana::$log))
+				{
+					// Add this exception to the log
+					Kohana::$log->add(Log::ERROR, $error);
+
+					// Make sure the logs are written
+					Kohana::$log->write();
+				}
+
+				// Do NOT display the exception, it will corrupt the output!
+			}
+		}
+
+		// Stop execution
+		exit;
+	}
+
+	/**
+	 * Renders the HTTP_Interaction to a string, producing
+	 *
+	 *  - Protocol
+	 *  - Headers
+	 *  - Body
+	 *
+	 * @return  string
+	 */
+	public function render()
+	{
+		if ( ! $this->_header->offsetExists('content-type'))
+		{
+			// Add the default Content-Type header if required
+			$this->_header['content-type'] = Kohana::$content_type.'; charset='.Kohana::$charset;
+		}
+
+		$content_length = $this->content_length();
+
+		// Set the content length for the body if required
+		if ($content_length > 0)
+		{
+			$this->_header['content-length'] = (string) $content_length;
+		}
+
+		// Prepare cookies
+		if ($this->_cookies)
+		{
+			if (extension_loaded('http'))
+			{
+				$this->_header['set-cookie'] = http_build_cookie($this->_cookies);
+			}
+			else
+			{
+				$cookies = array();
+
+				// Parse each
+				foreach ($this->_cookies as $key => $value)
+				{
+					$string = $key.'='.$value['value'].'; expires='.date('l, d M Y H:i:s T', $value['expiration']);
+					$cookies[] = $string;
+				}
+
+				// Create the cookie string
+				$this->_header['set-cookie'] = $cookies;
+			}
+		}
+
+		$output = $this->_protocol.' '.$this->_status.' '.Response::$messages[$this->_status]."\n";
+		$output .= (string) $this->_header;
+		$output .= $this->_body;
+
+		return $output;
+	}
+
+	/**
+	 * Generate ETag
+	 * Generates an ETag from the response ready to be returned
+	 *
+	 * @throws Kohana_Request_Exception
+	 * @return String Generated ETag
+	 */
+	public function generate_etag()
+	{
+	    if ($this->_body === NULL)
+		{
+			throw new Kohana_Request_Exception('No response yet associated with request - cannot auto generate resource ETag');
+		}
+
+		// Generate a unique hash for the response
+		return '"'.sha1($this->render()).'"';
+	}
+
+	/**
+	 * Check Cache
+	 * Checks the browser cache to see the response needs to be returned
+	 *
+	 * @param   string   $etag Resource ETag
+	 * @param   Request  $request The request to test against
+	 * @return  Response
+	 * @throws  Kohana_Request_Exception
+	 */
+	public function check_cache($etag = NULL, Request $request = NULL)
+	{
+		if ( ! $etag)
+		{
+			$etag = $this->generate_etag();
+		}
+
+		if ( ! $request)
+			throw new Kohana_Request_Exception('A Request object must be supplied with an etag for evaluation');
+
+		// Set the ETag header
+		$this->_header['etag'] = $etag;
+
+		// Add the Cache-Control header if it is not already set
+		// This allows etags to be used with max-age, etc
+		if ($this->_header->offsetExists('cache-control'))
+		{
+			if (is_array($this->_header['cache-control']))
+			{
+				$this->_header['cache-control'][] = new HTTP_Header_Value('must-revalidate');
+			}
+			else
+			{
+				$this->_header['cache-control'] = $this->_header['cache-control'].', must-revalidate';
+			}
+		}
+		else
+		{
+			$this->_header['cache-control'] = 'must-revalidate';
+		}
+
+		if ($request->headers('if-none-match') AND (string) $request->headers('if-none-match') === $etag)
+		{
+			// No need to send data again
+			$this->_status = 304;
+			$this->send_headers();
+
+			// Stop execution
+			exit;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Serializes the object to json - handy if you
+	 * need to pass the response data to other
+	 * systems
+	 *
+	 * @param   array    array of data to serialize
+	 * @return  string
+	 * @throws  Kohana_Exception
+	 */
+	public function serialize(array $to_serialize = array())
+	{
+		// Serialize the class properties
+		$to_serialize += array
+		(
+			'_status'  => $this->_status,
+			'_header'  => $this->_header,
+			'_cookies' => $this->_cookies,
+			'_body'    => $this->_body
+		);
+
+		$serialized = serialize($to_serialize);
+
+		if (is_string($serialized))
+		{
+			return $serialized;
+		}
+		else
+		{
+			throw new Kohana_Exception('Unable to serialize object');
+		}
+	}
+
+	/**
+	 * JSON encoded object
+	 *
+	 * @param   string   json encoded object
+	 * @return  bool
+	 * @throws  Kohana_Exception
+	 */
+	public function unserialize($string)
+	{
+		// Unserialise object
+		$unserialized = unserialize($string);
+
+		// If failed
+		if ($unserialized === NULL)
+		{
+			// Throw exception
+			throw new Kohana_Exception('Unable to correctly unserialize string: :string', array(':string' => $string));
+		}
+
+		// Foreach key/value pair
+		foreach ($unserialized as $key => $value)
+		{
+			$this->$key = $value;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Parse the byte ranges from the HTTP_RANGE header used for
+	 * resumable downloads.
+	 *
+	 * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+	 * @return array|FALSE
+	 */
+	protected function _parse_byte_range()
+	{
+		if ( ! isset($_SERVER['HTTP_RANGE']))
+		{
+			return FALSE;
+		}
+
+		// TODO, speed this up with the use of string functions.
+		preg_match_all('/(-?[0-9]++(?:-(?![0-9]++))?)(?:-?([0-9]++))?/', $_SERVER['HTTP_RANGE'], $matches, PREG_SET_ORDER);
+
+		return $matches[0];
+	}
+
+	/**
+	 * Calculates the byte range to use with send_file. If HTTP_RANGE doesn't
+	 * exist then the complete byte range is returned
+	 *
+	 * @param  integer $size
+	 * @return array
+	 */
+	protected function _calculate_byte_range($size)
+	{
+		// Defaults to start with when the HTTP_RANGE header doesn't exist.
+		$start = 0;
+		$end = $size - 1;
+
+		if ($range = $this->_parse_byte_range())
+		{
+			// We have a byte range from HTTP_RANGE
+			$start = $range[1];
+
+			if ($start[0] === '-')
+			{
+				// A negative value means we start from the end, so -500 would be the
+				// last 500 bytes.
+				$start = $size - abs($start);
+			}
+
+			if (isset($range[2]))
+			{
+				// Set the end range
+				$end = $range[2];
+			}
+		}
+
+		// Normalize values.
+		$start = abs(intval($start));
+
+		// Keep the the end value in bounds and normalize it.
+		$end = min(abs(intval($end)), $size - 1);
+
+		// Keep the start in bounds.
+		$start = ($end < $start) ? 0 : max($start, 0);
+
+		return array($start, $end);
+	}
+} // End Kohana_Response
diff --git a/includes/kohana/system/classes/kohana/route.php b/includes/kohana/system/classes/kohana/route.php
new file mode 100644
index 0000000..8dcd318
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/route.php
@@ -0,0 +1,541 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Routes are used to determine the controller and action for a requested URI.
+ * Every route generates a regular expression which is used to match a URI
+ * and a route. Routes may also contain keys which can be used to set the
+ * controller, action, and parameters.
+ *
+ * Each <key> will be translated to a regular expression using a default
+ * regular expression pattern. You can override the default pattern by providing
+ * a pattern for the key:
+ *
+ *     // This route will only match when <id> is a digit
+ *     Route::set('user', 'user/<action>/<id>', array('id' => '\d+'));
+ *
+ *     // This route will match when <path> is anything
+ *     Route::set('file', '<path>', array('path' => '.*'));
+ *
+ * It is also possible to create optional segments by using parentheses in
+ * the URI definition:
+ *
+ *     // This is the standard default route, and no keys are required
+ *     Route::set('default', '(<controller>(/<action>(/<id>)))');
+ *
+ *     // This route only requires the <file> key
+ *     Route::set('file', '(<path>/)<file>(.<format>)', array('path' => '.*', 'format' => '\w+'));
+ *
+ * Routes also provide a way to generate URIs (called "reverse routing"), which
+ * makes them an extremely powerful and flexible way to generate internal links.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Route {
+
+	// Defines the pattern of a <segment>
+	const REGEX_KEY     = '<([a-zA-Z0-9_]++)>';
+
+	// What can be part of a <segment> value
+	const REGEX_SEGMENT = '[^/.,;?\n]++';
+
+	// What must be escaped in the route regex
+	const REGEX_ESCAPE  = '[.\\+*?[^\\]${}=!|]';
+
+	/**
+	 * @var  string  default protocol for all routes
+	 *
+	 * @example  'http://'
+	 */
+	public static $default_protocol = 'http://';
+
+	/**
+	 * @var  array   list of valid localhost entries
+	 */
+	public static $localhosts = array(FALSE, '', 'local', 'localhost');
+
+	/**
+	 * @var  string  default action for all routes
+	 */
+	public static $default_action = 'index';
+
+	/**
+	 * @var  bool Indicates whether routes are cached
+	 */
+	public static $cache = FALSE;
+
+	/**
+	 * @var  array 
+	 */
+	protected static $_routes = array();
+
+	/**
+	 * Stores a named route and returns it. The "action" will always be set to
+	 * "index" if it is not defined.
+	 *
+	 *     Route::set('default', '(<controller>(/<action>(/<id>)))')
+	 *         ->defaults(array(
+	 *             'controller' => 'welcome',
+	 *         ));
+	 *
+	 * @param   string   route name
+	 * @param   string   URI pattern
+	 * @param   array    regex patterns for route keys
+	 * @return  Route
+	 */
+	public static function set($name, $uri_callback = NULL, $regex = NULL)
+	{
+		return Route::$_routes[$name] = new Route($uri_callback, $regex);
+	}
+
+	/**
+	 * Retrieves a named route.
+	 *
+	 *     $route = Route::get('default');
+	 *
+	 * @param   string  route name
+	 * @return  Route
+	 * @throws  Kohana_Exception
+	 */
+	public static function get($name)
+	{
+		if ( ! isset(Route::$_routes[$name]))
+		{
+			throw new Kohana_Exception('The requested route does not exist: :route',
+				array(':route' => $name));
+		}
+
+		return Route::$_routes[$name];
+	}
+
+	/**
+	 * Retrieves all named routes.
+	 *
+	 *     $routes = Route::all();
+	 *
+	 * @return  array  routes by name
+	 */
+	public static function all()
+	{
+		return Route::$_routes;
+	}
+
+	/**
+	 * Get the name of a route.
+	 *
+	 *     $name = Route::name($route)
+	 *
+	 * @param   object  Route instance
+	 * @return  string
+	 */
+	public static function name(Route $route)
+	{
+		return array_search($route, Route::$_routes);
+	}
+
+	/**
+	 * Saves or loads the route cache. If your routes will remain the same for
+	 * a long period of time, use this to reload the routes from the cache
+	 * rather than redefining them on every page load.
+	 *
+	 *     if ( ! Route::cache())
+	 *     {
+	 *         // Set routes here
+	 *         Route::cache(TRUE);
+	 *     }
+	 *
+	 * @param   boolean   cache the current routes
+	 * @return  void      when saving routes
+	 * @return  boolean   when loading routes
+	 * @uses    Kohana::cache
+	 */
+	public static function cache($save = FALSE)
+	{
+		if ($save === TRUE)
+		{
+			// Cache all defined routes
+			Kohana::cache('Route::cache()', Route::$_routes);
+		}
+		else
+		{
+			if ($routes = Kohana::cache('Route::cache()'))
+			{
+				Route::$_routes = $routes;
+
+				// Routes were cached
+				return Route::$cache = TRUE;
+			}
+			else
+			{
+				// Routes were not cached
+				return Route::$cache = FALSE;
+			}
+		}
+	}
+
+	/**
+	 * Create a URL from a route name. This is a shortcut for:
+	 *
+	 *     echo URL::site(Route::get($name)->uri($params), $protocol);
+	 *
+	 * @param   string   route name
+	 * @param   array    URI parameters
+	 * @param   mixed   protocol string or boolean, adds protocol and domain
+	 * @return  string
+	 * @since   3.0.7
+	 * @uses    URL::site
+	 */
+	public static function url($name, array $params = NULL, $protocol = NULL)
+	{
+		$route = Route::get($name);
+
+		// Create a URI with the route and convert it to a URL
+		if ($route->is_external())
+			return Route::get($name)->uri($params);
+		else
+			return URL::site(Route::get($name)->uri($params), $protocol);
+	}
+
+	/**
+	 * Returns the compiled regular expression for the route. This translates
+	 * keys and optional groups to a proper PCRE regular expression.
+	 *
+	 *     $compiled = Route::compile(
+	 *        '<controller>(/<action>(/<id>))',
+	 *         array(
+	 *           'controller' => '[a-z]+',
+	 *           'id' => '\d+',
+	 *         )
+	 *     );
+	 *
+	 * @return  string
+	 * @uses    Route::REGEX_ESCAPE
+	 * @uses    Route::REGEX_SEGMENT
+	 */
+	public static function compile($uri, array $regex = NULL)
+	{
+		if ( ! is_string($uri))
+			return;
+
+		// The URI should be considered literal except for keys and optional parts
+		// Escape everything preg_quote would escape except for : ( ) < >
+		$expression = preg_replace('#'.Route::REGEX_ESCAPE.'#', '\\\\$0', $uri);
+
+		if (strpos($expression, '(') !== FALSE)
+		{
+			// Make optional parts of the URI non-capturing and optional
+			$expression = str_replace(array('(', ')'), array('(?:', ')?'), $expression);
+		}
+
+		// Insert default regex for keys
+		$expression = str_replace(array('<', '>'), array('(?P<', '>'.Route::REGEX_SEGMENT.')'), $expression);
+
+		if ($regex)
+		{
+			$search = $replace = array();
+			foreach ($regex as $key => $value)
+			{
+				$search[]  = "<$key>".Route::REGEX_SEGMENT;
+				$replace[] = "<$key>$value";
+			}
+
+			// Replace the default regex with the user-specified regex
+			$expression = str_replace($search, $replace, $expression);
+		}
+
+		return '#^'.$expression.'$#uD';
+	}
+
+	/**
+	 * @var  callback     The callback method for routes
+	 */
+	protected $_callback;
+
+	/**
+	 * @var  string  route URI
+	 */
+	protected $_uri = '';
+
+	/**
+	 * @var  array
+	 */
+	protected $_regex = array();
+
+	/**
+	 * @var  array
+	 */
+	protected $_defaults = array('action' => 'index', 'host' => FALSE);
+
+	/**
+	 * @var  string
+	 */
+	protected $_route_regex;
+
+	/**
+	 * Creates a new route. Sets the URI and regular expressions for keys.
+	 * Routes should always be created with [Route::set] or they will not
+	 * be properly stored.
+	 *
+	 *     $route = new Route($uri, $regex);
+	 *
+	 * The $uri parameter can either be a string for basic regex matching or it
+	 * can be a valid callback or anonymous function (php 5.3+). If you use a
+	 * callback or anonymous function, your method should return an array
+	 * containing the proper keys for the route. If you want the route to be
+	 * "reversable", you need pass the route string as the third parameter.
+	 *
+	 *     $route = new Route(function($uri)
+	 *     {
+	 *     	if (list($controller, $action, $param) = explode('/', $uri) AND $controller == 'foo' AND $action == 'bar')
+	 *     	{
+	 *     		return array(
+	 *     			'controller' => 'foobar',
+	 *     			'action' => $action,
+	 *     			'id' => $param,
+	 *     		);
+	 *     	},
+	 *     	'foo/bar/<id>'
+	 *     });
+	 *
+	 * @param   mixed    route URI pattern or lambda/callback function
+	 * @param   array    key patterns
+	 * @return  void
+	 * @uses    Route::_compile
+	 */
+	public function __construct($uri = NULL, $regex = NULL)
+	{
+		if ($uri === NULL)
+		{
+			// Assume the route is from cache
+			return;
+		}
+
+		if ( ! is_string($uri) AND is_callable($uri))
+		{
+			$this->_callback = $uri;
+			$this->_uri = $regex;
+			$regex = NULL;
+		}
+		elseif ( ! empty($uri))
+		{
+			$this->_uri = $uri;
+		}
+
+		if ( ! empty($regex))
+		{
+			$this->_regex = $regex;
+		}
+
+		// Store the compiled regex locally
+		$this->_route_regex = Route::compile($uri, $regex);
+	}
+
+	/**
+	 * Provides default values for keys when they are not present. The default
+	 * action will always be "index" unless it is overloaded here.
+	 *
+	 *     $route->defaults(array(
+	 *         'controller' => 'welcome',
+	 *         'action'     => 'index'
+	 *     ));
+	 *
+	 * @param   array  key values
+	 * @return  $this
+	 */
+	public function defaults(array $defaults = NULL)
+	{
+		$this->_defaults = $defaults;
+
+		return $this;
+	}
+
+	/**
+	 * Tests if the route matches a given URI. A successful match will return
+	 * all of the routed parameters as an array. A failed match will return
+	 * boolean FALSE.
+	 *
+	 *     // Params: controller = users, action = edit, id = 10
+	 *     $params = $route->matches('users/edit/10');
+	 *
+	 * This method should almost always be used within an if/else block:
+	 *
+	 *     if ($params = $route->matches($uri))
+	 *     {
+	 *         // Parse the parameters
+	 *     }
+	 *
+	 * @param   string  URI to match
+	 * @return  array   on success
+	 * @return  FALSE   on failure
+	 */
+	public function matches($uri)
+	{
+		if ($this->_callback)
+		{
+			$closure = $this->_callback;
+			$params = call_user_func($closure, $uri);
+
+			if ( ! is_array($params))
+				return FALSE;
+		}
+		else
+		{
+			if ( ! preg_match($this->_route_regex, $uri, $matches))
+				return FALSE;
+
+			$params = array();
+			foreach ($matches as $key => $value)
+			{
+				if (is_int($key))
+				{
+					// Skip all unnamed keys
+					continue;
+				}
+
+				// Set the value for all matched keys
+				$params[$key] = $value;
+			}
+		}
+
+		foreach ($this->_defaults as $key => $value)
+		{
+			if ( ! isset($params[$key]) OR $params[$key] === '')
+			{
+				// Set default values for any key that was not matched
+				$params[$key] = $value;
+			}
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Returns whether this route is an external route
+	 * to a remote controller.
+	 *
+	 * @return  boolean
+	 */
+	public function is_external()
+	{
+		return ! in_array(Arr::get($this->_defaults, 'host', FALSE), Route::$localhosts);
+	}
+
+	/**
+	 * Generates a URI for the current route based on the parameters given.
+	 *
+	 *     // Using the "default" route: "users/profile/10"
+	 *     $route->uri(array(
+	 *         'controller' => 'users',
+	 *         'action'     => 'profile',
+	 *         'id'         => '10'
+	 *     ));
+	 *
+	 * @param   array   URI parameters
+	 * @return  string
+	 * @throws  Kohana_Exception
+	 * @uses    Route::REGEX_Key
+	 */
+	public function uri(array $params = NULL)
+	{
+		// Start with the routed URI
+		$uri = $this->_uri;
+
+		if (strpos($uri, '<') === FALSE AND strpos($uri, '(') === FALSE)
+		{
+			// This is a static route, no need to replace anything
+
+			if ( ! $this->is_external())
+				return $uri;
+
+			// If the localhost setting does not have a protocol
+			if (strpos($this->_defaults['host'], '://') === FALSE)
+			{
+				// Use the default defined protocol
+				$params['host'] = Route::$default_protocol.$this->_defaults['host'];
+			}
+			else
+			{
+				// Use the supplied host with protocol
+				$params['host'] = $this->_defaults['host'];
+			}
+
+			// Compile the final uri and return it
+			return rtrim($params['host'], '/').'/'.$uri;
+		}
+
+		while (preg_match('#\([^()]++\)#', $uri, $match))
+		{
+			// Search for the matched value
+			$search = $match[0];
+
+			// Remove the parenthesis from the match as the replace
+			$replace = substr($match[0], 1, -1);
+
+			while (preg_match('#'.Route::REGEX_KEY.'#', $replace, $match))
+			{
+				list($key, $param) = $match;
+
+				if (isset($params[$param]))
+				{
+					// Replace the key with the parameter value
+					$replace = str_replace($key, $params[$param], $replace);
+				}
+				else
+				{
+					// This group has missing parameters
+					$replace = '';
+					break;
+				}
+			}
+
+			// Replace the group in the URI
+			$uri = str_replace($search, $replace, $uri);
+		}
+
+		while (preg_match('#'.Route::REGEX_KEY.'#', $uri, $match))
+		{
+			list($key, $param) = $match;
+
+			if ( ! isset($params[$param]))
+			{
+				// Look for a default
+				if (isset($this->_defaults[$param]))
+				{
+					$params[$param] = $this->_defaults[$param];
+				}
+				else
+				{
+					// Ungrouped parameters are required
+					throw new Kohana_Exception('Required route parameter not passed: :param', array(
+						':param' => $param,
+					));
+			}
+			}
+
+			$uri = str_replace($key, $params[$param], $uri);
+		}
+
+		// Trim all extra slashes from the URI
+		$uri = preg_replace('#//+#', '/', rtrim($uri, '/'));
+
+		if ($this->is_external())
+		{
+			// Need to add the host to the URI
+			$host = $this->_defaults['host'];
+
+			if (strpos($host, '://') === FALSE)
+			{
+				// Use the default defined protocol
+				$host = Route::$default_protocol.$host;
+			}
+
+			// Clean up the host and prepend it to the URI
+			$uri = rtrim($host, '/').'/'.$uri;
+		}
+
+		return $uri;
+	}
+
+} // End Route
diff --git a/includes/kohana/system/classes/kohana/security.php b/includes/kohana/system/classes/kohana/security.php
new file mode 100644
index 0000000..e85af5b
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/security.php
@@ -0,0 +1,103 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Security helper class.
+ *
+ * @package    Kohana
+ * @category   Security
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Security {
+
+	/**
+	 * @var  string  key name used for token storage
+	 */
+	public static $token_name = 'security_token';
+
+	/**
+	 * Generate and store a unique token which can be used to help prevent
+	 * [CSRF](http://wikipedia.org/wiki/Cross_Site_Request_Forgery) attacks.
+	 *
+	 *     $token = Security::token();
+	 *
+	 * You can insert this token into your forms as a hidden field:
+	 *
+	 *     echo Form::hidden('csrf', Security::token());
+	 *
+	 * And then check it when using [Validation]:
+	 *
+	 *     $array->rules('csrf', array(
+	 *         'not_empty'       => NULL,
+	 *         'Security::check' => NULL,
+	 *     ));
+	 *
+	 * This provides a basic, but effective, method of preventing CSRF attacks.
+	 *
+	 * @param   boolean  force a new token to be generated?
+	 * @return  string
+	 * @uses    Session::instance
+	 */
+	public static function token($new = FALSE)
+	{
+		$session = Session::instance();
+
+		// Get the current token
+		$token = $session->get(Security::$token_name);
+
+		if ($new === TRUE OR ! $token)
+		{
+			// Generate a new unique token
+			$token = sha1(uniqid(NULL, TRUE));
+
+			// Store the new token
+			$session->set(Security::$token_name, $token);
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Check that the given token matches the currently stored security token.
+	 *
+	 *     if (Security::check($token))
+	 *     {
+	 *         // Pass
+	 *     }
+	 *
+	 * @param   string   token to check
+	 * @return  boolean
+	 * @uses    Security::token
+	 */
+	public static function check($token)
+	{
+		return Security::token() === $token;
+	}
+
+	/**
+	 * Remove image tags from a string.
+	 *
+	 *     $str = Security::strip_image_tags($str);
+	 *
+	 * @param   string  string to sanitize
+	 * @return  string
+	 */
+	public static function strip_image_tags($str)
+	{
+		return preg_replace('#<img\s.*?(?:src\s*=\s*["\']?([^"\'<>\s]*)["\']?[^>]*)?>#is', '$1', $str);
+	}
+
+	/**
+	 * Encodes PHP tags in a string.
+	 *
+	 *     $str = Security::encode_php_tags($str);
+	 *
+	 * @param   string  string to sanitize
+	 * @return  string
+	 */
+	public static function encode_php_tags($str)
+	{
+		return str_replace(array('<?', '?>'), array('&lt;?', '?&gt;'), $str);
+	}
+
+} // End security
diff --git a/includes/kohana/system/classes/kohana/session.php b/includes/kohana/system/classes/kohana/session.php
new file mode 100644
index 0000000..64be88c
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/session.php
@@ -0,0 +1,434 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Base session class.
+ *
+ * @package    Kohana
+ * @category   Session
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+abstract class Kohana_Session {
+
+	/**
+	 * @var  string  default session adapter
+	 */
+	public static $default = 'native';
+
+	/**
+	 * @var  array  session instances
+	 */
+	public static $instances = array();
+
+	/**
+	 * Creates a singleton session of the given type. Some session types
+	 * (native, database) also support restarting a session by passing a
+	 * session id as the second parameter.
+	 *
+	 *     $session = Session::instance();
+	 *
+	 * [!!] [Session::write] will automatically be called when the request ends.
+	 *
+	 * @param   string   type of session (native, cookie, etc)
+	 * @param   string   session identifier
+	 * @return  Session
+	 * @uses    Kohana::config
+	 */
+	public static function instance($type = NULL, $id = NULL)
+	{
+		if ($type === NULL)
+		{
+			// Use the default type
+			$type = Session::$default;
+		}
+
+		if ( ! isset(Session::$instances[$type]))
+		{
+			// Load the configuration for this type
+			$config = Kohana::config('session')->get($type);
+
+			// Set the session class name
+			$class = 'Session_'.ucfirst($type);
+
+			// Create a new session instance
+			Session::$instances[$type] = $session = new $class($config, $id);
+
+			// Write the session at shutdown
+			register_shutdown_function(array($session, 'write'));
+		}
+
+		return Session::$instances[$type];
+	}
+
+	/**
+	 * @var  string  cookie name
+	 */
+	protected $_name = 'session';
+
+	/**
+	 * @var  int  cookie lifetime
+	 */
+	protected $_lifetime = 0;
+
+	/**
+	 * @var  bool  encrypt session data?
+	 */
+	protected $_encrypted = FALSE;
+
+	/**
+	 * @var  array  session data
+	 */
+	protected $_data = array();
+
+	/**
+	 * @var  bool  session destroyed?
+	 */
+	protected $_destroyed = FALSE;
+
+	/**
+	 * Overloads the name, lifetime, and encrypted session settings.
+	 *
+	 * [!!] Sessions can only be created using the [Session::instance] method.
+	 *
+	 * @param   array   configuration
+	 * @param   string  session id
+	 * @return  void
+	 * @uses    Session::read
+	 */
+	public function __construct(array $config = NULL, $id = NULL)
+	{
+		if (isset($config['name']))
+		{
+			// Cookie name to store the session id in
+			$this->_name = (string) $config['name'];
+		}
+
+		if (isset($config['lifetime']))
+		{
+			// Cookie lifetime
+			$this->_lifetime = (int) $config['lifetime'];
+		}
+
+		if (isset($config['encrypted']))
+		{
+			if ($config['encrypted'] === TRUE)
+			{
+				// Use the default Encrypt instance
+				$config['encrypted'] = 'default';
+			}
+
+			// Enable or disable encryption of data
+			$this->_encrypted = $config['encrypted'];
+		}
+
+		// Load the session
+		$this->read($id);
+	}
+
+	/**
+	 * Session object is rendered to a serialized string. If encryption is
+	 * enabled, the session will be encrypted. If not, the output string will
+	 * be encoded using [base64_encode].
+	 *
+	 *     echo $session;
+	 *
+	 * @return  string
+	 * @uses    Encrypt::encode
+	 */
+	public function __toString()
+	{
+		// Serialize the data array
+		$data = serialize($this->_data);
+
+		if ($this->_encrypted)
+		{
+			// Encrypt the data using the default key
+			$data = Encrypt::instance($this->_encrypted)->encode($data);
+		}
+		else
+		{
+			// Obfuscate the data with base64 encoding
+			$data = base64_encode($data);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Returns the current session array. The returned array can also be
+	 * assigned by reference.
+	 *
+	 *     // Get a copy of the current session data
+	 *     $data = $session->as_array();
+	 *
+	 *     // Assign by reference for modification
+	 *     $data =& $session->as_array();
+	 *
+	 * @return  array
+	 */
+	public function & as_array()
+	{
+		return $this->_data;
+	}
+
+	/**
+	 * Get the current session id, if the session supports it.
+	 *
+	 *     $id = $session->id();
+	 *
+	 * [!!] Not all session types have ids.
+	 *
+	 * @return  string
+	 * @since   3.0.8
+	 */
+	public function id()
+	{
+		return NULL;
+	}
+
+	/**
+	 * Get the current session cookie name.
+	 *
+	 *     $name = $session->name();
+	 *
+	 * @return  string
+	 * @since   3.0.8
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
+
+	/**
+	 * Get a variable from the session array.
+	 *
+	 *     $foo = $session->get('foo');
+	 *
+	 * @param   string   variable name
+	 * @param   mixed    default value to return
+	 * @return  mixed
+	 */
+	public function get($key, $default = NULL)
+	{
+		return array_key_exists($key, $this->_data) ? $this->_data[$key] : $default;
+	}
+
+	/**
+	 * Get and delete a variable from the session array.
+	 *
+	 *     $bar = $session->get_once('bar');
+	 *
+	 * @param   string  variable name
+	 * @param   mixed   default value to return
+	 * @return  mixed
+	 */
+	public function get_once($key, $default = NULL)
+	{
+		$value = $this->get($key, $default);
+
+		unset($this->_data[$key]);
+
+		return $value;
+	}
+
+	/**
+	 * Set a variable in the session array.
+	 *
+	 *     $session->set('foo', 'bar');
+	 *
+	 * @param   string   variable name
+	 * @param   mixed    value
+	 * @return  $this
+	 */
+	public function set($key, $value)
+	{
+		$this->_data[$key] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Set a variable by reference.
+	 *
+	 *     $session->bind('foo', $foo);
+	 *
+	 * @param   string  variable name
+	 * @param   mixed   referenced value
+	 * @return  $this
+	 */
+	public function bind($key, & $value)
+	{
+		$this->_data[$key] =& $value;
+
+		return $this;
+	}
+
+	/**
+	 * Removes a variable in the session array.
+	 *
+	 *     $session->delete('foo');
+	 *
+	 * @param   string  variable name
+	 * @param   ...
+	 * @return  $this
+	 */
+	public function delete($key)
+	{
+		$args = func_get_args();
+
+		foreach ($args as $key)
+		{
+			unset($this->_data[$key]);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Loads existing session data.
+	 *
+	 *     $session->read();
+	 *
+	 * @param   string   session id
+	 * @return  void
+	 */
+	public function read($id = NULL)
+	{
+		$data = NULL;
+
+		try
+		{
+			if (is_string($data = $this->_read($id)))
+			{
+				if ($this->_encrypted)
+				{
+					// Decrypt the data using the default key
+					$data = Encrypt::instance($this->_encrypted)->decode($data);
+				}
+				else
+				{
+					// Decode the base64 encoded data
+					$data = base64_decode($data);
+				}
+
+				// Unserialize the data
+				$data = unserialize($data);
+			}
+			else
+			{
+				// Ignore these, session is valid, likely no data though.
+			}
+		}
+		catch (Exception $e)
+		{
+			// Ignore all reading errors, but log them
+			Kohana::$log->add(Log::ERROR, 'Error reading session data: '.$id);
+		}
+
+		if (is_array($data))
+		{
+			// Load the data locally
+			$this->_data = $data;
+		}
+	}
+
+	/**
+	 * Generates a new session id and returns it.
+	 *
+	 *     $id = $session->regenerate();
+	 *
+	 * @return  string
+	 */
+	public function regenerate()
+	{
+		return $this->_regenerate();
+	}
+
+	/**
+	 * Sets the last_active timestamp and saves the session.
+	 *
+	 *     $session->write();
+	 *
+	 * [!!] Any errors that occur during session writing will be logged,
+	 * but not displayed, because sessions are written after output has
+	 * been sent.
+	 *
+	 * @return  boolean
+	 * @uses    Kohana::$log
+	 */
+	public function write()
+	{
+		if (headers_sent() OR $this->_destroyed)
+		{
+			// Session cannot be written when the headers are sent or when
+			// the session has been destroyed
+			return FALSE;
+		}
+
+		// Set the last active timestamp
+		$this->_data['last_active'] = time();
+
+		try
+		{
+			return $this->_write();
+		}
+		catch (Exception $e)
+		{
+			// Log & ignore all errors when a write fails
+			Kohana::$log->add(Log::ERROR, Kohana_Exception::text($e))->write();
+
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Completely destroy the current session.
+	 *
+	 *     $success = $session->destroy();
+	 *
+	 * @return  boolean
+	 */
+	public function destroy()
+	{
+		if ($this->_destroyed === FALSE)
+		{
+			if ($this->_destroyed = $this->_destroy())
+			{
+				// The session has been destroyed, clear all data
+				$this->_data = array();
+			}
+		}
+
+		return $this->_destroyed;
+	}
+
+	/**
+	 * Loads the raw session data string and returns it.
+	 *
+	 * @param   string   session id
+	 * @return  string
+	 */
+	abstract protected function _read($id = NULL);
+
+	/**
+	 * Generate a new session id and return it.
+	 *
+	 * @return  string
+	 */
+	abstract protected function _regenerate();
+
+	/**
+	 * Writes the current session.
+	 *
+	 * @return  boolean
+	 */
+	abstract protected function _write();
+
+	/**
+	 * Destroys the current session.
+	 *
+	 * @return  boolean
+	 */
+	abstract protected function _destroy();
+
+} // End Session
diff --git a/includes/kohana/system/classes/kohana/session/cookie.php b/includes/kohana/system/classes/kohana/session/cookie.php
new file mode 100644
index 0000000..dc12c9c
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/session/cookie.php
@@ -0,0 +1,47 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Cookie-based session class.
+ *
+ * @package    Kohana
+ * @category   Session
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Session_Cookie extends Session {
+
+	/**
+	 * @param   string  $id  session id
+	 * @return  string
+	 */
+	protected function _read($id = NULL)
+	{
+		return Cookie::get($this->_name, NULL);
+	}
+
+	/**
+	 * @return  null
+	 */
+	protected function _regenerate()
+	{
+		// Cookie sessions have no id
+		return NULL;
+	}
+
+	/**
+	 * @return  bool
+	 */
+	protected function _write()
+	{
+		return Cookie::set($this->_name, $this->__toString(), $this->_lifetime);
+	}
+
+	/**
+	 * @return  bool
+	 */
+	protected function _destroy()
+	{
+		return Cookie::delete($this->_name);
+	}
+
+} // End Session_Cookie
diff --git a/includes/kohana/system/classes/kohana/session/native.php b/includes/kohana/system/classes/kohana/session/native.php
new file mode 100644
index 0000000..1d2c996
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/session/native.php
@@ -0,0 +1,93 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Native PHP session class.
+ *
+ * @package    Kohana
+ * @category   Session
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Session_Native extends Session {
+
+	/**
+	 * @return  string
+	 */
+	public function id()
+	{
+		return session_id();
+	}
+
+	/**
+	 * @param   string  $id  session id
+	 * @return  null
+	 */
+	protected function _read($id = NULL)
+	{
+		// Sync up the session cookie with Cookie parameters
+		session_set_cookie_params($this->_lifetime, Cookie::$path, Cookie::$domain, Cookie::$secure, Cookie::$httponly);
+
+		// Do not allow PHP to send Cache-Control headers
+		session_cache_limiter(FALSE);
+
+		// Set the session cookie name
+		session_name($this->_name);
+
+		if ($id)
+		{
+			// Set the session id
+			session_id($id);
+		}
+
+		// Start the session
+		session_start();
+
+		// Use the $_SESSION global for storing data
+		$this->_data =& $_SESSION;
+
+		return NULL;
+	}
+
+	/**
+	 * @return  string
+	 */
+	protected function _regenerate()
+	{
+		// Regenerate the session id
+		session_regenerate_id();
+
+		return session_id();
+	}
+
+	/**
+	 * @return  bool
+	 */
+	protected function _write()
+	{
+		// Write and close the session
+		session_write_close();
+
+		return TRUE;
+	}
+
+	/**
+	 * @return  bool
+	 */
+	protected function _destroy()
+	{
+		// Destroy the current session
+		session_destroy();
+
+		// Did destruction work?
+		$status = ! session_id();
+
+		if ($status)
+		{
+			// Make sure the session cannot be restarted
+			Cookie::delete($this->_name);
+		}
+
+		return $status;
+	}
+
+} // End Session_Native
diff --git a/includes/kohana/system/classes/kohana/text.php b/includes/kohana/system/classes/kohana/text.php
new file mode 100644
index 0000000..44b0d21
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/text.php
@@ -0,0 +1,590 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Text helper class. Provides simple methods for working with text.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Text {
+
+	/**
+	 * @var  array   number units and text equivalents
+	 */
+	public static $units = array(
+		1000000000 => 'billion',
+		1000000    => 'million',
+		1000       => 'thousand',
+		100        => 'hundred',
+		90 => 'ninety',
+		80 => 'eighty',
+		70 => 'seventy',
+		60 => 'sixty',
+		50 => 'fifty',
+		40 => 'fourty',
+		30 => 'thirty',
+		20 => 'twenty',
+		19 => 'nineteen',
+		18 => 'eighteen',
+		17 => 'seventeen',
+		16 => 'sixteen',
+		15 => 'fifteen',
+		14 => 'fourteen',
+		13 => 'thirteen',
+		12 => 'twelve',
+		11 => 'eleven',
+		10 => 'ten',
+		9  => 'nine',
+		8  => 'eight',
+		7  => 'seven',
+		6  => 'six',
+		5  => 'five',
+		4  => 'four',
+		3  => 'three',
+		2  => 'two',
+		1  => 'one',
+	);
+
+	/**
+	 * Limits a phrase to a given number of words.
+	 *
+	 *     $text = Text::limit_words($text);
+	 *
+	 * @param   string   phrase to limit words of
+	 * @param   integer  number of words to limit to
+	 * @param   string   end character or entity
+	 * @return  string
+	 */
+	public static function limit_words($str, $limit = 100, $end_char = NULL)
+	{
+		$limit = (int) $limit;
+		$end_char = ($end_char === NULL) ? '…' : $end_char;
+
+		if (trim($str) === '')
+			return $str;
+
+		if ($limit <= 0)
+			return $end_char;
+
+		preg_match('/^\s*+(?:\S++\s*+){1,'.$limit.'}/u', $str, $matches);
+
+		// Only attach the end character if the matched string is shorter
+		// than the starting string.
+		return rtrim($matches[0]).((strlen($matches[0]) === strlen($str)) ? '' : $end_char);
+	}
+
+	/**
+	 * Limits a phrase to a given number of characters.
+	 *
+	 *     $text = Text::limit_chars($text);
+	 *
+	 * @param   string   phrase to limit characters of
+	 * @param   integer  number of characters to limit to
+	 * @param   string   end character or entity
+	 * @param   boolean  enable or disable the preservation of words while limiting
+	 * @return  string
+	 * @uses    UTF8::strlen
+	 */
+	public static function limit_chars($str, $limit = 100, $end_char = NULL, $preserve_words = FALSE)
+	{
+		$end_char = ($end_char === NULL) ? '…' : $end_char;
+
+		$limit = (int) $limit;
+
+		if (trim($str) === '' OR UTF8::strlen($str) <= $limit)
+			return $str;
+
+		if ($limit <= 0)
+			return $end_char;
+
+		if ($preserve_words === FALSE)
+			return rtrim(UTF8::substr($str, 0, $limit)).$end_char;
+
+		// Don't preserve words. The limit is considered the top limit.
+		// No strings with a length longer than $limit should be returned.
+		if ( ! preg_match('/^.{0,'.$limit.'}\s/us', $str, $matches))
+			return $end_char;
+
+		return rtrim($matches[0]).((strlen($matches[0]) === strlen($str)) ? '' : $end_char);
+	}
+
+	/**
+	 * Alternates between two or more strings.
+	 *
+	 *     echo Text::alternate('one', 'two'); // "one"
+	 *     echo Text::alternate('one', 'two'); // "two"
+	 *     echo Text::alternate('one', 'two'); // "one"
+	 *
+	 * Note that using multiple iterations of different strings may produce
+	 * unexpected results.
+	 *
+	 * @param   string  strings to alternate between
+	 * @return  string
+	 */
+	public static function alternate()
+	{
+		static $i;
+
+		if (func_num_args() === 0)
+		{
+			$i = 0;
+			return '';
+		}
+
+		$args = func_get_args();
+		return $args[($i++ % count($args))];
+	}
+
+	/**
+	 * Generates a random string of a given type and length.
+	 *
+	 *
+	 *     $str = Text::random(); // 8 character random string
+	 *
+	 * The following types are supported:
+	 *
+	 * alnum
+	 * :  Upper and lower case a-z, 0-9 (default)
+	 *
+	 * alpha
+	 * :  Upper and lower case a-z
+	 *
+	 * hexdec
+	 * :  Hexadecimal characters a-f, 0-9
+	 *
+	 * distinct
+	 * :  Uppercase characters and numbers that cannot be confused
+	 *
+	 * You can also create a custom type by providing the "pool" of characters
+	 * as the type.
+	 *
+	 * @param   string   a type of pool, or a string of characters to use as the pool
+	 * @param   integer  length of string to return
+	 * @return  string
+	 * @uses    UTF8::split
+	 */
+	public static function random($type = NULL, $length = 8)
+	{
+		if ($type === NULL)
+		{
+			// Default is to generate an alphanumeric string
+			$type = 'alnum';
+		}
+
+		$utf8 = FALSE;
+
+		switch ($type)
+		{
+			case 'alnum':
+				$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+			break;
+			case 'alpha':
+				$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+			break;
+			case 'hexdec':
+				$pool = '0123456789abcdef';
+			break;
+			case 'numeric':
+				$pool = '0123456789';
+			break;
+			case 'nozero':
+				$pool = '123456789';
+			break;
+			case 'distinct':
+				$pool = '2345679ACDEFHJKLMNPRSTUVWXYZ';
+			break;
+			default:
+				$pool = (string) $type;
+				$utf8 = ! UTF8::is_ascii($pool);
+			break;
+		}
+
+		// Split the pool into an array of characters
+		$pool = ($utf8 === TRUE) ? UTF8::str_split($pool, 1) : str_split($pool, 1);
+
+		// Largest pool key
+		$max = count($pool) - 1;
+
+		$str = '';
+		for ($i = 0; $i < $length; $i++)
+		{
+			// Select a random character from the pool and add it to the string
+			$str .= $pool[mt_rand(0, $max)];
+		}
+
+		// Make sure alnum strings contain at least one letter and one digit
+		if ($type === 'alnum' AND $length > 1)
+		{
+			if (ctype_alpha($str))
+			{
+				// Add a random digit
+				$str[mt_rand(0, $length - 1)] = chr(mt_rand(48, 57));
+			}
+			elseif (ctype_digit($str))
+			{
+				// Add a random letter
+				$str[mt_rand(0, $length - 1)] = chr(mt_rand(65, 90));
+			}
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Reduces multiple slashes in a string to single slashes.
+	 *
+	 *     $str = Text::reduce_slashes('foo//bar/baz'); // "foo/bar/baz"
+	 *
+	 * @param   string  string to reduce slashes of
+	 * @return  string
+	 */
+	public static function reduce_slashes($str)
+	{
+		return preg_replace('#(?<!:)//+#', '/', $str);
+	}
+
+	/**
+	 * Replaces the given words with a string.
+	 *
+	 *     // Displays "What the #####, man!"
+	 *     echo Text::censor('What the frick, man!', array(
+	 *         'frick' => '#####',
+	 *     ));
+	 *
+	 * @param   string   phrase to replace words in
+	 * @param   array    words to replace
+	 * @param   string   replacement string
+	 * @param   boolean  replace words across word boundries (space, period, etc)
+	 * @return  string
+	 * @uses    UTF8::strlen
+	 */
+	public static function censor($str, $badwords, $replacement = '#', $replace_partial_words = TRUE)
+	{
+		foreach ( (array) $badwords as $key => $badword)
+		{
+			$badwords[$key] = str_replace('\*', '\S*?', preg_quote( (string) $badword));
+		}
+
+		$regex = '('.implode('|', $badwords).')';
+
+		if ($replace_partial_words === FALSE)
+		{
+			// Just using \b isn't sufficient when we need to replace a badword that already contains word boundaries itself
+			$regex = '(?<=\b|\s|^)'.$regex.'(?=\b|\s|$)';
+		}
+
+		$regex = '!'.$regex.'!ui';
+
+		if (UTF8::strlen($replacement) == 1)
+		{
+			$regex .= 'e';
+			return preg_replace($regex, 'str_repeat($replacement, UTF8::strlen(\'$1\'))', $str);
+		}
+
+		return preg_replace($regex, $replacement, $str);
+	}
+
+	/**
+	 * Finds the text that is similar between a set of words.
+	 *
+	 *     $match = Text::similar(array('fred', 'fran', 'free'); // "fr"
+	 *
+	 * @param   array   words to find similar text of
+	 * @return  string
+	 */
+	public static function similar(array $words)
+	{
+		// First word is the word to match against
+		$word = current($words);
+
+		for ($i = 0, $max = strlen($word); $i < $max; ++$i)
+		{
+			foreach ($words as $w)
+			{
+				// Once a difference is found, break out of the loops
+				if ( ! isset($w[$i]) OR $w[$i] !== $word[$i])
+					break 2;
+			}
+		}
+
+		// Return the similar text
+		return substr($word, 0, $i);
+	}
+
+	/**
+	 * Converts text email addresses and anchors into links. Existing links
+	 * will not be altered.
+	 *
+	 *     echo Text::auto_link($text);
+	 *
+	 * [!!] This method is not foolproof since it uses regex to parse HTML.
+	 *
+	 * @param   string   text to auto link
+	 * @return  string
+	 * @uses    Text::auto_link_urls
+	 * @uses    Text::auto_link_emails
+	 */
+	public static function auto_link($text)
+	{
+		// Auto link emails first to prevent problems with "www.domain.com@example.com"
+		return Text::auto_link_urls(Text::auto_link_emails($text));
+	}
+
+	/**
+	 * Converts text anchors into links. Existing links will not be altered.
+	 *
+	 *     echo Text::auto_link_urls($text);
+	 *
+	 * [!!] This method is not foolproof since it uses regex to parse HTML.
+	 *
+	 * @param   string   text to auto link
+	 * @return  string
+	 * @uses    HTML::anchor
+	 */
+	public static function auto_link_urls($text)
+	{
+		// Find and replace all http/https/ftp/ftps links that are not part of an existing html anchor
+		$text = preg_replace_callback('~\b(?<!href="|">)(?:ht|f)tps?://\S+(?:/|\b)~i', 'Text::_auto_link_urls_callback1', $text);
+
+		// Find and replace all naked www.links.com (without http://)
+		return preg_replace_callback('~\b(?<!://|">)www(?:\.[a-z0-9][-a-z0-9]*+)+\.[a-z]{2,6}\b~i', 'Text::_auto_link_urls_callback2', $text);
+	}
+
+	protected static function _auto_link_urls_callback1($matches)
+	{
+		return HTML::anchor($matches[0]);
+	}
+
+	protected static function _auto_link_urls_callback2($matches)
+	{
+		return HTML::anchor('http://'.$matches[0], $matches[0]);
+	}
+
+	/**
+	 * Converts text email addresses into links. Existing links will not
+	 * be altered.
+	 *
+	 *     echo Text::auto_link_emails($text);
+	 *
+	 * [!!] This method is not foolproof since it uses regex to parse HTML.
+	 *
+	 * @param   string   text to auto link
+	 * @return  string
+	 * @uses    HTML::mailto
+	 */
+	public static function auto_link_emails($text)
+	{
+		// Find and replace all email addresses that are not part of an existing html mailto anchor
+		// Note: The "58;" negative lookbehind prevents matching of existing encoded html mailto anchors
+		//       The html entity for a colon (:) is &#58; or &#058; or &#0058; etc.
+		return preg_replace_callback('~\b(?<!href="mailto:|58;)(?!\.)[-+_a-z0-9.]++(?<!\.)@(?![-.])[-a-z0-9.]+(?<!\.)\.[a-z]{2,6}\b(?!</a>)~i', 'Text::_auto_link_emails_callback', $text);
+	}
+
+	protected static function _auto_link_emails_callback($matches)
+	{
+		return HTML::mailto($matches[0]);
+	}
+
+	/**
+	 * Automatically applies "p" and "br" markup to text.
+	 * Basically [nl2br](http://php.net/nl2br) on steroids.
+	 *
+	 *     echo Text::auto_p($text);
+	 *
+	 * [!!] This method is not foolproof since it uses regex to parse HTML.
+	 *
+	 * @param   string   subject
+	 * @param   boolean  convert single linebreaks to <br />
+	 * @return  string
+	 */
+	public static function auto_p($str, $br = TRUE)
+	{
+		// Trim whitespace
+		if (($str = trim($str)) === '')
+			return '';
+
+		// Standardize newlines
+		$str = str_replace(array("\r\n", "\r"), "\n", $str);
+
+		// Trim whitespace on each line
+		$str = preg_replace('~^[ \t]+~m', '', $str);
+		$str = preg_replace('~[ \t]+$~m', '', $str);
+
+		// The following regexes only need to be executed if the string contains html
+		if ($html_found = (strpos($str, '<') !== FALSE))
+		{
+			// Elements that should not be surrounded by p tags
+			$no_p = '(?:p|div|h[1-6r]|ul|ol|li|blockquote|d[dlt]|pre|t[dhr]|t(?:able|body|foot|head)|c(?:aption|olgroup)|form|s(?:elect|tyle)|a(?:ddress|rea)|ma(?:p|th))';
+
+			// Put at least two linebreaks before and after $no_p elements
+			$str = preg_replace('~^<'.$no_p.'[^>]*+>~im', "\n$0", $str);
+			$str = preg_replace('~</'.$no_p.'\s*+>$~im', "$0\n", $str);
+		}
+
+		// Do the <p> magic!
+		$str = '<p>'.trim($str).'</p>';
+		$str = preg_replace('~\n{2,}~', "</p>\n\n<p>", $str);
+
+		// The following regexes only need to be executed if the string contains html
+		if ($html_found !== FALSE)
+		{
+			// Remove p tags around $no_p elements
+			$str = preg_replace('~<p>(?=</?'.$no_p.'[^>]*+>)~i', '', $str);
+			$str = preg_replace('~(</?'.$no_p.'[^>]*+>)</p>~i', '$1', $str);
+		}
+
+		// Convert single linebreaks to <br />
+		if ($br === TRUE)
+		{
+			$str = preg_replace('~(?<!\n)\n(?!\n)~', "<br />\n", $str);
+		}
+
+		return $str;
+	}
+
+	/**
+	 * Returns human readable sizes. Based on original functions written by
+	 * [Aidan Lister](http://aidanlister.com/repos/v/function.size_readable.php)
+	 * and [Quentin Zervaas](http://www.phpriot.com/d/code/strings/filesize-format/).
+	 *
+	 *     echo Text::bytes(filesize($file));
+	 *
+	 * @param   integer  size in bytes
+	 * @param   string   a definitive unit
+	 * @param   string   the return string format
+	 * @param   boolean  whether to use SI prefixes or IEC
+	 * @return  string
+	 */
+	public static function bytes($bytes, $force_unit = NULL, $format = NULL, $si = TRUE)
+	{
+		// Format string
+		$format = ($format === NULL) ? '%01.2f %s' : (string) $format;
+
+		// IEC prefixes (binary)
+		if ($si == FALSE OR strpos($force_unit, 'i') !== FALSE)
+		{
+			$units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB');
+			$mod   = 1024;
+		}
+		// SI prefixes (decimal)
+		else
+		{
+			$units = array('B', 'kB', 'MB', 'GB', 'TB', 'PB');
+			$mod   = 1000;
+		}
+
+		// Determine unit to use
+		if (($power = array_search( (string) $force_unit, $units)) === FALSE)
+		{
+			$power = ($bytes > 0) ? floor(log($bytes, $mod)) : 0;
+		}
+
+		return sprintf($format, $bytes / pow($mod, $power), $units[$power]);
+	}
+
+	/**
+	 * Format a number to human-readable text.
+	 *
+	 *     // Display: one thousand and twenty-four
+	 *     echo Text::number(1024);
+	 *
+	 *     // Display: five million, six hundred and thirty-two
+	 *     echo Text::number(5000632);
+	 *
+	 * @param   integer   number to format
+	 * @return  string
+	 * @since   3.0.8
+	 */
+	public static function number($number)
+	{
+		// The number must always be an integer
+		$number = (int) $number;
+
+		// Uncompiled text version
+		$text = array();
+
+		// Last matched unit within the loop
+		$last_unit = NULL;
+
+		// The last matched item within the loop
+		$last_item = '';
+
+		foreach (Text::$units as $unit => $name)
+		{
+			if ($number / $unit >= 1)
+			{
+				// $value = the number of times the number is divisble by unit
+				$number -= $unit * ($value = (int) floor($number / $unit));
+				// Temporary var for textifying the current unit
+				$item = '';
+
+				if ($unit < 100)
+				{
+					if ($last_unit < 100 AND $last_unit >= 20)
+					{
+						$last_item .= '-'.$name;
+					}
+					else
+					{
+						$item = $name;
+					}
+				}
+				else
+				{
+					$item = Text::number($value).' '.$name;
+				}
+
+				// In the situation that we need to make a composite number (i.e. twenty-three)
+				// then we need to modify the previous entry
+				if (empty($item))
+				{
+					array_pop($text);
+
+					$item = $last_item;
+				}
+
+				$last_item = $text[] = $item;
+				$last_unit = $unit;
+			}
+		}
+
+		if (count($text) > 1)
+		{
+			$and = array_pop($text);
+		}
+
+		$text = implode(', ', $text);
+
+		if (isset($and))
+		{
+			$text .= ' and '.$and;
+		}
+
+		return $text;
+	}
+
+	/**
+	 * Prevents [widow words](http://www.shauninman.com/archive/2006/08/22/widont_wordpress_plugin)
+	 * by inserting a non-breaking space between the last two words.
+	 *
+	 *     echo Text::widont($text);
+	 *
+	 * @param   string  text to remove widows from
+	 * @return  string
+	 */
+	public static function widont($str)
+	{
+		$str = rtrim($str);
+		$space = strrpos($str, ' ');
+
+		if ($space !== FALSE)
+		{
+			$str = substr($str, 0, $space).'&nbsp;'.substr($str, $space + 1);
+		}
+
+		return $str;
+	}
+
+} // End text
diff --git a/includes/kohana/system/classes/kohana/upload.php b/includes/kohana/system/classes/kohana/upload.php
new file mode 100644
index 0000000..7f0821b
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/upload.php
@@ -0,0 +1,190 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Upload helper class for working with uploaded files and [Validation].
+ *
+ *     $array = Validation::factory($_FILES);
+ *
+ * [!!] Remember to define your form with "enctype=multipart/form-data" or file
+ * uploading will not work!
+ *
+ * The following configuration properties can be set:
+ *
+ * - [Upload::$remove_spaces]
+ * - [Upload::$default_directory]
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Upload {
+
+	/**
+	 * @var  boolean  remove spaces in uploaded files
+	 */
+	public static $remove_spaces = TRUE;
+
+	/**
+	 * @var  string  default upload directory
+	 */
+	public static $default_directory = 'upload';
+
+	/**
+	 * Save an uploaded file to a new location. If no filename is provided,
+	 * the original filename will be used, with a unique prefix added.
+	 *
+	 * This method should be used after validating the $_FILES array:
+	 *
+	 *     if ($array->check())
+	 *     {
+	 *         // Upload is valid, save it
+	 *         Upload::save($array['file']);
+	 *     }
+	 *
+	 * @param   array    uploaded file data
+	 * @param   string   new filename
+	 * @param   string   new directory
+	 * @param   integer  chmod mask
+	 * @return  string   on success, full path to new file
+	 * @return  FALSE    on failure
+	 */
+	public static function save(array $file, $filename = NULL, $directory = NULL, $chmod = 0644)
+	{
+		if ( ! isset($file['tmp_name']) OR ! is_uploaded_file($file['tmp_name']))
+		{
+			// Ignore corrupted uploads
+			return FALSE;
+		}
+
+		if ($filename === NULL)
+		{
+			// Use the default filename, with a timestamp pre-pended
+			$filename = uniqid().$file['name'];
+		}
+
+		if (Upload::$remove_spaces === TRUE)
+		{
+			// Remove spaces from the filename
+			$filename = preg_replace('/\s+/u', '_', $filename);
+		}
+
+		if ($directory === NULL)
+		{
+			// Use the pre-configured upload directory
+			$directory = Upload::$default_directory;
+		}
+
+		if ( ! is_dir($directory) OR ! is_writable(realpath($directory)))
+		{
+			throw new Kohana_Exception('Directory :dir must be writable',
+				array(':dir' => Debug::path($directory)));
+		}
+
+		// Make the filename into a complete path
+		$filename = realpath($directory).DIRECTORY_SEPARATOR.$filename;
+
+		if (move_uploaded_file($file['tmp_name'], $filename))
+		{
+			if ($chmod !== FALSE)
+			{
+				// Set permissions on filename
+				chmod($filename, $chmod);
+			}
+
+			// Return new file path
+			return $filename;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Tests if upload data is valid, even if no file was uploaded. If you
+	 * _do_ require a file to be uploaded, add the [Upload::not_empty] rule
+	 * before this rule.
+	 *
+	 *     $array->rule('file', 'Upload::valid')
+	 *
+	 * @param   array  $_FILES item
+	 * @return  bool
+	 */
+	public static function valid($file)
+	{
+		return (isset($file['error'])
+			AND isset($file['name'])
+			AND isset($file['type'])
+			AND isset($file['tmp_name'])
+			AND isset($file['size']));
+	}
+
+	/**
+	 * Tests if a successful upload has been made.
+	 *
+	 *     $array->rule('file', 'Upload::not_empty');
+	 *
+	 * @param   array    $_FILES item
+	 * @return  bool
+	 */
+	public static function not_empty(array $file)
+	{
+		return (isset($file['error'])
+			AND isset($file['tmp_name'])
+			AND $file['error'] === UPLOAD_ERR_OK
+			AND is_uploaded_file($file['tmp_name']));
+	}
+
+	/**
+	 * Test if an uploaded file is an allowed file type, by extension.
+	 *
+	 *     $array->rule('file', 'Upload::type', array(':value', array('jpg', 'png', 'gif')));
+	 *
+	 * @param   array    $_FILES item
+	 * @param   array    allowed file extensions
+	 * @return  bool
+	 */
+	public static function type(array $file, array $allowed)
+	{
+		if ($file['error'] !== UPLOAD_ERR_OK)
+			return TRUE;
+
+		$ext = strtolower(pathinfo($file['name'], PATHINFO_EXTENSION));
+
+		return in_array($ext, $allowed);
+	}
+
+	/**
+	 * Validation rule to test if an uploaded file is allowed by file size.
+	 * File sizes are defined as: SB, where S is the size (1, 8.5, 300, etc.)
+	 * and B is the byte unit (K, MiB, GB, etc.). All valid byte units are
+	 * defined in Num::$byte_units
+	 *
+	 *     $array->rule('file', 'Upload::size', array(':value', '1M'))
+	 *     $array->rule('file', 'Upload::size', array(':value', '2.5KiB'))
+	 *
+	 * @param   array    $_FILES item
+	 * @param   string   maximum file size allowed
+	 * @return  bool
+	 */
+	public static function size(array $file, $size)
+	{
+		if ($file['error'] === UPLOAD_ERR_INI_SIZE)
+		{
+			// Upload is larger than PHP allowed size (upload_max_filesize)
+			return FALSE;
+		}
+
+		if ($file['error'] !== UPLOAD_ERR_OK)
+		{
+			// The upload failed, no size to check
+			return TRUE;
+		}
+
+		// Convert the provided size to bytes for comparison
+		$size = Num::bytes($size);
+
+		// Test that the file is under or equal to the max size
+		return ($file['size'] <= $size);
+	}
+
+} // End upload
diff --git a/includes/kohana/system/classes/kohana/url.php b/includes/kohana/system/classes/kohana/url.php
new file mode 100644
index 0000000..9c02643
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/url.php
@@ -0,0 +1,194 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * URL helper class.
+ *
+ * @package    Kohana
+ * @category   Helpers
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_URL {
+
+	/**
+	 * Gets the base URL to the application.
+	 * To specify a protocol, provide the protocol as a string or request object.
+	 * If a protocol is used, a complete URL will be generated using the
+	 * `$_SERVER['HTTP_HOST']` variable.
+	 *
+	 *     // Absolute URL path with no host or protocol
+	 *     echo URL::base();
+	 *
+	 *     // Absolute URL path with host, https protocol and index.php if set
+	 *     echo URL::base('https', TRUE);
+	 *
+	 *     // Absolute URL path with host and protocol from $request
+	 *     echo URL::base($request);
+	 *
+	 * @param   mixed    $protocol Protocol string, [Request], or boolean
+	 * @param   boolean  $index    Add index file to URL?
+	 * @return  string
+	 * @uses    Kohana::$index_file
+	 * @uses    Request::protocol()
+	 */
+	public static function base($protocol = NULL, $index = FALSE)
+	{
+		// Start with the configured base URL
+		$base_url = Kohana::$base_url;
+
+		if ($protocol === TRUE)
+		{
+			// Use the initial request to get the protocol
+			$protocol = Request::$initial;
+		}
+
+		if ($protocol instanceof Request)
+		{
+			// Use the current protocol
+			$protocol = $protocol->protocol();
+		}
+
+		if ( ! $protocol)
+		{
+			// Use the configured default protocol
+			$protocol = parse_url($base_url, PHP_URL_SCHEME);
+		}
+
+		if ($index === TRUE AND ! empty(Kohana::$index_file))
+		{
+			// Add the index file to the URL
+			$base_url .= Kohana::$index_file.'/';
+		}
+
+		if (is_string($protocol))
+		{
+			if ($port = parse_url($base_url, PHP_URL_PORT))
+			{
+				// Found a port, make it usable for the URL
+				$port = ':'.$port;
+			}
+
+			if ($domain = parse_url($base_url, PHP_URL_HOST))
+			{
+				// Remove everything but the path from the URL
+				$base_url = parse_url($base_url, PHP_URL_PATH);
+			}
+			else
+			{
+				// Attempt to use HTTP_HOST and fallback to SERVER_NAME
+				$domain = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
+			}
+
+			// Add the protocol and domain to the base URL
+			$base_url = $protocol.'://'.$domain.$port.$base_url;
+		}
+
+		return $base_url;
+	}
+
+	/**
+	 * Fetches an absolute site URL based on a URI segment.
+	 *
+	 *     echo URL::site('foo/bar');
+	 *
+	 * @param   string  $uri        Site URI to convert
+	 * @param   mixed   $protocol   Protocol string or [Request] class to use protocol from
+	 * @param   boolean $index		Include the index_page in the URL
+	 * @return  string
+	 * @uses    URL::base
+	 */
+	public static function site($uri = '', $protocol = NULL, $index = TRUE)
+	{
+		// Chop off possible scheme, host, port, user and pass parts
+		$path = preg_replace('~^[-a-z0-9+.]++://[^/]++/?~', '', trim($uri, '/'));
+
+		if ( ! UTF8::is_ascii($path))
+		{
+			// Encode all non-ASCII characters, as per RFC 1738
+			$path = preg_replace('~([^/]+)~e', 'rawurlencode("$1")', $path);
+		}
+
+		// Concat the URL
+		return URL::base($protocol, $index).$path;
+	}
+
+	/**
+	 * Merges the current GET parameters with an array of new or overloaded
+	 * parameters and returns the resulting query string.
+	 *
+	 *     // Returns "?sort=title&limit=10" combined with any existing GET values
+	 *     $query = URL::query(array('sort' => 'title', 'limit' => 10));
+	 *
+	 * Typically you would use this when you are sorting query results,
+	 * or something similar.
+	 *
+	 * [!!] Parameters with a NULL value are left out.
+	 *
+	 * @param   array    $params   Array of GET parameters
+	 * @param   boolean  $use_get  Include current request GET parameters
+	 * @return  string
+	 */
+	public static function query(array $params = NULL, $use_get = TRUE)
+	{
+		if ($use_get)
+		{
+			if ($params === NULL)
+			{
+				// Use only the current parameters
+				$params = $_GET;
+			}
+			else
+			{
+				// Merge the current and new parameters
+				$params = array_merge($_GET, $params);
+			}
+		}
+
+		if (empty($params))
+		{
+			// No query parameters
+			return '';
+		}
+
+		// Note: http_build_query returns an empty string for a params array with only NULL values
+		$query = http_build_query($params, '', '&');
+
+		// Don't prepend '?' to an empty string
+		return ($query === '') ? '' : ('?'.$query);
+	}
+
+	/**
+	 * Convert a phrase to a URL-safe title.
+	 *
+	 *     echo URL::title('My Blog Post'); // "my-blog-post"
+	 *
+	 * @param   string   $title       Phrase to convert
+	 * @param   string   $separator   Word separator (any single character)
+	 * @param   boolean  $ascii_only  Transliterate to ASCII?
+	 * @return  string
+	 * @uses    UTF8::transliterate_to_ascii
+	 */
+	public static function title($title, $separator = '-', $ascii_only = FALSE)
+	{
+		if ($ascii_only === TRUE)
+		{
+			// Transliterate non-ASCII characters
+			$title = UTF8::transliterate_to_ascii($title);
+
+			// Remove all characters that are not the separator, a-z, 0-9, or whitespace
+			$title = preg_replace('![^'.preg_quote($separator).'a-z0-9\s]+!', '', strtolower($title));
+		}
+		else
+		{
+			// Remove all characters that are not the separator, letters, numbers, or whitespace
+			$title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', UTF8::strtolower($title));
+		}
+
+		// Replace all separator characters and whitespace by a single separator
+		$title = preg_replace('!['.preg_quote($separator).'\s]+!u', $separator, $title);
+
+		// Trim separators from the beginning and end
+		return trim($title, $separator);
+	}
+
+} // End url
\ No newline at end of file
diff --git a/includes/kohana/system/classes/kohana/utf8.php b/includes/kohana/system/classes/kohana/utf8.php
new file mode 100644
index 0000000..fde08e0
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/utf8.php
@@ -0,0 +1,767 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * A port of [phputf8](http://phputf8.sourceforge.net/) to a unified set
+ * of files. Provides multi-byte aware replacement string functions.
+ *
+ * For UTF-8 support to work correctly, the following requirements must be met:
+ *
+ * - PCRE needs to be compiled with UTF-8 support (--enable-utf8)
+ * - Support for [Unicode properties](http://php.net/manual/reference.pcre.pattern.modifiers.php)
+ *   is highly recommended (--enable-unicode-properties)
+ * - UTF-8 conversion will be much more reliable if the
+ *   [iconv extension](http://php.net/iconv) is loaded
+ * - The [mbstring extension](http://php.net/mbstring) is highly recommended,
+ *   but must not be overloading string functions
+ *
+ * [!!] This file is licensed differently from the rest of Kohana. As a port of
+ * [phputf8](http://phputf8.sourceforge.net/), this file is released under the LGPL.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+class Kohana_UTF8 {
+
+	/**
+	 * @var  boolean  Does the server support UTF-8 natively?
+	 */
+	public static $server_utf8 = NULL;
+
+	/**
+	 * @var  array  List of called methods that have had their required file included.
+	 */
+	public static $called = array();
+
+	/**
+	 * Recursively cleans arrays, objects, and strings. Removes ASCII control
+	 * codes and converts to the requested charset while silently discarding
+	 * incompatible characters.
+	 *
+	 *     UTF8::clean($_GET); // Clean GET data
+	 *
+	 * [!!] This method requires [Iconv](http://php.net/iconv)
+	 *
+	 * @param   mixed   variable to clean
+	 * @param   string  character set, defaults to Kohana::$charset
+	 * @return  mixed
+	 * @uses    UTF8::strip_ascii_ctrl
+	 * @uses    UTF8::is_ascii
+	 */
+	public static function clean($var, $charset = NULL)
+	{
+		if ( ! $charset)
+		{
+			// Use the application character set
+			$charset = Kohana::$charset;
+		}
+
+		if (is_array($var) OR is_object($var))
+		{
+			foreach ($var as $key => $val)
+			{
+				// Recursion!
+				$var[self::clean($key)] = self::clean($val);
+			}
+		}
+		elseif (is_string($var) AND $var !== '')
+		{
+			// Remove control characters
+			$var = self::strip_ascii_ctrl($var);
+
+			if ( ! self::is_ascii($var))
+			{
+				// Disable notices
+				$error_reporting = error_reporting(~E_NOTICE);
+
+				// iconv is expensive, so it is only used when needed
+				$var = iconv($charset, $charset.'//IGNORE', $var);
+
+				// Turn notices back on
+				error_reporting($error_reporting);
+			}
+		}
+
+		return $var;
+	}
+
+	/**
+	 * Tests whether a string contains only 7-bit ASCII bytes. This is used to
+	 * determine when to use native functions or UTF-8 functions.
+	 *
+	 *     $ascii = UTF8::is_ascii($str);
+	 *
+	 * @param   mixed    string or array of strings to check
+	 * @return  boolean
+	 */
+	public static function is_ascii($str)
+	{
+		if (is_array($str))
+		{
+			$str = implode($str);
+		}
+
+		return ! preg_match('/[^\x00-\x7F]/S', $str);
+	}
+
+	/**
+	 * Strips out device control codes in the ASCII range.
+	 *
+	 *     $str = UTF8::strip_ascii_ctrl($str);
+	 *
+	 * @param   string  string to clean
+	 * @return  string
+	 */
+	public static function strip_ascii_ctrl($str)
+	{
+		return preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S', '', $str);
+	}
+
+	/**
+	 * Strips out all non-7bit ASCII bytes.
+	 *
+	 *     $str = UTF8::strip_non_ascii($str);
+	 *
+	 * @param   string  string to clean
+	 * @return  string
+	 */
+	public static function strip_non_ascii($str)
+	{
+		return preg_replace('/[^\x00-\x7F]+/S', '', $str);
+	}
+
+	/**
+	 * Replaces special/accented UTF-8 characters by ASCII-7 "equivalents".
+	 *
+	 *     $ascii = UTF8::transliterate_to_ascii($utf8);
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   string to transliterate
+	 * @param   integer  -1 lowercase only, +1 uppercase only, 0 both cases
+	 * @return  string
+	 */
+	public static function transliterate_to_ascii($str, $case = 0)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _transliterate_to_ascii($str, $case);
+	}
+
+	/**
+	 * Returns the length of the given string. This is a UTF8-aware version
+	 * of [strlen](http://php.net/strlen).
+	 *
+	 *     $length = UTF8::strlen($str);
+	 *
+	 * @param   string   string being measured for length
+	 * @return  integer
+	 * @uses    UTF8::$server_utf8
+	 */
+	public static function strlen($str)
+	{
+		if (UTF8::$server_utf8)
+			return mb_strlen($str, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strlen($str);
+	}
+
+	/**
+	 * Finds position of first occurrence of a UTF-8 string. This is a
+	 * UTF8-aware version of [strpos](http://php.net/strpos).
+	 *
+	 *     $position = UTF8::strpos($str, $search);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   haystack
+	 * @param   string   needle
+	 * @param   integer  offset from which character in haystack to start searching
+	 * @return  integer  position of needle
+	 * @return  boolean  FALSE if the needle is not found
+	 * @uses    UTF8::$server_utf8
+	 */
+	public static function strpos($str, $search, $offset = 0)
+	{
+		if (UTF8::$server_utf8)
+			return mb_strpos($str, $search, $offset, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strpos($str, $search, $offset);
+	}
+
+	/**
+	 * Finds position of last occurrence of a char in a UTF-8 string. This is
+	 * a UTF8-aware version of [strrpos](http://php.net/strrpos).
+	 *
+	 *     $position = UTF8::strrpos($str, $search);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   haystack
+	 * @param   string   needle
+	 * @param   integer  offset from which character in haystack to start searching
+	 * @return  integer  position of needle
+	 * @return  boolean  FALSE if the needle is not found
+	 * @uses    UTF8::$server_utf8
+	 */
+	public static function strrpos($str, $search, $offset = 0)
+	{
+		if (UTF8::$server_utf8)
+			return mb_strrpos($str, $search, $offset, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strrpos($str, $search, $offset);
+	}
+
+	/**
+	 * Returns part of a UTF-8 string. This is a UTF8-aware version
+	 * of [substr](http://php.net/substr).
+	 *
+	 *     $sub = UTF8::substr($str, $offset);
+	 *
+	 * @author  Chris Smith <chris@jalakai.co.uk>
+	 * @param   string   input string
+	 * @param   integer  offset
+	 * @param   integer  length limit
+	 * @return  string
+	 * @uses    UTF8::$server_utf8
+	 * @uses    Kohana::$charset
+	 */
+	public static function substr($str, $offset, $length = NULL)
+	{
+		if (UTF8::$server_utf8)
+			return ($length === NULL)
+				? mb_substr($str, $offset, mb_strlen($str), Kohana::$charset)
+				: mb_substr($str, $offset, $length, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _substr($str, $offset, $length);
+	}
+
+	/**
+	 * Replaces text within a portion of a UTF-8 string. This is a UTF8-aware
+	 * version of [substr_replace](http://php.net/substr_replace).
+	 *
+	 *     $str = UTF8::substr_replace($str, $replacement, $offset);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   input string
+	 * @param   string   replacement string
+	 * @param   integer  offset
+	 * @return  string
+	 */
+	public static function substr_replace($str, $replacement, $offset, $length = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _substr_replace($str, $replacement, $offset, $length);
+	}
+
+	/**
+	 * Makes a UTF-8 string lowercase. This is a UTF8-aware version
+	 * of [strtolower](http://php.net/strtolower).
+	 *
+	 *     $str = UTF8::strtolower($str);
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   mixed case string
+	 * @return  string
+	 * @uses    UTF8::$server_utf8
+	 */
+	public static function strtolower($str)
+	{
+		if (UTF8::$server_utf8)
+			return mb_strtolower($str, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strtolower($str);
+	}
+
+	/**
+	 * Makes a UTF-8 string uppercase. This is a UTF8-aware version
+	 * of [strtoupper](http://php.net/strtoupper).
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   mixed case string
+	 * @return  string
+	 * @uses    UTF8::$server_utf8
+	 * @uses    Kohana::$charset
+	 */
+	public static function strtoupper($str)
+	{
+		if (UTF8::$server_utf8)
+			return mb_strtoupper($str, Kohana::$charset);
+
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strtoupper($str);
+	}
+
+	/**
+	 * Makes a UTF-8 string's first character uppercase. This is a UTF8-aware
+	 * version of [ucfirst](http://php.net/ucfirst).
+	 *
+	 *     $str = UTF8::ucfirst($str);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   mixed case string
+	 * @return  string
+	 */
+	public static function ucfirst($str)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _ucfirst($str);
+	}
+
+	/**
+	 * Makes the first character of every word in a UTF-8 string uppercase.
+	 * This is a UTF8-aware version of [ucwords](http://php.net/ucwords).
+	 *
+	 *     $str = UTF8::ucwords($str);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   mixed case string
+	 * @return  string
+	 * @uses    UTF8::$server_utf8
+	 */
+	public static function ucwords($str)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _ucwords($str);
+	}
+
+	/**
+	 * Case-insensitive UTF-8 string comparison. This is a UTF8-aware version
+	 * of [strcasecmp](http://php.net/strcasecmp).
+	 *
+	 *     $compare = UTF8::strcasecmp($str1, $str2);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   string to compare
+	 * @param   string   string to compare
+	 * @return  integer  less than 0 if str1 is less than str2
+	 * @return  integer  greater than 0 if str1 is greater than str2
+	 * @return  integer  0 if they are equal
+	 */
+	public static function strcasecmp($str1, $str2)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strcasecmp($str1, $str2);
+	}
+
+	/**
+	 * Returns a string or an array with all occurrences of search in subject
+	 * (ignoring case) and replaced with the given replace value. This is a
+	 * UTF8-aware version of [str_ireplace](http://php.net/str_ireplace).
+	 *
+	 * [!!] This function is very slow compared to the native version. Avoid
+	 * using it when possible.
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com
+	 * @param   string|array  text to replace
+	 * @param   string|array  replacement text
+	 * @param   string|array  subject text
+	 * @param   integer       number of matched and replaced needles will be returned via this parameter which is passed by reference
+	 * @return  string        if the input was a string
+	 * @return  array         if the input was an array
+	 */
+	public static function str_ireplace($search, $replace, $str, & $count = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _str_ireplace($search, $replace, $str, $count);
+	}
+
+	/**
+	 * Case-insenstive UTF-8 version of strstr. Returns all of input string
+	 * from the first occurrence of needle to the end. This is a UTF8-aware
+	 * version of [stristr](http://php.net/stristr).
+	 *
+	 *     $found = UTF8::stristr($str, $search);
+	 *
+	 * @author Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string  input string
+	 * @param   string  needle
+	 * @return  string  matched substring if found
+	 * @return  FALSE   if the substring was not found
+	 */
+	public static function stristr($str, $search)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _stristr($str, $search);
+	}
+
+	/**
+	 * Finds the length of the initial segment matching mask. This is a
+	 * UTF8-aware version of [strspn](http://php.net/strspn).
+	 *
+	 *     $found = UTF8::strspn($str, $mask);
+	 *
+	 * @author Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   input string
+	 * @param   string   mask for search
+	 * @param   integer  start position of the string to examine
+	 * @param   integer  length of the string to examine
+	 * @return  integer  length of the initial segment that contains characters in the mask
+	 */
+	public static function strspn($str, $mask, $offset = NULL, $length = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strspn($str, $mask, $offset, $length);
+	}
+
+	/**
+	 * Finds the length of the initial segment not matching mask. This is a
+	 * UTF8-aware version of [strcspn](http://php.net/strcspn).
+	 *
+	 *     $found = UTF8::strcspn($str, $mask);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   input string
+	 * @param   string   mask for search
+	 * @param   integer  start position of the string to examine
+	 * @param   integer  length of the string to examine
+	 * @return  integer  length of the initial segment that contains characters not in the mask
+	 */
+	public static function strcspn($str, $mask, $offset = NULL, $length = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strcspn($str, $mask, $offset, $length);
+	}
+
+	/**
+	 * Pads a UTF-8 string to a certain length with another string. This is a
+	 * UTF8-aware version of [str_pad](http://php.net/str_pad).
+	 *
+	 *     $str = UTF8::str_pad($str, $length);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   input string
+	 * @param   integer  desired string length after padding
+	 * @param   string   string to use as padding
+	 * @param   string   padding type: STR_PAD_RIGHT, STR_PAD_LEFT, or STR_PAD_BOTH
+	 * @return  string
+	 */
+	public static function str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_RIGHT)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _str_pad($str, $final_str_length, $pad_str, $pad_type);
+	}
+
+	/**
+	 * Converts a UTF-8 string to an array. This is a UTF8-aware version of
+	 * [str_split](http://php.net/str_split).
+	 *
+	 *     $array = UTF8::str_split($str);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   input string
+	 * @param   integer  maximum length of each chunk
+	 * @return  array
+	 */
+	public static function str_split($str, $split_length = 1)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _str_split($str, $split_length);
+	}
+
+	/**
+	 * Reverses a UTF-8 string. This is a UTF8-aware version of [strrev](http://php.net/strrev).
+	 *
+	 *     $str = UTF8::strrev($str);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   string to be reversed
+	 * @return  string
+	 */
+	public static function strrev($str)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _strrev($str);
+	}
+
+	/**
+	 * Strips whitespace (or other UTF-8 characters) from the beginning and
+	 * end of a string. This is a UTF8-aware version of [trim](http://php.net/trim).
+	 *
+	 *     $str = UTF8::trim($str);
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   input string
+	 * @param   string   string of characters to remove
+	 * @return  string
+	 */
+	public static function trim($str, $charlist = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _trim($str, $charlist);
+	}
+
+	/**
+	 * Strips whitespace (or other UTF-8 characters) from the beginning of
+	 * a string. This is a UTF8-aware version of [ltrim](http://php.net/ltrim).
+	 *
+	 *     $str = UTF8::ltrim($str);
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   input string
+	 * @param   string   string of characters to remove
+	 * @return  string
+	 */
+	public static function ltrim($str, $charlist = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _ltrim($str, $charlist);
+	}
+
+	/**
+	 * Strips whitespace (or other UTF-8 characters) from the end of a string.
+	 * This is a UTF8-aware version of [rtrim](http://php.net/rtrim).
+	 *
+	 *     $str = UTF8::rtrim($str);
+	 *
+	 * @author  Andreas Gohr <andi@splitbrain.org>
+	 * @param   string   input string
+	 * @param   string   string of characters to remove
+	 * @return  string
+	 */
+	public static function rtrim($str, $charlist = NULL)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _rtrim($str, $charlist);
+	}
+
+	/**
+	 * Returns the unicode ordinal for a character. This is a UTF8-aware
+	 * version of [ord](http://php.net/ord).
+	 *
+	 *     $digit = UTF8::ord($character);
+	 *
+	 * @author  Harry Fuecks <hfuecks@gmail.com>
+	 * @param   string   UTF-8 encoded character
+	 * @return  integer
+	 */
+	public static function ord($chr)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _ord($chr);
+	}
+
+	/**
+	 * Takes an UTF-8 string and returns an array of ints representing the Unicode characters.
+	 * Astral planes are supported i.e. the ints in the output can be > 0xFFFF.
+	 * Occurrences of the BOM are ignored. Surrogates are not allowed.
+	 *
+	 *     $array = UTF8::to_unicode($str);
+	 *
+	 * The Original Code is Mozilla Communicator client code.
+	 * The Initial Developer of the Original Code is Netscape Communications Corporation.
+	 * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer.
+	 * Ported to PHP by Henri Sivonen <hsivonen@iki.fi>, see <http://hsivonen.iki.fi/php-utf8/>
+	 * Slight modifications to fit with phputf8 library by Harry Fuecks <hfuecks@gmail.com>
+	 *
+	 * @param   string  UTF-8 encoded string
+	 * @return  array   unicode code points
+	 * @return  FALSE   if the string is invalid
+	 */
+	public static function to_unicode($str)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _to_unicode($str);
+	}
+
+	/**
+	 * Takes an array of ints representing the Unicode characters and returns a UTF-8 string.
+	 * Astral planes are supported i.e. the ints in the input can be > 0xFFFF.
+	 * Occurrances of the BOM are ignored. Surrogates are not allowed.
+	 *
+	 *     $str = UTF8::to_unicode($array);
+	 *
+	 * The Original Code is Mozilla Communicator client code.
+	 * The Initial Developer of the Original Code is Netscape Communications Corporation.
+	 * Portions created by the Initial Developer are Copyright (C) 1998 the Initial Developer.
+	 * Ported to PHP by Henri Sivonen <hsivonen@iki.fi>, see http://hsivonen.iki.fi/php-utf8/
+	 * Slight modifications to fit with phputf8 library by Harry Fuecks <hfuecks@gmail.com>.
+	 *
+	 * @param   array    unicode code points representing a string
+	 * @return  string   utf8 string of characters
+	 * @return  boolean  FALSE if a code point cannot be found
+	 */
+	public static function from_unicode($arr)
+	{
+		if ( ! isset(self::$called[__FUNCTION__]))
+		{
+			require SYSPATH.'utf8'.DIRECTORY_SEPARATOR.__FUNCTION__.EXT;
+
+			// Function has been called
+			self::$called[__FUNCTION__] = TRUE;
+		}
+
+		return _from_unicode($arr);
+	}
+
+} // End UTF8
+
+if (Kohana_UTF8::$server_utf8 === NULL)
+{
+	// Determine if this server supports UTF-8 natively
+	Kohana_UTF8::$server_utf8 = extension_loaded('mbstring');
+}
diff --git a/includes/kohana/system/classes/kohana/valid.php b/includes/kohana/system/classes/kohana/valid.php
new file mode 100644
index 0000000..a2d0a7e
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/valid.php
@@ -0,0 +1,518 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Validation rules.
+ *
+ * @package    Kohana
+ * @category   Security
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Valid {
+
+	/**
+	 * Checks if a field is not empty.
+	 *
+	 * @return  boolean
+	 */
+	public static function not_empty($value)
+	{
+		if (is_object($value) AND $value instanceof ArrayObject)
+		{
+			// Get the array from the ArrayObject
+			$value = $value->getArrayCopy();
+		}
+
+		// Value cannot be NULL, FALSE, '', or an empty array
+		return ! in_array($value, array(NULL, FALSE, '', array()), TRUE);
+	}
+
+	/**
+	 * Checks a field against a regular expression.
+	 *
+	 * @param   string  value
+	 * @param   string  regular expression to match (including delimiters)
+	 * @return  boolean
+	 */
+	public static function regex($value, $expression)
+	{
+		return (bool) preg_match($expression, (string) $value);
+	}
+
+	/**
+	 * Checks that a field is long enough.
+	 *
+	 * @param   string   value
+	 * @param   integer  minimum length required
+	 * @return  boolean
+	 */
+	public static function min_length($value, $length)
+	{
+		return UTF8::strlen($value) >= $length;
+	}
+
+	/**
+	 * Checks that a field is short enough.
+	 *
+	 * @param   string   value
+	 * @param   integer  maximum length required
+	 * @return  boolean
+	 */
+	public static function max_length($value, $length)
+	{
+		return UTF8::strlen($value) <= $length;
+	}
+
+	/**
+	 * Checks that a field is exactly the right length.
+	 *
+	 * @param   string   value
+	 * @param   integer  exact length required
+	 * @return  boolean
+	 */
+	public static function exact_length($value, $length)
+	{
+		return UTF8::strlen($value) === $length;
+	}
+
+	/**
+	 * Checks that a field is exactly the value required.
+	 *
+	 * @param   string   value
+	 * @param   string   required value
+	 * @return  boolean
+	 */
+	public static function equals($value, $required)
+	{
+		return ($value === $required);
+	}
+
+	/**
+	 * Check an email address for correct format.
+	 *
+	 * @link  http://www.iamcal.com/publish/articles/php/parsing_email/
+	 * @link  http://www.w3.org/Protocols/rfc822/
+	 *
+	 * @param   string   email address
+	 * @param   boolean  strict RFC compatibility
+	 * @return  boolean
+	 */
+	public static function email($email, $strict = FALSE)
+	{
+		if ($strict === TRUE)
+		{
+			$qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]';
+			$dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]';
+			$atom  = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+';
+			$pair  = '\\x5c[\\x00-\\x7f]';
+
+			$domain_literal = "\\x5b($dtext|$pair)*\\x5d";
+			$quoted_string  = "\\x22($qtext|$pair)*\\x22";
+			$sub_domain     = "($atom|$domain_literal)";
+			$word           = "($atom|$quoted_string)";
+			$domain         = "$sub_domain(\\x2e$sub_domain)*";
+			$local_part     = "$word(\\x2e$word)*";
+
+			$expression     = "/^$local_part\\x40$domain$/D";
+		}
+		else
+		{
+			$expression = '/^[-_a-z0-9\'+*$^&%=~!?{}]++(?:\.[-_a-z0-9\'+*$^&%=~!?{}]+)*+@(?:(?![-.])[-a-z0-9.]+(?<![-.])\.[a-z]{2,6}|\d{1,3}(?:\.\d{1,3}){3})(?::\d++)?$/iD';
+		}
+
+		return (bool) preg_match($expression, (string) $email);
+	}
+
+	/**
+	 * Validate the domain of an email address by checking if the domain has a
+	 * valid MX record.
+	 *
+	 * @link  http://php.net/checkdnsrr  not added to Windows until PHP 5.3.0
+	 *
+	 * @param   string   email address
+	 * @return  boolean
+	 */
+	public static function email_domain($email)
+	{
+		// Check if the email domain has a valid MX record
+		return (bool) checkdnsrr(preg_replace('/^[^@]++@/', '', $email), 'MX');
+	}
+
+	/**
+	 * Validate a URL.
+	 *
+	 * @param   string   URL
+	 * @return  boolean
+	 */
+	public static function url($url)
+	{
+		// Based on http://www.apps.ietf.org/rfc/rfc1738.html#sec-5
+		if ( ! preg_match(
+			'~^
+
+			# scheme
+			[-a-z0-9+.]++://
+
+			# username:password (optional)
+			(?:
+				    [-a-z0-9$_.+!*\'(),;?&=%]++   # username
+				(?::[-a-z0-9$_.+!*\'(),;?&=%]++)? # password (optional)
+				@
+			)?
+
+			(?:
+				# ip address
+				\d{1,3}+(?:\.\d{1,3}+){3}+
+
+				| # or
+
+				# hostname (captured)
+				(
+					     (?!-)[-a-z0-9]{1,63}+(?<!-)
+					(?:\.(?!-)[-a-z0-9]{1,63}+(?<!-)){0,126}+
+				)
+			)
+
+			# port (optional)
+			(?::\d{1,5}+)?
+
+			# path (optional)
+			(?:/.*)?
+
+			$~iDx', $url, $matches))
+			return FALSE;
+
+		// We matched an IP address
+		if ( ! isset($matches[1]))
+			return TRUE;
+
+		// Check maximum length of the whole hostname
+		// http://en.wikipedia.org/wiki/Domain_name#cite_note-0
+		if (strlen($matches[1]) > 253)
+			return FALSE;
+
+		// An extra check for the top level domain
+		// It must start with a letter
+		$tld = ltrim(substr($matches[1], (int) strrpos($matches[1], '.')), '.');
+		return ctype_alpha($tld[0]);
+	}
+
+	/**
+	 * Validate an IP.
+	 *
+	 * @param   string   IP address
+	 * @param   boolean  allow private IP networks
+	 * @return  boolean
+	 */
+	public static function ip($ip, $allow_private = TRUE)
+	{
+		// Do not allow reserved addresses
+		$flags = FILTER_FLAG_NO_RES_RANGE;
+
+		if ($allow_private === FALSE)
+		{
+			// Do not allow private or reserved addresses
+			$flags = $flags | FILTER_FLAG_NO_PRIV_RANGE;
+		}
+
+		return (bool) filter_var($ip, FILTER_VALIDATE_IP, $flags);
+	}
+
+	/**
+	 * Validates a credit card number, with a Luhn check if possible.
+	 *
+	 * @param   integer       credit card number
+	 * @param   string|array  card type, or an array of card types
+	 * @return  boolean
+	 * @uses    Validate::luhn
+	 */
+	public static function credit_card($number, $type = NULL)
+	{
+		// Remove all non-digit characters from the number
+		if (($number = preg_replace('/\D+/', '', $number)) === '')
+			return FALSE;
+
+		if ($type == NULL)
+		{
+			// Use the default type
+			$type = 'default';
+		}
+		elseif (is_array($type))
+		{
+			foreach ($type as $t)
+			{
+				// Test each type for validity
+				if (Valid::credit_card($number, $t))
+					return TRUE;
+			}
+
+			return FALSE;
+		}
+
+		$cards = Kohana::config('credit_cards');
+
+		// Check card type
+		$type = strtolower($type);
+
+		if ( ! isset($cards[$type]))
+			return FALSE;
+
+		// Check card number length
+		$length = strlen($number);
+
+		// Validate the card length by the card type
+		if ( ! in_array($length, preg_split('/\D+/', $cards[$type]['length'])))
+			return FALSE;
+
+		// Check card number prefix
+		if ( ! preg_match('/^'.$cards[$type]['prefix'].'/', $number))
+			return FALSE;
+
+		// No Luhn check required
+		if ($cards[$type]['luhn'] == FALSE)
+			return TRUE;
+
+		return Valid::luhn($number);
+	}
+
+	/**
+	 * Validate a number against the [Luhn](http://en.wikipedia.org/wiki/Luhn_algorithm)
+	 * (mod10) formula.
+	 *
+	 * @param   string   number to check
+	 * @return  boolean
+	 */
+	public static function luhn($number)
+	{
+		// Force the value to be a string as this method uses string functions.
+		// Converting to an integer may pass PHP_INT_MAX and result in an error!
+		$number = (string) $number;
+
+		if ( ! ctype_digit($number))
+		{
+			// Luhn can only be used on numbers!
+			return FALSE;
+		}
+
+		// Check number length
+		$length = strlen($number);
+
+		// Checksum of the card number
+		$checksum = 0;
+
+		for ($i = $length - 1; $i >= 0; $i -= 2)
+		{
+			// Add up every 2nd digit, starting from the right
+			$checksum += substr($number, $i, 1);
+		}
+
+		for ($i = $length - 2; $i >= 0; $i -= 2)
+		{
+			// Add up every 2nd digit doubled, starting from the right
+			$double = substr($number, $i, 1) * 2;
+
+			// Subtract 9 from the double where value is greater than 10
+			$checksum += ($double >= 10) ? ($double - 9) : $double;
+		}
+
+		// If the checksum is a multiple of 10, the number is valid
+		return ($checksum % 10 === 0);
+	}
+
+	/**
+	 * Checks if a phone number is valid.
+	 *
+	 * @param   string   phone number to check
+	 * @return  boolean
+	 */
+	public static function phone($number, $lengths = NULL)
+	{
+		if ( ! is_array($lengths))
+		{
+			$lengths = array(7,10,11);
+		}
+
+		// Remove all non-digit characters from the number
+		$number = preg_replace('/\D+/', '', $number);
+
+		// Check if the number is within range
+		return in_array(strlen($number), $lengths);
+	}
+
+	/**
+	 * Tests if a string is a valid date string.
+	 *
+	 * @param   string   date to check
+	 * @return  boolean
+	 */
+	public static function date($str)
+	{
+		return (strtotime($str) !== FALSE);
+	}
+
+	/**
+	 * Checks whether a string consists of alphabetical characters only.
+	 *
+	 * @param   string   input string
+	 * @param   boolean  trigger UTF-8 compatibility
+	 * @return  boolean
+	 */
+	public static function alpha($str, $utf8 = FALSE)
+	{
+		$str = (string) $str;
+
+		if ($utf8 === TRUE)
+		{
+			return (bool) preg_match('/^\pL++$/uD', $str);
+		}
+		else
+		{
+			return ctype_alpha($str);
+		}
+	}
+
+	/**
+	 * Checks whether a string consists of alphabetical characters and numbers only.
+	 *
+	 * @param   string   input string
+	 * @param   boolean  trigger UTF-8 compatibility
+	 * @return  boolean
+	 */
+	public static function alpha_numeric($str, $utf8 = FALSE)
+	{
+		if ($utf8 === TRUE)
+		{
+			return (bool) preg_match('/^[\pL\pN]++$/uD', $str);
+		}
+		else
+		{
+			return ctype_alnum($str);
+		}
+	}
+
+	/**
+	 * Checks whether a string consists of alphabetical characters, numbers, underscores and dashes only.
+	 *
+	 * @param   string   input string
+	 * @param   boolean  trigger UTF-8 compatibility
+	 * @return  boolean
+	 */
+	public static function alpha_dash($str, $utf8 = FALSE)
+	{
+		if ($utf8 === TRUE)
+		{
+			$regex = '/^[-\pL\pN_]++$/uD';
+		}
+		else
+		{
+			$regex = '/^[-a-z0-9_]++$/iD';
+		}
+
+		return (bool) preg_match($regex, $str);
+	}
+
+	/**
+	 * Checks whether a string consists of digits only (no dots or dashes).
+	 *
+	 * @param   string   input string
+	 * @param   boolean  trigger UTF-8 compatibility
+	 * @return  boolean
+	 */
+	public static function digit($str, $utf8 = FALSE)
+	{
+		if ($utf8 === TRUE)
+		{
+			return (bool) preg_match('/^\pN++$/uD', $str);
+		}
+		else
+		{
+			return (is_int($str) AND $str >= 0) OR ctype_digit($str);
+		}
+	}
+
+	/**
+	 * Checks whether a string is a valid number (negative and decimal numbers allowed).
+	 *
+	 * Uses {@link http://www.php.net/manual/en/function.localeconv.php locale conversion}
+	 * to allow decimal point to be locale specific.
+	 *
+	 * @param   string   input string
+	 * @return  boolean
+	 */
+	public static function numeric($str)
+	{
+		// Get the decimal point for the current locale
+		list($decimal) = array_values(localeconv());
+
+		// A lookahead is used to make sure the string contains at least one digit (before or after the decimal point)
+		return (bool) preg_match('/^-?+(?=.*[0-9])[0-9]*+'.preg_quote($decimal).'?+[0-9]*+$/D', (string) $str);
+	}
+
+	/**
+	 * Tests if a number is within a range.
+	 *
+	 * @param   string   number to check
+	 * @param   integer  minimum value
+	 * @param   integer  maximum value
+	 * @return  boolean
+	 */
+	public static function range($number, $min, $max)
+	{
+		return ($number >= $min AND $number <= $max);
+	}
+
+	/**
+	 * Checks if a string is a proper decimal format. Optionally, a specific
+	 * number of digits can be checked too.
+	 *
+	 * @param   string   number to check
+	 * @param   integer  number of decimal places
+	 * @param   integer  number of digits
+	 * @return  boolean
+	 */
+	public static function decimal($str, $places = 2, $digits = NULL)
+	{
+		if ($digits > 0)
+		{
+			// Specific number of digits
+			$digits = '{'.( (int) $digits).'}';
+		}
+		else
+		{
+			// Any number of digits
+			$digits = '+';
+		}
+
+		// Get the decimal point for the current locale
+		list($decimal) = array_values(localeconv());
+
+		return (bool) preg_match('/^[0-9]'.$digits.preg_quote($decimal).'[0-9]{'.( (int) $places).'}$/D', $str);
+	}
+
+	/**
+	 * Checks if a string is a proper hexadecimal HTML color value. The validation
+	 * is quite flexible as it does not require an initial "#" and also allows for
+	 * the short notation using only three instead of six hexadecimal characters.
+	 *
+	 * @param   string   input string
+	 * @return  boolean
+	 */
+	public static function color($str)
+	{
+		return (bool) preg_match('/^#?+[0-9a-f]{3}(?:[0-9a-f]{3})?$/iD', $str);
+	}
+
+	/**
+	 * Checks if a field matches the value of another field.
+	 *
+	 * @param   array    array of values
+	 * @param   string   field name
+	 * @param   string   field name to match
+	 * @return  boolean
+	 */
+	public static function matches($array, $field, $match)
+	{
+		return ($array[$field] === $array[$match]);
+	}
+
+} // End Valid
diff --git a/includes/kohana/system/classes/kohana/validation.php b/includes/kohana/system/classes/kohana/validation.php
new file mode 100644
index 0000000..5756659
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/validation.php
@@ -0,0 +1,518 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Array and variable validation.
+ *
+ * @package    Kohana
+ * @category   Security
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Validation extends ArrayObject {
+
+	/**
+	 * Creates a new Validation instance.
+	 *
+	 * @param   array   array to use for validation
+	 * @return  Validation
+	 */
+	public static function factory(array $array)
+	{
+		return new Validation($array);
+	}
+
+	// Bound values
+	protected $_bound = array();
+
+	// Field rules
+	protected $_rules = array();
+
+	// Field labels
+	protected $_labels = array();
+
+	// Rules that are executed even when the value is empty
+	protected $_empty_rules = array('not_empty', 'matches');
+
+	// Error list, field => rule
+	protected $_errors = array();
+
+	/**
+	 * Sets the unique "any field" key and creates an ArrayObject from the
+	 * passed array.
+	 *
+	 * @param   array   array to validate
+	 * @return  void
+	 */
+	public function __construct(array $array)
+	{
+		parent::__construct($array, ArrayObject::STD_PROP_LIST);
+	}
+
+	/**
+	 * Copies the current rule to a new array.
+	 *
+	 *     $copy = $array->copy($new_data);
+	 *
+	 * @param   array   new data set
+	 * @return  Validation
+	 * @since   3.0.5
+	 */
+	public function copy(array $array)
+	{
+		// Create a copy of the current validation set
+		$copy = clone $this;
+
+		// Replace the data set
+		$copy->exchangeArray($array);
+
+		return $copy;
+	}
+
+	/**
+	 * Returns the array representation of the current object.
+	 *
+	 * @return  array
+	 */
+	public function as_array()
+	{
+		return $this->getArrayCopy();
+	}
+
+	/**
+	 * Sets or overwrites the label name for a field.
+	 *
+	 * @param   string  field name
+	 * @param   string  label
+	 * @return  $this
+	 */
+	public function label($field, $label)
+	{
+		// Set the label for this field
+		$this->_labels[$field] = $label;
+
+		return $this;
+	}
+
+	/**
+	 * Sets labels using an array.
+	 *
+	 * @param   array  list of field => label names
+	 * @return  $this
+	 */
+	public function labels(array $labels)
+	{
+		$this->_labels = $labels + $this->_labels;
+
+		return $this;
+	}
+
+	/**
+	 * Overwrites or appends rules to a field. Each rule will be executed once.
+	 * All rules must be string names of functions method names. Parameters must
+	 * match the parameters of the callback function exactly
+	 *
+	 * Aliases you can use in callback parameters:
+	 * - :validation - the validation object
+	 * - :field - the field name
+	 * - :value - the value of the field
+	 *
+	 *     // The "username" must not be empty and have a minimum length of 4
+	 *     $validation->rule('username', 'not_empty')
+	 *                ->rule('username', 'min_length', array('username', 4));
+	 *
+	 *     // The "password" field must match the "password_repeat" field
+	 *     $validation->rule('password', 'matches', array(':validation', 'password', 'password_repeat'));
+	 *
+	 * @param   string    field name
+	 * @param   callback  valid PHP callback
+	 * @param   array     extra parameters for the rule
+	 * @return  $this
+	 */
+	public function rule($field, $rule, array $params = NULL)
+	{
+		if ($params === NULL)
+		{
+			// Default to array(':value')
+			$params = array(':value');
+		}
+
+		if ($field !== TRUE AND ! isset($this->_labels[$field]))
+		{
+			// Set the field label to the field name
+			$this->_labels[$field] = preg_replace('/[^\pL]+/u', ' ', $field);
+		}
+
+		// Store the rule and params for this rule
+		$this->_rules[$field][] = array($rule, $params);
+
+		return $this;
+	}
+
+	/**
+	 * Add rules using an array.
+	 *
+	 * @param   string  field name
+	 * @param   array   list of callbacks
+	 * @return  $this
+	 */
+	public function rules($field, array $rules)
+	{
+		foreach ($rules as $rule)
+		{
+			$this->rule($field, $rule[0], Arr::get($rule, 1));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Bind a value to a parameter definition.
+	 *
+	 *     // This allows you to use :model in the parameter definition of rules
+	 *     $validation->bind(':model', $model)
+	 *         ->rule('status', 'valid_status', array(':model'));
+	 *
+	 * @param   string  variable name or an array of variables
+	 * @param   mixed   value
+	 * @return  $this
+	 */
+	public function bind($key, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			foreach ($key as $name => $value)
+			{
+				$this->_bound[$name] = $value;
+			}
+		}
+		else
+		{
+			$this->_bound[$key] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Executes all validation rules. This should
+	 * typically be called within an if/else block.
+	 *
+	 *     if ($validation->check())
+	 *     {
+	 *          // The data is valid, do something here
+	 *     }
+	 *
+	 * @param   boolean   allow empty array?
+	 * @return  boolean
+	 */
+	public function check()
+	{
+		if (Kohana::$profiling === TRUE)
+		{
+			// Start a new benchmark
+			$benchmark = Profiler::start('Validation', __FUNCTION__);
+		}
+
+		// New data set
+		$data = $this->_errors = array();
+
+		// Store the original data because this class should not modify it post-validation
+		$original = $this->getArrayCopy();
+
+		// Get a list of the expected fields
+		$expected = Arr::merge(array_keys($original), array_keys($this->_labels));
+
+		// Import the rules locally
+		$rules     = $this->_rules;
+
+		foreach ($expected as $field)
+		{
+			// Use the submitted value or NULL if no data exists
+			$data[$field] = Arr::get($this, $field);
+
+			if (isset($rules[TRUE]))
+			{
+				if ( ! isset($rules[$field]))
+				{
+					// Initialize the rules for this field
+					$rules[$field] = array();
+				}
+
+				// Append the rules
+				$rules[$field] = array_merge($rules[$field], $rules[TRUE]);
+			}
+		}
+
+		// Overload the current array with the new one
+		$this->exchangeArray($data);
+
+		// Remove the rules that apply to every field
+		unset($rules[TRUE]);
+
+		// Bind the validation object to :validation
+		$this->bind(':validation', $this);
+
+		// Execute the rules
+		foreach ($rules as $field => $set)
+		{
+			// Get the field value
+			$value = $this[$field];
+
+			// Bind the field name and value to :field and :value respectively
+			$this->bind(array
+			(
+				':field' => $field,
+				':value' => $value,
+			));
+
+			foreach ($set as $array)
+			{
+				// Rules are defined as array($rule, $params)
+				list($rule, $params) = $array;
+
+				foreach ($params as $key => $param)
+				{
+					if (is_string($param) AND array_key_exists($param, $this->_bound))
+					{
+						// Replace with bound value
+						$params[$key] = $this->_bound[$param];
+					}
+				}
+
+				// Default the error name to be the rule (except array and lambda rules)
+				$error_name = $rule;
+
+				if (is_array($rule))
+				{
+					// This is an array callback, the method name is the error name
+					$error_name = $rule[1];
+					$passed = call_user_func_array($rule, $params);
+				}
+				elseif ( ! is_string($rule))
+				{
+					// This is a lambda function, there is no error name (errors must be added manually)
+					$error_name = FALSE;
+					$passed = call_user_func_array($rule, $params);
+				}
+				elseif (method_exists('Valid', $rule))
+				{
+					// Use a method in this object
+					$method = new ReflectionMethod('Valid', $rule);
+
+					// Call static::$rule($this[$field], $param, ...) with Reflection
+					$passed = $method->invokeArgs(NULL, $params);
+				}
+				elseif (strpos($rule, '::') === FALSE)
+				{
+					// Use a function call
+					$function = new ReflectionFunction($rule);
+
+					// Call $function($this[$field], $param, ...) with Reflection
+					$passed = $function->invokeArgs($params);
+				}
+				else
+				{
+					// Split the class and method of the rule
+					list($class, $method) = explode('::', $rule, 2);
+
+					// Use a static method call
+					$method = new ReflectionMethod($class, $method);
+
+					// Call $Class::$method($this[$field], $param, ...) with Reflection
+					$passed = $method->invokeArgs(NULL, $params);
+				}
+
+				// Ignore return values from rules when the field is empty
+				if ( ! in_array($rule, $this->_empty_rules) AND ! Valid::not_empty($value))
+					continue;
+
+				if ($passed === FALSE AND $error_name !== FALSE)
+				{
+					// Add the rule to the errors
+					$this->error($field, $error_name, $params);
+
+					// This field has an error, stop executing rules
+					break;
+				}
+			}
+		}
+
+		// Restore the data to its original form
+		$this->exchangeArray($original);
+
+		if (isset($benchmark))
+		{
+			// Stop benchmarking
+			Profiler::stop($benchmark);
+		}
+
+		return empty($this->_errors);
+	}
+
+	/**
+	 * Add an error to a field.
+	 *
+	 * @param   string  field name
+	 * @param   string  error message
+	 * @return  $this
+	 */
+	public function error($field, $error, array $params = NULL)
+	{
+		$this->_errors[$field] = array($error, $params);
+
+		return $this;
+	}
+
+	/**
+	 * Returns the error messages. If no file is specified, the error message
+	 * will be the name of the rule that failed. When a file is specified, the
+	 * message will be loaded from "field/rule", or if no rule-specific message
+	 * exists, "field/default" will be used. If neither is set, the returned
+	 * message will be "file/field/rule".
+	 *
+	 * By default all messages are translated using the default language.
+	 * A string can be used as the second parameter to specified the language
+	 * that the message was written in.
+	 *
+	 *     // Get errors from messages/forms/login.php
+	 *     $errors = $Validation->errors('forms/login');
+	 *
+	 * @uses    Kohana::message
+	 * @param   string  file to load error messages from
+	 * @param   mixed   translate the message
+	 * @return  array
+	 */
+	public function errors($file = NULL, $translate = TRUE)
+	{
+		if ($file === NULL)
+		{
+			// Return the error list
+			return $this->_errors;
+		}
+
+		// Create a new message list
+		$messages = array();
+
+		foreach ($this->_errors as $field => $set)
+		{
+			list($error, $params) = $set;
+
+			// Get the label for this field
+			$label = $this->_labels[$field];
+
+			if ($translate)
+			{
+				if (is_string($translate))
+				{
+					// Translate the label using the specified language
+					$label = __($label, NULL, $translate);
+				}
+				else
+				{
+					// Translate the label
+					$label = __($label);
+				}
+			}
+
+			// Start the translation values list
+			$values = array(
+				':field' => $label,
+				':value' => Arr::get($this, $field),
+			);
+
+			if (is_array($values[':value']))
+			{
+				// All values must be strings
+				$values[':value'] = implode(', ', Arr::flatten($values[':value']));
+			}
+
+			if ($params)
+			{
+				foreach ($params as $key => $value)
+				{
+					if (is_array($value))
+					{
+						// All values must be strings
+						$value = implode(', ', Arr::flatten($value));
+					}
+					elseif (is_object($value))
+					{
+						// Objects cannot be used in message files
+						continue;
+					}
+
+					// Check if a label for this parameter exists
+					if (isset($this->_labels[$value]))
+					{
+						// Use the label as the value, eg: related field name for "matches"
+						$value = $this->_labels[$value];
+
+						if ($translate)
+						{
+							if (is_string($translate))
+							{
+								// Translate the value using the specified language
+								$value = __($value, NULL, $translate);
+							}
+							else
+							{
+								// Translate the value
+								$value = __($value);
+							}
+						}
+					}
+
+					// Add each parameter as a numbered value, starting from 1
+					$values[':param'.($key + 1)] = $value;
+				}
+			}
+
+			if ($message = Kohana::message($file, "{$field}.{$error}"))
+			{
+				// Found a message for this field and error
+			}
+			elseif ($message = Kohana::message($file, "{$field}.default"))
+			{
+				// Found a default message for this field
+			}
+			elseif ($message = Kohana::message($file, $error))
+			{
+				// Found a default message for this error
+			}
+			elseif ($message = Kohana::message('validation', $error))
+			{
+				// Found a default message for this error
+			}
+			else
+			{
+				// No message exists, display the path expected
+				$message = "{$file}.{$field}.{$error}";
+			}
+
+			if ($translate)
+			{
+				if (is_string($translate))
+				{
+					// Translate the message using specified language
+					$message = __($message, $values, $translate);
+				}
+				else
+				{
+					// Translate the message using the default language
+					$message = __($message, $values);
+				}
+			}
+			else
+			{
+				// Do not translate, just replace the values
+				$message = strtr($message, $values);
+			}
+
+			// Set the message for this field
+			$messages[$field] = $message;
+		}
+
+		return $messages;
+	}
+
+} // End Validation
diff --git a/includes/kohana/system/classes/kohana/validation/exception.php b/includes/kohana/system/classes/kohana/validation/exception.php
new file mode 100644
index 0000000..db12404
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/validation/exception.php
@@ -0,0 +1,29 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana
+ * @category   Exceptions
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Validation_Exception extends Kohana_Exception {
+
+	/**
+	 * @var  object  Validation instance
+	 */
+	public $array;
+
+	/**
+	 * @param  Validate  Validate object
+	 * @param  string    error message
+	 * @param  array     translation variables
+	 * @param  int       the exception code
+	 */
+	public function __construct(Validation $array, $message = 'Failed to validate array', array $values = NULL, $code = 0)
+	{
+		$this->array = $array;
+
+		parent::__construct($message, $values, $code);
+	}
+
+} // End Kohana_Validation_Exception
diff --git a/includes/kohana/system/classes/kohana/view.php b/includes/kohana/system/classes/kohana/view.php
new file mode 100644
index 0000000..086f440
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/view.php
@@ -0,0 +1,346 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Acts as an object wrapper for HTML pages with embedded PHP, called "views".
+ * Variables can be assigned with the view object and referenced locally within
+ * the view.
+ *
+ * @package    Kohana
+ * @category   Base
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_View {
+
+	// Array of global variables
+	protected static $_global_data = array();
+
+	/**
+	 * Returns a new View object. If you do not define the "file" parameter,
+	 * you must call [View::set_filename].
+	 *
+	 *     $view = View::factory($file);
+	 *
+	 * @param   string  view filename
+	 * @param   array   array of values
+	 * @return  View
+	 */
+	public static function factory($file = NULL, array $data = NULL)
+	{
+		return new View($file, $data);
+	}
+
+	/**
+	 * Captures the output that is generated when a view is included.
+	 * The view data will be extracted to make local variables. This method
+	 * is static to prevent object scope resolution.
+	 *
+	 *     $output = View::capture($file, $data);
+	 *
+	 * @param   string  filename
+	 * @param   array   variables
+	 * @return  string
+	 */
+	protected static function capture($kohana_view_filename, array $kohana_view_data)
+	{
+		// Import the view variables to local namespace
+		extract($kohana_view_data, EXTR_SKIP);
+
+		if (View::$_global_data)
+		{
+			// Import the global view variables to local namespace
+			extract(View::$_global_data, EXTR_SKIP);
+		}
+
+		// Capture the view output
+		ob_start();
+
+		try
+		{
+			// Load the view within the current scope
+			include $kohana_view_filename;
+		}
+		catch (Exception $e)
+		{
+			// Delete the output buffer
+			ob_end_clean();
+
+			// Re-throw the exception
+			throw $e;
+		}
+
+		// Get the captured output and close the buffer
+		return ob_get_clean();
+	}
+
+	/**
+	 * Sets a global variable, similar to [View::set], except that the
+	 * variable will be accessible to all views.
+	 *
+	 *     View::set_global($name, $value);
+	 *
+	 * @param   string  variable name or an array of variables
+	 * @param   mixed   value
+	 * @return  void
+	 */
+	public static function set_global($key, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			foreach ($key as $key2 => $value)
+			{
+				View::$_global_data[$key2] = $value;
+			}
+		}
+		else
+		{
+			View::$_global_data[$key] = $value;
+		}
+	}
+
+	/**
+	 * Assigns a global variable by reference, similar to [View::bind], except
+	 * that the variable will be accessible to all views.
+	 *
+	 *     View::bind_global($key, $value);
+	 *
+	 * @param   string  variable name
+	 * @param   mixed   referenced variable
+	 * @return  void
+	 */
+	public static function bind_global($key, & $value)
+	{
+		View::$_global_data[$key] =& $value;
+	}
+
+	// View filename
+	protected $_file;
+
+	// Array of local variables
+	protected $_data = array();
+
+	/**
+	 * Sets the initial view filename and local data. Views should almost
+	 * always only be created using [View::factory].
+	 *
+	 *     $view = new View($file);
+	 *
+	 * @param   string  view filename
+	 * @param   array   array of values
+	 * @return  void
+	 * @uses    View::set_filename
+	 */
+	public function __construct($file = NULL, array $data = NULL)
+	{
+		if ($file !== NULL)
+		{
+			$this->set_filename($file);
+		}
+
+		if ($data !== NULL)
+		{
+			// Add the values to the current data
+			$this->_data = $data + $this->_data;
+		}
+	}
+
+	/**
+	 * Magic method, searches for the given variable and returns its value.
+	 * Local variables will be returned before global variables.
+	 *
+	 *     $value = $view->foo;
+	 *
+	 * [!!] If the variable has not yet been set, an exception will be thrown.
+	 *
+	 * @param   string  variable name
+	 * @return  mixed
+	 * @throws  Kohana_Exception
+	 */
+	public function & __get($key)
+	{
+		if (array_key_exists($key, $this->_data))
+		{
+			return $this->_data[$key];
+		}
+		elseif (array_key_exists($key, View::$_global_data))
+		{
+			return View::$_global_data[$key];
+		}
+		else
+		{
+			throw new Kohana_Exception('View variable is not set: :var',
+				array(':var' => $key));
+		}
+	}
+
+	/**
+	 * Magic method, calls [View::set] with the same parameters.
+	 *
+	 *     $view->foo = 'something';
+	 *
+	 * @param   string  variable name
+	 * @param   mixed   value
+	 * @return  void
+	 */
+	public function __set($key, $value)
+	{
+		$this->set($key, $value);
+	}
+
+	/**
+	 * Magic method, determines if a variable is set.
+	 *
+	 *     isset($view->foo);
+	 *
+	 * [!!] `NULL` variables are not considered to be set by [isset](http://php.net/isset).
+	 *
+	 * @param   string  variable name
+	 * @return  boolean
+	 */
+	public function __isset($key)
+	{
+		return (isset($this->_data[$key]) OR isset(View::$_global_data[$key]));
+	}
+
+	/**
+	 * Magic method, unsets a given variable.
+	 *
+	 *     unset($view->foo);
+	 *
+	 * @param   string  variable name
+	 * @return  void
+	 */
+	public function __unset($key)
+	{
+		unset($this->_data[$key], View::$_global_data[$key]);
+	}
+
+	/**
+	 * Magic method, returns the output of [View::render].
+	 *
+	 * @return  string
+	 * @uses    View::render
+	 */
+	public function __toString()
+	{
+		try
+		{
+			return $this->render();
+		}
+		catch (Exception $e)
+		{
+			// Display the exception message
+			Kohana_Exception::handler($e);
+
+			return '';
+		}
+	}
+
+	/**
+	 * Sets the view filename.
+	 *
+	 *     $view->set_filename($file);
+	 *
+	 * @param   string  view filename
+	 * @return  View
+	 * @throws  Kohana_View_Exception
+	 */
+	public function set_filename($file)
+	{
+		if (($path = Kohana::find_file('views', $file)) === FALSE)
+		{
+			throw new Kohana_View_Exception('The requested view :file could not be found', array(
+				':file' => $file,
+			));
+		}
+
+		// Store the file path locally
+		$this->_file = $path;
+
+		return $this;
+	}
+
+	/**
+	 * Assigns a variable by name. Assigned values will be available as a
+	 * variable within the view file:
+	 *
+	 *     // This value can be accessed as $foo within the view
+	 *     $view->set('foo', 'my value');
+	 *
+	 * You can also use an array to set several values at once:
+	 *
+	 *     // Create the values $food and $beverage in the view
+	 *     $view->set(array('food' => 'bread', 'beverage' => 'water'));
+	 *
+	 * @param   string   variable name or an array of variables
+	 * @param   mixed    value
+	 * @return  $this
+	 */
+	public function set($key, $value = NULL)
+	{
+		if (is_array($key))
+		{
+			foreach ($key as $name => $value)
+			{
+				$this->_data[$name] = $value;
+			}
+		}
+		else
+		{
+			$this->_data[$key] = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Assigns a value by reference. The benefit of binding is that values can
+	 * be altered without re-setting them. It is also possible to bind variables
+	 * before they have values. Assigned values will be available as a
+	 * variable within the view file:
+	 *
+	 *     // This reference can be accessed as $ref within the view
+	 *     $view->bind('ref', $bar);
+	 *
+	 * @param   string   variable name
+	 * @param   mixed    referenced variable
+	 * @return  $this
+	 */
+	public function bind($key, & $value)
+	{
+		$this->_data[$key] =& $value;
+
+		return $this;
+	}
+
+	/**
+	 * Renders the view object to a string. Global and local data are merged
+	 * and extracted to create local variables within the view file.
+	 *
+	 *     $output = $view->render();
+	 *
+	 * [!!] Global variables with the same key name as local variables will be
+	 * overwritten by the local variable.
+	 *
+	 * @param    string  view filename
+	 * @return   string
+	 * @throws   Kohana_View_Exception
+	 * @uses     View::capture
+	 */
+	public function render($file = NULL)
+	{
+		if ($file !== NULL)
+		{
+			$this->set_filename($file);
+		}
+
+		if (empty($this->_file))
+		{
+			throw new Kohana_View_Exception('You must set the file to use within your view before rendering');
+		}
+
+		// Combine local and global data and capture the output
+		return View::capture($this->_file, $this->_data);
+	}
+
+} // End View
diff --git a/includes/kohana/system/classes/kohana/view/exception.php b/includes/kohana/system/classes/kohana/view/exception.php
new file mode 100644
index 0000000..77200c0
--- /dev/null
+++ b/includes/kohana/system/classes/kohana/view/exception.php
@@ -0,0 +1,9 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * @package    Kohana
+ * @category   Exceptions
+ * @author     Kohana Team
+ * @copyright  (c) 2009-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_View_Exception extends Kohana_Exception {  }
diff --git a/includes/kohana/system/classes/log.php b/includes/kohana/system/classes/log.php
new file mode 100644
index 0000000..b481973
--- /dev/null
+++ b/includes/kohana/system/classes/log.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Log extends Kohana_Log {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/log/file.php b/includes/kohana/system/classes/log/file.php
new file mode 100644
index 0000000..c1d6621
--- /dev/null
+++ b/includes/kohana/system/classes/log/file.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Log_File extends Kohana_Log_File {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/log/stderr.php b/includes/kohana/system/classes/log/stderr.php
new file mode 100644
index 0000000..2c16f01
--- /dev/null
+++ b/includes/kohana/system/classes/log/stderr.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Log_StdErr extends Kohana_Log_StdErr {}
diff --git a/includes/kohana/system/classes/log/stdout.php b/includes/kohana/system/classes/log/stdout.php
new file mode 100644
index 0000000..dae9de5
--- /dev/null
+++ b/includes/kohana/system/classes/log/stdout.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Log_StdOut extends Kohana_Log_StdOut {}
diff --git a/includes/kohana/system/classes/log/syslog.php b/includes/kohana/system/classes/log/syslog.php
new file mode 100644
index 0000000..a972299
--- /dev/null
+++ b/includes/kohana/system/classes/log/syslog.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Log_Syslog extends Kohana_Log_Syslog {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/log/writer.php b/includes/kohana/system/classes/log/writer.php
new file mode 100644
index 0000000..5515bde
--- /dev/null
+++ b/includes/kohana/system/classes/log/writer.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Log_Writer extends Kohana_Log_Writer {}
diff --git a/includes/kohana/system/classes/model.php b/includes/kohana/system/classes/model.php
new file mode 100644
index 0000000..147d621
--- /dev/null
+++ b/includes/kohana/system/classes/model.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Model extends Kohana_Model {}
diff --git a/includes/kohana/system/classes/num.php b/includes/kohana/system/classes/num.php
new file mode 100644
index 0000000..aa70943
--- /dev/null
+++ b/includes/kohana/system/classes/num.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Num extends Kohana_Num {}
diff --git a/includes/kohana/system/classes/profiler.php b/includes/kohana/system/classes/profiler.php
new file mode 100644
index 0000000..4225487
--- /dev/null
+++ b/includes/kohana/system/classes/profiler.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Profiler extends Kohana_Profiler {}
diff --git a/includes/kohana/system/classes/request.php b/includes/kohana/system/classes/request.php
new file mode 100644
index 0000000..aa7b877
--- /dev/null
+++ b/includes/kohana/system/classes/request.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Request extends Kohana_Request {}
diff --git a/includes/kohana/system/classes/request/client.php b/includes/kohana/system/classes/request/client.php
new file mode 100644
index 0000000..630cfee
--- /dev/null
+++ b/includes/kohana/system/classes/request/client.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Request_Client extends Kohana_Request_Client {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/request/client/external.php b/includes/kohana/system/classes/request/client/external.php
new file mode 100644
index 0000000..746e34f
--- /dev/null
+++ b/includes/kohana/system/classes/request/client/external.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Request_Client_External extends Kohana_Request_Client_External {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/request/client/internal.php b/includes/kohana/system/classes/request/client/internal.php
new file mode 100644
index 0000000..a8b394f
--- /dev/null
+++ b/includes/kohana/system/classes/request/client/internal.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Request_Client_Internal extends Kohana_Request_Client_Internal {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/response.php b/includes/kohana/system/classes/response.php
new file mode 100644
index 0000000..7972697
--- /dev/null
+++ b/includes/kohana/system/classes/response.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Response extends Kohana_Response {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/route.php b/includes/kohana/system/classes/route.php
new file mode 100644
index 0000000..864f041
--- /dev/null
+++ b/includes/kohana/system/classes/route.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Route extends Kohana_Route {}
diff --git a/includes/kohana/system/classes/security.php b/includes/kohana/system/classes/security.php
new file mode 100644
index 0000000..dd358ac
--- /dev/null
+++ b/includes/kohana/system/classes/security.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Security extends Kohana_Security {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/session.php b/includes/kohana/system/classes/session.php
new file mode 100644
index 0000000..43c0a21
--- /dev/null
+++ b/includes/kohana/system/classes/session.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+abstract class Session extends Kohana_Session {}
diff --git a/includes/kohana/system/classes/session/cookie.php b/includes/kohana/system/classes/session/cookie.php
new file mode 100644
index 0000000..32e4af7
--- /dev/null
+++ b/includes/kohana/system/classes/session/cookie.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Session_Cookie extends Kohana_Session_Cookie {}
diff --git a/includes/kohana/system/classes/session/native.php b/includes/kohana/system/classes/session/native.php
new file mode 100644
index 0000000..5fdf7b1
--- /dev/null
+++ b/includes/kohana/system/classes/session/native.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Session_Native extends Kohana_Session_Native {}
diff --git a/includes/kohana/system/classes/text.php b/includes/kohana/system/classes/text.php
new file mode 100644
index 0000000..9989b36
--- /dev/null
+++ b/includes/kohana/system/classes/text.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Text extends Kohana_Text {}
diff --git a/includes/kohana/system/classes/upload.php b/includes/kohana/system/classes/upload.php
new file mode 100644
index 0000000..2723ff4
--- /dev/null
+++ b/includes/kohana/system/classes/upload.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Upload extends Kohana_Upload {}
diff --git a/includes/kohana/system/classes/url.php b/includes/kohana/system/classes/url.php
new file mode 100644
index 0000000..dbbd50c
--- /dev/null
+++ b/includes/kohana/system/classes/url.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class URL extends Kohana_URL {}
\ No newline at end of file
diff --git a/includes/kohana/system/classes/utf8.php b/includes/kohana/system/classes/utf8.php
new file mode 100644
index 0000000..cbedd52
--- /dev/null
+++ b/includes/kohana/system/classes/utf8.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class UTF8 extends Kohana_UTF8 {}
diff --git a/includes/kohana/system/classes/valid.php b/includes/kohana/system/classes/valid.php
new file mode 100644
index 0000000..bc52b15
--- /dev/null
+++ b/includes/kohana/system/classes/valid.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Valid extends Kohana_Valid {}
diff --git a/includes/kohana/system/classes/validation.php b/includes/kohana/system/classes/validation.php
new file mode 100644
index 0000000..8ffdb0a
--- /dev/null
+++ b/includes/kohana/system/classes/validation.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Validation extends Kohana_Validation {}
diff --git a/includes/kohana/system/classes/validation/exception.php b/includes/kohana/system/classes/validation/exception.php
new file mode 100644
index 0000000..e067f30
--- /dev/null
+++ b/includes/kohana/system/classes/validation/exception.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Validation_Exception extends Kohana_Validation_Exception {}
diff --git a/includes/kohana/system/classes/view.php b/includes/kohana/system/classes/view.php
new file mode 100644
index 0000000..426ac1b
--- /dev/null
+++ b/includes/kohana/system/classes/view.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+class View extends Kohana_View {}
diff --git a/includes/kohana/system/config/credit_cards.php b/includes/kohana/system/config/credit_cards.php
new file mode 100644
index 0000000..308a28c
--- /dev/null
+++ b/includes/kohana/system/config/credit_cards.php
@@ -0,0 +1,60 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Credit card validation configuration.
+ *
+ * Options for each credit card:
+ *  length - All the allowed card number lengths, in a comma separated string
+ *  prefix - The digits the card needs to start with, in regex format
+ *  luhn   - Enable or disable card number validation by the Luhn algorithm
+ */
+return array(
+
+	'default' => array(
+		'length' => '13,14,15,16,17,18,19',
+		'prefix' => '',
+		'luhn'   => TRUE,
+	),
+
+	'american express' => array(
+		'length' => '15',
+		'prefix' => '3[47]',
+		'luhn'   => TRUE,
+	),
+
+	'diners club' => array(
+		'length' => '14,16',
+		'prefix' => '36|55|30[0-5]',
+		'luhn'   => TRUE,
+	),
+
+	'discover' => array(
+		'length' => '16',
+		'prefix' => '6(?:5|011)',
+		'luhn'   => TRUE,
+	),
+
+	'jcb' => array(
+		'length' => '15,16',
+		'prefix' => '3|1800|2131',
+		'luhn'   => TRUE,
+	),
+
+	'maestro' => array(
+		'length' => '16,18',
+		'prefix' => '50(?:20|38)|6(?:304|759)',
+		'luhn'   => TRUE,
+	),
+
+	'mastercard' => array(
+		'length' => '16',
+		'prefix' => '5[1-5]',
+		'luhn'   => TRUE,
+	),
+
+	'visa' => array(
+		'length' => '13,16',
+		'prefix' => '4',
+		'luhn'   => TRUE,
+	),
+
+);
\ No newline at end of file
diff --git a/includes/kohana/system/config/curl.php b/includes/kohana/system/config/curl.php
new file mode 100644
index 0000000..8bb3638
--- /dev/null
+++ b/includes/kohana/system/config/curl.php
@@ -0,0 +1,9 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	CURLOPT_USERAGENT      => 'Mozilla/5.0 (compatible; Kohana v'.Kohana::VERSION.' +http://kohanaframework.org/)',
+	CURLOPT_CONNECTTIMEOUT => 5,
+	CURLOPT_TIMEOUT        => 5,
+	CURLOPT_HEADERFUNCTION => array('Request_Client_External', '_parse_headers'),
+	CURLOPT_HEADER         => FALSE,
+);
\ No newline at end of file
diff --git a/includes/kohana/system/config/encrypt.php b/includes/kohana/system/config/encrypt.php
new file mode 100644
index 0000000..ae9126a
--- /dev/null
+++ b/includes/kohana/system/config/encrypt.php
@@ -0,0 +1,17 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+
+	'default' => array(
+		/**
+		 * The following options must be set:
+		 *
+		 * string   key     secret passphrase
+		 * integer  mode    encryption mode, one of MCRYPT_MODE_*
+		 * integer  cipher  encryption cipher, one of the Mcrpyt cipher constants
+		 */
+		'cipher' => MCRYPT_RIJNDAEL_128,
+		'mode'   => MCRYPT_MODE_NOFB,
+	),
+
+);
diff --git a/includes/kohana/system/config/inflector.php b/includes/kohana/system/config/inflector.php
new file mode 100644
index 0000000..623c379
--- /dev/null
+++ b/includes/kohana/system/config/inflector.php
@@ -0,0 +1,71 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+
+	'uncountable' => array(
+		'access',
+		'advice',
+		'aircraft',
+		'art',
+		'baggage',
+		'bison',
+		'dances',
+		'deer',
+		'equipment',
+		'fish',
+		'fuel',
+		'furniture',
+		'heat',
+		'honey',
+		'homework',
+		'impatience',
+		'information',
+		'knowledge',
+		'luggage',
+		'media',
+		'money',
+		'moose',
+		'music',
+		'news',
+		'patience',
+		'progress',
+		'pollution',
+		'research',
+		'rice',
+		'salmon',
+		'sand',
+		'series',
+		'sheep',
+		'sms',
+		'spam',
+		'species',
+		'staff',
+		'swine',
+		'toothpaste',
+		'traffic',
+		'understanding',
+		'water',
+		'weather',
+		'work',
+	),
+
+	'irregular' => array(
+		'child' => 'children',
+		'clothes' => 'clothing',
+		'man' => 'men',
+		'movie' => 'movies',
+		'person' => 'people',
+		'woman' => 'women',
+		'mouse' => 'mice',
+		'goose' => 'geese',
+		'ox' => 'oxen',
+		'leaf' => 'leaves',
+		'course' => 'courses',
+		'size' => 'sizes',
+		'was' => 'were',
+		'is' => 'are',
+		'verse' => 'verses',
+		'hero' => 'heroes',
+		'purchase' => 'purchases',
+	),
+);
diff --git a/includes/kohana/system/config/mimes.php b/includes/kohana/system/config/mimes.php
new file mode 100644
index 0000000..fe79951
--- /dev/null
+++ b/includes/kohana/system/config/mimes.php
@@ -0,0 +1,226 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * A list of mime types. Our list is generally more complete and accurate than
+ * the operating system MIME list.
+ *
+ * If there are any missing options, please create a ticket on our issue tracker,
+ * http://kohanaphp.com/trac/newticket. Be sure to give the filename and
+ * expected MIME type, as well as any additional information you can provide.
+ */
+return array
+(
+	'323'   => array('text/h323'),
+	'7z'    => array('application/x-7z-compressed'),
+	'abw'   => array('application/x-abiword'),
+	'acx'   => array('application/internet-property-stream'),
+	'ai'    => array('application/postscript'),
+	'aif'   => array('audio/x-aiff'),
+	'aifc'  => array('audio/x-aiff'),
+	'aiff'  => array('audio/x-aiff'),
+	'amf'   => array('application/x-amf'),
+	'asf'   => array('video/x-ms-asf'),
+	'asr'   => array('video/x-ms-asf'),
+	'asx'   => array('video/x-ms-asf'),
+	'atom'  => array('application/atom+xml'),
+	'avi'   => array('video/avi', 'video/msvideo', 'video/x-msvideo'),
+	'bin'   => array('application/octet-stream','application/macbinary'),
+	'bmp'   => array('image/bmp'),
+	'c'     => array('text/x-csrc'),
+	'c++'   => array('text/x-c++src'),
+	'cab'   => array('application/x-cab'),
+	'cc'    => array('text/x-c++src'),
+	'cda'   => array('application/x-cdf'),
+	'class' => array('application/octet-stream'),
+	'cpp'   => array('text/x-c++src'),
+	'cpt'   => array('application/mac-compactpro'),
+	'csh'   => array('text/x-csh'),
+	'css'   => array('text/css'),
+	'csv'   => array('text/x-comma-separated-values', 'application/vnd.ms-excel', 'text/comma-separated-values', 'text/csv'),
+	'dbk'   => array('application/docbook+xml'),
+	'dcr'   => array('application/x-director'),
+	'deb'   => array('application/x-debian-package'),
+	'diff'  => array('text/x-diff'),
+	'dir'   => array('application/x-director'),
+	'divx'  => array('video/divx'),
+	'dll'   => array('application/octet-stream', 'application/x-msdos-program'),
+	'dmg'   => array('application/x-apple-diskimage'),
+	'dms'   => array('application/octet-stream'),
+	'doc'   => array('application/msword'),
+	'docx'  => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
+	'dvi'   => array('application/x-dvi'),
+	'dxr'   => array('application/x-director'),
+	'eml'   => array('message/rfc822'),
+	'eps'   => array('application/postscript'),
+	'evy'   => array('application/envoy'),
+	'exe'   => array('application/x-msdos-program', 'application/octet-stream'),
+	'fla'   => array('application/octet-stream'),
+	'flac'  => array('application/x-flac'),
+	'flc'   => array('video/flc'),
+	'fli'   => array('video/fli'),
+	'flv'   => array('video/x-flv'),
+	'gif'   => array('image/gif'),
+	'gtar'  => array('application/x-gtar'),
+	'gz'    => array('application/x-gzip'),
+	'h'     => array('text/x-chdr'),
+	'h++'   => array('text/x-c++hdr'),
+	'hh'    => array('text/x-c++hdr'),
+	'hpp'   => array('text/x-c++hdr'),
+	'hqx'   => array('application/mac-binhex40'),
+	'hs'    => array('text/x-haskell'),
+	'htm'   => array('text/html'),
+	'html'  => array('text/html'),
+	'ico'   => array('image/x-icon'),
+	'ics'   => array('text/calendar'),
+	'iii'   => array('application/x-iphone'),
+	'ins'   => array('application/x-internet-signup'),
+	'iso'   => array('application/x-iso9660-image'),
+	'isp'   => array('application/x-internet-signup'),
+	'jar'   => array('application/java-archive'),
+	'java'  => array('application/x-java-applet'),
+	'jpe'   => array('image/jpeg', 'image/pjpeg'),
+	'jpeg'  => array('image/jpeg', 'image/pjpeg'),
+	'jpg'   => array('image/jpeg', 'image/pjpeg'),
+	'js'    => array('application/x-javascript'),
+	'json'  => array('application/json'),
+	'latex' => array('application/x-latex'),
+	'lha'   => array('application/octet-stream'),
+	'log'   => array('text/plain', 'text/x-log'),
+	'lzh'   => array('application/octet-stream'),
+	'm4a'   => array('audio/mpeg'),
+	'm4p'   => array('video/mp4v-es'),
+	'm4v'   => array('video/mp4'),
+	'man'   => array('application/x-troff-man'),
+	'mdb'   => array('application/x-msaccess'),
+	'midi'  => array('audio/midi'),
+	'mid'   => array('audio/midi'),
+	'mif'   => array('application/vnd.mif'),
+	'mka'   => array('audio/x-matroska'),
+	'mkv'   => array('video/x-matroska'),
+	'mov'   => array('video/quicktime'),
+	'movie' => array('video/x-sgi-movie'),
+	'mp2'   => array('audio/mpeg'),
+	'mp3'   => array('audio/mpeg'),
+	'mp4'   => array('application/mp4','audio/mp4','video/mp4'),
+	'mpa'   => array('video/mpeg'),
+	'mpe'   => array('video/mpeg'),
+	'mpeg'  => array('video/mpeg'),
+	'mpg'   => array('video/mpeg'),
+	'mpg4'  => array('video/mp4'),
+	'mpga'  => array('audio/mpeg'),
+	'mpp'   => array('application/vnd.ms-project'),
+	'mpv'   => array('video/x-matroska'),
+	'mpv2'  => array('video/mpeg'),
+	'ms'    => array('application/x-troff-ms'),
+	'msg'   => array('application/msoutlook','application/x-msg'),
+	'msi'   => array('application/x-msi'),
+	'nws'   => array('message/rfc822'),
+	'oda'   => array('application/oda'),
+	'odb'   => array('application/vnd.oasis.opendocument.database'),
+	'odc'   => array('application/vnd.oasis.opendocument.chart'),
+	'odf'   => array('application/vnd.oasis.opendocument.forumla'),
+	'odg'   => array('application/vnd.oasis.opendocument.graphics'),
+	'odi'   => array('application/vnd.oasis.opendocument.image'),
+	'odm'   => array('application/vnd.oasis.opendocument.text-master'),
+	'odp'   => array('application/vnd.oasis.opendocument.presentation'),
+	'ods'   => array('application/vnd.oasis.opendocument.spreadsheet'),
+	'odt'   => array('application/vnd.oasis.opendocument.text'),
+	'oga'   => array('audio/ogg'),
+	'ogg'   => array('application/ogg'),
+	'ogv'   => array('video/ogg'),
+	'otg'   => array('application/vnd.oasis.opendocument.graphics-template'),
+	'oth'   => array('application/vnd.oasis.opendocument.web'),
+	'otp'   => array('application/vnd.oasis.opendocument.presentation-template'),
+	'ots'   => array('application/vnd.oasis.opendocument.spreadsheet-template'),
+	'ott'   => array('application/vnd.oasis.opendocument.template'),
+	'p'     => array('text/x-pascal'),
+	'pas'   => array('text/x-pascal'),
+	'patch' => array('text/x-diff'),
+	'pbm'   => array('image/x-portable-bitmap'),
+	'pdf'   => array('application/pdf', 'application/x-download'),
+	'php'   => array('application/x-httpd-php'),
+	'php3'  => array('application/x-httpd-php'),
+	'php4'  => array('application/x-httpd-php'),
+	'php5'  => array('application/x-httpd-php'),
+	'phps'  => array('application/x-httpd-php-source'),
+	'phtml' => array('application/x-httpd-php'),
+	'pl'    => array('text/x-perl'),
+	'pm'    => array('text/x-perl'),
+	'png'   => array('image/png', 'image/x-png'),
+	'po'    => array('text/x-gettext-translation'),
+	'pot'   => array('application/vnd.ms-powerpoint'),
+	'pps'   => array('application/vnd.ms-powerpoint'),
+	'ppt'   => array('application/powerpoint'),
+	'pptx'  => array('application/vnd.openxmlformats-officedocument.presentationml.presentation'),
+	'ps'    => array('application/postscript'),
+	'psd'   => array('application/x-photoshop', 'image/x-photoshop'),
+	'pub'   => array('application/x-mspublisher'),
+	'py'    => array('text/x-python'),
+	'qt'    => array('video/quicktime'),
+	'ra'    => array('audio/x-realaudio'),
+	'ram'   => array('audio/x-realaudio', 'audio/x-pn-realaudio'),
+	'rar'   => array('application/rar'),
+	'rgb'   => array('image/x-rgb'),
+	'rm'    => array('audio/x-pn-realaudio'),
+	'rpm'   => array('audio/x-pn-realaudio-plugin', 'application/x-redhat-package-manager'),
+	'rss'   => array('application/rss+xml'),
+	'rtf'   => array('text/rtf'),
+	'rtx'   => array('text/richtext'),
+	'rv'    => array('video/vnd.rn-realvideo'),
+	'sea'   => array('application/octet-stream'),
+	'sh'    => array('text/x-sh'),
+	'shtml' => array('text/html'),
+	'sit'   => array('application/x-stuffit'),
+	'smi'   => array('application/smil'),
+	'smil'  => array('application/smil'),
+	'so'    => array('application/octet-stream'),
+	'src'   => array('application/x-wais-source'),
+	'svg'   => array('image/svg+xml'),
+	'swf'   => array('application/x-shockwave-flash'),
+	't'     => array('application/x-troff'),
+	'tar'   => array('application/x-tar'),
+	'tcl'   => array('text/x-tcl'),
+	'tex'   => array('application/x-tex'),
+	'text'  => array('text/plain'),
+	'texti' => array('application/x-texinfo'),
+	'textinfo' => array('application/x-texinfo'),
+	'tgz'   => array('application/x-tar'),
+	'tif'   => array('image/tiff'),
+	'tiff'  => array('image/tiff'),
+	'torrent' => array('application/x-bittorrent'),
+	'tr'    => array('application/x-troff'),
+	'tsv'   => array('text/tab-separated-values'),
+	'txt'   => array('text/plain'),
+	'wav'   => array('audio/x-wav'),
+	'wax'   => array('audio/x-ms-wax'),
+	'wbxml' => array('application/wbxml'),
+	'wm'    => array('video/x-ms-wm'),
+	'wma'   => array('audio/x-ms-wma'),
+	'wmd'   => array('application/x-ms-wmd'),
+	'wmlc'  => array('application/wmlc'),
+	'wmv'   => array('video/x-ms-wmv', 'application/octet-stream'),
+	'wmx'   => array('video/x-ms-wmx'),
+	'wmz'   => array('application/x-ms-wmz'),
+	'word'  => array('application/msword', 'application/octet-stream'),
+	'wp5'   => array('application/wordperfect5.1'),
+	'wpd'   => array('application/vnd.wordperfect'),
+	'wvx'   => array('video/x-ms-wvx'),
+	'xbm'   => array('image/x-xbitmap'),
+	'xcf'   => array('image/xcf'),
+	'xhtml' => array('application/xhtml+xml'),
+	'xht'   => array('application/xhtml+xml'),
+	'xl'    => array('application/excel', 'application/vnd.ms-excel'),
+	'xla'   => array('application/excel', 'application/vnd.ms-excel'),
+	'xlc'   => array('application/excel', 'application/vnd.ms-excel'),
+	'xlm'   => array('application/excel', 'application/vnd.ms-excel'),
+	'xls'   => array('application/excel', 'application/vnd.ms-excel'),
+	'xlsx'  => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
+	'xlt'   => array('application/excel', 'application/vnd.ms-excel'),
+	'xml'   => array('text/xml', 'application/xml'),
+	'xof'   => array('x-world/x-vrml'),
+	'xpm'   => array('image/x-xpixmap'),
+	'xsl'   => array('text/xml'),
+	'xvid'  => array('video/x-xvid'),
+	'xwd'   => array('image/x-xwindowdump'),
+	'z'     => array('application/x-compress'),
+	'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed')
+);
diff --git a/includes/kohana/system/config/session.php b/includes/kohana/system/config/session.php
new file mode 100644
index 0000000..78ac9fa
--- /dev/null
+++ b/includes/kohana/system/config/session.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	'cookie' => array(
+		'encrypted' => FALSE,
+	),
+);
diff --git a/includes/kohana/system/config/user_agents.php b/includes/kohana/system/config/user_agents.php
new file mode 100644
index 0000000..93bc599
--- /dev/null
+++ b/includes/kohana/system/config/user_agents.php
@@ -0,0 +1,106 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+
+	'platform' => array(
+		'windows nt 6.1' => 'Windows 7',
+		'windows nt 6.0' => 'Windows Vista',
+		'windows nt 5.2' => 'Windows 2003',
+		'windows nt 5.1' => 'Windows XP',
+		'windows nt 5.0' => 'Windows 2000',
+		'windows nt 4.0' => 'Windows NT',
+		'winnt4.0'       => 'Windows NT',
+		'winnt 4.0'      => 'Windows NT',
+		'winnt'          => 'Windows NT',
+		'windows 98'     => 'Windows 98',
+		'win98'          => 'Windows 98',
+		'windows 95'     => 'Windows 95',
+		'win95'          => 'Windows 95',
+		'windows'        => 'Unknown Windows OS',
+		'os x'           => 'Mac OS X',
+		'intel mac'      => 'Intel Mac',
+		'ppc mac'        => 'PowerPC Mac',
+		'powerpc'        => 'PowerPC',
+		'ppc'            => 'PowerPC',
+		'cygwin'         => 'Cygwin',
+		'linux'          => 'Linux',
+		'debian'         => 'Debian',
+		'openvms'        => 'OpenVMS',
+		'sunos'          => 'Sun Solaris',
+		'amiga'          => 'Amiga',
+		'beos'           => 'BeOS',
+		'apachebench'    => 'ApacheBench',
+		'freebsd'        => 'FreeBSD',
+		'netbsd'         => 'NetBSD',
+		'bsdi'           => 'BSDi',
+		'openbsd'        => 'OpenBSD',
+		'os/2'           => 'OS/2',
+		'warp'           => 'OS/2',
+		'aix'            => 'AIX',
+		'irix'           => 'Irix',
+		'osf'            => 'DEC OSF',
+		'hp-ux'          => 'HP-UX',
+		'hurd'           => 'GNU/Hurd',
+		'unix'           => 'Unknown Unix OS',
+	),
+
+	'browser' => array(
+		'Opera'             => 'Opera',
+		'MSIE'              => 'Internet Explorer',
+		'Internet Explorer' => 'Internet Explorer',
+		'Shiira'            => 'Shiira',
+		'Firefox'           => 'Firefox',
+		'Chimera'           => 'Chimera',
+		'Phoenix'           => 'Phoenix',
+		'Firebird'          => 'Firebird',
+		'Camino'            => 'Camino',
+		'Navigator'         => 'Netscape',
+		'Netscape'          => 'Netscape',
+		'OmniWeb'           => 'OmniWeb',
+		'Chrome'            => 'Chrome',
+		'Safari'            => 'Safari',
+		'CFNetwork'         => 'Safari', // Core Foundation for OSX, WebKit/Safari
+		'Konqueror'         => 'Konqueror',
+		'Epiphany'          => 'Epiphany',
+		'Galeon'            => 'Galeon',
+		'Mozilla'           => 'Mozilla',
+		'icab'              => 'iCab',
+		'lynx'              => 'Lynx',
+		'links'             => 'Links',
+		'hotjava'           => 'HotJava',
+		'amaya'             => 'Amaya',
+		'IBrowse'           => 'IBrowse',
+	),
+
+	'mobile' => array(
+		'mobileexplorer' => 'Mobile Explorer',
+		'openwave'       => 'Open Wave',
+		'opera mini'     => 'Opera Mini',
+		'operamini'      => 'Opera Mini',
+		'elaine'         => 'Palm',
+		'palmsource'     => 'Palm',
+		'digital paths'  => 'Palm',
+		'avantgo'        => 'Avantgo',
+		'xiino'          => 'Xiino',
+		'palmscape'      => 'Palmscape',
+		'nokia'          => 'Nokia',
+		'ericsson'       => 'Ericsson',
+		'blackBerry'     => 'BlackBerry',
+		'motorola'       => 'Motorola',
+		'iphone'         => 'iPhone',
+		'ipad'           => 'iPad',
+		'ipod'           => 'iPod',
+		'android'        => 'Android',
+	),
+
+	'robot' => array(
+		'googlebot'   => 'Googlebot',
+		'msnbot'      => 'MSNBot',
+		'slurp'       => 'Inktomi Slurp',
+		'yahoo'       => 'Yahoo',
+		'askjeeves'   => 'AskJeeves',
+		'fastcrawler' => 'FastCrawler',
+		'infoseek'    => 'InfoSeek Robot 1.0',
+		'lycos'       => 'Lycos',
+	),
+);
diff --git a/includes/kohana/system/config/userguide.php b/includes/kohana/system/config/userguide.php
new file mode 100644
index 0000000..3c49362
--- /dev/null
+++ b/includes/kohana/system/config/userguide.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	// Leave this alone
+	'modules' => array(
+
+		// This should be the path to this modules userguide pages, without the 'guide/'. Ex: '/guide/modulename/' would be 'modulename'
+		'kohana' => array(
+
+			// Whether this modules userguide pages should be shown
+			'enabled' => TRUE,
+			
+			// The name that should show up on the userguide index page
+			'name' => 'Kohana',
+
+			// A short description of this module, shown on the index page
+			'description' => 'Documentation for Kohana core/system.',
+			
+			// Copyright message, shown in the footer for this module
+			'copyright' => '&copy; 2008–2010 Kohana Team',
+		)	
+	)
+);
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/autoloading.md b/includes/kohana/system/guide/kohana/autoloading.md
new file mode 100644
index 0000000..def15bc
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/autoloading.md
@@ -0,0 +1,69 @@
+# Loading Classes
+
+Kohana takes advantage of PHP [autoloading](http://php.net/manual/language.oop5.autoload.php). This removes the need to call [include](http://php.net/include) or [require](http://php.net/require) before using a class. When you use a class Kohana will find and include the class file for you. For instance, when you want to use the [Cookie::set] method, you simply call:
+
+    Cookie::set('mycookie', 'any string value');
+
+Or to load an [Encrypt] instance, just call [Encrypt::instance]:
+
+    $encrypt = Encrypt::instance();
+
+Classes are loaded via the [Kohana::auto_load] method, which makes a simple conversion from class name to file name:
+
+1. Classes are placed in the `classes/` directory of the [filesystem](files)
+2. Any underscore characters in the class name are converted to slashes
+2. The filename is lowercase
+
+When calling a class that has not been loaded (eg: `Session_Cookie`), Kohana will search the filesystem using [Kohana::find_file] for a file named `classes/session/cookie.php`.
+
+If your classes do not follow this convention, they cannot be autoloaded by Kohana.  You will have to manually included your files, or add your own [autoload function.](http://us3.php.net/manual/en/function.spl-autoload-register.php)
+
+## Custom Autoloaders
+
+Kohana's default autoloader is enabled in `application/bootstrap.php` using [spl_autoload_register](http://php.net/spl_autoload_register):
+
+    spl_autoload_register(array('Kohana', 'auto_load'));
+
+This allows [Kohana::auto_load] to attempt to find and include any class that does not yet exist when the class is first used.
+
+### Example: Zend
+
+You can easily gain access to other libraries if they include an autoloader.  For example, here is how to enable Zend's autoloader so you can use Zend libraries in your Kohana application.
+
+#### Download and install the Zend Framework files
+
+- [Download the latest Zend Framework files](http://framework.zend.com/download/latest).
+- Create a `vendor` directory at `application/vendor`. This keeps third party software separate from your application classes.
+- Move the decompressed Zend folder containing Zend Framework to `application/vendor/Zend`.
+
+
+#### Include Zend's Autoloader in your bootstrap
+
+Somewhere in `application/bootstrap.php`, copy the following code:
+
+	/**
+	 * Enable Zend Framework autoloading
+	 */
+	if ($path = Kohana::find_file('vendor', 'Zend/Loader'))
+	{
+	    ini_set('include_path',
+	    ini_get('include_path').PATH_SEPARATOR.dirname(dirname($path)));
+	
+	    require_once 'Zend/Loader/Autoloader.php';
+	    Zend_Loader_Autoloader::getInstance();
+	}
+	
+#### Usage example
+
+You can now autoload any Zend Framework classes from inside your Kohana application.
+
+	if ($validate($_POST))
+	{
+		$mailer = new Zend_Mail;
+		
+		$mailer->setBodyHtml($view)
+			->setFrom(Kohana::config('site')->email_from)
+			->addTo($email)
+			->setSubject($message)
+			->send();
+	}
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/bootstrap.md b/includes/kohana/system/guide/kohana/bootstrap.md
new file mode 100644
index 0000000..2b8c26a
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/bootstrap.md
@@ -0,0 +1,111 @@
+# Bootstrap
+
+The bootstrap is located at `application/bootstrap.php`.  It is responsible for setting up the Kohana environment and executing the main response. It is included by `index.php` (see [Request flow](flow))
+
+[!!] The bootstrap is responsible for the flow of your application.  In previous versions of Kohana the bootstrap was in `system` and was somewhat of an unseen, uneditible force.  In Kohana 3 the bootstrap takes on a much more integral and versatile role.  Do not be afraid to edit and change your bootstrap however you see fit.
+
+## Environment setup
+
+First the bootstrap sets the timezone and the locale, and adds Kohana's autoloader so the [cascading filesystem](files) works.  You could add any other settings that all your application needed here.
+
+~~~
+// Sample excerpt from bootstrap.php with comments trimmed down
+
+// Set the default time zone.
+date_default_timezone_set('America/Chicago');
+ 
+// Set the default locale.
+setlocale(LC_ALL, 'en_US.utf-8');
+ 
+// Enable the Kohana auto-loader.
+spl_autoload_register(array('Kohana', 'auto_load'));
+ 
+// Enable the Kohana auto-loader for unserialization.
+ini_set('unserialize_callback_func', 'spl_autoload_call');
+~~~
+
+## Initialization and Configuration
+
+Kohana is then initialized by calling [Kohana::init], and the log and [config](files/config) reader/writers are enabled. 
+
+~~~
+// Sample excerpt from bootstrap.php with comments trimmed down
+
+Kohana::init(array('
+    base_url' => '/kohana/',
+	index_file => false,
+));
+
+// Attach the file writer to logging. Multiple writers are supported.
+Kohana::$log->attach(new Kohana_Log_File(APPPATH.'logs'));
+
+// Attach a file reader to config. Multiple readers are supported.
+Kohana::$config->attach(new Kohana_Config_File);
+~~~
+
+You can add conditional statements to make the bootstrap have different values based on certain settings.  For example, detect whether we are live by checking `$_SERVER['HTTP_HOST']` and set caching, profiling, etc. accordingly.  This is just an example, there are many different ways to accomplish the same thing.
+
+~~~
+// Excerpt from http://github.com/isaiahdw/kohanaphp.com/blob/f2afe8e28b/application/bootstrap.php
+... [trimmed]
+ 
+/**
+ * Set the environment status by the domain.
+ */
+if (strpos($_SERVER['HTTP_HOST'], 'kohanaphp.com') !== FALSE)
+{
+	// We are live!
+	Kohana::$environment = Kohana::PRODUCTION;
+ 
+	// Turn off notices and strict errors
+	error_reporting(E_ALL ^ E_NOTICE ^ E_STRICT);
+}
+ 
+/**
+ * Initialize Kohana, setting the default options.
+ ... [trimmed]
+ */
+Kohana::init(array(
+	'base_url'   => Kohana::$environment === Kohana::PRODUCTION ? '/' : '/kohanaphp.com/',
+	'caching'    => Kohana::$environment === Kohana::PRODUCTION,
+	'profile'    => Kohana::$environment !== Kohana::PRODUCTION,
+	'index_file' => FALSE,
+));
+
+... [trimmed]
+
+~~~
+
+[!!] Note: The default bootstrap will set `Kohana::$environment = $_ENV['KOHANA_ENV']` if set. Docs on how to supply this variable are available in your web server's documentation (e.g. [Apache](http://httpd.apache.org/docs/1.3/mod/mod_env.html#setenv), [Lighttpd](http://redmine.lighttpd.net/wiki/1/Docs:ModSetEnv#Options)). This is considered better practice than many alternative methods to set `Kohana::$enviroment`, as you can change the setting per server, without having to rely on config options or hostnames.
+
+## Modules
+
+**Read the [Modules](modules) page for a more detailed description.**
+
+[Modules](modules) are then loaded using [Kohana::modules()].  Including modules is optional.  
+
+Each key in the array should be the name of the module, and the value is the path to the module, either relative or absolute.
+~~~
+// Example excerpt from bootstrap.php
+
+Kohana::modules(array(
+	'database'   => MODPATH.'database',
+	'orm'        => MODPATH.'orm',
+	'userguide'  => MODPATH.'userguide',
+));
+~~~
+
+## Routes
+
+**Read the [Routing](routing) page for a more detailed description and more examples.**
+
+[Routes](routing) are then defined via [Route::set()].  
+
+~~~
+// The default route that comes with Kohana 3
+Route::set('default', '(<controller>(/<action>(/<id>)))')
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'index',
+	));
+~~~
diff --git a/includes/kohana/system/guide/kohana/controllers.md b/includes/kohana/system/guide/kohana/controllers.md
new file mode 100644
index 0000000..d95d98a
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/controllers.md
@@ -0,0 +1 @@
+This will discuss controller basics, like before() and after(), private function, and about extending controllers like the Controller_Template, or using a parent::before() for authentication.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/conventions.md b/includes/kohana/system/guide/kohana/conventions.md
new file mode 100644
index 0000000..984c67d
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/conventions.md
@@ -0,0 +1,417 @@
+# Conventions and Coding Style
+
+It is encouraged that you follow Kohana's coding style. This makes code more readable and allows for easier code sharing and contributing. 
+
+## Class Names and File Location
+
+Class names in Kohana follow a strict convention to facilitate [autoloading](autoloading). Class names should have uppercase first letters with underscores to separate words. Underscores are significant as they directly reflect the file location in the filesystem.
+
+The following conventions apply:
+
+1. CamelCased class names should not be used, except when it is undesirable to create a new directory level.
+2. All class file names and directory names are lowercase.
+3. All classes should be in the `classes` directory. This may be at any level in the [cascading filesystem](files).
+
+### Examples  {#class-name-examples}
+
+Remember that in a class, an underscore means a new directory. Consider the following examples:
+
+Class Name            | File Path
+----------------------|-------------------------------
+Controller_Template   | classes/controller/template.php
+Model_User            | classes/model/user.php
+Database              | classes/database.php
+Database_Query        | classes/database/query.php
+Form                  | classes/form.php
+
+## Coding Standards
+
+In order to produce highly consistent source code, we ask that everyone follow the coding standards as closely as possible.
+
+### Brackets
+
+Please use [BSD/Allman Style](http://en.wikipedia.org/wiki/Indent_style#BSD.2FAllman_style) bracketing.  
+
+#### Curly Brackets
+
+Curly brackets are placed on their own line, indented to the same level as the control statement.
+
+	// Correct
+	if ($a === $b)
+	{
+		...
+	}
+	else
+	{
+		...
+	}
+
+	// Incorrect
+	if ($a === $b) {
+		...
+	} else {
+		...
+	}
+
+#### Class Brackets
+
+The only exception to the curly bracket rule is, the opening bracket of a class goes on the same line.
+
+	// Correct
+	class Foo {
+
+	// Incorrect
+	class Foo
+	{
+
+#### Empty Brackets
+
+Don't put any characters inside empty brackets.
+
+	// Correct
+	class Foo {}
+
+	// Incorrect
+	class Foo { }
+
+#### Array Brackets
+
+Arrays may be single line or multi-line.
+
+	array('a' => 'b', 'c' => 'd')
+	
+	array(
+		'a' => 'b', 
+		'c' => 'd',
+	)
+
+##### Opening Parenthesis
+
+The opening array parenthesis goes on the same line.
+
+	// Correct
+	array(
+		...
+	)
+
+	// Incorrect:
+	array
+	(
+		...
+	)
+
+##### Closing parenthesis
+
+###### Single Dimension
+
+The closing parenthesis of a multi-line single dimension array is placed on its own line, indented to the same level as the assignment or statement.
+
+	// Correct
+	$array = array(
+		...
+	)
+
+	// Incorrect
+	$array = array(
+		...
+		)
+
+###### Multidimensional
+
+The nested array is indented one tab to the right, following the single dimension rules.
+
+	// Correct
+	array(
+		'arr' => array(
+			...
+		),
+		'arr' => array(
+			...
+		),
+	)
+	
+	array(
+		'arr' => array(...),
+		'arr' => array(...),
+	)
+	
+##### Arrays as Function Arguments
+
+
+	// Correct
+	do(array(
+		...
+	))
+	
+	// Incorrect
+	do(array(
+		...
+		))
+
+As noted at the start of the array bracket section, single line syntax is also valid.
+
+	// Correct
+	do(array(...))
+	
+	// Alternative for wrapping long lines
+	do($bar, 'this is a very long line',
+		array(...));
+
+### Naming Conventions
+
+Kohana uses under_score naming, not camelCase naming.
+
+#### Classes
+
+	// Controller class, uses Controller_ prefix
+	class Controller_Apple extends Controller {
+
+	// Model class, uses Model_ prefix
+	class Model_Cheese extends Model {
+
+	// Regular class
+	class Peanut {
+
+When creating an instance of a class, don't use parentheses if you're not passing something on to the constructor:
+
+	// Correct:
+	$db = new Database;
+
+	// Incorrect:
+	$db = new Database();
+
+#### Functions and Methods
+
+Functions should be all lowercase, and use under_scores to separate words:
+
+	function drink_beverage($beverage)
+	{
+
+#### Variables
+
+All variables should be lowercase and use under_score, not camelCase:
+
+	// Correct:
+	$foo = 'bar';
+	$long_example = 'uses underscores';
+
+	// Incorrect:
+	$weDontWantThis = 'understood?';
+
+### Indentation
+
+You must use tabs to indent your code. Using spaces for tabbing is strictly forbidden.
+
+Vertical spacing (for multi-line) is done with spaces. Tabs are not good for vertical alignment because different people have different tab widths.
+
+	$text = 'this is a long text block that is wrapped. Normally, we aim for '
+		  .'wrapping at 80 chars. Vertical alignment is very important for '
+		  .'code readability. Remember that all indentation is done with tabs,'
+		  .'but vertical alignment should be completed with spaces, after '
+		  .'indenting with tabs.';
+
+### String Concatenation
+
+Do not put spaces around the concatenation operator:
+
+	// Correct:
+	$str = 'one'.$var.'two';
+
+	// Incorrect:
+	$str = 'one'. $var .'two';
+	$str = 'one' . $var . 'two';
+
+### Single Line Statements
+
+Single-line IF statements should only be used when breaking normal execution (e.g. return or continue):
+
+	// Acceptable:
+	if ($foo == $bar)
+		return $foo;
+
+	if ($foo == $bar)
+		continue;
+
+	if ($foo == $bar)
+		break;
+
+	if ($foo == $bar)
+		throw new Exception('You screwed up!');
+
+	// Not acceptable:
+	if ($baz == $bun)
+		$baz = $bar + 2;
+
+### Comparison Operations
+
+Please use OR and AND for comparison:
+
+	// Correct:
+	if (($foo AND $bar) OR ($b AND $c))
+
+	// Incorrect:
+	if (($foo && $bar) || ($b && $c))
+	
+Please use elseif, not else if:
+
+	// Correct:
+	elseif ($bar)
+
+	// Incorrect:
+	else if($bar)
+
+### Switch Structures
+
+Each case, break and default should be on a separate line. The block inside a case or default must be indented by 1 tab.
+
+	switch ($var)
+	{
+		case 'bar':
+		case 'foo':
+			echo 'hello';
+		break;
+		case 1:
+			echo 'one';
+		break;
+		default:
+			echo 'bye';
+		break;
+	}
+
+### Parentheses
+
+There should be one space after statement name, followed by a parenthesis. The ! (bang) character must have a space on either side to ensure maximum readability. Except in the case of a bang or type casting, there should be no whitespace after an opening parenthesis or before a closing parenthesis.
+
+	// Correct:
+	if ($foo == $bar)
+	if ( ! $foo)
+
+	// Incorrect:
+	if($foo == $bar)
+	if(!$foo)
+	if ((int) $foo)
+	if ( $foo == $bar )
+	if (! $foo)
+
+### Ternaries
+
+All ternary operations should follow a standard format. Use parentheses around expressions only, not around just variables.
+
+	$foo = ($bar == $foo) ? $foo : $bar;
+	$foo = $bar ? $foo : $bar;
+
+All comparisons and operations must be done inside of a parentheses group:
+
+	$foo = ($bar > 5) ? ($bar + $foo) : strlen($bar);
+
+When separating complex ternaries (ternaries where the first part goes beyond ~80 chars) into multiple lines, spaces should be used to line up operators, which should be at the front of the successive lines:
+
+	$foo = ($bar == $foo)
+		 ? $foo
+		 : $bar;
+
+### Type Casting
+
+Type casting should be done with spaces on each side of the cast:
+
+	// Correct:
+	$foo = (string) $bar;
+	if ( (string) $bar)
+
+	// Incorrect:
+	$foo = (string)$bar;
+
+When possible, please use type casting instead of ternary operations:
+
+	// Correct:
+	$foo = (bool) $bar;
+
+	// Incorrect:
+	$foo = ($bar == TRUE) ? TRUE : FALSE;
+
+When casting type to integer or boolean, use the short format:
+
+	// Correct:
+	$foo = (int) $bar;
+	$foo = (bool) $bar;
+
+	// Incorrect:
+	$foo = (integer) $bar;
+	$foo = (boolean) $bar;
+
+### Constants
+
+Always use uppercase for constants:
+
+	// Correct:
+	define('MY_CONSTANT', 'my_value');
+	$a = TRUE;
+	$b = NULL;
+
+	// Incorrect:
+	define('MyConstant', 'my_value');
+	$a = True;
+	$b = null;
+
+Place constant comparisons at the end of tests:
+
+	// Correct:
+	if ($foo !== FALSE)
+
+	// Incorrect:
+	if (FALSE !== $foo)
+
+This is a slightly controversial choice, so I will explain the reasoning. If we were to write the previous example in plain English, the correct example would read:
+
+	if variable $foo is not exactly FALSE
+
+And the incorrect example would read:
+
+	if FALSE is not exactly variable $foo
+
+Since we are reading left to right, it simply doesn't make sense to put the constant first.
+
+### Comments
+
+#### One-line Comments
+
+Use //, preferably above the line of code you're commenting on. Leave a space after it and start with a capital. Never use #.
+
+	// Correct
+
+	//Incorrect
+	// incorrect
+	# Incorrect
+
+### Regular Expressions
+
+When coding regular expressions please use PCRE rather than the POSIX flavor. PCRE is considered more powerful and faster.
+
+	// Correct:
+	if (preg_match('/abc/i'), $str)
+
+	// Incorrect:
+	if (eregi('abc', $str))
+
+Use single quotes around your regular expressions rather than double quotes. Single-quoted strings are more convenient because of their simplicity. Unlike double-quoted strings they don't support variable interpolation nor integrated backslash sequences like \n or \t, etc.
+
+	// Correct:
+	preg_match('/abc/', $str);
+
+	// Incorrect:
+	preg_match("/abc/", $str);
+
+When performing a regular expression search and replace, please use the $n notation for backreferences. This is preferred over \\n.
+
+	// Correct:
+	preg_replace('/(\d+) dollar/', '$1 euro', $str);
+
+	// Incorrect:
+	preg_replace('/(\d+) dollar/', '\\1 euro', $str);
+
+Finally, please note that the $ character for matching the position at the end of the line allows for a following newline character. Use the D modifier to fix this if needed. [More info](http://blog.php-security.org/archives/76-Holes-in-most-preg_match-filters.html).
+
+	$str = "email@example.com\n";
+
+	preg_match('/^.+@.+$/', $str);  // TRUE
+	preg_match('/^.+@.+$/D', $str); // FALSE
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/cookies.md b/includes/kohana/system/guide/kohana/cookies.md
new file mode 100644
index 0000000..b53a130
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/cookies.md
@@ -0,0 +1,100 @@
+# Cookies
+
+Kohana provides classes that make it easy to work with both cookies and sessions. At a high level both sessions and cookies provide the same functionality. They allow the developer to store temporary or persistent information about a specific client for later retrieval, usually to make something persistent between requests.
+
+[Cookies](http://en.wikipedia.org/wiki/HTTP_cookie) should be used for storing non-private data that is persistent for a long period of time. For example storing a user preference or a language setting. Use the [Cookie] class for getting and setting cookies.
+
+[!!] Kohana uses "signed" cookies. Every cookie that is stored is combined with a secure hash to prevent modification of the cookie.  If a cookie is modified outside of Kohana the hash will be incorrect and the cookie will be deleted.  This hash is generated using [Cookie::salt()], which uses the [Cookie::$salt] property. You must define this setting in your bootstrap.php:
+
+	Cookie::$salt = 'foobar';
+
+Or define an extended cookie class in your application:
+
+	class Cookie extends Kohana_Cookie
+	{
+		public static $salt = 'foobar';
+	}
+
+You should set the salt to a secure value. The example above is only for demonstrative purposes.
+
+Nothing stops you from using `$_COOKIE` like normal, but you can not mix using the Cookie class and the regular `$_COOKIE` global, because the hash that Kohana uses to sign cookies will not be present, and Kohana will delete the cookie.
+
+## Storing, Retrieving, and Deleting Data
+
+[Cookie] and [Session] provide a very similar API for storing data. The main difference between them is that sessions are accessed using an object, and cookies are accessed using a static class.
+
+### Storing Data
+
+Storing session or cookie data is done using the [Cookie::set] method:
+
+    // Set cookie data
+    Cookie::set($key, $value);
+
+    // Store a user id
+    Cookie::set('user_id', 10);
+
+### Retrieving Data
+
+Getting session or cookie data is done using the [Cookie::get] method:
+
+    // Get cookie data
+    $data = Cookie::get($key, $default_value);
+
+    // Get the user id
+    $user = Cookie::get('user_id');
+
+### Deleting Data
+
+Deleting session or cookie data is done using the [Cookie::delete] method:
+    
+    // Delete cookie data
+    Cookie::delete($key);
+
+    // Delete the user id
+    Cookie::delete('user_id');
+
+## Cookie Settings
+
+All of the cookie settings are changed using static properties. You can either change these settings in `bootstrap.php` or by using [transparent extension](extension).  Always check these settings before making your application live, as many of them will have a direct affect on the security of your application.
+
+The most important setting is [Cookie::$salt], which is used for secure signing. This value should be changed and kept secret:
+
+    Cookie::$salt = 'your secret is safe with me';
+
+[!!] Changing this value will render all cookies that have been set before invalid.
+
+By default, cookies are stored until the browser is closed. To use a specific lifetime, change the [Cookie::$expiration] setting:
+
+    // Set cookies to expire after 1 week
+    Cookie::$expiration = 604800;
+
+    // Alternative to using raw integers, for better clarity
+    Cookie::$expiration = Date::WEEK;
+
+The path that the cookie can be accessed from can be restricted using the [Cookie::$path] setting.
+
+    // Allow cookies only when going to /public/*
+    Cookie::$path = '/public/';
+
+The domain that the cookie can be accessed from can also be restricted, using the [Cookie::$domain] setting.
+
+    // Allow cookies only on the domain www.example.com
+    Cookie::$domain = 'www.example.com';
+
+If you want to make the cookie accessible on all subdomains, use a dot at the beginning of the domain.
+
+    // Allow cookies to be accessed on example.com and *.example.com
+    Cookie::$domain = '.example.com';
+
+To only allow the cookie to be accessed over a secure (HTTPS) connection, use the [Cookie::$secure] setting.
+
+    // Allow cookies to be accessed only on a secure connection
+    Cookie::$secure = TRUE;
+    
+    // Allow cookies to be accessed on any connection
+    Cookie::$secure = FALSE;
+
+To prevent cookies from being accessed using Javascript, you can change the [Cookie::$httponly] setting.
+
+    // Make cookies inaccessible to Javascript
+    Cookie::$httponly = TRUE;
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/debugging.md b/includes/kohana/system/guide/kohana/debugging.md
new file mode 100644
index 0000000..251e557
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/debugging.md
@@ -0,0 +1,20 @@
+# Debugging
+
+Kohana includes several tools to help you debug your application.
+
+The most basic of these is [Debug::vars]. This simple method will display any number of variables, similar to [var_export](http://php.net/var_export) or [print_r](http://php.net/print_r), but using HTML for extra formatting.
+
+    // Display a dump of the $foo and $bar variables
+    echo Debug::vars($foo, $bar);
+
+Kohana also provides a method to show the source code of a particular file using [Debug::source].
+
+    // Display this line of source code
+    echo Debug::source(__FILE__, __LINE__);
+
+If you want to display information about your application files without exposing the installation directory, you can use [Debug::path]:
+
+    // Displays "APPPATH/cache" rather than the real path
+    echo Debug::path(APPPATH.'cache');
+
+If you are having trouble getting something to work correctly, you could check your Kohana logs and your webserver logs, as well as using a debugging tool like [Xdebug](http://www.xdebug.org/).
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/errors.md b/includes/kohana/system/guide/kohana/errors.md
new file mode 100644
index 0000000..8ac5651
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/errors.md
@@ -0,0 +1,76 @@
+# Error/Exception Handling
+
+Kohana provides both an exception handler and an error handler that transforms errors into exceptions using PHP's [ErrorException](http://php.net/errorexception) class. Many details of the error and the internal state of the application is displayed by the handler:
+
+1. Exception class
+2. Error level
+3. Error message
+4. Source of the error, with the error line highlighted
+5. A [debug backtrace](http://php.net/debug_backtrace) of the execution flow
+6. Included files, loaded extensions, and global variables
+
+## Example
+
+Click any of the links to toggle the display of additional information:
+
+<div>{{userguide/examples/error}}</div>
+
+## Disabling Error/Exception Handling
+
+If you do not want to use the internal error handling, you can disable it (highly discouraged) when calling [Kohana::init]:
+
+    Kohana::init(array('errors' => FALSE));
+
+## Error Reporting
+
+By default, Kohana displays all errors, including strict mode warnings. This is set using [error_reporting](http://php.net/error_reporting):
+
+    error_reporting(E_ALL | E_STRICT);
+
+When you application is live and in production, a more conservative setting is recommended, such as ignoring notices:
+
+    error_reporting(E_ALL & ~E_NOTICE);
+
+If you get a white screen when an error is triggered, your host probably has disabled displaying errors. You can turn it on again by adding this line just after your `error_reporting` call:
+
+    ini_set('display_errors', TRUE);
+
+Errors should **always** be displayed, even in production, because it allows you to use [exception and error handling](debugging.errors) to serve a nice error page rather than a blank white screen when an error happens.
+
+## HTTP Exception Handling
+
+Kohana comes with a robust system for handing http errors. It includes exception classes for each http status code. To trigger a 404 in your application (the most common scenario):
+
+	throw new HTTP_Exception_404('File not found!');
+
+There is no default method to handle these errors in Kohana. It's recommended that you setup an exception handler (and register it) to handle these kinds of errors. Here's a simple example that would go in */application/classes/foobar/exception/handler.php*:
+
+	class Foobar_Exception_Handler
+	{
+		public static function handle(Exception $e)
+		{
+			switch (get_class($e))
+			{
+				case 'Http_Exception_404':
+					$response = new Response;
+					$response->status(404);
+					$view = new View('error_404');
+					$view->message = $e->getMessage();
+					$view->title = 'File Not Found';
+					echo $response->body($view)->send_headers()->body();
+					return TRUE;
+					break;
+				default:
+					return Kohana_Exception::handler($e);
+					break;
+			}
+		}
+	}
+
+And put something like this in your bootstrap to register the handler.
+
+	set_exception_handler(array('Foobar_Exception_Handler', 'handle'));
+
+ > *Note:* Be sure to place `set_exception_handler()` **after** `Kohana::init()` in your bootstrap, or it won't work.
+ 
+ > If you receive *Fatal error: Exception thrown without a stack frame in Unknown on line 0*, it means there was an error within your exception handler. If using the example above, be sure *404.php* exists under */application/views/error/*.
diff --git a/includes/kohana/system/guide/kohana/extension.md b/includes/kohana/system/guide/kohana/extension.md
new file mode 100644
index 0000000..49bad05
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/extension.md
@@ -0,0 +1,101 @@
+# Transparent Class Extension
+
+The [cascading filesystem](files) allows transparent class extension. For instance, the class [Cookie] is defined in `SYSPATH/classes/cookie.php` as:
+
+    class Cookie extends Kohana_Cookie {}
+
+The default Kohana classes, and many extensions, use this definition so that almost all classes can be extended. You extend any class transparently, by defining your own class in `APPPATH/classes/cookie.php` to add your own methods.
+
+[!!] You should **never** modify any of the files that are distributed with Kohana. Always make modifications to classes using transparent extension to prevent upgrade issues.
+
+For instance, if you wanted to create method that sets encrypted cookies using the [Encrypt] class, you would create a file at `application/classes/cookie.php` that extends Kohana_Cookie, and adds your functions:
+
+    <?php defined('SYSPATH') or die('No direct script access.');
+
+    class Cookie extends Kohana_Cookie {
+
+        /**
+         * @var  mixed  default encryption instance
+         */
+        public static $encryption = 'default';
+
+        /**
+         * Sets an encrypted cookie.
+         *
+         * @uses  Cookie::set
+         * @uses  Encrypt::encode
+         */
+         public static function encrypt($name, $value, $expiration = NULL)
+         {
+             $value = Encrypt::instance(Cookie::$encrpytion)->encode((string) $value);
+
+             parent::set($name, $value, $expiration);
+         }
+
+         /**
+          * Gets an encrypted cookie.
+          *
+          * @uses  Cookie::get
+          * @uses  Encrypt::decode
+          */
+          public static function decrypt($name, $default = NULL)
+          {
+              if ($value = parent::get($name, NULL))
+              {
+                  $value = Encrypt::instance(Cookie::$encryption)->decode($value);
+              }
+
+              return isset($value) ? $value : $default;
+          }
+
+    } // End Cookie
+
+Now calling `Cookie::encrypt('secret', $data)` will create an encrypted cookie which we can decrypt with `$data = Cookie::decrypt('secret')`.
+
+## How it works
+
+To understand how this works, let's look at what happens normally.  When you use the Cookie class, [Kohana::autoload] looks for `classes/cookie.php` in the [cascading filesystem](files).  It looks in `application`, then each module, then `system`. The file is found in `system` and is included.  Of coures, `system/classes/cookie.php` is just an empty class which extends `Kohana_Cookie`.  Again, [Kohana::autoload] is called this time looking for `classes/kohana/cookie.php` which it finds in `system`.
+
+When you add your transparently extended cookie class at `application/classes/cookie.php` this file essentially "replaces" the file at `system/classes/cookie.php` without actually touching it.  This happens because this time when we use the Cookie class [Kohana::autoload] looks for `classes/cookie.php` and finds the file in `application` and includes that one, instead of the one in system.
+
+## Example: changing [Cookie] settings
+
+If you are using the [Cookie](cookies) class, and want to change a setting, you should do so using transparent extension, rather than editing the file in the system folder.  If you edit it directly, and in the future you upgrade your Kohana version by replacing the system folder, your changes will be reverted and your cookies will probably be invalid.  Instead, create a cookie.php file either in `application/classes/cookie.php` or a module (`MODPATH/<modulename>/classes/cookie.php`).
+
+	class Cookie extends Kohana_Cookie {
+	
+		// Set a new salt
+		public $salt = "some new better random salt phrase";
+		
+		// Don't allow javascript access to cookies
+		public $httponly = TRUE;
+		
+	}
+
+## Example: TODO: an example
+
+Just post the code and brief description of what function it adds, you don't have to do the "How it works" like above.
+
+## Example: TODO: something else
+
+Just post the code and brief description of what function it adds, you don't have to do the "How it works" like above.
+
+## More examples
+
+TODO: Provide some links to modules on github, etc that have examples of transparent extension in use.
+
+## Multiple Levels of Extension
+
+If you are extending a Kohana class in a module, you should maintain transparent extensions. In other words, do not include any variables or function in the "base" class (eg. Cookie). Instead make your own namespaced class, and have the "base" class extend that one. With our Encrypted cookie example we can create `MODPATH/mymod/encrypted/cookie.php`:
+
+	class Encrypted_Cookie extends Kohana_Cookie {
+
+		// Use the same encrypt() and decrypt() methods as above
+
+	}
+
+And create `MODPATH/mymod/cookie.php`:
+
+	class Cookie extends Encrypted_Cookie {}
+
+This will still allow users to add their own extension to [Cookie] while leaving your extensions intact. To do that they would make a cookie class that extends `Encrypted_Cookie` (rather than `Kohana_Cookie`) in their application folder.
diff --git a/includes/kohana/system/guide/kohana/files.md b/includes/kohana/system/guide/kohana/files.md
new file mode 100644
index 0000000..0eb593e
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/files.md
@@ -0,0 +1,83 @@
+# Cascading Filesystem
+
+The Kohana filesystem is a hierarchy of similar directory structures that cascade. The hierarchy in Kohana (used when a file is loaded by [Kohana::find_file]) is in the following order:
+
+1. **Application Path**  
+   Defined as `APPPATH` in `index.php`. The default value is `application`.
+
+2. **Module Paths**  
+   This is set as an associative array using [Kohana::modules] in `APPPATH/bootstrap.php`. Each of the values of the array will be searched **in the order that the modules are defined**.
+
+3. **System Path**  
+   Defined as `SYSPATH` in `index.php`. The default value is `system`. All of the main or "core" files and classes are defined here.
+
+Files that are in directories higher up the include path order take precedence over files of the same name lower down the order, which makes it is possible to overload any file by placing a file with the same name in a "higher" directory:
+
+![Cascading Filesystem Infographic](cascading_filesystem.png)
+
+This image is only shows certain files, but we can use it to illustrate some examples of the cascading filesystem:
+
+* If Kohana catches an error, it would display the `kohana/error.php` view, So it would call `Kohana::find_file('views', 'kohana/error')`.  This would return `application/views/kohana/error.php` because it takes precidence over `system/views/kohana/error.php`.  By doing this we can change the error view without editing the system folder.
+
+* If we used `View::factory('welcome')` it would call `Kohana::find_file('views','welcome')` which would return `application/views/welcome.php` because it takes precidence over `modules/common/views/welcome.php`.  By doing this, you can overwrite things in a module without editing the modules files.
+
+* If use the Cookie class, [Kohana::auto_load] will call `Kohana::find_file('classes', 'cookie')` which will return `application/classes/cookie.php`.  Assuming Cookie extends Kohana_Cookie, the autoloader would then call `Kohana::find_file('classes','kohana/cookie')` which will return `system/classes/kohana/cookie.php` because that file does not exist anywhere higher in the cascade.  This is an example of [transparent extension](extension).
+
+* If you used `View::factory('user')` it would call `Kohana::find_file('views','user')` which would return `modules/common/views/user.php`.
+
+* If we wanted to change something in `config/database.php` we could copy the file to `application/config/database.php` and make the changes there.  Keep in mind that [config files are merged](files/config#merge) rather than overwritten by the cascade.
+
+## Types of Files
+
+The top level directories of the application, module, and system paths have the following default directories:
+
+classes/
+:  All classes that you want to [autoload](autoloading) should be stored here. This includes [controllers](mvc/controllers), [models](mvc/models), and all other classes. All classes must follow the [class naming conventions](conventions#class-names-and-file-location).
+
+config/
+:  Configuration files return an associative array of options that can be loaded using [Kohana::config]. Config files are merged rather than overwritten by the cascade. See [config files](files/config) for more information.
+
+i18n/
+:  Translation files return an associative array of strings. Translation is done using the `__()` method. To translate "Hello, world!" into Spanish, you would call `__('Hello, world!')` with [I18n::$lang] set to "es-es". I18n files are merged rather than overwritten by the cascade. See [I18n files](files/i18n) for more information.
+
+messages/
+:  Message files return an associative array of strings that can be loaded using [Kohana::message]. Messages and i18n files differ in that messages are not translated, but always written in the default language and referred to by a single key. Message files are merged rather than overwritten by the cascade. See [message files](files/messages) for more information.
+
+views/
+:  Views are plain PHP files which are used to generate HTML or other output. The view file is loaded into a [View] object and assigned variables, which it then converts into an HTML fragment. Multiple views can be used within each other. See [views](mvc/views) for more information.
+
+*other*
+:  You can include any other folders in your cascading filesystem.  Examples include, but are not limited to, `guide`, `vendor`, `media`, whatever you want.  For example, to find `media/logo.png` in the cascading filesystem you would call `Kohana::find_file('media','logo','png')`.
+
+## Finding Files
+
+The path to any file within the filesystem can be found by calling [Kohana::find_file]:
+
+    // Find the full path to "classes/cookie.php"
+    $path = Kohana::find_file('classes', 'cookie');
+
+    // Find the full path to "views/user/login.php"
+    $path = Kohana::find_file('views', 'user/login');
+	
+If the file doesn't have a `.php` extension, pass the extension as the third param.
+
+	// Find the full path to "guide/menu.md"
+	$path = Kohana::find_file('guide', 'menu', 'md');
+
+	// If $name is "2000-01-01-first-post" this would look for "posts/2000-01-01-first-post.textile"
+	$path = Kohana::find_file('posts', $name, '.textile');
+
+
+## Vendor Extensions
+
+We call extensions or external libraries that are not specific to Kohana "vendor" extensions, and they go in the vendor folder, either in application or in a module.  Because these libraries do not follow Kohana's file naming conventions, they cannot be autoloaded by Kohana, so you will have to manually included them. Some examples of vendor libraries are [Markdown](http://daringfireball.net/projects/markdown/), [DOMPDF](http://code.google.com/p/dompdf),  [Mustache](http://github.com/bobthecow/mustache.php) and [Swiftmailer](http://swiftmailer.org/).
+
+For example, if you wanted to use [DOMPDF](http://code.google.com/p/dompdf), you would copy it to `application/vendor/dompdf` and include the DOMPDF autoloading class.  It can be useful to do this in a controller's before method, as part of a module's init.php, or the contstructor of a singleton class.
+
+    require Kohana::find_file('vendor', 'dompdf/dompdf/dompdf_config','inc');
+
+Now you can use DOMPDF without loading any more files:
+
+    $pdf = new DOMPDF;
+
+[!!] If you want to convert views into PDFs using DOMPDF, try the [PDFView](http://github.com/shadowhand/pdfview) module.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/files/classes.md b/includes/kohana/system/guide/kohana/files/classes.md
new file mode 100644
index 0000000..898a4ac
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/files/classes.md
@@ -0,0 +1,41 @@
+# Classes
+
+TODO: Brief intro to classes.
+
+[Models](mvc/models) and [Controllers](mvc/controllers) are classes as well, but are treated slightly differently by Kohana.  Read their respective pages to learn more.
+
+## Helper or Library?
+
+Kohana 3 does not differentiate between "helper" classes and "library" classes like in previous versions.  They are all placed in the `classes/` folder and follow the same conventions.  The distinction is that in general, a "helper" class is used statically,  (for examples see the [helpers included in Kohana](helpers)), and library classes are typically instantiated and used as objects (like the [Database query builders](../database/query/builder)).  The distinction is not black and white, and is irrelevant anyways, since they are treated the same by Kohana.
+
+## Creating a class
+
+To create a new class, simply place a file in the `classes/` directory at any point in the [Cascading Filesystem](files), that follows the [Class naming conventions](conventions#class-names-and-file-location).  For example, lets create a `Foobar` class.
+
+	// classes/foobar.php
+	
+	class Foobar {
+		static function magic() {
+			// Does something
+		}
+	}
+	
+We can now call `Foobar::magic()` any where and Kohana will [autoload](autoloading) the file for us.
+
+We can also put classes in subdirectories.
+
+	// classes/professor/baxter.php
+	
+	class Professor_Baxter {
+		static function teach() {
+			// Does something
+		}
+	}
+	
+We could now call `Professor_Baxter::teach()` any where we want.
+
+For examples of how to create and use classes, simply look at the 'classes' folder in `system` or any module.
+
+## Namespacing your classes
+
+TODO: Discuss namespacing to provide transparent extension functionality in your own classes/modules.
diff --git a/includes/kohana/system/guide/kohana/files/config.md b/includes/kohana/system/guide/kohana/files/config.md
new file mode 100644
index 0000000..c1b8197
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/files/config.md
@@ -0,0 +1,102 @@
+# Config Files
+
+Configuration files are used to store any kind of configuration needed for a module, class, or anything else you want.  They are plain PHP files, stored in the `config/` directory, which return an associative array:
+
+    <?php defined('SYSPATH') or die('No direct script access.');
+
+    return array(
+        'setting' => 'value',
+        'options' => array(
+            'foo' => 'bar',
+        ),
+    );
+
+If the above configuration file was called `myconf.php`, you could access it using:
+
+    $config = Kohana::config('myconf');
+    $options = $config['options'];
+
+[Kohana::config] also provides a shortcut for accessing individual keys from configuration arrays using "dot paths" similar to [Arr::path].
+
+Get the "options" array:
+
+    $options = Kohana::config('myconf.options');
+
+Get the "foo" key from the "options" array:
+
+    $foo = Kohana::config('myconf.options.foo');
+
+Configuration arrays can also be accessed as objects, if you prefer that method:
+
+    $options = Kohana::config('myconf')->options;
+
+Please note that you can only access the top level of keys as object properties, all child keys must be accessed using standard array syntax:
+
+    $foo = Kohana::config('myconf')->options['foo'];
+
+## Merge
+
+Configuration files are slightly different from most other files within the [cascading filesystem](files) in that they are **merged** rather than overloaded. This means that all configuration files with the same file path are combined to produce the final configuration. The end result is that you can overload *individual* settings rather than duplicating an entire file.
+
+For example, if we wanted to change or add to an entry in the inflector configuration file, we would not need to duplicate all the other entries from the default configuration file.
+
+    // config/inflector.php
+
+    <?php defined('SYSPATH') or die('No direct script access.');
+
+    return array(
+        'irregular' => array(
+            'die' => 'dice', // does not exist in default config file
+            'mouse' => 'mouses', // overrides 'mouse' => 'mice' in the default config file
+    );
+
+
+## Creating your own config files
+
+Let's say we want a config file to store and easily change things like the title of a website, or the google analytics code.  We would create a config file, let's call it `site.php`:
+
+    // config/site.php
+
+    <?php defined('SYSPATH') or die('No direct script access.');
+
+    return array(
+        'title' => 'Our Shiny Website',
+        'analytics' => FALSE, // analytics code goes here, set to FALSE to disable
+    );
+
+We could now call `Kohana::config('site.title')` to get the site name, and `Kohana::config('site.analytics')` to get the analytics code.
+
+Let's say we want an archive of versions of some software.  We could use config files to store each version, and include links to download, documentation, and issue tracking.
+
+	// config/versions.php
+
+	<?php defined('SYSPATH') or die('No direct script access.');
+	
+    return array(
+		'1.0.0' => array(
+			'codename' => 'Frog',
+			'download' => 'files/ourapp-1.0.0.tar.gz',
+			'documentation' => 'docs/1.0.0',
+			'released' => '06/05/2009',
+			'issues' => 'link/to/bug/tracker',
+		),
+		'1.1.0' => array(
+			'codename' => 'Lizard',
+			'download' => 'files/ourapp-1.1.0.tar.gz',
+			'documentation' => 'docs/1.1.0',
+			'released' => '10/15/2009',
+			'issues' => 'link/to/bug/tracker',
+		),
+		/// ... etc ...
+	);
+
+You could then do the following:
+
+	// In your controller
+	$view->versions = Kohana::config('versions');
+	
+	// In your view:
+	foreach ($versions as $version)
+	{
+		// echo some html to display each version
+	}
diff --git a/includes/kohana/system/guide/kohana/files/i18n.md b/includes/kohana/system/guide/kohana/files/i18n.md
new file mode 100644
index 0000000..52efc81
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/files/i18n.md
@@ -0,0 +1,67 @@
+# I18n
+
+Kohana has a fairly simple and easy to use i18n system. It is slightly modeled after gettext, but is not as featureful. If you need the features of gettext, please use that :)
+
+## __()
+
+Kohana has a __() function to do your translations for you. This function is only meant for small sections of text, not entire paragraphs or pages of translated text.
+
+To echo a translated string:
+
+	<?php echo __('Hello, world!');?>
+
+This will echo 'Home' unless you've changed the defined language, which is explained below.
+
+## Changing the displayed language
+
+Use the I18n::lang() method to change the displayed language:
+
+	I18n::lang('fr');
+
+This will change the language to 'es-es'.
+
+## Defining language files
+
+To define the language file for the above language change, create a `i18n/fr.php` that contains:
+
+	<?php
+	
+	return array
+	(
+		'Hello, world!' => 'Bonjour, monde!',
+	);
+
+Now when you do `__('Hello, world!')`, you will get `Bonjour, monde!`
+
+## I18n variables
+
+You can define variables in your __() calls like so:
+
+	echo __('Hello, :user', array(':user' => $username));
+
+Your i18n key in your translation file will need to be defined as:
+
+	<?php
+	
+	return array
+	(
+		'Hello, :user' => 'Bonjour, :user',
+	);
+
+## Defining your own __() function
+
+You can define your own __() function by simply defining your own i18n class:
+
+	<?php
+	
+	class I18n extends Kohana_I18n
+	{
+		// Intentionally empty
+	}
+	
+	function __($string, array $values = NULL, $lang = 'en-us')
+	{
+		// Your functionality here
+	}
+
+This will cause the built-in __() function to be ignored.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/files/messages.md b/includes/kohana/system/guide/kohana/files/messages.md
new file mode 100644
index 0000000..8e0d8fb
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/files/messages.md
@@ -0,0 +1,36 @@
+# Messages
+
+Kohana has a robust key based lookup system so you can define system messages.
+
+## Getting a message
+
+Use the Kohana::message() method to get a message key:
+
+	Kohana::message('forms', 'foobar');
+
+This will look in the `messages/forms.php` file for the `foobar` key:
+
+	<?php
+	
+	return array(
+		'foobar' => 'Hello, world!',
+	);
+
+You can also look in subfolders and sub-keys:
+
+	Kohana::message('forms/contact', 'foobar.bar');
+
+This will look in the `messages/forms/contact.php` for the `[foobar][bar]` key:
+
+	<?php
+	
+	return array(
+		'foobar' => array(
+			'bar' => 'Hello, world!',
+		),
+	);
+
+## Notes
+
+ * Don't use __() in your messages files, as these files can be cached and will not work properly.
+ * Messages are merged by the cascading file system, not overwritten like config files.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/flow.md b/includes/kohana/system/guide/kohana/flow.md
new file mode 100644
index 0000000..96c55cb
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/flow.md
@@ -0,0 +1,27 @@
+# Request Flow
+
+Every application follows the same flow:
+
+1. Application starts from `index.php`.
+	1. The application, module, and system paths are set. (`APPPATH`, `MODPATH`, and `SYSPATH`)
+	2. Error reporting levels are set.
+	3. Install file is loaded, if it exists.
+	4. The [Kohana] class is loaded.
+	5. The bootstrap file, `APPPATH/bootstrap.php`, is included.
+2. Once we are in `bootstrap.php`:
+	7. [Kohana::init] is called, which sets up error handling, caching, and logging.
+	8. [Kohana_Config] readers and [Kohana_Log] writers are attached.
+	9. [Kohana::modules] is called to enable additional modules.
+	    * Module paths are added to the [cascading filesystem](files).
+		* Includes each module's `init.php` file, if it exists. 
+	    * The `init.php` file can perform additional environment setup, including adding routes.
+	10. [Route::set] is called multiple times to define the [application routes](routing).
+	11. [Request::instance] is called to start processing the request.
+		1. Checks each route that has been set until a match is found.
+		2. Creates the controller instance and passes the request to it.
+		3. Calls the [Controller::before] method.
+		4. Calls the controller action, which generates the request response.
+		5. Calls the [Controller::after] method.
+		    * The above 5 steps can be repeated multiple times when using [HMVC sub-requests](requests).
+3. Application flow returns to index.php
+	12. The main [Request] response is displayed
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/fragments.md b/includes/kohana/system/guide/kohana/fragments.md
new file mode 100644
index 0000000..fa4f0e3
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/fragments.md
@@ -0,0 +1,135 @@
+# Fragments
+
+Fragments are a quick and simple way to cache HTML or other output.  Fragments are not useful for caching objects or raw database results, in which case you should use a more robust caching method, which can be achieved with the [Cache module](../cache). Fragments use [Kohana::cache()] and will be placed in the cache directory (`application/cache` by default).
+
+You should use Fragment (or any caching solution) when reading the cache is faster than reprocessing the result.  Reading and parsing a remote file, parsing a complicated template, calculating something, etc.
+
+Fragments are typically used in view files.
+
+## Usage
+
+Fragments are used by calling [Fragment::load()] in an `if` statement at the beginning of what you want cached, and [Fragment::save()] at the end.  They use [output buffering](http://www.php.net/manual/en/function.ob-start.php) to capture the output between the two function calls.
+
+You can specify the lifetime (in seconds) of the Fragment using the second parameter of [Fragment::load()].  The default lifetime is 30 seconds.  You can use the [Date] helper to make more readable times.
+
+Fragments will store a different cache for each language (using [I18n]) if you pass `true` as the third parameter to [Fragment::load()];
+
+You can force the deletion of a Fragment using [Fragment::delete()], or specify a lifetime of 0.
+
+~~~
+// Cache for 5 minutes, and cache each language
+if ( ! Fragment::load('foobar', Date::MINUTE * 5, true))
+{
+    // Anything that is echo'ed here will be saved
+    Fragment::save();
+}
+~~~
+
+## Example: Calculating Pi
+
+In this example we will calculate pi to 1000 places, and cache the result using a fragment.  The first time you run this it will probably take a few seconds, but subsequent loads will be much faster, until the fragment lifetime runs out.
+
+~~~
+if ( ! Fragment::load('pi1000', Date::HOUR * 4))
+{   
+    // Change function nesting limit
+    ini_set('xdebug.max_nesting_level',1000);
+    
+    // Source: http://mgccl.com/2007/01/22/php-calculate-pi-revisited
+    function bcfact($n)
+    {
+      return ($n == 0 || $n== 1) ? 1 : bcmul($n,bcfact($n-1));
+    }
+    function bcpi($precision)
+    {
+        $num = 0;$k = 0;
+        bcscale($precision+3);
+        $limit = ($precision+3)/14;
+        while($k < $limit)
+        {
+            $num = bcadd($num, bcdiv(bcmul(bcadd('13591409',bcmul('545140134', $k)),bcmul(bcpow(-1, $k), bcfact(6*$k))),bcmul(bcmul(bcpow('640320',3*$k+1),bcsqrt('640320')), bcmul(bcfact(3*$k), bcpow(bcfact($k),3)))));
+            ++$k;
+        }
+        return bcdiv(1,(bcmul(12,($num))),$precision);
+    }
+    
+    echo bcpi(1000);
+    
+	Fragment::save();
+}
+
+echo View::factory('profiler/stats');
+
+?>
+~~~
+
+## Example: Recent Wikipedia edits
+
+In this example we will use the [Feed] class to retrieve and parse an RSS feed of recent edits to [http://en.wikipedia.org](http://en.wikipedia.org), then use Fragment to cache the results.
+
+~~~
+$feed = "http://en.wikipedia.org/w/index.php?title=Special:RecentChanges&feed=rss";
+$limit = 50;
+
+// Displayed feeds are cached for 30 seconds (default)
+if ( ! Fragment::load('rss:'.$feed)):
+
+	// Parse the feed
+	$items = Feed::parse($feed, $limit);
+	
+	foreach ($items as $item):
+	
+		// Convert $item to object
+		$item = (object) $item;
+		
+		echo HTML::anchor($item->link,$item->title);
+		
+		?>
+		<blockquote>
+			<p>author: <?php echo $item->creator ?></p>
+			<p>date: <?php echo $item->pubDate ?></p>
+		</blockquote>
+		<?php
+		
+	endforeach;
+
+	Fragment::save();
+
+endif;
+
+echo View::factory('profiler/stats');
+~~~
+
+## Example: Nested Fragments
+
+You can nest fragments with different lifetimes to provide more specific control.  For example, let's say your page has lots of dynamic content so we want to cache it with a lifetime of five minutes, but one of the pieces takes much longer to generate, and only changes every hour anyways. No reason to generate it every 5 minutes, so we will use a nested fragment.
+
+[!!] If a nested fragment has a shorter lifetime than the parent, it will only get processed when the parent has expired.
+
+~~~
+// Cache homepage for five minutes
+if ( ! Fragment::load('homepage', Date::MINUTE * 5)):
+
+	echo "<p>Home page stuff</p>";
+	
+	// Pretend like we are actually doing something :)
+	sleep(2);
+	
+	// Cache this every hour since it doesn't change as often
+	if ( ! Fragment::load('homepage-subfragment', Date::HOUR)):
+	
+		echo "<p>Home page special thingy</p>";
+		
+		// Pretend like this takes a long time
+		sleep(5);
+		
+	Fragment::save(); endif;
+	
+	echo "<p>More home page stuff</p>";
+	
+	Fragment::save();
+
+endif;
+
+echo View::factory('profiler/stats');
+~~~
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/helpers.md b/includes/kohana/system/guide/kohana/helpers.md
new file mode 100644
index 0000000..fb0559d
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/helpers.md
@@ -0,0 +1,53 @@
+# Helpers
+
+Kohana comes with many static "helper" functions to make certain tasks easier.
+
+You can make your own helpers by simply making a class and putting it in the `classes` directory, and you can also extend any helper to modify or add new functions using transparent extension.
+
+ - **[Arr]** - Array functions.  Get an array key or default to a set value, get an array key by path, etc.
+
+ - **[CLI]** - Parse command line options.
+
+ - **[Cookie]** - Covered in more detail on the [Cookies](cookies) page.
+
+ - **[Date]** - Useful date functions and constants. Time between two dates, convert between am/pm and military, date offset, etc.
+ 
+ - **[Encrypt]** - Covered in more detail on the [Security](security) page.
+ 
+ - **[Feed]** - Parse and create RSS feeds.
+ 
+ - **[File]** - Get file type by mime, split and merge a file into small pieces.
+ 
+ - **[Form]** - Create HTML form elements. 
+ 
+ - **[Fragment]** - Simple file based caching. Covered in more detail on the [Fragments](fragments) page.
+
+ - **[HTML]** - Useful HTML functions. Encode, obfuscate, create script, anchor, and image tags, etc.
+ 
+ - **[I18n]** - Internationalization helper for creating multilanguage sites.
+ 
+ - **[Inflector]** - Change a word into plural or singular form, camelize or humanize a phrase, etc.
+ 
+ - **[Kohana]** - The Kohana class is also a helper.  Debug variables (like print_r but better), file loading, etc.
+ 
+ - **[Num]** - Provides locale aware formating and english ordinals (th, st, nd, etc).
+ 
+ - **[Profiler]** - Covered in more detail on the [Profiling](profiling) page.
+
+ - **[Remote]** - Remote server access helper using [CURL](http://php.net/curl).
+ 
+ - **[Request]** - Get the current request url, create expire tags, send a file, get the user agent, etc. 
+ 
+ - **[Route]** - Create routes, create an internal link using a route.
+ 
+ - **[Security]** - Covered in more detail on the [Security](security) page.
+ 
+ - **[Session]** - Covered in more detail on the [Sessions](sessions) page.
+ 
+ - **[Text]** - Autolink, prevent window words, convert a number to text, etc.
+ 
+ - **[URL]** - Create a relative or absolute URL, make a URL-safe title, etc.
+ 
+ - **[UTF8]** - Provides multi-byte aware string functions like strlen, strpos, substr, etc.
+ 
+ - **[Upload]** - Helper for uploading files from a form.
diff --git a/includes/kohana/system/guide/kohana/index.md b/includes/kohana/system/guide/kohana/index.md
new file mode 100644
index 0000000..8e08466
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/index.md
@@ -0,0 +1,19 @@
+# What is Kohana?
+
+Kohana is an open source, [object oriented](http://wikipedia.org/wiki/Object-Oriented_Programming) [MVC](http://wikipedia.org/wiki/Model–View–Controller "Model View Controller") [web framework](http://wikipedia.org/wiki/Web_Framework) built using [PHP5](http://php.net/manual/intro-whatis "PHP Hypertext Preprocessor") by a team of volunteers that aims to be swift, secure, and small.
+
+[!!] Kohana is licensed under a [BSD license](http://kohanaframework.org/license), so you can legally use it for any kind of open source, commercial, or personal project.
+
+## What makes Kohana great?
+
+Anything can be extended using the unique [filesystem](about.filesystem) design, little or no [configuration](about.configuration) is necessary, [error handling](debugging.errors) helps locate the source of errors quickly, and [debugging](debugging) and [profiling](debugging.profiling) provide insight into the application.
+
+To help secure your applications, tools for [input validation](security.validation), [signed cookies](security.cookies), [form](security.forms) and [HTML](security.html) generators are all included. The [database](security.database) layer provides protection against [SQL injection](http://wikipedia.org/wiki/SQL_Injection). Of course, all official code is carefully written and reviewed for security.
+
+## Contribute to the Documentation
+
+We are working very hard to provide complete documentation. To help improve the guide, please [fork the userguide](http://github.com/kohana/userguide), make your changes, and send a pull request. If you are not familiar with git, you can also submit a [feature request](http://dev.kohanaframework.org/projects/kohana3/issues) (requires registration).
+
+## Unofficial Documentation
+
+If you are having trouble finding an answer here, have a look through the [unofficial wiki](http://kerkness.ca/wiki/doku.php). Your answer may also be found by searching the [forum](http://forum.kohanaphp.com/) or [stackoverflow](http://stackoverflow.com/questions/tagged/kohana) followed by asking your question on either.  Additionally, you can chat with the community of developers on the freenode [#kohana](irc://irc.freenode.net/kohana) IRC channel.  
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/install.md b/includes/kohana/system/guide/kohana/install.md
new file mode 100644
index 0000000..c440d45
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/install.md
@@ -0,0 +1,26 @@
+# Installation
+
+1. Download the latest **stable** release from the [Kohana website](http://kohanaframework.org/).
+2. Unzip the downloaded package to create a `kohana` directory.
+3. Upload the contents of this folder to your webserver.
+4. Open `application/bootstrap.php` and make the following changes:
+	- Set the default [timezone](http://php.net/timezones) for your application.
+	- Set the `base_url` in the [Kohana::init] call to reflect the location of the kohana folder on your server relative to the document root.
+6. Make sure the `application/cache` and `application/logs` directories are writable by the web server.
+7. Test your installation by opening the URL you set as the `base_url` in your favorite browser.
+
+[!!] Depending on your platform, the installation's subdirs may have lost their permissions thanks to zip extraction. Chmod them all to 755 by running `find . -type d -exec chmod 0755 {} \;` from the root of your Kohana installation.
+
+You should see the installation page. If it reports any errors, you will need to correct them before continuing.
+
+![Install Page](install.png "Example of install page")
+
+Once your install page reports that your environment is set up correctly you need to either rename or delete `install.php` in the root directory. Kohana is now installed and you should see the output of the welcome controller:
+
+![Welcome Page](welcome.png "Example of welcome page")
+
+## Installing Kohana 3.1 From GitHub
+
+The [source code](http://github.com/kohana/kohana) for Kohana 3.1 is hosted with [GitHub](http://github.com).  To install Kohana using the github source code first you need to install git.  Visit [http://help.github.com](http://help.github.com) for details on how to install git on your platform.
+
+[!!] For more information on installing Kohana using git submodules, see the [Working with Git](tutorials/git) tutorial.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/menu.md b/includes/kohana/system/guide/kohana/menu.md
new file mode 100644
index 0000000..b47b513
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/menu.md
@@ -0,0 +1,47 @@
+## [Kohana]()
+
+- Getting Started
+   - [Installation](install)
+   - [Conventions and Style](conventions)
+   - [Model View Controller](mvc)
+      - [Controllers](mvc/controllers)
+      - [Models](mvc/models)
+      - [Views](mvc/views)
+   - [Cascading Filesystem](files)
+      - [Class Files](files/classes)
+      - [Config Files](files/config)
+      - [Translation Files](files/i18n)
+      - [Message Files](files/messages)
+   - [Request Flow](flow)
+   - [Bootstrap](bootstrap)
+   - [Modules](modules)
+   - [Routing](routing)
+   - [Error Handling](errors)
+   - [Tips & Common Mistakes](tips)
+   - [Upgrading from v3.0](upgrading)
+- Basic Usage
+   - [Debugging](debugging)
+   - [Loading Classes](autoloading)
+   - [Transparent Extension](extension)
+   - [Helpers](helpers)
+   - [Requests](requests)
+   - [Sessions](sessions)
+   - [Cookies](cookies)
+   - [Fragments](fragments)
+   - [Profiling](profiling)
+- [Security](security)
+   - [XSS](security/xss)
+   - [Validation](security/validation)
+   - [Cookies](security/cookies)
+   - [Database](security/database)
+   - [Encryption](security/encryption)
+   - [Deploying](security/deploying)
+- [Tutorials](tutorials)
+   - [Hello World](tutorials/hello-world)
+   - [Simple MVC](tutorials/simple-mvc)
+   - [Custom Error Pages](tutorials/error-pages)
+   - [Content Translation](tutorials/translation)
+   - [Clean URLs](tutorials/clean-urls)
+   - [Sharing Kohana](tutorials/sharing-kohana)
+   - [Template Driven Site](tutorials/templates)
+   - [Working with Git](tutorials/git)
diff --git a/includes/kohana/system/guide/kohana/modules.md b/includes/kohana/system/guide/kohana/modules.md
new file mode 100644
index 0000000..bc906c4
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/modules.md
@@ -0,0 +1,40 @@
+# Modules
+
+Modules are simply an addition to the [Cascading Filesystem](files).  A module can add any kind of file (controllers, views, classes, config files, etc.) to the filesystem available to Kohana (via [Kohana::find_file]).  This is useful to make any part of your application more transportable or shareable between different apps.  For example, creating a new modeling system, a search engine, a css/js manager, etc.
+
+## Where to find modules
+
+Kolanos has created [kohana-universe](http://github.com/kolanos/kohana-universe/tree/master/modules/), a fairly comprehensive list of modules that are available on Github. To get your module listed there, send him a message via Github.
+
+Mon Geslani created a [very nice site](http://kohana.mongeslani.com/) that allows you to sort Github modules by activity, watchers, forks, etc.  It seems to not be as comprehensive as kohana-universe.
+
+Andrew Hutchings has created [kohana-modules](http://www.kohana-modules.com) which is similar to the above sites.
+
+## Enabling modules
+
+Modules are enabled by calling [Kohana::modules] and passing an array of `'name' => 'path'`.  The name isn't important, but the path obviously is.  A module's path does not have to be in `MODPATH`, but usually is.  You can only call [Kohana::modules] once.
+
+	Kohana::modules(array(
+		'auth'       => MODPATH.'auth',       // Basic authentication
+		'cache'      => MODPATH.'cache',      // Caching with multiple backends
+		'codebench'  => MODPATH.'codebench',  // Benchmarking tool
+		'database'   => MODPATH.'database',   // Database access
+		'image'      => MODPATH.'image',      // Image manipulation
+		'orm'        => MODPATH.'orm',        // Object Relationship Mapping
+		'oauth'      => MODPATH.'oauth',      // OAuth authentication
+		'pagination' => MODPATH.'pagination', // Paging of results
+		'unittest'   => MODPATH.'unittest',   // Unit testing
+		'userguide'  => MODPATH.'userguide',  // User guide and API documentation
+		));
+
+## Init.php
+
+When a module is activated, if an `init.php` file exists in that module's directory, it is included.  This is the ideal place to have a module include routes or other initialization necessary for the module to function.  The Userguide and Codebench modules have init.php files you can look at.
+
+## How modules work
+
+A file in an enabled module is virtually the same as having that exact file in the same place in the application folder.  The main difference being that it can be overwritten by a file of the same name in a higher location (a module enabled after it, or the application folder) via the [Cascading Filesystem](files).  It also provides an easy way to organize and share your code.
+
+## Creating your own module
+
+To create a module simply create a folder (usually in `DOCROOT/modules`) and place the files you want to be in the module there, and activate that module in your bootstrap.  To share your module, you can upload it to [Github](http://github.com).  You can look at examples of modules made by [Kohana](http://github.com/kohana) or [other users](#where-to-find-modules).
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/mvc.md b/includes/kohana/system/guide/kohana/mvc.md
new file mode 100644
index 0000000..2ee8549
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/mvc.md
@@ -0,0 +1,3 @@
+<http://kohanaframework.org/guide/about.mvc>
+
+Discus the MVC pattern, as it pertains to Kohana.  Perhaps have an image, etc.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/mvc/controllers.md b/includes/kohana/system/guide/kohana/mvc/controllers.md
new file mode 100644
index 0000000..f8d840b
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/mvc/controllers.md
@@ -0,0 +1,182 @@
+# Controllers
+
+A Controller is a class file that stands in between the models and the views in an application. It passes information on to the model when data needs to be changed and it requests information from the model when data needs to be loaded. Controllers then pass on the information of the model to the views where the final output can be rendered for the users.  Controllers essentially control the flow of the application.
+
+Controllers are called by the [Request::execute()] function based on the [Route] that the url matched.  Be sure to read the [routing](routing) page to understand how to use routes to map urls to your controllers.
+
+## Creating Controllers
+
+In order to function, a controller must do the following:
+
+* Reside in `classes/controller` (or a sub-directory)
+* Filename must be lowercase, e.g. `articles.php`
+* The class name must map to the filename (with `/` replaced with `_`) and each word is capitalized
+* Must have the Controller class as a (grand)parent
+
+Some examples of controller names and file locations:
+
+	// classes/controller/foobar.php
+	class Controller_Foobar extends Controller {
+	
+	// classes/controller/admin.php
+	class Controller_Admin extends Controller {
+
+Controllers can be in sub-folders:
+
+	// classes/controller/baz/bar.php
+	class Controller_Baz_Bar extends Controller {
+	
+	// classes/controller/product/category.php
+	class Controller_Product_Category extends Controller {
+	
+[!!] Note that controllers in sub-folders can not be called by the default route, you will need to define a route that has a [directory](routing#directory) param or sets a default value for directory.
+
+Controllers can extend other controllers.
+
+	// classes/controller/users.php
+	class Controller_Users extends Controller_Template
+	
+	// classes/controller/api.php
+	class Controller_Api extends Controller_REST
+	
+[!!] [Controller_Template] and [Controller_REST] are some example controllers provided in Kohana.
+
+You can also have a controller extend another controller to share common things, such as requiring you to be logged in to use all of those controllers.
+
+	// classes/controller/admin.php
+	class Controller_Admin extends Controller {
+		// This controller would have a before() that checks if the user is logged in
+	
+	// classes/controller/admin/plugins.php
+	class Controller_Admin_Plugins extends Controller_Admin {
+		// Because this controller extends Controller_Admin, it would have the same logged in check
+		
+## $this->request
+
+Every controller has the `$this->request` property which is the [Request] object that called the controller.  You can use this to get information about the current request, as well as set the response body via `$this->response->body($ouput)`.
+
+Here is a partial list of the properties and methods available to `$this->request`.  These can also be accessed via `Request::instance()`, but `$this->request` is provided as a shortcut.  See the [Request] class for more information on any of these. 
+
+Property/method | What it does
+--- | ---
+[$this->request->route()](../api/Request#property:route) | The [Route] that matched the current request url
+[$this->request->directory()](../api/Request#property:directory), <br /> [$this->request->controller](../api/Request#property:controller), <br /> [$this->request->action](../api/Request#property:action) | The directory, controller and action that matched for the current route
+[$this->request->param()](../api/Request#param) | Any other params defined in your route
+[$this->request->redirect()](../api/Request#redirect) | Redirect the request to a different url
+
+## $this->response
+[$this->response->body()](../api/Response#property:body) | The content to return for this request
+[$this->response->status()](../api/Response#property:status) | The HTTP status for the request (200, 404, 500, etc.)
+[$this->response->headers()](../api/Response#property:headers) | The HTTP headers to return with the response
+
+
+## Actions
+
+You create actions for your controller by defining a public function with an `action_` prefix.  Any method that is not declared as `public` and prefixed with `action_` can NOT be called via routing.
+
+An action method will decide what should be done based on the current request, it *controls* the application.  Did the user want to save a blog post?  Did they provide the necessary fields?   Do they have permission to do that?  The controller will call other classes, including models, to accomplish this.  Every action should set `$this->response->body($view)` to the [view file](mvc/views) to be sent to the browser, unless it [redirected](../api/Request#redirect) or otherwise ended the script earlier.
+
+A very basic action method that simply loads a [view](mvc/views) file.
+
+	public function action_hello()
+	{
+		$this->response->body(View::factory('hello/world')); // This will load views/hello/world.php
+	}
+
+### Parameters
+
+Parameters are accessed by calling `$this->request->param('name')` where `name` is the name defined in the route.
+
+	// Assuming Route::set('example','<controller>(/<action>(/<id>(/<new>)))');
+	
+	public function action_foobar()
+	{
+		$id = $this->request->param('id');
+		$new = $this->request->param('new');
+
+If that parameter is not set it will be returned as NULL.  You can provide a second parameter to set a default value if that param is not set.
+
+	public function action_foobar()
+	{
+		// $id will be false if it was not supplied in the url
+		$id = $this->request->param('user',FALSE);
+
+### Examples
+
+A view action for a product page.
+
+	public function action_view()
+	{
+		$product = new Model_Product($this->request->param('id'));
+
+		if ( ! $product->loaded())
+		{
+			throw new HTTP_Exception_404('Product not found!');
+		}
+
+		$this->response->body(View::factory('product/view')
+			->set('product', $product));
+	}
+
+A user login action.
+
+	public function action_login()
+	{
+		$view = View::factory('user/login');
+
+		if ($_POST)
+		{
+			// Try to login
+			if (Auth::instance()->login(arr::get($_POST, 'username'), arr::get($_POST, 'password')))
+			{
+				Request::current()->redirect('home');
+			}
+
+			$view->errors = 'Invalid email or password';
+		}
+
+		$this->response->body($view);
+	}
+
+## Before and after
+
+You can use the `before()` and `after()` functions to have code executed before or after the action is executed. For example, you could check if the user is logged in, set a template view, loading a required file, etc.
+
+For example, if you look in `Controller_Template` you can see that in the be
+
+You can check what action has been requested (via `$this->request->action`) and do something based on that, such as requiring the user to be logged in to use a controller, unless they are using the login action.
+
+	// Checking auth/login in before, and redirecting if necessary:
+
+	Controller_Admin extends Controller {
+
+		public function before()
+		{
+			// If this user doesn't have the admin role, and is not trying to login, redirect to login
+			if ( ! Auth::instance()->logged_in('admin') AND $this->request->action !== 'login')
+			{
+				$this->request->redirect('admin/login');
+			}
+		}
+		
+		public function action_login() {
+			...
+
+### Custom __construct() function
+
+In general, you should not have to change the `__construct()` function, as anything you need for all actions can be done in `before()`.  If you need to change the controller constructor, you must preserve the parameters or PHP will complain.  This is so the Request object that called the controller is available.  *Again, in most cases you should probably be using `before()`, and not changing the constructor*, but if you really, *really* need to it should look like this:
+
+	// You should almost never need to do this, use before() instead!
+
+	// Be sure Kohana_Request is in the params
+	public function __construct(Request $request, Response $response)
+	{
+		// You must call parent::__construct at some point in your function
+		parent::__construct($request, $response);
+		
+		// Do whatever else you want
+	}
+
+## Extending other controllers
+
+TODO: More description and examples of extending other controllers, multiple extension, etc.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/mvc/models.md b/includes/kohana/system/guide/kohana/mvc/models.md
new file mode 100644
index 0000000..bfcf240
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/mvc/models.md
@@ -0,0 +1,35 @@
+# Models
+
+From Wikipedia:
+
+ > The model manages the behavior and data of the application domain,
+ > responds to requests for information about its state (usually from the view),
+ > and responds to instructions to change state (usually from the controller).
+
+Creating a simple model:
+
+	class Model_Post extends Model
+	{
+		public function do_stuff()
+		{
+			// This is where you do domain logic...
+		}
+	}
+
+If you want database access, have your model extend the Model_Database class:
+
+	class Model_Post extends Model_Database
+	{
+		public function do_stuff()
+		{
+			// This is where you do domain logic...
+		}
+
+		public function get_stuff()
+		{
+			// Get stuff from the database:
+			return $this->db->query(...);
+		}
+	}
+
+If you want CRUD/ORM capabilities, see the [ORM Module](../../guide/orm)
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/mvc/views.md b/includes/kohana/system/guide/kohana/mvc/views.md
new file mode 100644
index 0000000..4ff0543
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/mvc/views.md
@@ -0,0 +1,153 @@
+# Views
+
+Views are files that contain the display information for your application. This is most commonly HTML, CSS and Javascript but can be anything you require such as XML or JSON for AJAX output. The purpose of views is to keep this information separate from your application logic for easy reusability and cleaner code.
+
+Views themselves can contain code used for displaying the data you pass into them. For example, looping through an array of product information and display each one on a new table row. Views are still PHP files so you can use any code you normally would.  However, you should try to keep your views as "dumb" as possible and retreive all data you need in your controllers, then pass it to the view.
+
+# Creating View Files
+
+View files are stored in the `views` directory of the [filesystem](files). You can also create sub-directories within the `views` directory to organize your files. All of the following examples are reasonable view files:
+
+    APPPATH/views/home.php
+    APPPATH/views/pages/about.php
+    APPPATH/views/products/details.php
+    MODPATH/error/views/errors/404.php
+    MODPATH/common/views/template.php
+
+## Loading Views
+
+[View] objects will typically be created inside a [Controller](mvc/controllers) using the [View::factory] method. Typically the view is then assigned as the [Request::$response] property or to another view.
+
+    public function action_about()
+    {
+        $this->response->body(View::factory('pages/about'));
+    }
+
+When a view is assigned as the [Response::body], as in the example above, it will automatically be rendered when necessary. To get the rendered result of a view you can call the [View::render] method or just type cast it to a string. When a view is rendered, the view file is loaded and HTML is generated.
+
+    public function action_index()
+    {
+        $view = View::factory('pages/about');
+
+        // Render the view
+        $about_page = $view->render();
+
+        // Or just type cast it to a string
+        $about_page = (string) $view;
+
+        $this->response->body($about_page);
+    }
+
+## Variables in Views
+
+Once view has been loaded, variables can be assigned to it using the [View::set] and [View::bind] methods.
+
+    public function action_roadtrip()
+    {
+        $view = View::factory('user/roadtrip')
+            ->set('places', array('Rome', 'Paris', 'London', 'New York', 'Tokyo'));
+            ->bind('user', $this->user);
+
+        // The view will have $places and $user variables
+        $this->response->body($view);
+    }
+
+[!!] The only difference between `set()` and `bind()` is that `bind()` assigns the variable by reference. If you `bind()` a variable before it has been defined, the variable will be created with a value of `NULL`.  
+
+You can also assign variables directly to the View object.  This is identical to calling `set()`;
+
+	public function action_roadtrip()
+	{
+		$view = View::factory('user/roadtrip');
+            
+		$view->places = array('Rome', 'Paris', 'London', 'New York', 'Tokyo');
+        $view->user = $this->user;
+
+        // The view will have $places and $user variables
+        $this->response->body($view);
+	}
+
+### Global Variables
+
+An application may have several view files that need access to the same variables. For example, to display a page title in both the header of your template and in the body of the page content. You can create variables that are accessible in any view using the [View::set_global] and [View::bind_global] methods.
+
+    // Assign $page_title to all views
+    View::bind_global('page_title', $page_title);
+
+If the application has three views that are rendered for the home page: `template`, `template/sidebar`, and `pages/home`. First, an abstract controller to create the template will be created:
+
+    abstract class Controller_Website extends Controller_Template {
+
+        public $page_title;
+
+        public function before()
+        {
+            parent::before();
+
+            // Make $page_title available to all views
+            View::bind_global('page_title', $this->page_title);
+
+            // Load $sidebar into the template as a view
+            $this->template->sidebar = View::factory('template/sidebar');
+        }
+
+    }
+
+Next, the home controller will extend `Controller_Website`:
+
+    class Controller_Home extends Controller_Website {
+
+        public function action_index()
+        {
+            $this->page_title = 'Home';
+
+            $this->template->content = View::factory('pages/home');
+        }
+
+    }
+
+## Views Within Views
+
+If you want to include another view within a view, there are two choices. By calling [View::factory] you can sandbox the included view. This means that you will have to provide all of the variables to the view using [View::set] or [View::bind]:
+	
+	// In your view file:
+	
+    // Only the $user variable will be available in "views/user/login.php"
+    <?php echo View::factory('user/login')->bind('user', $user) ?>
+
+The other option is to include the view directly, which makes all of the current variables available to the included view:
+
+	// In your view file:
+	
+    // Any variable defined in this view will be included in "views/message.php"
+    <?php include Kohana::find_file('views', 'user/login') ?>
+
+You can also assign a variable of your parent view to be the child view from within your controller.  For example:
+
+	// In your controller:
+
+	public functin action_index()
+	{
+		$view = View::factory('common/template);
+		
+		$view->title = "Some title";
+		$view->body = View::factory('pages/foobar');
+	}
+	
+	// In views/common/template.php:
+	
+	<html>
+	<head>
+		<title><?php echo $title></title>
+	</head>
+	
+	<body>
+		<?php echo $body ?>
+	</body>
+	</html>
+
+Of course, you can also load an entire [Request] within a view:
+
+    <?php echo Request::factory('user/login')->execute() ?>
+
+This is an example of \[HMVC], which makes it possible to create and read calls to other URLs within your application.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/profiling.md b/includes/kohana/system/guide/kohana/profiling.md
new file mode 100644
index 0000000..e7303c8
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/profiling.md
@@ -0,0 +1,54 @@
+# Profiling
+
+Kohana provides a very simple way to display statistics about your application:
+
+1. Common [Kohana] method calls, such as [Kohana::find_file()].
+2. Requests. Including the main request, as well as any sub-requests.
+3. [Database] queries
+4. Average execution times for your application
+
+[!!]  In order for profiling to work, the `profile` setting must be `TRUE` in your [Kohana::init()] call in your bootstrap.
+
+## Profiling your code
+
+You can easily add profiling to your own functions and code.  This is done using the [Profiler::start()] function.  The first parameter is the group, the second parameter is the name of the benchmark.  
+
+	public function foobar($input)
+	{
+		// Be sure to only profile if it's enabled
+		if (Kohana::$profiling === TRUE)
+		{
+			// Start a new benchmark
+			$benchmark = Profiler::start('Your Category', __FUNCTION__);
+		}
+
+		// Do some stuff
+
+		if (isset($benchmark))
+		{
+			// Stop the benchmark
+			Profiler::stop($benchmark);
+		}
+
+		return $something;
+	}
+
+## How to read the profiling report
+
+The benchmarks are sorted into groups.  Each benchmark will show its name, how many times it was run (show in parenthesis after the benchmark name), and then the min, max, average, and total time and memory spent on that benchmark.  The total column will have shaded backgrounds to show the relative times between benchmarks in the same group.
+
+At the very end is a group called "Application Execution".  This keeps track of how long each execution has taken.  The number in parenthesis is how many executions are being compared.  It shows the fastest, slowest, and average time and memory usage of the last several requsets.  The last box is the time and memory usage of the current request.
+
+((This could use a picture of a profiler with some database queries, etc. with annotations to point out each area as just described.))
+
+## Displaying the profiler
+
+You can display or collect the current [profiler] statistics at any time:
+
+    <?php echo View::factory('profiler/stats') ?>
+
+## Preview
+
+(This is the actual profiler stats for this page.)
+
+{{profiler/stats}}
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/requests.md b/includes/kohana/system/guide/kohana/requests.md
new file mode 100644
index 0000000..52720d7
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/requests.md
@@ -0,0 +1,65 @@
+# Requests
+
+Kohana includes a flexible HMVC request system. It supports out of the box support for internal requests and external requests.
+
+HMVC stands for `Hierarchical Model View Controller` and basically means requests can each have MVC triads called from inside each other.
+
+The Request object in Kohana is HTTP/1.1 compliant.
+
+## Creating Requests
+
+Creating a request is very easy:
+
+### Internal Requests
+
+An internal request is a request calling to the internal application. It utilizes [routes](routing) to direct the application based on the URI that is passed to it. A basic internal request might look something like:
+
+	$request = Request::factory('welcome');
+
+In this example, the URI is 'welcome'.
+
+#### The initial request
+
+Since Kohana uses HMVC, you can call many requests inside each other. The first request (usually called from `index.php`) is called the "initial request". You can access this request via:
+
+	Request::initial();
+
+You should only use this method if you are absolutely sure you want the initial request. Otherwise you should use the `Request::current()` method.
+
+#### Sub-requests
+
+You can call a request at any time in your application by using the `Request::factory()` syntax. All of these requests will be considered sub-requests.
+
+Other than this difference, they are exactly the same. You can detect if the request is a sub-request in your controller with the is_initial() method:
+
+	$sub_request = ! $this->request->is_initial()
+
+### External Requests
+
+An external request calls out to a third party website.
+
+You can use this to scrape HTML from a remote site, or make a REST call to a third party API:
+
+	// This uses GET
+	$request = Request::factory('http://www.google.com/');
+
+	// This uses PUT
+	$request = Request::factory('http://example.com/put_api')->method(Request::PUT)->body(json_encode('the body'))->headers('Content-Type', 'application/json');
+
+	// This uses POST
+	$request = Request::factory('http://example.com/post_api')->method(Request::POST)->post(array('foo' => 'bar', 'bar' => 'baz'));
+
+## Executing Requests
+
+To execute a request, use the `execute()` method on it. This will give you a [response](responses) object.
+
+	$request = Request::factory('welcome');
+	$response = $request->execute();
+
+## Request Cache Control
+
+You can cache requests for fast execution by passing a cache instance in as the second parameter of factory:
+
+	$request = Request::factory('welcome', Cache::instance());
+
+TODO
diff --git a/includes/kohana/system/guide/kohana/routing.md b/includes/kohana/system/guide/kohana/routing.md
new file mode 100644
index 0000000..85eacbd
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/routing.md
@@ -0,0 +1,271 @@
+# Routing
+
+Kohana provides a very powerful routing system.  In essence, routes provide an interface between the urls and your controllers and actions.  With the correct routes you could make almost any url scheme correspond to almost any arrangement of controllers, and you could change one without impacting the other.
+
+As mentioned in the [Request Flow](flow) section, a request is handled by the [Request] class, which will look for a matching [Route] and load the appropriate controller to handle that request.
+
+[!!] It is important to understand that **routes are matched in the order they are added**, and as soon as a URL matches a route, routing is essentially "stopped" and *the remaining routes are never tried*.  Because the default route matches almost anything, including an empty url, new routes must be place before it.
+
+## Creating routes
+
+If you look in `APPPATH/bootstrap.php` you will see the "default" route as follows:
+
+	Route::set('default', '(<controller>(/<action>(/<id>)))')
+	->defaults(array(
+		'controller' => 'welcome',
+		'action'     => 'index',
+	));
+	
+[!!] The default route is simply provided as a sample, you can remove it and replace it with your own routes.
+
+So this creates a route with the name `default` that will match urls in the format of `(<controller>(/<action>(/<id>)))`.  
+
+Let's take a closer look at each of the parameters of [Route::set], which are `name`, `uri`, and an optional array `regex`.
+
+### Name
+
+The name of the route must be a **unique** string.  If it is not it will overwrite the older route with the same name. The name is used for creating urls by reverse routing, or checking which route was matched.
+
+### URI
+
+The uri is a string that represents the format of urls that should be matched.  The tokens surrounded with `<>` are *keys* and anything surrounded with `()` are *optional* parts of the uri. In Kohana routes, any character is allowed and treated literally aside from `()<>`.  The `/` has no meaning besides being a character that must match in the uri.  Usually the `/` is used as a static seperator but as long as the regex makes sense, there are no restrictions to how you can format your routes.
+
+Lets look at the default route again, the uri is `(<controller>(/<action>(/<id>)))`.  We have three keys or params: controller, action, and id.   In this case, the entire uri is optional, so a blank uri would match and the default controller and action (set by defaults(), [covered below](#defaults)) would be assumed resulting in the `Controller_Welcome` class being loaded and the `action_index` method being called to handle the request.
+
+You can use any name you want for your keys, but the following keys have special meaning to the [Request] object, and will influence which controller and action are called:
+
+ * **Directory** - The sub-directory of `classes/controller` to look for the controller (\[covered below]\(#directory))
+ * **Controller** - The controller that the request should execute.
+ * **Action** - The action method to call.
+
+### Regex
+
+The Kohana route system uses [perl compatible regular expressions](http://perldoc.perl.org/perlre.html) in its matching process.  By default each key (surrounded by `<>`) will match `[^/.,;?\n]++` (or in english: anything that is not a slash, period, comma, semicolon, question mark, or newline).  You can define your own patterns for each key by passing an associative array of keys and patterns as an additional third argument to Route::set.
+
+In this example, we have controllers in two directories, `admin` and `affiliate`.  Because this route will only match urls that begin with `admin` or `affiliate`, the default route would still work for controllers in `classes/controller`.  
+
+	Route::set('sections', '<directory>(/<controller>(/<action>(/<id>)))',
+		array(
+			'directory' => '(admin|affiliate)'
+		))
+		->defaults(array(
+			'controller' => 'home',
+			'action'     => 'index',
+		));
+
+You can also use a less restrictive regex to match unlimited parameters, or to ignore overflow in a route.  In this example, the url `foobar/baz/and-anything/else_that/is-on-the/url` would be routed to `Controller_Foobar::action_baz()` and the `"stuff"` parameter would be `"and-anything/else_that/is-on-the/url"`.  If you wanted to use this for unlimited parameters, you could [explode](http://php.net/manual/en/function.explode.php) it, or you just ignore the overflow.  
+
+	Route::set('default', '(<controller>(/<action>(/<stuff>)))', array('stuff' => '.*'))
+		->defaults(array(
+			'controller' => 'welcome',
+			'action' => 'index',
+	  ));
+
+
+### Default values
+
+If a key in a route is optional (or not present in the route), you can provide a default value for that key by passing an associated array of keys and default values to [Route::defaults], chained after your [Route::set].  This can be useful to provide a default controller or action for your site, among other things.
+
+[!!] The `controller` and `action` key must always have a value, so they either need to be required in your route (not inside of parentheses) or have a default value provided.
+
+In the default route, all the keys are optional, and the controller and action are given a default.   If we called an empty url, the defaults would fill in and `Controller_Welcome::action_index()` would be called.  If we called `foobar` then only the default for action would be used, so it would call `Controller_Foobar::action_index()` and finally, if we called `foobar/baz` then neither default would be used and `Controller_Foobar::action_baz()` would be called.
+
+TODO: need an example here
+
+You can also use defaults to set a key that isn't in the route at all.
+
+TODO: example of either using directory or controller where it isn't in the route, but set by defaults
+
+### Directory
+
+## Lambda/Callback route logic
+
+In 3.1, you can specify advanced routing schemes by using lambda routes. Instead of a URI, you can use an anonymous function or callback syntax to specify a function that will process your routes. Here's a simple example:
+
+If you want to use reverse routing with lambda routes, you must pass the third parameter:
+
+	Route::set('testing', function($uri)
+		{
+			if ($uri == 'foo/bar')
+				return array(
+					'controller' => 'welcome',
+					'action'     => 'foobar',
+				);
+		},
+		'foo/bar'
+	);
+
+As you can see in the below route, the reverse uri parameter might not make sense.
+
+	Route::set('testing', function($uri)
+		{
+			if ($uri == '</language regex/>(.+)')
+			{
+				Cookie::set('language', $match[1]);
+				return array(
+					'controller' => 'welcome',
+					'action'     => 'foobar'
+				);
+			}
+		},
+		'<language>/<rest_of_uri>
+	);
+
+If you are using php 5.2, you can still use callbacks for this behavior (this example omits the reverse route):
+
+	Route::set('testing', array('Class', 'method_to_process_my_uri'));
+
+## Examples
+
+There are countless other possibilities for routes. Here are some more examples:
+
+    /*
+     * Authentication shortcuts
+     */
+    Route::set('auth', '<action>',
+      array(
+        'action' => '(login|logout)'
+      ))
+      ->defaults(array(
+        'controller' => 'auth'
+      ));
+      
+    /*
+     * Multi-format feeds
+     *   452346/comments.rss
+     *   5373.json
+     */
+    Route::set('feeds', '<user_id>(/<action>).<format>',
+      array(
+        'user_id' => '\d+',
+        'format' => '(rss|atom|json)',
+      ))
+      ->defaults(array(
+        'controller' => 'feeds',
+        'action' => 'status',
+      ));
+    
+    /*
+     * Static pages
+     */
+    Route::set('static', '<path>.html',
+      array(
+        'path' => '[a-zA-Z0-9_/]+',
+      ))
+      ->defaults(array(
+        'controller' => 'static',
+        'action' => 'index',
+      ));
+      
+    /*
+     * You don't like slashes?
+     *   EditGallery:bahamas
+     *   Watch:wakeboarding
+     */
+    Route::set('gallery', '<action>(<controller>):<id>',
+      array(
+        'controller' => '[A-Z][a-z]++',
+        'action'     => '[A-Z][a-z]++',
+      ))
+      ->defaults(array(
+        'controller' => 'Slideshow',
+      ));
+      
+    /*
+     * Quick search
+     */
+    Route::set('search', ':<query>', array('query' => '.*'))
+      ->defaults(array(
+        'controller' => 'search',
+        'action' => 'index',
+      ));
+
+## Request parameters
+
+The `directory`, `controller` and `action` can be accessed from the [Request] as public properties like so:
+
+	// From within a controller:
+	$this->request->action();
+	$this->request->controller();
+	$this->request->directory();
+	
+	// Can be used anywhere:
+	Request::current()->action();
+	Request::current()->controller();
+	Request::current()->directory();
+
+All other keys specified in a route can be accessed via [Request::param()]:
+
+	// From within a controller:
+	$this->request->param('key_name');
+	
+	// Can be used anywhere:
+	Request::current()->param('key_name');
+
+The [Request::param] method takes an optional second argument to specify a default return value in case the key is not set by the route. If no arguments are given, all keys are returned as an associative array.  In addition, `action`, `controller` and `directory` are not accessible via [Request::param()].
+
+For example, with the following route:
+
+	Route::set('ads','ad/<ad>(/<affiliate>)')
+	->defaults(array(
+		'controller' => 'ads',
+		'action'     => 'index',
+	));
+	
+If a url matches the route, then `Controller_Ads::index()` will be called.  You could access the parameters in two ways:
+
+First, any non-special parameters (parameters other than controller, action, and directory) in a route are passed as parameters to the action method in the order they appear in the route.  Be sure to define a default value for optional parameters if you don't define them in the route's `->defaults()`.
+
+	class Controller_Ads extends Controller {
+		public function action_index($ad, $affiliate = NULL)
+		{
+			
+		}
+
+Secondly, you can access the parameters using the `param()` method of the [Request] class. Again, remember to define a default value (via the second, optional parameter of [Request::param]) if you didn't in `->defaults()`.
+
+	class Controller_Ads extends Controller {
+		public function action_index()
+		{
+			$ad = $this->request->param('ad');
+			$affiliate = $this->request->param('affiliate',NULL);
+		}
+	
+
+## Where should routes be defined?
+
+The established convention is to either place your custom routes in the `MODPATH/<module>/init.php` file of your module if the routes belong to a module, or simply insert them into the `APPPATH/bootstrap.php` file (be sure to put them **above** the default route) if they are specific to the application. Of course, nothing stops you from including them from an external file, or even generating them dynamically.
+
+## A deeper look at how routes work
+
+TODO: talk about how routes are compiled
+
+## Creating URLs and links using routes
+
+Along with Kohana's powerful routing capabilities are included some methods for generating URLs for your routes' uris. You can always specify your uris as a string using [URL::site] to create a full URL like so:
+
+    URL::site('admin/edit/user/'.$user_id);
+
+However, Kohana also provides a method to generate the uri from the route's definition. This is extremely useful if your routing could ever change since it would relieve you from having to go back through your code and change everywhere that you specified a uri as a string. Here is an example of dynamic generation that corresponds to the `feeds` route example from above:
+
+    Route::get('feeds')->uri(array(
+      'user_id' => $user_id,
+      'action' => 'comments',
+      'format' => 'rss'
+    ));
+
+Let's say you decided later to make that route definition more verbose by changing it to `feeds/<user_id>(/<action>).<format>`. If you wrote your code with the above uri generation method you wouldn't have to change a single line! When a part of the uri is enclosed in parentheses and specifies a key for which there in no value provided for uri generation and no default value specified in the route, then that part will be removed from the uri. An example of this is the `(/<id>)` part of the default route; this will not be included in the generated uri if an id is not provided.
+
+One method you might use frequently is the shortcut [Request::uri] which is the same as the above except it assumes the current route, directory, controller and action. If our current route is the default and the uri was `users/list`, we can do the following to generate uris in the format `users/view/$id`:
+
+    $this->request->uri(array('action' => 'view', 'id' => $user_id));
+    
+Or if within a view, the preferable method is:
+
+    Request::instance()->uri(array('action' => 'view', 'id' => $user_id));
+
+TODO: examples of using html::anchor in addition to the above examples
+
+## Testing routes
+
+TODO: mention bluehawk's devtools module
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/security.md b/includes/kohana/system/guide/kohana/security.md
new file mode 100644
index 0000000..2f90a04
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security.md
@@ -0,0 +1 @@
+General security concerns, like using the Security class, CSRF, and a brief intro to XSS, database security, etc.  Also mention the security features that Kohana provides, like cleaning globals.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/security/cookies.md b/includes/kohana/system/guide/kohana/security/cookies.md
new file mode 100644
index 0000000..3966f6c
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/cookies.md
@@ -0,0 +1,3 @@
+Discuss security of cookies, like changing the encryption key in the config.
+
+Not sure why I'm linking to this: <http://kohanaframework.org/guide/security.cookies>
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/security/database.md b/includes/kohana/system/guide/kohana/security/database.md
new file mode 100644
index 0000000..e6190b7
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/database.md
@@ -0,0 +1,5 @@
+Discuss database security.
+
+How to avoid injection, etc.
+
+Not sure why I'm linking to this: <http://kohanaframework.org/guide/security.database>
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/security/deploying.md b/includes/kohana/system/guide/kohana/security/deploying.md
new file mode 100644
index 0000000..2c0a0fa
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/deploying.md
@@ -0,0 +1,61 @@
+Changes that should happen when you deploy. (Production)
+
+Security settings from: <http://kohanaframework.org/guide/using.configuration>
+
+<http://kerkness.ca/wiki/doku.php?id=setting_up_production_environment>
+
+
+## Setting up a production environment
+
+There are a few things you'll want to do with your application before moving into production.
+
+1. See the [Bootstrap page](bootstrap) in the docs.
+   This covers most of the global settings that would change between environments.
+   As a general rule, you should enable caching and disable profiling ([Kohana::init] settings) for production sites.
+   [Route::cache] can also help if you have a lot of routes.
+2. Turn on APC or some kind of opcode caching.
+   This is the single easiest performance boost you can make to PHP itself. The more complex your application, the bigger the benefit of using opcode caching.
+
+		/**
+		 * Set the environment string by the domain (defaults to Kohana::DEVELOPMENT).
+		 */
+		Kohana::$environment = ($_SERVER['SERVER_NAME'] !== 'localhost') ? Kohana::PRODUCTION : Kohana::DEVELOPMENT;
+		/**
+		 * Initialise Kohana based on environment
+		 */
+		Kohana::init(array(
+			'base_url'   => '/',
+			'index_file' => FALSE,
+			'profile'    => Kohana::$environment !== Kohana::PRODUCTION,
+			'caching'    => Kohana::$environment === Kohana::PRODUCTION,
+		));
+
+`index.php`:
+
+		/**
+		 * Execute the main request using PATH_INFO. If no URI source is specified,
+		 * the URI will be automatically detected.
+		 */
+		$request = Request::instance($_SERVER['PATH_INFO']);
+
+		// Attempt to execute the response
+		$request->execute();
+
+		if ($request->send_headers()->response)
+		{
+			// Get the total memory and execution time
+			$total = array(
+			  '{memory_usage}' => number_format((memory_get_peak_usage() - KOHANA_START_MEMORY) / 1024, 2).'KB',
+			  '{execution_time}' => number_format(microtime(TRUE) - KOHANA_START_TIME, 5).' seconds');
+
+			// Insert the totals into the response
+			$request->response = str_replace(array_keys($total), $total, $request->response);
+		}
+
+
+		/**
+		 * Display the request response.
+		 */
+		echo $request->response;
+
+
diff --git a/includes/kohana/system/guide/kohana/security/encryption.md b/includes/kohana/system/guide/kohana/security/encryption.md
new file mode 100644
index 0000000..8ba6ecf
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/encryption.md
@@ -0,0 +1 @@
+Discuss using encryption, including setting the encryption key in config.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/security/validation.md b/includes/kohana/system/guide/kohana/security/validation.md
new file mode 100644
index 0000000..ddd137f
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/validation.md
@@ -0,0 +1,234 @@
+# Validation
+
+*This page needs to be reviewed for accuracy by the development team. Better examples would be helpful.*
+
+Validation can be performed on any array using the [Validation] class. Labels and rules can be attached to a Validate object by the array key, called a "field name".
+
+labels
+:  A label is a human-readable version of the field name.
+
+rules
+:  A rule is a callback used to decide whether or not to add an error to a field
+
+[!!] Note that any valid [PHP callback](http://php.net/manual/language.pseudo-types.php#language.types.callback) can be used as a rule.
+
+Using `TRUE` as the field name when adding a rule will be applied to all named fields.
+
+Creating a validation object is done using the [Validation::factory] method:
+
+    $post = Validation::factory($_POST);
+
+[!!] The `$post` object will be used for the rest of this tutorial. This tutorial will show you how to validate the registration of a new user.
+
+## Provided Rules
+
+Kohana provides a set of useful rules in the [Valid] class:
+
+Rule name                 | Function
+------------------------- |-------------------------------------------------
+[Valid::not_empty]     | Value must be a non-empty value
+[Valid::regex]         | Match the value against a regular expression
+[Valid::min_length]    | Minimum number of characters for value
+[Valid::max_length]    | Maximum number of characters for value
+[Valid::exact_length]  | Value must be an exact number of characters
+[Valid::email]         | An email address is required
+[Validate::email_domain]  | Check that the domain of the email exists
+[Valid::url]           | Value must be a URL
+[Valid::ip]            | Value must be an IP address
+[Valid::phone]         | Value must be a phone number
+[Valid::credit_card]   | Require a credit card number
+[Valid::date]          | Value must be a date (and time)
+[Valid::alpha]         | Only alpha characters allowed
+[Valid::alpha_dash]    | Only alpha and hyphens allowed
+[Valid::alpha_numeric] | Only alpha and numbers allowed
+[Valid::digit]         | Value must be an integer digit
+[Valid::decimal]       | Value must be a decimal or float value
+[Valid::numeric]       | Only numeric characters allowed
+[Valid::range]         | Value must be within a range
+[Valid::color]         | Value must be a valid HEX color
+[Valid::matches]       | Value matches another field value
+
+## Adding Rules
+
+All validation rules are defined as a field name, a method or function (using the [PHP callback](http://php.net/callback) syntax), and an array of parameters:
+
+    $object->rule($field, $callback, array($parameter1, $parameter2));
+
+If no parameters are specified, the field value will be passed to the callback. The following two rules are equivalent:
+
+    $object->rule($field, 'not_empty');
+    $object->rule($field, 'not_empty', array(':value'));
+
+Rules defined in the [Valid] class can be added by using the method name alone. The following three rules are equivalent:
+
+    $object->rule('number', 'phone');
+    $object->rule('number', array('Valid', 'phone'));
+    $object->rule('number', 'Valid::phone');
+
+## Binding Variables
+
+The [Validation] class allows you to bind variables to certain strings so that they can be used when defining rules. Variables are bound by calling the [Validation::bind] method.
+
+    $object->bind(':model', $user_model);
+    // Future code will be able to use :model to reference the object
+    $object->rule('username', 'some_rule', array(':model'));
+
+By default, the validation object will automatically bind the following values for you to use as rule parameters:
+
+- `:validation` - references the validation object
+- `:field` - references the field name the rule is for
+- `:value` - references the value of the field the rule is for
+
+## Adding Errors
+
+The [Validation] class will add an error for a field if any of the rules associated to it return `FALSE`. This allows many built in PHP functions to be used as rules, like `in_array`.
+
+    $object->rule('color', 'in_array', array(':value', array('red', 'green', 'blue')));
+
+Rules added to empty fields will run, but returning `FALSE` will not automatically add an error for the field. In order for a rule to affect empty fields, you must add the error manually by calling the [Validation::error] method. In order to do this, you must pass the validation object to the rule.
+
+    $object->rule($field, 'the_rule', array(':validation', ':field'));
+    
+    public function the_rule($validation, $field)
+    {
+        if (something went wrong)
+        {
+            $validation->error($field, 'the_rule');
+        }
+    }
+
+[!!] `not_empty` and `matches` are the only rules that will run on empty fields and add errors by returning `FALSE`.
+
+## Example
+
+To start our example, we will perform validation on a `$_POST` array that contains user registration information:
+
+    $post = Validation::factory($_POST);
+
+Next we need to process the POST'ed information using [Validation]. To start, we need to add some rules:
+
+    $post
+        ->rule('username', 'not_empty')
+        ->rule('username', 'regex', array(':value', '/^[a-z_.]++$/iD'))
+        ->rule('password', 'not_empty')
+        ->rule('password', 'min_length', array(':value', '6'))
+        ->rule('confirm',  'matches', array(':validation', 'confirm', 'password'))
+        ->rule('use_ssl', 'not_empty');
+
+Any existing PHP function can also be used a rule. For instance, if we want to check if the user entered a proper value for the SSL question:
+
+    $post->rule('use_ssl', 'in_array', array(':value', array('yes', 'no')));
+
+Note that all array parameters must still be wrapped in an array! Without the wrapping array, `in_array` would be called as `in_array($value, 'yes', 'no')`, which would result in a PHP error.
+
+Any custom rules can be added using a [PHP callback](http://php.net/manual/language.pseudo-types.php#language.types.callback]:
+
+    $post->rule('username', 'User_Model::unique_username');
+
+The method `User_Model::unique_username()` would be defined similar to:
+
+    public static function unique_username($username)
+    {
+        // Check if the username already exists in the database
+        return ! DB::select(array(DB::expr('COUNT(username)'), 'total'))
+            ->from('users')
+            ->where('username', '=', $username)
+            ->execute()
+            ->get('total');
+    }
+
+[!!] Custom rules allow many additional checks to be reused for multiple purposes. These methods will almost always exist in a model, but may be defined in any class.
+
+# A Complete Example
+
+First, we need a [View] that contains the HTML form, which will be placed in `application/views/user/register.php`:
+
+    <?php echo Form::open() ?>
+    <?php if ($errors): ?>
+    <p class="message">Some errors were encountered, please check the details you entered.</p>
+    <ul class="errors">
+    <?php foreach ($errors as $message): ?>
+        <li><?php echo $message ?></li>
+    <?php endforeach ?>
+    <?php endif ?>
+
+    <dl>
+        <dt><?php echo Form::label('username', 'Username') ?></dt>
+        <dd><?php echo Form::input('username', $post['username']) ?></dd>
+
+        <dt><?php echo Form::label('password', 'Password') ?></dt>
+        <dd><?php echo Form::password('password') ?></dd>
+        <dd class="help">Passwords must be at least 6 characters long.</dd>
+        <dt><?php echo Form::label('confirm', 'Confirm Password') ?></dt>
+        <dd><?php echo Form::password('confirm') ?></dd>
+
+        <dt><?php echo Form::label('use_ssl', 'Use extra security?') ?></dt>
+        <dd><?php echo Form::select('use_ssl', array('yes' => 'Always', 'no' => 'Only when necessary'), $post['use_ssl']) ?></dd>
+        <dd class="help">For security, SSL is always used when making payments.</dd>
+    </dl>
+
+    <?php echo Form::submit(NULL, 'Sign Up') ?>
+    <?php echo Form::close() ?>
+
+[!!] This example uses the [Form] helper extensively. Using [Form] instead of writing HTML ensures that all of the form inputs will properly handle input that includes HTML characters. If you prefer to write the HTML yourself, be sure to use [HTML::chars] to escape user input.
+
+Next, we need a controller and action to process the registration, which will be placed in `application/classes/controller/user.php`:
+
+    class Controller_User extends Controller {
+
+        public function action_register()
+        {
+            $user = Model::factory('user');
+
+            $post = Validate::factory($_POST)
+                ->rule('username', 'not_empty')
+                ->rule('username', 'regex', array(':value', '/^[a-z_.]++$/iD'))
+                ->rule('username', array($user, 'unique_username'))
+
+                ->rule('password', 'not_empty')
+                ->rule('password', 'min_length', array(':value', 6))
+                ->rule('confirm',  'matches', array(':validation', ':field', 'password'))
+
+                ->rule('use_ssl', 'not_empty')
+                ->rule('use_ssl', 'in_array', array(':value', array('yes', 'no')));
+
+            if ($post->check())
+            {
+                // Data has been validated, register the user
+                $user->register($post);
+
+                // Always redirect after a successful POST to prevent refresh warnings
+                $this->request->redirect('user/profile');
+            }
+
+            // Validation failed, collect the errors
+            $errors = $post->errors('user');
+
+            // Display the registration form
+            $this->response->body(View::factory('user/register'))
+                ->bind('post', $post)
+                ->bind('errors', $errors);
+        }
+
+    }
+
+We will also need a user model, which will be placed in `application/classes/model/user.php`:
+
+    class Model_User extends Model {
+
+        public function register($array)
+        {
+            // Create a new user record in the database
+            $id = DB::insert(array_keys($array))
+                ->values($array)
+                ->execute();
+
+            // Save the new user id to a cookie
+            cookie::set('user', $id);
+
+            return $id;
+        }
+
+    }
+
+That is it, we have a complete user registration example that properly checks user input!
diff --git a/includes/kohana/system/guide/kohana/security/xss.md b/includes/kohana/system/guide/kohana/security/xss.md
new file mode 100644
index 0000000..d1e1c11
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/security/xss.md
@@ -0,0 +1,17 @@
+# Cross-Site Scripting (XSS) Security
+
+*This page is not comprehensive and should not be considered a complete guide to XSS prevention.*
+
+The first step to preventing [XSS](http://wikipedia.org/wiki/Cross-Site_Scripting) attacks is knowing when you need to protect yourself. XSS can only be triggered when it is displayed within HTML content, sometimes via a form input or being displayed from database results. Any global variable that contains client information can be tainted. This includes `$_GET`, `$_POST`, and `$_COOKIE` data.
+
+## Prevention
+
+There are a few simple rules to follow to guard your application HTML against XSS. If you do not want HTML in a variable, use [strip_tags](http://php.net/strip_tags) to remove all unwanted HTML tags from a value.
+
+[!!] If you allow users to submit HTML to your application, it is highly recommended to use an HTML cleaning tool such as [HTML Purifier](http://htmlpurifier.org/) or [HTML Tidy](http://php.net/tidy).
+
+The second is to always escape data when inserting into HTML. The [HTML] class provides generators for many common tags, including script and stylesheet links, anchors, images, and email (mailto) links. Any untrusted content should be escaped using [HTML::chars].
+
+## References
+
+* [OWASP XSS Cheat Sheet](http://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet)
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/sessions.md b/includes/kohana/system/guide/kohana/sessions.md
new file mode 100644
index 0000000..d60e709
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/sessions.md
@@ -0,0 +1,167 @@
+# Sessions
+
+Kohana provides classes that make it easy to work with both cookies and sessions. At a high level both sessions and cookies provide the same functionality. They allow the developer to store temporary or persistent information about a specific client for later retrieval, usually to make something persistent between requests.
+
+Sessions should be used for storing temporary or private data.  Very sensitive data should be stored using the [Session] class with the "database" or "native" adapters. When using the "cookie" adapter, the session should always be encrypted.
+
+[!!] For more information on best practices with session variables see [the seven deadly sins of sessions](http://lists.nyphp.org/pipermail/talk/2006-December/020358.html).
+
+## Storing, Retrieving, and Deleting Data
+
+[Cookie] and [Session] provide a very similar API for storing data. The main difference between them is that sessions are accessed using an object, and cookies are accessed using a static class.
+
+Accessing the session instance is done using the [Session::instance] method:
+
+    // Get the session instance
+    $session = Session::instance();
+
+When using sessions, you can also get all of the current session data using the [Session::as_array] method:
+
+    // Get all of the session data as an array
+    $data = $session->as_array();
+
+You can also use this to overload the `$_SESSION` global to get and set data in a way more similar to standard PHP:
+
+    // Overload $_SESSION with the session data
+    $_SESSION =& $session->as_array();
+    
+    // Set session data
+    $_SESSION[$key] = $value;
+
+### Storing Data
+
+Storing session or cookie data is done using the `set` method:
+
+    // Set session data
+    $session->set($key, $value);
+	// Or
+	Session::instance()->set($key, $value);
+
+    // Store a user id
+    $session->set('user_id', 10);
+
+### Retrieving Data
+
+Getting session or cookie data is done using the `get` method:
+
+    // Get session data
+    $data = $session->get($key, $default_value);
+
+    // Get the user id
+    $user = $session->get('user_id');
+
+### Deleting Data
+
+Deleting session or cookie data is done using the `delete` method:
+
+    // Delete session data
+    $session->delete($key);
+
+
+    // Delete the user id
+    $session->delete('user_id');
+
+## Session Configuration
+
+Always check these settings before making your application live, as many of them will have a direct affect on the security of your application.
+
+## Session Adapters
+
+When creating or accessing an instance of the [Session] class you can decide which session adapter or driver you wish to use. The session adapters that are available to you are:
+
+Native
+: Stores session data in the default location for your web server. The storage location is defined by [session.save_path](http://php.net/manual/session.configuration.php#ini.session.save-path) in `php.ini` or defined by [ini_set](http://php.net/ini_set).
+
+Database
+: Stores session data in a database table using the [Session_Database] class. Requires the [Database] module to be enabled.
+
+Cookie
+: Stores session data in a cookie using the [Cookie] class. **Sessions will have a 4KB limit when using this adapter, and should be encrypted.**
+
+The default adapter can be set by changing the value of [Session::$default]. The default adapter is "native".
+
+To access a Session using the default adapter, simply call [Session::instance()].  To access a Session using something other than the default, pass the adapter name to `instance()`, for example: `Session::instance('cookie')`
+
+
+### Session Adapter Settings
+
+You can apply configuration settings to each of the session adapters by creating a session config file at `APPPATH/config/session.php`. The following sample configuration file defines all the settings for each adapter:
+
+[!!] As with cookies, a "lifetime" setting of "0" means that the session will expire when the browser is closed.
+
+    return array(
+        'native' => array(
+            'name' => 'session_name',
+            'lifetime' => 43200,
+        ),
+        'cookie' => array(
+            'name' => 'cookie_name',
+            'encrypted' => TRUE,
+            'lifetime' => 43200,
+        ),
+        'database' => array(
+            'name' => 'cookie_name',
+            'encrypted' => TRUE,
+            'lifetime' => 43200,
+            'group' => 'default',
+            'table' => 'table_name',
+            'columns' => array(
+                'session_id'  => 'session_id',
+        		'last_active' => 'last_active',
+        		'contents'    => 'contents'
+            ),
+            'gc' => 500,
+        ),
+    );
+
+#### Native Adapter
+
+Type      | Setting   | Description                                       | Default
+----------|-----------|---------------------------------------------------|-----------
+`string`  | name      | name of the session                               | `"session"`
+`integer` | lifetime  | number of seconds the session should live for     | `0`
+
+#### Cookie Adapter
+
+Type      | Setting   | Description                                       | Default
+----------|-----------|---------------------------------------------------|-----------
+`string`  | name      | name of the cookie used to store the session data | `"session"`
+`boolean` | encrypted | encrypt the session data using [Encrypt]?         | `FALSE`
+`integer` | lifetime  | number of seconds the session should live for     | `0`
+
+#### Database Adapter
+
+Type      | Setting   | Description                                       | Default
+----------|-----------|---------------------------------------------------|-----------
+`string`  | group     | [Database::instance] group name                   | `"default"`
+`string`  | table     | table name to store sessions in                   | `"sessions"`
+`array`   | columns   | associative array of column aliases               | `array`
+`integer` | gc        | 1:x chance that garbage collection will be run    | `500`
+`string`  | name      | name of the cookie used to store the session data | `"session"`
+`boolean` | encrypted | encrypt the session data using [Encrypt]?         | `FALSE`
+`integer` | lifetime  | number of seconds the session should live for     | `0`
+
+##### Table Schema
+
+You will need to create the session storage table in the database. This is the default schema:
+
+    CREATE TABLE  `sessions` (
+        `session_id` VARCHAR(24) NOT NULL,
+        `last_active` INT UNSIGNED NOT NULL,
+        `contents` TEXT NOT NULL,
+        PRIMARY KEY (`session_id`),
+        INDEX (`last_active`)
+    ) ENGINE = MYISAM;
+
+##### Table Columns
+
+You can change the column names to match an existing database schema when connecting to a legacy session table. The default value is the same as the key value.
+
+session_id
+: the name of the "id" column
+
+last_active
+: UNIX timestamp of the last time the session was updated
+
+contents
+: session data stored as a serialized string, and optionally encrypted
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tips.md b/includes/kohana/system/guide/kohana/tips.md
new file mode 100644
index 0000000..760232b
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tips.md
@@ -0,0 +1,33 @@
+# Tips and Common Mistakes
+
+This is a collection of tips and common mistakes or errors you may encounter. 
+
+## Never edit the `system` folder!
+
+You should (almost) never edit the system folder.  Any change you want to make to files in system and modules can be made via the [cascading filesystem](files) and [transparent extension](extension) and won't break when you try to update your Kohana version.  
+
+## Don't try and use one route for everything
+
+Kohana 3 [routes](routing) are very powerful and flexible, don't be afraid to use as many as you need to make your app function the way you want!
+
+## Reflection_Exception
+
+If you get a Reflection_Exception when setting up your site, it is almost certainly because your [Kohana::init] 'base_url' setting is wrong.  If your base url is correct something is probably wrong with your [routes](routing).
+
+	ReflectionException [ -1 ]: Class controller_<something> does not exist
+	// where <something> is part of the url you entered in your browser
+
+### Solution  {#reflection-exception-solution}
+
+Set your [Kohana::init] 'base_url' to the correct setting. The base url should be the path to your index.php file relative to the webserver document root.
+
+## ORM/Session __sleep() bug
+
+There is a bug in php which can corrupt your session after a fatal error.  A production server shouldn't have uncaught fatal errors, so this bug should only happen during development, when you do something stupid and cause a fatal error.  On the next page load you will get a database connection error, then all subsequent page loads will display the following error:
+
+	ErrorException [ Notice ]: Undefined index: id
+	MODPATH/orm/classes/kohana/orm.php [ 1308 ]
+
+### Solution   {#orm-session-sleep-solution}
+
+To fix this, clear your cookies for that domain to reset your session.  This should never happen on a production server, so you won't have to explain to your clients how to clear their cookies.  You can see the [discussion on this issue](http://dev.kohanaframework.org/issues/3242) for more details.
diff --git a/includes/kohana/system/guide/kohana/tutorials.md b/includes/kohana/system/guide/kohana/tutorials.md
new file mode 100644
index 0000000..c921bcd
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials.md
@@ -0,0 +1,17 @@
+# Tutorials
+
+## Tutorials in this guide
+
+## Tutorials written elsewhere
+
+### Ellisgl's KO3 tutorial on dealtaker.com:
+
+1. [Install and Basic Usage](http://www.dealtaker.com/blog/2009/11/20/kohana-php-3-0-ko3-tutorial-part-1/)
+2. [Views](http://www.dealtaker.com/blog/2009/12/07/kohana-php-3-0-ko3-tutorial-part-2/)
+3. [Controllers](http://www.dealtaker.com/blog/2009/12/30/kohana-php-3-0-ko3-tutorial-part-3/)
+4. [Models](http://www.dealtaker.com/blog/2010/02/01/kohana-php-3-0-ko3-tutorial-part-4/)
+5. [Subrequests](http://www.dealtaker.com/blog/2010/02/25/kohana-php-3-0-ko3-tutorial-part-5/)
+6. [Routes](http://www.dealtaker.com/blog/2010/03/03/kohana-php-3-0-ko3-tutorial-part-6/)
+7. [Helpers](http://www.dealtaker.com/blog/2010/03/26/kohana-php-3-0-ko3-tutorial-part-7/)
+8. [Modules](http://www.dealtaker.com/blog/2010/04/30/kohana-php-3-0-ko3-tutorial-part-8/)
+9. [Vendor Libraries](http://www.dealtaker.com/blog/2010/06/02/kohana-php-3-0-ko3-tutorial-part-9/)
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tutorials/clean-urls.md b/includes/kohana/system/guide/kohana/tutorials/clean-urls.md
new file mode 100644
index 0000000..4e85966
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/clean-urls.md
@@ -0,0 +1,80 @@
+# Clean URLs
+
+Removing `index.php` from your urls.
+
+To keep your URLs clean, you will probably want to be able to access your app without having `/index.php/` in the URL. There are two steps to remove `index.php` from the URL.
+
+1. Edit the bootstrap file
+2. Set up rewriting
+
+## 1. Configure Bootstrap
+
+The first thing you will need to change is the `index_file` setting of [Kohana::init] to false:
+
+    Kohana::init(array(
+        'base_url'   => '/myapp/',
+        'index_file' => FALSE,
+    ));
+
+This change will make it so all of the links generated using [URL::site], [URL::base], and [HTML::anchor] will no longer include "index.php" in the URL. All generated links will start with `/myapp/` instead of `/myapp/index.php/`.
+
+## 2. URL Rewriting
+
+Enabling rewriting is done differently, depending on your web server.
+
+Rewriting will make it so urls will be passed to index.php.
+
+## Apache
+
+Rename `example.htaccess` to only `.htaccess` and alter the `RewriteBase` line to match the `base_url` setting from your [Kohana::init]
+
+    RewriteBase /myapp/
+
+The rest of the `.htaccess file` rewrites all requests through index.php, unless the file exists on the server (so your css, images, favicon, etc. are still loaded like normal).  In most cases, you are done!
+
+### Failed!
+
+If you get a "Internal Server Error" or "No input file specified" error, try changing:
+
+    RewriteRule ^(?:application|modules|system)\b - [F,L]
+
+Instead, we can try a slash:
+
+    RewriteRule ^(application|modules|system)/ - [F,L]
+
+If that doesn't work, try changing:
+
+    RewriteRule .* index.php/$0 [PT]
+
+To something more simple:
+
+    RewriteRule .* index.php [PT]
+
+### Still Failed!
+
+If you are still getting errors, check to make sure that your host supports URL `mod_rewrite`. If you can change the Apache configuration, add these lines to the the configuration, usually `httpd.conf`:
+
+    <Directory "/var/www/html/myapp">
+        Order allow,deny
+        Allow from all
+        AllowOverride All
+    </Directory>
+
+You should also check your Apache logs to see if they can shed some light on the error.
+
+## NGINX
+
+It is hard to give examples of nginx configuration, but here is a sample for a server:
+
+    location / {
+        index     index.php index.html index.htm;
+        try_files $uri index.php;
+    }
+
+    location = index.php {
+        include       fastcgi.conf;
+        fastcgi_pass  127.0.0.1:9000;
+        fastcgi_index index.php;
+    }
+
+If you are having issues getting this working, enable debug level logging in nginx and check the access and error logs.
diff --git a/includes/kohana/system/guide/kohana/tutorials/error-pages.md b/includes/kohana/system/guide/kohana/tutorials/error-pages.md
new file mode 100644
index 0000000..d25017f
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/error-pages.md
@@ -0,0 +1,154 @@
+# Friendly Error Pages
+
+By default Kohana 3 doesn't have a method to display friendly error pages like that
+seen in Kohana 2; In this short guide you will learn how it is done.
+
+## Prerequisites
+
+You will need `'errors' => TRUE` passed to `Kohana::init`. This will convert PHP
+errors into exceptions which are easier to handle.
+
+## 1. An Improved Exception Handler
+
+Our custom exception handler is self explanatory.
+
+	class Kohana_Exception extends Kohana_Kohana_Exception {
+
+		public static function handler(Exception $e)
+		{
+			if (Kohana::DEVELOPMENT === Kohana::$environment)
+			{
+				parent::handler($e);
+			}
+			else
+			{
+				try
+				{
+					Kohana::$log->add(Log::ERROR, parent::text($e));
+
+					$attributes = array
+					(
+						'action'  => 500,
+						'message' => rawurlencode($e->getMessage())
+					);
+
+					if ($e instanceof HTTP_Exception)
+					{
+						$attributes['action'] = $e->getCode();
+					}
+
+					// Error sub-request.
+					echo Request::factory(Route::get('error')->uri($attributes))
+					->execute()
+					->send_headers()
+					->body();
+				}
+				catch (Exception $e)
+				{
+					// Clean the output buffer if one exists
+					ob_get_level() and ob_clean();
+
+					// Display the exception text
+					echo parent::text($e);
+
+					// Exit with an error status
+					exit(1);
+				}
+			}
+		}
+	}
+
+If we are in the development environment then pass it off to Kohana otherwise:
+
+* Log the error
+* Set the route action and message attributes.
+* If a `HTTP_Exception` was thrown, then override the action with the error code.
+* Fire off an internal sub-request.
+
+The action will be used as the HTTP response code. By default this is: 500 (internal
+server error) unless a `HTTP_Response_Exception` was thrown.
+
+So this:
+
+	throw new HTTP_Exception_404(':file does not exist', array(':file' => 'Gaia'));
+
+would display a nice 404 error page, where:
+
+	throw new Kohana_Exception('Directory :dir must be writable',
+				array(':dir' => Debug::path(Kohana::$cache_dir)));
+
+would display an error 500 page.
+
+**The Route**
+
+	Route::set('error', 'error/<action>(/<message>)', array('action' => '[0-9]++', 'message' => '.+'))
+	->defaults(array(
+		'controller' => 'error_handler'
+	));
+
+## 2. The Error Page Controller
+
+	public function before()
+	{
+		parent::before();
+
+		$this->template->page = URL::site(rawurldecode(Request::$initial->uri()));
+
+		// Internal request only!
+		if (Request::$initial !== Request::$current)
+		{
+			if ($message = rawurldecode($this->request->param('message')))
+			{
+				$this->template->message = $message;
+			}
+		}
+		else
+		{
+			$this->request->action(404);
+		}
+
+		$this->response->status((int) $this->request->action());
+	}
+
+1. Set a template variable "page" so the user can see what they requested. This
+   is for display purposes only.
+2. If an internal request, then set a template variable "message" to be shown to
+   the user.
+3. Otherwise use the 404 action. Users could otherwise craft their own error messages, eg:
+   `error/404/email%20your%20login%20information%20to%20hacker%40google.com`
+
+
+		public function action_404()
+		{
+			$this->template->title = '404 Not Found';
+
+			// Here we check to see if a 404 came from our website. This allows the
+			// webmaster to find broken links and update them in a shorter amount of time.
+			if (isset ($_SERVER['HTTP_REFERER']) AND strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME']) !== FALSE)
+			{
+				// Set a local flag so we can display different messages in our template.
+				$this->template->local = TRUE;
+			}
+
+			// HTTP Status code.
+			$this->response->status(404);
+		}
+
+		public function action_503()
+		{
+			$this->template->title = 'Maintenance Mode';
+		}
+
+		public function action_500()
+		{
+			$this->template->title = 'Internal Server Error';
+		}
+
+You will notice that each example method is named after the HTTP response code
+and sets the request response code.
+
+## 3. Conclusion
+
+So that's it. Now displaying a nice error page is as easy as:
+
+	throw new HTTP_Exception_503('The website is down');
diff --git a/includes/kohana/system/guide/kohana/tutorials/git.md b/includes/kohana/system/guide/kohana/tutorials/git.md
new file mode 100644
index 0000000..e558f26
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/git.md
@@ -0,0 +1,143 @@
+# Creating a New Application
+
+[!!] The following examples assume that your web server is already set up, and you are going to create a new application at <http://localhost/gitorial/>.
+
+Using your console, change to the empty directory `gitorial` and run `git init`. This will create the bare structure for a new git repository.
+
+Next, we will create a [submodule](http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html) for the `system` directory. Go to <http://github.com/kohana/core> and copy the "Clone URL":
+
+![Github Clone URL](http://img.skitch.com/20091019-rud5mmqbf776jwua6hx9nm1n.png)
+
+Now use the URL to create the submodule for `system`:
+
+    git submodule add git://github.com/kohana/core.git system
+
+[!!] This will create a link to the current development version of the next stable release. The development version should almost always be safe to use, have the same API as the current stable download with bugfixes applied.
+
+Now add whatever submodules you need. For example, if you need the [Database] module:
+
+    git submodule add git://github.com/kohana/database.git modules/database
+
+After submodules are added, they must be initialized:
+
+    git submodule init
+
+Now that the submodules are added, you can commit them:
+
+    git commit -m 'Added initial submodules'
+
+Next, create the application directory structure. This is the bare minimum required:
+
+    mkdir -p application/classes/{controller,model}
+    mkdir -p application/{config,views}
+    mkdir -m 0777 -p application/{cache,logs}
+
+If you run `find application` you should see this:
+
+    application
+    application/cache
+    application/config
+    application/classes
+    application/classes/controller
+    application/classes/model
+    application/logs
+    application/views
+
+We don't want git to track log or cache files, so add a `.gitignore` file to each of the directories. This will ignore all non-hidden files:
+
+    echo '[^.]*' > application/{logs,cache}/.gitignore
+
+[!!] Git ignores empty directories, so adding a `.gitignore` file also makes sure that git will track the directory, but not the files within it.
+
+Now we need the `index.php` and `bootstrap.php` files:
+
+    wget https://github.com/kohana/kohana/raw/3.1/master/index.php --no-check-certificate
+    wget https://github.com/kohana/kohana/raw/3.1/master/application/bootstrap.php --no-check-certificate -O application/bootstrap.php
+
+Commit these changes too:
+
+    git add application
+    git commit -m 'Added initial directory structure'
+
+That's all there is to it. You now have an application that is using Git for versioning.
+
+## Adding Submodules
+To add a new submodule complete the following steps:
+
+1. run the following code - git submodule add repository path for each new submodule e.g.:
+
+        git submodule add git://github.com/shadowhand/sprig.git modules/sprig
+
+2. then init and update the submodules:
+
+        git submodule init
+        git submodule update
+
+## Updating Submodules
+
+At some point you will probably also want to upgrade your submodules. To update all of your submodules to the latest `HEAD` version:
+
+    git submodule foreach 'git checkout 3.1/master && git pull origin 3.1/master'
+
+To update a single submodule, for example, `system`:
+
+    cd system
+    git checkout 3.1/master
+    git pull origin 3.1/master
+    cd ..
+    git add system
+    git commit -m 'Updated system to latest version'
+
+If you want to update a single submodule to a specific commit:
+
+    cd modules/database
+    git pull origin 3.1/master
+    git checkout fbfdea919028b951c23c3d99d2bc1f5bbeda0c0b
+    cd ../..
+    git add database
+    git commit -m 'Updated database module'
+
+Note that you can also check out the commit at a tagged official release point, for example:
+
+    git checkout 3.1.0
+
+Simply run `git tag` without arguments to get a list of all tags.
+
+## Removing Submodules
+To remove a submodule that is no longer needed complete the following steps:
+
+1. open .gitmodules and remove the reference to the to submodule
+    It will look something like this:
+
+        [submodule "modules/auth"]
+        path = modules/auth
+        url = git://github.com/kohana/auth.git
+
+2. open .git/config and remove the reference to the to submodule\\
+
+        [submodule "modules/auth"]
+        url = git://github.com/kohana/auth.git
+
+3. run git rm --cached path/to/submodule, e.g.
+
+        git rm --cached modules/auth
+
+**Note:** Do not put a trailing slash at the end of path. If you put a trailing slash at the end of the command, it will fail.
+
+## Updating Remote Repository URL
+
+During the development of a project, the source of a submodule may change for any reason (you've created your own fork, the server URL changed, the repository name or path changed, etc...) and you'll have to update those changes. To do so, you'll need to perform the following steps:
+
+1. edit the .gitmodules file, and change the URL for the submodules which changed.
+
+2. in your source tree's root run:
+
+		git submodule sync
+
+3. run `git init` to update the project's repository configuration with the new URLs:
+
+		git submodule init
+
+And it's done, now you can continue pushing and pulling your submodules with no problems.
+
+Source: http://jtrancas.wordpress.com/2011/02/06/git-submodule-location/
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tutorials/hello-world.md b/includes/kohana/system/guide/kohana/tutorials/hello-world.md
new file mode 100644
index 0000000..748ad6f
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/hello-world.md
@@ -0,0 +1,106 @@
+# Hello, World
+
+Just about every framework ever written has some kind of hello world example included, so it'd be pretty rude of us to break this tradition!
+
+We'll start out by creating a very very basic hello world, and then we'll expand it to follow MVC principles.
+
+## Bare bones
+
+First off we have to make a controller that Kohana can use to handle a request.
+
+Create the file `application/classes/controller/hello.php` in your application folder and fill it out like so:
+
+    <?php defined('SYSPATH') OR die('No Direct Script Access');
+
+	Class Controller_Hello extends Controller
+	{
+		public function action_index()
+		{
+			echo 'hello, world!';
+		}
+	}
+
+Lets see what's going on here:
+
+`<?php defined('SYSPATH') OR die('No Direct Script Access');`
+:	You should recognise the first tag as an opening php tag (if you don't you should probably [learn php](http://php.net)).  What follows is a small check that makes sure that this file is being included by Kohana.  It stops people from accessing files directly from the url.
+
+`Class Controller_Hello extends Controller`
+:	This line declares our controller,  each controller class has to be prefixed with `Controller_` and an underscore delimited path to the folder the controller is in (see [Conventions and styles](about.conventions) for more info).  Each controller should also extend the base `Controller` class which provides a standard structure for controllers.
+
+
+`public function action_index()`
+:	This defines the "index" action of our controller.  Kohana will attempt to call this action if the user hasn't specified an action. (See [Routes, URLs and Links](tutorials.urls))
+
+`echo 'hello, world!';`
+:	And this is the line which outputs the customary phrase!
+
+Now if you open your browser and go to http://localhost/index.php/hello you should see something like:
+
+![Hello, World!](hello_world_1.png "Hello, World!")
+
+## That was good, but we can do better
+
+What we did in the previous section was a good example of how easy it to create an *extremely* basic Kohana app. (In fact it's so basic, that you should never make it again!)
+
+If you've ever heard anything about MVC you'll probably have realised that echoing content out in a controller is strictly against the principles of MVC.
+
+The proper way to code with an MVC framework is to use _views_ to handle the presentation of your application, and allow the controller to do what it does best – control the flow of the request!
+
+Lets change our original controller slightly:
+
+    <?php defined('SYSPATH') OR die('No Direct Script Access');
+
+	Class Controller_Hello extends Controller_Template
+	{
+		public $template = 'site';
+
+		public function action_index()
+		{
+			$this->template->message = 'hello, world!';
+		}
+	}
+
+`extends Controller_Template`
+:	We're now extending the template controller,  it makes it more convenient to use views within our controller.
+
+`public $template = 'site';`
+:	The template controller needs to know what template you want to use. It'll automatically load the view defined in this variable and assign the view object to it.
+
+`$this->template->message = 'hello, world!';`
+:	`$this->template` is a reference to the view object for our site template.  What we're doing here is assigning a variable called "message", with a value of "hello, world!" to the view.
+
+Now lets try running our code...
+
+![Hello, World!](hello_world_2_error.png "Hello, World!")
+
+For some reason Kohana's thrown a wobbly and isn't showing our amazing message.
+
+If we look at the error message we can see that the View library wasn't able to find our site template, probably because we haven't made it yet – *doh*!
+
+Let's go and make the view file `application/views/site.php` for our message:
+
+	<html>
+		<head>
+			<title>We've got a message for you!</title>
+			<style type="text/css">
+				body {font-family: Georgia;}
+				h1 {font-style: italic;}
+
+			</style>
+		</head>
+		<body>
+			<h1><?php echo $message; ?></h1>
+			<p>We just wanted to say it! :)</p>
+		</body>
+	</html>
+
+If we refresh the page then we can see the fruits of our labour:
+
+![hello, world! We just wanted to say it!](hello_world_2.png "hello, world! We just wanted to say it!")
+
+## Stage 3 – Profit!
+
+In this tutorial you've learnt how to create a controller and use a view to separate your logic from your display.
+
+This is obviously a very basic introduction to working with Kohana and doesn't even scrape the potential you have when developing applications with it.
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tutorials/sharing-kohana.md b/includes/kohana/system/guide/kohana/tutorials/sharing-kohana.md
new file mode 100644
index 0000000..8621452
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/sharing-kohana.md
@@ -0,0 +1,54 @@
+# Sharing Kohana
+
+Because Kohana follows a [front controller] pattern, which means that all requests are sent to `index.php`, the filesystem is very configurable.  Inside of `index.php` you can change the `$application`, `$modules`, and `$system` paths.
+
+[!!] There is a security check at the top of every Kohana file to prevent it from being accessed without using the front controller.  Also, the `.htaccess` file should protect those folders as well.  Moving the application, modules, and system directories to a location that cannot be accessed vie web can add another layer of security, but is optional.   
+
+The `$application` variable lets you set the directory that contains your application files. By default, this is `application`. The `$modules` variable lets you set the directory that contains module files. The `$system` variable lets you set the directory that contains the default Kohana files. You can move these three directories anywhere.
+
+For instance, by default the directories are set up like this:
+
+    www/
+        index.php
+        application/
+        modules/
+        system/
+
+You could move the directories out of the web root so they look like this:
+
+    application/
+    modules/
+    system/
+    www/
+        index.php
+
+Then you would need to change the settings in `index.php` to be:
+
+    $application = '../application';
+    $modules     = '../modules';
+    $system      = '../system';
+
+## Sharing system and modules
+
+To take this a step further, we could point several kohana apps to the same system and modules folders.  For example (and this is just an example, you could arrange these anyway you want):
+
+	apps/
+		foobar/
+			application/
+			www/
+		bazbar/
+			application/
+			www/
+	kohana/
+		3.0.6/
+		3.0.7/
+		3.0.8/
+	modules/
+
+And you would need to change the settings in `index.php` to be:
+
+	$application = '../application';
+	$system      = '../../../kohana/3.0.6';
+	$modules     = '../../../kohana/modules';
+
+Using this method each app can point to a central copy of kohana, and you can add a new version, and quickly update your apps to point to the new version by editing their `index.php` files.
diff --git a/includes/kohana/system/guide/kohana/tutorials/simple-mvc.md b/includes/kohana/system/guide/kohana/tutorials/simple-mvc.md
new file mode 100644
index 0000000..b3a475d
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/simple-mvc.md
@@ -0,0 +1 @@
+Simple example of controller model and view working together.  
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tutorials/templates.md b/includes/kohana/system/guide/kohana/tutorials/templates.md
new file mode 100644
index 0000000..4bfd9c2
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/templates.md
@@ -0,0 +1,7 @@
+Making a template driven site.
+
+<http://kerkness.ca/wiki/doku.php?id=template-site:create_the_template>
+	
+<http://kerkness.ca/wiki/doku.php?id=template-site:extending_the_template_controller>
+
+<http://kerkness.ca/wiki/doku.php?id=template-site:basic_page_controller>
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/tutorials/translation.md b/includes/kohana/system/guide/kohana/tutorials/translation.md
new file mode 100644
index 0000000..12f7cfc
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/tutorials/translation.md
@@ -0,0 +1,5 @@
+
+
+<http://kerkness.ca/wiki/doku.php?id=routing:static_pages>
+
+<http://kerkness.ca/wiki/doku.php?id=routing:multi-language_with_a_route>
\ No newline at end of file
diff --git a/includes/kohana/system/guide/kohana/upgrading.md b/includes/kohana/system/guide/kohana/upgrading.md
new file mode 100644
index 0000000..d4d5d57
--- /dev/null
+++ b/includes/kohana/system/guide/kohana/upgrading.md
@@ -0,0 +1,93 @@
+# Migrating from 3.0.x
+
+## Request/Response
+
+The request class has been split into a request and response class. To set the response body, you used to do:
+
+	$this->request->response = 'foo';
+
+This has changed to:
+
+	$this->response->body('foo');
+
+Some properties that existed in the request class have been converted into methods:
+
+	- Request::$controller -> Request::controller()
+	- Request::$action -> Request::action()
+	- Request::$directory -> Request::directory()
+	- Request::$uri -> Request::uri()
+
+Request::instance() has been replaced by Request::current() and Request::initial(). Normally you'll want to use Request::current(), but if you are sure you want the *original* request (when running hmvc requests), use Request::initial().
+
+## Validation
+
+The validation class has been improved to include "context" support. Because of this, the api has changed. Also, The class has been split: core validation logic is now separate from built-in validation rules. The new core class is called `Validation` and the rules are located in the `Valid` class.
+
+### Context
+
+The validation class now contains "context" support. This allowed us to merge the rule() and callback() methods, and there is now simply a rule() method that handles both cases.
+
+Old usage:
+
+	rule('password', 'matches', array('repeat_password'))
+
+New usage:
+
+	rule('password', 'matches', array(':validation', 'password', 'repeat_password'))
+
+The third parameter now contains all parameters that get passed to the rule. If you look at Valid::matches(), you'll see:
+
+	public static function matches($array, $field, $match)
+
+:validation is the first parameter, 'password' is the second (the field we want to check) and 'repeat_password' is the third (what we want to match)
+
+:validation is a special "context" variable that tells the Validation class to replace with the actual validation class. You can see in this way, the matches rule is no different than how callbacks used to work, yet are more powerful. There are other context variables:
+
+ - :validation - The validation object
+ - :field - The field being compared (rule('username', 'min_length', array(':field', 4)))
+ - :value - The value of the field
+
+You can use any php function as a rule if it returns a boolean value.
+
+### Filters
+
+Filters have been removed from the validation class. There is no specific replacement. If you were using it with ORM, there is a new mechanism for filtering in that module.
+
+## Cookie salts
+
+The cookie class now throws an exception if there isn't a salt set, and no salt is the now the default. You'll need to make sure you set the salt in your bootstrap:
+
+	Cookie::$salt = 'foobar';
+
+Or define an extended cookie class in your application:
+
+	class Cookie extends Kohana_Cookie
+	{
+		public static $salt = 'foobar';
+	}
+
+## Controller constructor
+
+If for some reason you are overloading your controller's constructor, it has changed to:
+
+	public function __construct(Request $request, Response $response)
+
+## index.php / bootstrap.php changes
+
+The main change here is that the request execution has been removed from bootstrap.php and moved to index.php. This allows you to use one bootstrap when doing testing. The reason for this change is that the bootstrap should only setup the environment. It shouldn't run it.
+
+## 404 Handling
+
+Kohana now has built in exception support for 404 and other http status codes. If you were using ReflectionException to detect 404s, you should be using HTTP_Exception_404 instead. For details on how to handle 404s, see [error handling](errors).
+
+## Form Class
+
+If you used Form::open(), the default behavior has changed. It used to default to the current URI, but now an empty parameter will default to "/" (your home page).
+
+## Logging
+
+The log message level constants now belong to the Log class.  If you are referencing those constants to invoke Kohana::$log->add( ... ) you will need to change the following:
+
+    - Kohana::ERROR -> Log::ERROR
+    - Kohana::DEBUG -> Log::DEBUG
+    - Kohana::INFO  -> Log::INFO
diff --git a/includes/kohana/system/i18n/en.php b/includes/kohana/system/i18n/en.php
new file mode 100644
index 0000000..16276f1
--- /dev/null
+++ b/includes/kohana/system/i18n/en.php
@@ -0,0 +1,3 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array();
\ No newline at end of file
diff --git a/includes/kohana/system/i18n/es.php b/includes/kohana/system/i18n/es.php
new file mode 100644
index 0000000..85538f4
--- /dev/null
+++ b/includes/kohana/system/i18n/es.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'Spanish' => 'Español',
+	'Hello, world!' => '¡Hola, mundo!',
+);
\ No newline at end of file
diff --git a/includes/kohana/system/i18n/fr.php b/includes/kohana/system/i18n/fr.php
new file mode 100644
index 0000000..b8ed57f
--- /dev/null
+++ b/includes/kohana/system/i18n/fr.php
@@ -0,0 +1,7 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array
+(
+	'French' => 'Français',
+	'Hello, world!' => 'Bonjour, monde!',
+);
\ No newline at end of file
diff --git a/includes/kohana/system/media/guide/kohana/cascading_filesystem.png b/includes/kohana/system/media/guide/kohana/cascading_filesystem.png
new file mode 100644
index 0000000..52a3576
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/cascading_filesystem.png differ
diff --git a/includes/kohana/system/media/guide/kohana/hello_world_1.png b/includes/kohana/system/media/guide/kohana/hello_world_1.png
new file mode 100644
index 0000000..e4ea75d
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/hello_world_1.png differ
diff --git a/includes/kohana/system/media/guide/kohana/hello_world_2.png b/includes/kohana/system/media/guide/kohana/hello_world_2.png
new file mode 100644
index 0000000..9eb10f5
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/hello_world_2.png differ
diff --git a/includes/kohana/system/media/guide/kohana/hello_world_2_error.png b/includes/kohana/system/media/guide/kohana/hello_world_2_error.png
new file mode 100644
index 0000000..244c38e
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/hello_world_2_error.png differ
diff --git a/includes/kohana/system/media/guide/kohana/install.png b/includes/kohana/system/media/guide/kohana/install.png
new file mode 100644
index 0000000..d4ea788
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/install.png differ
diff --git a/includes/kohana/system/media/guide/kohana/welcome.png b/includes/kohana/system/media/guide/kohana/welcome.png
new file mode 100644
index 0000000..0d7ac3d
Binary files /dev/null and b/includes/kohana/system/media/guide/kohana/welcome.png differ
diff --git a/includes/kohana/system/messages/validation.php b/includes/kohana/system/messages/validation.php
new file mode 100644
index 0000000..dcaa389
--- /dev/null
+++ b/includes/kohana/system/messages/validation.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+
+return array(
+	'alpha'         => ':field must contain only letters',
+	'alpha_dash'    => ':field must contain only numbers, letters and dashes',
+	'alpha_numeric' => ':field must contain only letters and numbers',
+	'color'         => ':field must be a color',
+	'credit_card'   => ':field must be a credit card number',
+	'date'          => ':field must be a date',
+	'decimal'       => ':field must be a decimal with :param2 places',
+	'digit'         => ':field must be a digit',
+	'email'         => ':field must be a email address',
+	'email_domain'  => ':field must contain a valid email domain',
+	'equals'        => ':field must equal :param2',
+	'exact_length'  => ':field must be exactly :param2 characters long',
+	'in_array'      => ':field must be one of the available options',
+	'ip'            => ':field must be an ip address',
+	'matches'       => ':field must be the same as :param2',
+	'min_length'    => ':field must be at least :param2 characters long',
+	'max_length'    => ':field must not exceed :param2 characters long',
+	'not_empty'     => ':field must not be empty',
+	'numeric'       => ':field must be numeric',
+	'phone'         => ':field must be a phone number',
+	'range'         => ':field must be within the range of :param2 to :param3',
+	'regex'         => ':field does not match the required format',
+	'url'           => ':field must be a url',
+);
diff --git a/includes/kohana/system/tests/kohana/ArrTest.php b/includes/kohana/system/tests/kohana/ArrTest.php
new file mode 100644
index 0000000..db0fb47
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ArrTest.php
@@ -0,0 +1,554 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the Arr lib that's shipped with kohana
+ *
+ * @group kohana
+ * @group kohana.arr
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ArrTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_callback()
+	 *
+	 * @return array
+	 */
+	public function provider_callback()
+	{
+		return array(
+			// Tests....
+			// That no parameters returns null
+			array('function', array('function', NULL)),
+			// That we can get an array of parameters values
+			array('function(1,2,3)', array('function', array('1', '2', '3'))),
+			// That it's not just using the callback "function"
+			array('different_name(harry,jerry)', array('different_name', array('harry', 'jerry'))),
+			// That static callbacks are parsed into arrays
+			array('kohana::appify(this)', array(array('kohana', 'appify'), array('this'))),
+			// Spaces are preserved in parameters
+			array('deal::make(me, my mate )', array(array('deal', 'make'), array('me', ' my mate ')))
+			// TODO: add more cases
+		);
+	}
+
+	/**
+	 * Tests Arr::callback()
+	 *
+	 * @test
+	 * @dataProvider provider_callback
+	 * @param string $str       String to parse
+	 * @param array  $expected  Callback and its parameters
+	 */
+	public function test_callback($str, $expected)
+	{
+		$result = Arr::callback($str);
+
+		$this->assertSame(2, count($result));
+		$this->assertSame($expected, $result);
+	}
+
+	/**
+	 * Provides test data for test_extract
+	 *
+	 * @return array
+	 */
+	public function provider_extract()
+	{
+		return array(
+			array(
+				array('kohana' => 'awesome', 'blueflame' => 'was'),
+				array('kohana', 'cakephp', 'symfony'),
+				NULL,
+				array('kohana' => 'awesome', 'cakephp' => NULL, 'symfony' => NULL)
+			),
+			// I realise noone should EVER code like this in real life,
+			// but unit testing is very very very very boring
+			array(
+				array('chocolate cake' => 'in stock', 'carrot cake' => 'in stock'),
+				array('carrot cake', 'humble pie'),
+				'not in stock',
+				array('carrot cake' => 'in stock', 'humble pie' => 'not in stock'),
+			),
+		);
+	}
+
+	/**
+	 * Tests Arr::extract()
+	 *
+	 * @test
+	 * @dataProvider provider_extract
+	 * @param array $array
+	 * @param array $keys
+	 * @param mixed $default
+	 * @param array $expected
+	 */
+	public function test_extract(array $array, array $keys, $default, $expected)
+	{
+		$array = Arr::extract($array, $keys, $default);
+
+		$this->assertSame(count($expected), count($array));
+		$this->assertSame($expected, $array);
+	}
+
+	/**
+	 * Provides test data for test_pluck
+	 *
+	 * @return array
+	 */
+	public function provider_pluck()
+	{
+		return array(
+			array(
+				array(
+					  array('id' => 20, 'name' => 'John Smith'),
+					  array('name' => 'Linda'),
+					  array('id' => 25, 'name' => 'Fred'),
+					 ),
+				'id',
+				array(20, 25)
+			),
+		);
+	}
+
+	/**
+	 * Tests Arr::pluck()
+	 *
+	 * @test
+	 * @dataProvider provider_pluck
+	 * @param array $array
+	 * @param string $key
+	 * @param array $expected
+	 */
+	public function test_pluck(array $array, $key, $expected)
+	{
+		$array = Arr::pluck($array, $key);
+
+		$this->assertSame(count($expected), count($array));
+		$this->assertSame($expected, $array);
+	}
+
+	/**
+	 * Provides test data for test_get()
+	 *
+	 * @return array
+	 */
+	public function provider_get()
+	{
+		return array(
+			array(array('uno', 'dos', 'tress'), 1, NULL, 'dos'),
+			array(array('we' => 'can', 'make' => 'change'), 'we', NULL, 'can'),
+
+			array(array('uno', 'dos', 'tress'), 10, NULL, NULL),
+			array(array('we' => 'can', 'make' => 'change'), 'he', NULL, NULL),
+			array(array('we' => 'can', 'make' => 'change'), 'he', 'who', 'who'),
+			array(array('we' => 'can', 'make' => 'change'), 'he', array('arrays'), array('arrays')),
+		);
+	}
+
+	/**
+	 * Tests Arr::get()
+	 *
+	 * @test
+	 * @dataProvider provider_get()
+	 * @param array          $array      Array to look in
+	 * @param string|integer $key        Key to look for
+	 * @param mixed          $default    What to return if $key isn't set
+	 * @param mixed          $expected   The expected value returned
+	 */
+	public function test_get(array $array, $key, $default, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::get($array, $key, $default)
+		);
+	}
+
+	/**
+	 * Provides test data for test_is_assoc()
+	 *
+	 * @return array
+	 */
+	public function provider_is_assoc()
+	{
+		return array(
+			array(array('one', 'two', 'three'), FALSE),
+			array(array('one' => 'o clock', 'two' => 'o clock', 'three' => 'o clock'), TRUE),
+		);
+	}
+
+	/**
+	 * Tests Arr::is_assoc()
+	 *
+	 * @test
+	 * @dataProvider provider_is_assoc
+	 * @param array   $array     Array to check
+	 * @param boolean $expected  Is $array assoc
+	 */
+	public function test_is_assoc(array $array, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::is_assoc($array)
+		);
+	}
+
+	/**
+	 * Provides test data for test_is_array()
+	 *
+	 * @return array
+	 */
+	public function provider_is_array()
+	{
+		return array(
+			array($a = array('one', 'two', 'three'), TRUE),
+			array(new ArrayObject($a), TRUE),
+			array(new ArrayIterator($a), TRUE),
+			array('not an array', FALSE),
+			array(new stdClass, FALSE),
+		);
+	}
+
+	/**
+	 * Tests Arr::is_array()
+	 *
+	 * @test
+	 * @dataProvider provider_is_array
+	 * @param mixed   $value     Value to check
+	 * @param boolean $expected  Is $value an array?
+	 */
+	public function test_is_array($array, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::is_array($array)
+		);
+	}
+
+	public function provider_merge()
+	{
+		return array(
+			// Test how it merges arrays and sub arrays with assoc keys
+			array(
+				array('name' => 'mary', 'children' => array('fred', 'paul', 'sally', 'jane')),
+				array('name' => 'john', 'children' => array('fred', 'paul', 'sally', 'jane')),
+				array('name' => 'mary', 'children' => array('jane')),
+			),
+			// See how it merges sub-arrays with numerical indexes
+			array(
+				array(array('test1','test3'), array('test2','test4')),
+				array(array('test1'), array('test2')),
+				array(array('test3'), array('test4')),
+			),
+			array(
+				array(array('test1','test3'), array('test2','test4')),
+				array(array('test1'), array('test2')),
+				array(array('test3'), array('test4')),
+			),
+			array(
+				array('digits' => array(0, 1, 2, 3)),
+				array('digits' => array(0, 1)),
+				array('digits' => array(2, 3)),
+			),
+			// See how it manages merging items with numerical indexes
+			array(
+				array(0, 1, 2, 3),
+				array(0, 1),
+				array(2, 3),
+			),
+			// Try and get it to merge assoc. arrays recursively
+			array(
+				array('foo' => 'bar', array('temp' => 'life')),
+				array('foo' => 'bin', array('temp' => 'name')),
+				array('foo' => 'bar', array('temp' => 'life')),
+			),
+			// Bug #3139
+			array(
+				array('foo'	=> array('bar')),
+				array('foo'	=> 'bar'),
+				array('foo'	=> array('bar')),
+			),
+			array(
+				array('foo'	=> 'bar'),
+				array('foo'	=> array('bar')),
+				array('foo'	=> 'bar'),
+			),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_merge
+	 */
+	public function test_merge($expected, $array1, $array2)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::merge($array1,$array2)
+		);
+	}
+
+	/**
+	 * Provides test data for test_path()
+	 *
+	 * @return array
+	 */
+	public function provider_path()
+	{
+		$array = array(
+			'foobar' => array('definition' => 'lost'),
+			'kohana' => 'awesome',
+			'users'  => array(
+				1 => array('name' => 'matt'),
+				2 => array('name' => 'john', 'interests' => array('hocky' => array('length' => 2), 'football' => array())),
+				3 => 'frank', // Issue #3194
+			),
+			'object' => new ArrayObject(array('iterator' => TRUE)), // Iterable object should work exactly the same
+		);
+
+		return array(
+			// Tests returns normal values
+			array($array['foobar'], $array, 'foobar'),
+			array($array['kohana'], $array, 'kohana'),
+			array($array['foobar']['definition'], $array, 'foobar.definition'),
+			// Custom delimiters
+			array($array['foobar']['definition'], $array, 'foobar/definition', NULL, '/'),
+			// We should be able to use NULL as a default, returned if the key DNX
+			array(NULL, $array, 'foobar.alternatives',  NULL),
+			array(NULL, $array, 'kohana.alternatives',  NULL),
+			// Try using a string as a default
+			array('nothing', $array, 'kohana.alternatives',  'nothing'),
+			// Make sure you can use arrays as defaults
+			array(array('far', 'wide'), $array, 'cheese.origins',  array('far', 'wide')),
+			// Ensures path() casts ints to actual integers for keys
+			array($array['users'][1]['name'], $array, 'users.1.name'),
+			// Test that a wildcard returns the entire array at that "level"
+			array($array['users'], $array, 'users.*'),
+			// Now we check that keys after a wilcard will be processed
+			array(array(0 => array(0 => 2)), $array, 'users.*.interests.*.length'),
+			// See what happens when it can't dig any deeper from a wildcard
+			array(NULL, $array, 'users.*.fans'),
+			// Starting wildcards, issue #3269
+			array(array('matt', 'john'), $array['users'], '*.name'),
+			// Path as array, issue #3260
+			array($array['users'][2]['name'], $array, array('users', 2, 'name')),
+			array($array['object']['iterator'], $array, 'object.iterator'),
+		);
+	}
+
+	/**
+	 * Tests Arr::path()
+	 *
+	 * @test
+	 * @dataProvider provider_path
+	 * @param string  $path       The path to follow
+	 * @param mixed   $default    The value to return if dnx
+	 * @param boolean $expected   The expected value
+	 * @param string  $delimiter  The path delimiter
+	 */
+	public function test_path($expected, $array, $path, $default = NULL, $delimiter = NULL)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::path($array, $path, $default, $delimiter)
+		);
+	}
+
+	/**
+	 * Provides test data for test_path()
+	 *
+	 * @return array
+	 */
+	public function provider_set_path()
+	{
+		return array(
+			// Tests returns normal values
+			array(array('foo' => 'bar'), array(), 'foo', 'bar'),
+			array(array('kohana' => array('is' => 'awesome')), array(), 'kohana.is', 'awesome'),
+			array(array('kohana' => array('is' => 'cool', 'and' => 'slow')),
+				  array('kohana' => array('is' => 'cool')), 'kohana.and', 'slow'),
+			// Custom delimiters
+			array(array('kohana' => array('is' => 'awesome')), array(), 'kohana/is', 'awesome', '/'),
+			// Ensures set_path() casts ints to actual integers for keys
+			array(array('foo' => array('bar')), array('foo' => array('test')), 'foo.0', 'bar'),
+		);
+	}
+
+	/**
+	 * Tests Arr::path()
+	 *
+	 * @test
+	 * @dataProvider provider_set_path
+	 * @param string  $path       The path to follow
+	 * @param boolean $expected   The expected value
+	 * @param string  $delimiter  The path delimiter
+	 */
+	public function test_set_path($expected, $array, $path, $value, $delimiter = NULL)
+	{
+		Arr::set_path($array, $path, $value, $delimiter);
+
+		$this->assertSame($expected, $array);
+	}
+
+	/**
+	 * Provides test data for test_range()
+	 *
+	 * @return array
+	 */
+	public function provider_range()
+	{
+		return array(
+			array(1, 2),
+			array(1, 100),
+			array(25, 10),
+		);
+	}
+
+	/**
+	 * Tests Arr::range()
+	 *
+	 * @dataProvider provider_range
+	 * @param integer $step  The step between each value in the array
+	 * @param integer $max   The max value of the range (inclusive)
+	 */
+	public function test_range($step, $max)
+	{
+		$range = Arr::range($step, $max);
+
+		$this->assertSame((int) floor($max / $step), count($range));
+
+		$current = $step;
+
+		foreach($range as $key => $value)
+		{
+			$this->assertSame($key, $value);
+			$this->assertSame($current, $key);
+			$this->assertLessThanOrEqual($max, $key);
+			$current += $step;
+		}
+	}
+
+	/**
+	 * Provides test data for test_unshift()
+	 *
+	 * @return array
+	 */
+	public function provider_unshift()
+	{
+		return array(
+			array(array('one' => '1', 'two' => '2',), 'zero', '0'),
+			array(array('step 1', 'step 2', 'step 3'), 'step 0', 'wow')
+		);
+	}
+
+	/**
+	 * Tests Arr::unshift()
+	 *
+	 * @test
+	 * @dataProvider provider_unshift
+	 * @param array $array
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function test_unshift(array $array, $key, $value)
+	{
+		$original = $array;
+
+		Arr::unshift($array, $key, $value);
+
+		$this->assertNotSame($original, $array);
+		$this->assertSame(count($original) + 1, count($array));
+		$this->assertArrayHasKey($key, $array);
+
+		$this->assertSame($value, reset($array));
+		$this->assertSame(key($array), $key);
+	}
+
+	/**
+	 * Provies test data for test_overwrite
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_overwrite()
+	{
+		return array(
+			array(
+				array('name' => 'Henry', 'mood' => 'tired', 'food' => 'waffles', 'sport' => 'checkers'),
+				array('name' => 'John', 'mood' => 'bored', 'food' => 'bacon', 'sport' => 'checkers'),
+				array('name' => 'Matt', 'mood' => 'tired', 'food' => 'waffles'),
+				array('name' => 'Henry', 'age' => 18,),
+			),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_overwrite
+	 */
+	public function test_overwrite($expected, $arr1, $arr2, $arr3 = array(), $arr4 = array())
+	{
+		$this->assertSame(
+			$expected,
+			Arr::overwrite($arr1, $arr2, $arr3, $arr4)
+		);
+	}
+
+	/**
+	 * Provides test data for test_map
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_map()
+	{
+		return array(
+			array('strip_tags', array('<p>foobar</p>'), array('foobar')),
+			array('strip_tags', array(array('<p>foobar</p>'), array('<p>foobar</p>')), array(array('foobar'), array('foobar'))),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_map
+	 */
+	public function test_map($method, $source, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::map($method, $source)
+		);
+	}
+
+	/**
+	 * Provides test data for test_flatten
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_flatten()
+	{
+		return array(
+			array(array('set' => array('one' => 'something'), 'two' => 'other'), array('one' => 'something', 'two' => 'other')),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_flatten
+	 */
+	public function test_flatten($source, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Arr::flatten($source)
+		);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/CLITest.php b/includes/kohana/system/tests/kohana/CLITest.php
new file mode 100644
index 0000000..4519c7c
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/CLITest.php
@@ -0,0 +1,168 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Unit tests for CLI
+ *
+ * Based on the Kohana-unittest test
+ *
+ * @group kohana
+ * @group kohana.cli
+ *
+ * @see CLI
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_CLITest extends Unittest_TestCase
+{
+	
+	/**
+	 * Tell PHPUnit to isolate globals during tests 
+	 * @var boolean 
+	 */
+	protected $backupGlobals = TRUE;
+
+	/**
+	 * An array of arguments to put in $_SERVER['argv']
+	 * @var array 
+	 */
+	protected $options = array(
+							'--uri' => 'test/something',
+							'--we_are_cool',
+							'invalid option',
+							'--version' => '2.23',
+							'--important' => 'something=true',
+							'--name' => 'Jeremy Taylor',
+						);
+
+	/**
+	 * Setup the enviroment for each test
+	 *
+	 * PHPUnit automatically backups up & restores global variables
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		$_SERVER['argv'] = array('index.php');
+
+		foreach($this->options as $option => $value)
+		{
+			if(is_string($option))
+			{
+				$_SERVER['argv'][] = $option.'='.$value;
+			}
+			else
+			{
+				$_SERVER['argv'][] = $value;
+			}
+		}
+
+		$_SERVER['argc'] = count($_SERVER['argv']);
+	}
+
+	/**
+	 * If for some reason arc != count(argv) then we need
+	 * to fail gracefully.
+	 *
+	 * This test ensures it will
+	 *
+	 * @test
+	 */
+	public function test_only_loops_over_available_arguments()
+	{
+		++$_SERVER['argc'];
+		
+		$options = CLI::options('uri');
+
+		$this->assertSame(1, count($options));
+	}
+
+	/**
+	 * Options should only parse arguments requested
+	 *
+	 * @test
+	 */
+	public function test_only_parses_wanted_arguments()
+	{
+		$options = CLI::options('uri');
+
+		$this->assertSame(1, count($options));
+		
+		$this->assertArrayHasKey('uri', $options);
+		$this->assertSame($options['uri'], $this->options['--uri']);
+	}
+
+	/**
+	 * Options should not parse invalid arguments (i.e. not starting with --_
+	 *
+	 * @test
+	 */
+	public function test_does_not_parse_invalid_arguments()
+	{
+		$options = CLI::options('uri', 'invalid');
+		
+		$this->assertSame(1, count($options));
+		$this->assertArrayHasKey('uri', $options);
+		$this->assertArrayNotHasKey('invalid', $options);
+	}
+
+	/**
+	 * Options should parse multiple arguments & values correctly
+	 *
+	 * @test
+	 */
+	public function test_parses_multiple_arguments()
+	{
+		$options = CLI::options('uri', 'version');
+
+		$this->assertSame(2, count($options));
+		$this->assertArrayHasKey('uri', $options);
+		$this->assertArrayHasKey('version', $options);
+		$this->assertSame($this->options['--uri'], $options['uri']);
+		$this->assertSame($this->options['--version'], $options['version']);
+	}
+
+	/**
+	 * Options should parse arguments without specified values as NULL
+	 *
+	 * @test
+	 */
+	public function test_parses_arguments_without_value_as_null()
+	{
+		$options = CLI::options('uri', 'we_are_cool');
+
+		$this->assertSame(2, count($options));
+		$this->assertSame(NULL, $options['we_are_cool']);
+	}
+
+	/**
+	 * If the argument contains an equals sign then it shouldn't be split
+	 *
+	 * @test
+	 * @ticket 2642
+	 */
+	public function test_cli_only_splits_on_the_first_equals()
+	{
+		$options = CLI::options('important');
+
+		$this->assertSame(1, count($options));
+		$this->assertSame('something=true', reset($options));
+	}
+
+	/**
+	 * Arguments enclosed with quote marks should be allowed to contain
+	 * spaces
+	 *
+	 * @test
+	 */
+	public function test_value_includes_spaces_when_enclosed_with_quotes()
+	{
+		$options = CLI::options('name');
+
+		$this->assertSame(array('name' => 'Jeremy Taylor'), $options);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/ConfigTest.php b/includes/kohana/system/tests/kohana/ConfigTest.php
new file mode 100644
index 0000000..d918722
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ConfigTest.php
@@ -0,0 +1,245 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the Config lib that's shipped with kohana
+ *
+ * @group kohana
+ * @group kohana.config
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @author     Matt Button <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ConfigTest extends Unittest_TestCase
+{
+
+	/**
+	 * Calling Config::instance() should return the global singleton
+	 * which should persist
+	 *
+	 * @test
+	 * @covers Config::instance
+	 */
+	public function test_instance_returns_singleton_instance()
+	{
+		$this->assertSame(Config::instance(), Config::instance());
+		$this->assertNotSame(new Config, Config::instance());
+	}
+
+	/**
+	 * When a config object is initially created there should be
+	 * no readers attached
+	 *
+	 * @test
+	 * @covers Config
+	 */
+	public function test_initially_there_are_no_readers()
+	{
+		$config = new Config;
+
+		$this->assertAttributeSame(array(), '_readers', $config);
+	}
+
+	/**
+	 * Test that calling attach() on a kohana config object
+	 * adds the specified reader to the config object
+	 *
+	 * @test
+	 * @covers Config::attach
+	 */
+	public function test_attach_adds_reader_and_returns_this()
+	{
+		$config = new Config;
+		$reader = $this->getMock('Config_Reader');
+
+		$this->assertSame($config, $config->attach($reader));
+
+		$this->assertAttributeContains($reader, '_readers', $config);
+	}
+
+	/**
+	 * By default (or by passing TRUE as the second parameter) the config object
+	 * should prepend the reader to the front of the readers queue
+	 *
+	 * @test
+	 * @covers Config::attach
+	 */
+	public function test_attach_adds_reader_to_front_of_queue()
+	{
+		$config  = new Config;
+
+		$reader1 = $this->getMock('Config_Reader');
+		$reader2 = $this->getMock('Config_Reader');
+
+		$config->attach($reader1);
+		$config->attach($reader2);
+
+		// Rather than do two assertContains we'll do an assertSame to assert
+		// the order of the readers
+		$this->assertAttributeSame(array($reader2, $reader1), '_readers', $config);
+
+		// Now we test using the second parameter
+		$config = new Config;
+
+		$config->attach($reader1);
+		$config->attach($reader2, TRUE);
+
+		$this->assertAttributeSame(array($reader2, $reader1), '_readers', $config);
+	}
+
+	/**
+	 * Test that attaching a new reader (and passing FALSE as second param) causes
+	 * phpunit to append the reader rather than prepend
+	 *
+	 * @test
+	 * @covers Config::attach
+	 */
+	public function test_attach_can_add_reader_to_end_of_queue()
+	{
+		$config  = new Config;
+		$reader1 = $this->getMock('Config_Reader');
+		$reader2 = $this->getMock('Config_Reader');
+
+		$config->attach($reader1);
+		$config->attach($reader2, FALSE);
+
+		$this->assertAttributeSame(array($reader1, $reader2), '_readers', $config);
+	}
+
+	/**
+	 * Calling detach() on a config object should remove it from the queue of readers
+	 *
+	 * @test
+	 * @covers Config::detach
+	 */
+	public function test_detach_removes_reader_and_returns_this()
+	{
+		$config  = new Config;
+
+		// Due to the way phpunit mock generator works if you try and mock a class
+		// that has already been used then it just re-uses the first's name
+
+		// To get around this we have to specify a totally random name for the second mock object
+		$reader1 = $this->getMock('Config_Reader');
+		$reader2 = $this->getMock('Config_Reader', array(), array(), 'MY_AWESOME_READER');
+
+		$config->attach($reader1);
+		$config->attach($reader2);
+
+		$this->assertSame($config, $config->detach($reader1));
+
+		$this->assertAttributeNotContains($reader1, '_readers', $config);
+		$this->assertAttributeContains($reader2, '_readers', $config);
+
+		$this->assertSame($config, $config->detach($reader2));
+
+		$this->assertAttributeNotContains($reader2, '_readers', $config);
+	}
+
+	/**
+	 * detach() should return $this even if the specified reader does not exist
+	 *
+	 * @test
+	 * @covers Config::detach
+	 */
+	public function test_detach_returns_this_even_when_reader_dnx()
+	{
+		$config = new Config;
+		$reader = $this->getMock('Config_Reader');
+
+		$this->assertSame($config, $config->detach($reader));
+	}
+
+	/**
+	 * If load() is called and there are no readers present then it should throw
+	 * a kohana exception
+	 *
+	 * @test
+	 * @covers Config::load
+	 * @expectedException Kohana_Exception
+	 */
+	public function test_load_throws_exception_if_there_are_no_readers()
+	{
+		// The following code should throw an exception and phpunit will catch / handle it
+		// (see the @expectedException doccomment)
+		$config = new Kohana_config;
+
+		$config->load('random');
+	}
+
+	/**
+	 * When load() is called it should interrogate each reader in turn until a match
+	 * is found
+	 *
+	 * @test
+	 * @covers Config::load
+	 */
+	public function test_load_interrogates_each_reader_until_group_found()
+	{
+		$config       = new Config;
+		$config_group = 'groupy';
+
+		$reader1 = $this->getMock('Config_Reader', array('load'));
+		$reader1
+			->expects($this->once())
+			->method('load')
+			->with($config_group)
+			->will($this->returnValue(FALSE));
+
+		$reader2 = $this->getMock('Config_Reader', array('load'));
+		$reader2
+			->expects($this->once())
+			->method('load')
+			->with($config_group)
+			->will($this->returnValue($reader2));
+
+		$reader3 = $this->getMock('Config_Reader', array('load'));
+		$reader3->expects($this->never())->method('load');
+
+		$config->attach($reader1, FALSE);
+		$config->attach($reader2, FALSE);
+		$config->attach($reader3, FALSE);
+
+		// By asserting a return type we're making the test a little less brittle / less likely
+		// to break due to minor modifications
+		$this->assertInstanceOf('Config_Reader', $config->load($config_group));
+	}
+
+	/**
+	 * Calling load() with a group that doesn't exist, should get it to use the last reader
+	 * to create a new config group
+	 *
+	 * @test
+	 * @covers Config::load
+	 */
+	public function test_load_returns_new_config_group_if_one_dnx()
+	{
+		$config  = new Config;
+		$group   = 'my_group';
+
+		$reader1 = $this->getMock('Config_Reader');
+		$reader2 = $this->getMock('Config_Reader', array('load'), array(), 'Config_Waffles');
+
+		// This is a slightly hacky way of doing it, but it works
+		$reader2
+			->expects($this->exactly(2))
+			->method('load')
+			->with($group)
+			->will($this->onConsecutiveCalls(
+				$this->returnValue(FALSE),
+				$this->returnValue(clone $reader2)
+			));
+
+		$config->attach($reader1)->attach($reader2);
+
+		$new_config = $config->load('my_group');
+
+		$this->assertInstanceOf('Config_Waffles', $new_config);
+		// Slightly taboo, testing a different api!!
+		$this->assertSame(array(), $new_config->as_array());
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/CookieTest.php b/includes/kohana/system/tests/kohana/CookieTest.php
new file mode 100644
index 0000000..eb74b0d
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/CookieTest.php
@@ -0,0 +1,160 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the cookie class
+ *
+ * @group kohana
+ * @group kohana.cookie
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_CookieTest extends Unittest_TestCase
+{
+
+	protected $_default_salt = 'AdaoidadnA£ASDNadnaoiwdnawd';
+	/**
+	 * Sets up the environment
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		Cookie::$salt = $this->_default_salt;
+	}
+
+	/**
+	 * Tears down the environment
+	 */
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		Cookie::$salt = NULL;
+	}
+
+	/**
+	 * Provides test data for test_set()
+	 *
+	 * @return array
+	 */
+	public function provider_set()
+	{
+		return array(
+			array('foo', 'bar', NULL, TRUE),
+			array('foo', 'bar', 10, TRUE),
+		);
+	}
+
+	/**
+	 * Tests cookie::set()
+	 *
+	 * @test
+	 * @dataProvider provider_set
+	 * @covers cookie::set
+	 * @param mixed   $key      key to use
+	 * @param mixed   $value    value to set
+	 * @param mixed   $exp      exp to set
+	 * @param boolean $expected Output for cookie::set()
+	 */
+	public function test_set($key, $value, $exp, $expected)
+	{
+		$this->assertSame($expected, cookie::set($key, $value, $exp));
+	}
+
+	/**
+	 * Provides test data for test_get()
+	 *
+	 * @return array
+	 */
+	public function provider_get()
+	{
+		// setUp is called after the provider so we need to specify a
+		// salt here in order to use it in the provider
+		Cookie::$salt = $this->_default_salt;
+
+		return array(
+			array('foo', Cookie::salt('foo', 'bar').'~bar', 'bar'),
+			array('bar', Cookie::salt('foo', 'bar').'~bar', NULL),
+			array(NULL, Cookie::salt('foo', 'bar').'~bar', NULL),
+		);
+	}
+
+	/**
+	 * Tests cookie::set()
+	 *
+	 * @test
+	 * @dataProvider provider_get
+	 * @covers cookie::get
+	 * @param mixed   $key      key to use
+	 * @param mixed   $value    value to set
+	 * @param boolean $expected Output for cookie::get()
+	 */
+	public function test_get($key, $value, $expected)
+	{
+		// Force $_COOKIE
+		if ($key !== NULL)
+		{
+			$_COOKIE[$key] = $value;
+		}
+
+		$this->assertSame($expected, cookie::get($key));
+	}
+
+	/**
+	 * Provides test data for test_delete()
+	 *
+	 * @return array
+	 */
+	public function provider_delete()
+	{
+		return array(
+			array('foo', TRUE),
+		);
+	}
+
+	/**
+	 * Tests cookie::delete()
+	 *
+	 * @test
+	 * @dataProvider provider_delete
+	 * @covers cookie::delete
+	 * @param mixed   $key      key to use
+	 * @param boolean $expected Output for cookie::delete()
+	 */
+	public function test_delete($key, $expected)
+	{
+		$this->assertSame($expected, cookie::delete($key));
+	}
+
+	/**
+	 * Provides test data for test_salt()
+	 *
+	 * @return array
+	 */
+	public function provider_salt()
+	{
+		return array(
+			array('foo', 'bar', 'b5773a6255d1deefc23f9f69bcc40fdc998e5802'),
+		);
+	}
+
+	/**
+	 * Tests cookie::salt()
+	 *
+	 * @test
+	 * @dataProvider provider_salt
+	 * @covers cookie::salt
+	 * @param mixed   $key      key to use
+	 * @param mixed   $value    value to salt with
+	 * @param boolean $expected Output for cookie::delete()
+	 */
+	public function test_salt($key, $value, $expected)
+	{
+		$this->assertSame($expected, cookie::salt($key, $value));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/CoreTest.php b/includes/kohana/system/tests/kohana/CoreTest.php
new file mode 100644
index 0000000..42ffa9b
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/CoreTest.php
@@ -0,0 +1,326 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana Core
+ *
+ * @TODO Use a virtual filesystem (see phpunit doc on mocking fs) for find_file etc.
+ *
+ * @group kohana
+ * @group kohana.core
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_CoreTest extends Unittest_TestCase
+{
+
+	/**
+	 * Provides test data for test_sanitize()
+	 *
+	 * @return array
+	 */
+	public function provider_sanitize()
+	{
+		return array(
+			// $value, $result
+			array('foo', 'foo'),
+			array("foo\r\nbar", "foo\nbar"),
+			array("foo\rbar", "foo\nbar"),
+			array("Is your name O\'reilly?", "Is your name O'reilly?")
+		);
+	}
+
+	/**
+	 * Tests Kohana::santize()
+	 *
+	 * @test
+	 * @dataProvider provider_sanitize
+	 * @covers Kohana::sanitize
+	 * @param boolean $value  Input for Kohana::sanitize
+	 * @param boolean $result Output for Kohana::sanitize
+	 */
+	public function test_sanitize($value, $result)
+	{
+		$this->setEnvironment(array('Kohana::$magic_quotes' => TRUE));
+
+		$this->assertSame($result, Kohana::sanitize($value));
+	}
+
+	/**
+	 * Passing FALSE for the file extension should prevent appending any extension.
+	 * See issue #3214
+	 *
+	 * @test
+	 * @covers  Kohana::find_file
+	 */
+	public function test_find_file_no_extension()
+	{
+		// EXT is manually appened to the _file name_, not passed as the extension
+		$path = Kohana::find_file('classes', $file = 'kohana/core'.EXT, FALSE);
+
+		$this->assertInternalType('string', $path);
+
+		$this->assertStringEndsWith($file, $path);
+	}
+
+	/**
+	 * If a file can't be found then find_file() should return FALSE if
+	 * only a single file was requested, or an empty array if multiple files
+	 * (i.e. configuration files) were requested
+	 *
+	 * @test
+	 * @covers Kohana::find_file
+	 */
+	public function test_find_file_returns_false_or_array_on_failure()
+	{
+		$this->assertFalse(Kohana::find_file('configy', 'zebra'));
+
+		$this->assertSame(array(), Kohana::find_file('configy', 'zebra', NULL, TRUE));
+	}
+
+	/**
+	 * Kohana::list_files() should return an array on success and an empty array on failure
+	 *
+	 * @test
+	 * @covers Kohana::list_files
+	 */
+	public function test_list_files_returns_array_on_success_and_failure()
+	{
+		$files = Kohana::list_files('config');
+
+		$this->assertInternalType('array', $files);
+		$this->assertGreaterThan(3, count($files));
+
+		$this->assertSame(array(), Kohana::list_files('geshmuck'));
+	}
+
+	/**
+	 * Tests Kohana::globals()
+	 *
+	 * @test
+	 * @covers Kohana::globals
+	 */
+	public function test_globals_removes_user_def_globals()
+	{
+		$GLOBALS = array('hackers' => 'foobar','name' => array('','',''), '_POST' => array());
+
+		Kohana::globals();
+
+		$this->assertEquals(array('_POST' => array()), $GLOBALS);
+	}
+
+	/**
+	 * Provides test data for testCache()
+	 *
+	 * @return array
+	 */
+	public function provider_cache()
+	{
+		return array(
+			// $value, $result
+			array('foo', 'hello, world', 10),
+			array('bar', NULL, 10),
+			array('bar', NULL, -10),
+		);
+	}
+
+	/**
+	 * Tests Kohana::cache()
+	 *
+	 * @test
+	 * @dataProvider provider_cache
+	 * @covers Kohana::cache
+	 * @param boolean $key      Key to cache/get for Kohana::cache
+	 * @param boolean $value    Output from Kohana::cache
+	 * @param boolean $lifetime Lifetime for Kohana::cache
+	 */
+	public function test_cache($key, $value, $lifetime)
+	{
+		Kohana::cache($key, $value, $lifetime);
+		$this->assertEquals($value, Kohana::cache($key));
+	}
+
+	/**
+	 * Provides test data for test_message()
+	 *
+	 * @return array
+	 */
+	public function provider_message()
+	{
+		return array(
+			// $value, $result
+			array(':field must not be empty', 'validation', 'not_empty'),
+			array(
+				array(
+					'alpha'         => ':field must contain only letters',
+					'alpha_dash'    => ':field must contain only numbers, letters and dashes',
+					'alpha_numeric' => ':field must contain only letters and numbers',
+					'color'         => ':field must be a color',
+					'credit_card'   => ':field must be a credit card number',
+					'date'          => ':field must be a date',
+					'decimal'       => ':field must be a decimal with :param2 places',
+					'digit'         => ':field must be a digit',
+					'email'         => ':field must be a email address',
+					'email_domain'  => ':field must contain a valid email domain',
+					'equals'        => ':field must equal :param2',
+					'exact_length'  => ':field must be exactly :param2 characters long',
+					'in_array'      => ':field must be one of the available options',
+					'ip'            => ':field must be an ip address',
+					'matches'       => ':field must be the same as :param2',
+					'min_length'    => ':field must be at least :param2 characters long',
+					'max_length'    => ':field must not exceed :param2 characters long',
+					'not_empty'     => ':field must not be empty',
+					'numeric'       => ':field must be numeric',
+					'phone'         => ':field must be a phone number',
+					'range'         => ':field must be within the range of :param2 to :param3',
+					'regex'         => ':field does not match the required format',
+					'url'           => ':field must be a url',
+				),
+				'validation', NULL,
+			),
+		);
+	}
+
+	/**
+	 * Tests Kohana::message()
+	 *
+	 * @test
+	 * @dataProvider provider_message
+	 * @covers Kohana::message
+	 * @param boolean $expected Output for Kohana::message
+	 * @param boolean $file     File to look in for Kohana::message
+	 * @param boolean $key      Key for Kohana::message
+	 */
+	public function test_message($expected, $file, $key)
+	{
+		$this->assertEquals($expected, Kohana::message($file, $key));
+	}
+
+	/**
+	 * Provides test data for test_error_handler()
+	 *
+	 * @return array
+	 */
+	public function provider_error_handler()
+	{
+		return array(
+			array(1, 'Foobar', 'foobar.php', __LINE__),
+		);
+	}
+
+	/**
+	 * Tests Kohana::error_handler()
+	 *
+	 * @test
+	 * @dataProvider provider_error_handler
+	 * @covers Kohana::error_handler
+	 * @param boolean $code  Input for Kohana::sanitize
+	 * @param boolean $error  Input for Kohana::sanitize
+	 * @param boolean $file  Input for Kohana::sanitize
+	 * @param boolean $line Output for Kohana::sanitize
+	 */
+	public function test_error_handler($code, $error, $file, $line)
+	{
+		$error_level = error_reporting();
+		error_reporting(E_ALL);
+		try
+		{
+			Kohana::error_handler($code, $error, $file, $line);
+		}
+		catch (Exception $e)
+		{
+			$this->assertEquals($code, $e->getCode());
+			$this->assertEquals($error, $e->getMessage());
+		}
+		error_reporting($error_level);
+	}
+
+	/**
+	 * Provides test data for test_modules_sets_and_returns_valid_modules()
+	 *
+	 * @return array
+	 */
+	public function provider_modules_sets_and_returns_valid_modules()
+	{
+		return array(
+			array(array(), array()),
+			array(array('unittest' => MODPATH.'fo0bar'), array()),
+			array(array('unittest' => MODPATH.'unittest'), array('unittest' => $this->dirSeparator(MODPATH.'unittest/'))),
+		);
+	}
+
+	/**
+	 * Tests Kohana::modules()
+	 *
+	 * @test
+	 * @dataProvider provider_modules_sets_and_returns_valid_modules
+	 * @param boolean $source   Input for Kohana::modules
+	 * @param boolean $expected Output for Kohana::modules
+	 */
+	public function test_modules_sets_and_returns_valid_modules($source, $expected)
+	{
+		$modules = Kohana::modules();
+
+		try
+		{
+			$this->assertEquals($expected, Kohana::modules($source));
+		}
+		catch(Exception $e)
+		{
+			Kohana::modules($modules);
+
+			throw $e;
+		}
+
+		Kohana::modules($modules);
+	}
+
+	/**
+	 * To make the tests as portable as possible this just tests that
+	 * you get an array of modules when you can Kohana::modules() and that
+	 * said array contains unittest
+	 *
+	 * @test
+	 * @covers Kohana::modules
+	 */
+	public function test_modules_returns_array_of_modules()
+	{
+		$modules = Kohana::modules();
+
+		$this->assertInternalType('array', $modules);
+
+		$this->assertArrayHasKey('unittest', $modules);
+	}
+
+	/**
+	 * Tests Kohana::include_paths()
+	 *
+	 * The include paths must contain the apppath and syspath
+	 * @test
+	 * @covers Kohana::include_paths
+	 */
+	public function test_include_paths()
+	{
+		$include_paths = Kohana::include_paths();
+		$modules       = Kohana::modules();
+
+		$this->assertInternalType('array', $include_paths);
+
+		// We must have at least 2 items in include paths (APP / SYS)
+		$this->assertGreaterThan(2, count($include_paths));
+		// Make sure said paths are in the include paths
+		// And make sure they're in the correct positions
+		$this->assertSame(APPPATH, reset($include_paths));
+		$this->assertSame(SYSPATH, end($include_paths));
+
+		foreach ($modules as $module)
+		{
+			$this->assertContains($module, $include_paths);
+		}
+	}
+}
+
diff --git a/includes/kohana/system/tests/kohana/DateTest.php b/includes/kohana/system/tests/kohana/DateTest.php
new file mode 100644
index 0000000..58f26d1
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/DateTest.php
@@ -0,0 +1,780 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Date class
+ *
+ * @group kohana
+ * @group kohana.date
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_DateTest extends Unittest_TestCase
+{
+	protected $_original_timezone = NULL;
+
+	/**
+	 * Ensures we have a consistant timezone for testing.
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->_original_timezone = date_default_timezone_get();
+
+		date_default_timezone_set('America/Chicago');
+	}
+
+	/**
+	 * Restores original timezone after testing.
+	 */
+	public function tearDown()
+	{
+		date_default_timezone_set($this->_original_timezone);
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Provides test data for test_offset()
+	 *
+	 * @return array
+	 */
+	public function provider_offset()
+	{
+		return array(
+			array(30600, 'Asia/Calcutta', 'America/Argentina/Buenos_Aires'),
+		);
+	}
+
+	/**
+	 * Tests Date::offset()
+	 *
+	 * @test
+	 * @dataProvider provider_offset
+	 * @covers Date::offset
+	 * @param integer $expected Expected offset
+	 * @param string  $remote   Remote TZ
+	 * @param string  $local    Local TZ
+	 * @param integer $now      Current timestamp
+	 */
+	public function test_offset($expected, $remote, $local, $now = NULL)
+	{
+		$this->assertSame($expected, Date::offset($remote, $local, $now));
+	}
+
+	/**
+	 * Provides test data for test_date()
+	 *
+	 * @return array
+	 */
+	public function provider_am_pm()
+	{
+		return array(
+			// All possible values
+			array(0, 'AM'),
+			array(1, 'AM'),
+			array(2, 'AM'),
+			array(3, 'AM'),
+			array(4, 'AM'),
+			array(5, 'AM'),
+			array(6, 'AM'),
+			array(7, 'AM'),
+			array(8, 'AM'),
+			array(9, 'AM'),
+			array(10, 'AM'),
+			array(11, 'AM'),
+			array(12, 'PM'),
+			array(13, 'PM'),
+			array(14, 'PM'),
+			array(15, 'PM'),
+			array(16, 'PM'),
+			array(17, 'PM'),
+			array(18, 'PM'),
+			array(19, 'PM'),
+			array(20, 'PM'),
+			array(21, 'PM'),
+			array(22, 'PM'),
+			array(23, 'PM'),
+			array(24, 'PM'),
+			// ampm doesn't validate the hour, so I don't think we should test it..
+			// test strings are converted
+			array('0', 'AM'),
+			array('12', 'PM'),
+		);
+	}
+
+	/**
+	 * Tests Date::ampm()
+	 *
+	 * @test
+	 * @covers Date::ampm
+	 * @dataProvider provider_am_pm
+	 * @param <type> $hour
+	 * @param <type> $expected
+	 */
+	public function test_am_pm($hour, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Date::ampm($hour)
+		);
+	}
+
+	/**
+	 * Provides test data for test_adjust()
+	 *
+	 * @return array
+	 */
+	public function provider_adjust()
+	{
+		return array(
+			// Might as well test all possibilities
+			array(1,  'am', '01'),
+			array(2,  'am', '02'),
+			array(3,  'am', '03'),
+			array(4,  'am', '04'),
+			array(5,  'am', '05'),
+			array(6,  'am', '06'),
+			array(7,  'am', '07'),
+			array(8,  'am', '08'),
+			array(9,  'am', '09'),
+			array(10, 'am', '10'),
+			array(11, 'am', '11'),
+			array(12, 'am', '00'),
+			array(1,  'pm', '13'),
+			array(2,  'pm', '14'),
+			array(3,  'pm', '15'),
+			array(4,  'pm', '16'),
+			array(5,  'pm', '17'),
+			array(6,  'pm', '18'),
+			array(7,  'pm', '19'),
+			array(8,  'pm', '20'),
+			array(9,  'pm', '21'),
+			array(10, 'pm', '22'),
+			array(11, 'pm', '23'),
+			array(12, 'pm', '12'),
+			// It should also work with strings instead of ints
+			array('10', 'pm', '22'),
+			array('10', 'am', '10'),
+		);
+	}
+
+	/**
+	 * Tests Date::ampm()
+	 *
+	 * @test
+	 * @dataProvider provider_adjust
+	 * @param integer $hour       Hour in 12 hour format
+	 * @param string  $ampm       Either am or pm
+	 * @param string  $expected   Expected result
+	 */
+	public function test_adjust($hour, $ampm, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Date::adjust($hour, $ampm)
+		);
+	}
+
+	/**
+	 * Provides test data for test_days()
+	 *
+	 * @return array
+	 */
+	public function provider_days()
+	{
+		return array(
+			// According to "the rhyme" these should be the same every year
+			array(9, FALSE, 30),
+			array(4, FALSE, 30),
+			array(6, FALSE, 30),
+			array(11, FALSE, 30),
+			array(1, FALSE, 31),
+			array(3, FALSE, 31),
+			array(5, FALSE, 31),
+			array(7, FALSE, 31),
+			array(8, FALSE, 31),
+			array(10, FALSE, 31),
+			// February is such a pain
+			array(2, 2001, 28),
+			array(2, 2000, 29),
+			array(2, 2012, 29),
+		);
+	}
+
+	/**
+	 * Tests Date::days()
+	 *
+	 * @test
+	 * @covers Date::days
+	 * @dataProvider provider_days
+	 * @param integer $month
+	 * @param integer $year
+	 * @param integer $expected
+	 */
+	public function test_days($month, $year, $expected)
+	{
+		$days = Date::days($month, $year);
+
+		$this->assertSame(
+			$expected,
+			count($days)
+		);
+
+		// This should be a mirrored array, days => days
+		for ($i = 1; $i <= $expected; ++$i)
+		{
+			$this->assertArrayHasKey($i, $days);
+			// Combining the type check into this saves about 400-500 assertions!
+			$this->assertSame( (string) $i, $days[$i]);
+		}
+	}
+
+	/**
+	 * Provides test data for test_formatted_time()
+	 *
+	 * @return array
+	 */
+	public function provider_formatted_time()
+	{
+		return array(
+			// Test the default format
+			array('2010-04-16 17:00:00', '5:00PM 16th April 2010'),
+			// Now we use our own format
+			// Binary date!
+			array('01/01/2010 01:00', '1AM 1st January 2010', 'd/m/Y H:i'),
+		);
+	}
+
+	/**
+	 * Tests Date::formatted_time()
+	 *
+	 * @test
+	 * @dataProvider provider_formatted_time
+	 * @covers Date::formatted_time
+	 * @ticket 3035
+	 * @param string         $expected         Expected output
+	 * @param string|integer $datetime_str     The datetime timestamp / string
+	 * @param string|null    $timestamp_format The output format
+	 */
+	public function test_formatted_time($expected, $datetime_str, $timestamp_format = NULL)
+	{
+		$timestamp = Date::formatted_time($datetime_str, $timestamp_format);
+
+		$this->assertSame($expected, $timestamp);
+	}
+
+	/**
+	 * Provider for test_months()
+	 *
+	 * @return array Test data
+	 */
+	public function provider_months()
+	{
+		return array(
+			array(
+				array(
+					1 => "1",
+					2 => "2",
+					3 => "3",
+					4 => "4",
+					5 => "5",
+					6 => "6",
+					7 => "7",
+					8 => "8",
+					9 => "9",
+					10 => "10",
+					11 => "11",
+					12 => "12"
+				),
+				NULL
+			),
+			array(
+				array(
+					1 => "1",
+					2 => "2",
+					3 => "3",
+					4 => "4",
+					5 => "5",
+					6 => "6",
+					7 => "7",
+					8 => "8",
+					9 => "9",
+					10 => "10",
+					11 => "11",
+					12 => "12"
+				),
+				'Guinness'
+			),
+			array(
+				array(
+					1 => "January",
+					2 => "February",
+					3 => "March",
+					4 => "April",
+					5 => "May",
+					6 => "June",
+					7 => "July",
+					8 => "August",
+					9 => "September",
+					10 => "October",
+					11 => "November",
+					12 => "December"
+				),
+				Date::MONTHS_LONG
+			),
+			array(
+				array(
+					1 => "Jan",
+					2 => "Feb",
+					3 => "Mar",
+					4 => "Apr",
+					5 => "May",
+					6 => "Jun",
+					7 => "Jul",
+					8 => "Aug",
+					9 => "Sep",
+					10 => "Oct",
+					11 => "Nov",
+					12 => "Dec"
+				),
+				Date::MONTHS_SHORT
+			)
+
+		);
+	}
+
+	/**
+	 * Date::months() should allow the user to specify different format types, defaulting
+	 * to a mirrored month number => month number array if format is NULL or unrecognised
+	 *
+	 * @test
+	 * @dataProvider provider_months
+	 * @covers Date::months
+	 */
+	public function test_months($expected, $format)
+	{
+		$months = Date::months($format);
+
+		$this->assertSame($expected, $months);
+	}
+
+	/**
+	 * Provides test data for test_span()
+	 *
+	 * @return array
+	 */
+	public function provider_span()
+	{
+		$time = time();
+		return array(
+			// Test that it must specify an output format
+			array(
+				$time,
+				$time,
+				'',
+				FALSE
+			),
+			// Test that providing only one output just returns that output
+			array(
+				$time - 30,
+				$time,
+				'seconds',
+				30
+			),
+			// Random tests
+			array(
+				$time - 30,
+				$time,
+				'years,months,weeks,days,hours,minutes,seconds',
+				array('years' => 0, 'months' => 0, 'weeks' => 0, 'days' => 0, 'hours' => 0, 'minutes' => 0, 'seconds' => 30),
+			),
+			array(
+				$time - (60 * 60 * 24 * 782) + (60 * 25),
+				$time,
+				'years,months,weeks,days,hours,minutes,seconds',
+				array('years' => 2, 'months' => 1, 'weeks' => 3, 'days' => 0, 'hours' => 1, 'minutes' => 28, 'seconds' => 24),
+			),
+			// Should be able to compare with the future & that it only uses formats specified
+			array(
+				$time + (60 * 60 * 24 * 15) + (60 * 5),
+				$time,
+				'weeks,days,hours,minutes,seconds',
+				array('weeks' => 2, 'days' => 1, 'hours' => 0, 'minutes' => 5, 'seconds' => 0),
+			),
+			array(
+				// Add a bit of extra time to account for phpunit processing
+				$time + (14 * 31 * 24* 60 * 60) + (79 * 80),
+				NULL,
+				'months,years',
+				array('months' => 2, 'years' => 1),
+			),
+		);
+	}
+
+	/**
+	 * Tests Date::span()
+	 *
+	 * @test
+	 * @covers Date::span
+	 * @dataProvider provider_span
+	 * @param integer $time1     Time in the past
+	 * @param integer $time2     Time to compare against
+	 * @param string  $output    Units to output
+	 * @param array   $expected  Array of $outputs => values
+	 */
+	public function test_span($time1, $time2, $output, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Date::span($time1, $time2, $output)
+		);
+	}
+
+	/**
+	 * Provides test data to test_fuzzy_span
+	 *
+	 * This test data is provided on the assumption that it
+	 * won't take phpunit more than 30 seconds to get the
+	 * data from this provider to the test... ;)
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_fuzzy_span()
+	{
+		$now = time();
+
+		return array(
+			array('moments ago', $now - 30, $now),
+			array('in moments', $now + 30, $now),
+
+			array('a few minutes ago', $now - 10*60, $now),
+			array('in a few minutes', $now + 10*60, $now),
+
+			array('less than an hour ago', $now - 45*60, $now),
+			array('in less than an hour', $now + 45*60, $now),
+
+			array('a couple of hours ago', $now - 2*60*60, $now),
+			array('in a couple of hours', $now + 2*60*60, $now),
+
+			array('less than a day ago', $now - 12*60*60, $now),
+			array('in less than a day', $now + 12*60*60, $now),
+
+			array('about a day ago', $now - 30*60*60, $now),
+			array('in about a day', $now + 30*60*60, $now),
+
+			array('a couple of days ago', $now - 3*24*60*60, $now),
+			array('in a couple of days', $now + 3*24*60*60, $now),
+
+			array('less than a week ago', $now - 5*24*60*60, $now),
+			array('in less than a week', $now + 5*24*60*60, $now),
+
+			array('about a week ago', $now - 9*24*60*60, $now),
+			array('in about a week', $now + 9*24*60*60, $now),
+
+			array('less than a month ago', $now - 20*24*60*60, $now),
+			array('in less than a month', $now + 20*24*60*60, $now),
+
+			array('about a month ago', $now - 40*24*60*60, $now),
+			array('in about a month', $now + 40*24*60*60, $now),
+
+			array('a couple of months ago', $now - 3*30*24*60*60, $now),
+			array('in a couple of months', $now + 3*30*24*60*60, $now),
+
+			array('less than a year ago', $now - 7*31*24*60*60, $now),
+			array('in less than a year', $now + 7*31*24*60*60, $now),
+
+			array('about a year ago', $now - 18*31*24*60*60, $now),
+			array('in about a year', $now + 18*31*24*60*60, $now),
+
+			array('a couple of years ago', $now - 3*12*31*24*60*60, $now),
+			array('in a couple of years', $now + 3*12*31*24*60*60, $now),
+
+			array('a few years ago', $now - 5*12*31*24*60*60, $now),
+			array('in a few years', $now + 5*12*31*24*60*60, $now),
+
+			array('about a decade ago', $now - 11*12*31*24*60*60, $now),
+			array('in about a decade', $now + 11*12*31*24*60*60, $now),
+
+			array('a couple of decades ago', $now - 20*12*31*24*60*60, $now),
+			array('in a couple of decades', $now + 20*12*31*24*60*60, $now),
+
+			array('several decades ago', $now - 50*12*31*24*60*60, $now),
+			array('in several decades', $now + 50*12*31*24*60*60, $now),
+
+			array('a long time ago', $now - pow(10,10), $now),
+			array('in a long time', $now + pow(10,10), $now),
+		);
+	}
+
+	/**
+	 * Test of Date::fuzy_span()
+	 *
+	 * @test
+	 * @dataProvider provider_fuzzy_span
+	 * @param string  $expected        Expected output
+	 * @param integer $timestamp       Timestamp to use
+	 * @param integer $local_timestamp The local timestamp to use
+	 */
+	public function test_fuzzy_span($expected, $timestamp, $local_timestamp)
+	{
+		$this->assertSame(
+			$expected,
+			Date::fuzzy_span($timestamp, $local_timestamp)
+		);
+	}
+
+	/**
+	 * Provides test data for test_years()
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_years()
+	{
+		return array(
+			array(
+				array (
+					2005 => '2005',
+					2006 => '2006',
+					2007 => '2007',
+				    2008 => '2008',
+				    2009 => '2009',
+				    2010 => '2010',
+				    2011 => '2011',
+				    2012 => '2012',
+					2013 => '2013',
+					2014 => '2014',
+					2015 => '2015',
+				),
+				2005,
+				2015
+			),
+		);
+	}
+
+	/**
+	 * Tests Data::years()
+	 *
+	 * @test
+	 * @dataProvider provider_years
+	 */
+	public function test_years($expected, $start = FALSE, $end = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			Date::years($start, $end)
+		);
+	}
+
+	public function provider_hours()
+	{
+		return array(
+			array(
+				array(
+					1 => '1',
+					2 => '2',
+					3 => '3',
+					4 => '4',
+					5 => '5',
+					6 => '6',
+					7 => '7',
+					8 => '8',
+					9 => '9',
+					10 => '10',
+					11 => '11',
+					12 => '12',
+				),
+			),
+		);
+	}
+
+	/**
+	 * Test for Date::hours
+	 *
+	 * @test
+	 * @dataProvider provider_hours
+	 */
+	public function test_hours($expected, $step = 1, $long = FALSE, $start = NULL)
+	{
+		$this->assertSame(
+			$expected,
+			Date::hours($step, $long, $start)
+		);
+	}
+
+	/**
+	 * Provides test data for test_seconds
+	 *
+	 * @return array Test data
+	 */
+	public function provider_seconds()
+	{
+		return array(
+			array(
+				// Thank god for var_export()
+				array (
+					0 => '00', 1 => '01', 2 => '02', 3 => '03', 4 => '04',
+					5 => '05', 6 => '06', 7 => '07', 8 => '08', 9 => '09',
+					10 => '10', 11 => '11', 12 => '12', 13 => '13', 14 => '14',
+					15 => '15', 16 => '16', 17 => '17', 18 => '18', 19 => '19',
+					20 => '20', 21 => '21', 22 => '22', 23 => '23', 24 => '24',
+					25 => '25', 26 => '26', 27 => '27', 28 => '28', 29 => '29',
+					30 => '30', 31 => '31', 32 => '32', 33 => '33', 34 => '34',
+					35 => '35', 36 => '36', 37 => '37', 38 => '38', 39 => '39',
+					40 => '40', 41 => '41', 42 => '42', 43 => '43', 44 => '44',
+					45 => '45', 46 => '46', 47 => '47', 48 => '48', 49 => '49',
+					50 => '50', 51 => '51', 52 => '52', 53 => '53', 54 => '54',
+					55 => '55', 56 => '56', 57 => '57', 58 => '58', 59 => '59',
+				),
+				1,
+				0,
+				60
+			),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_seconds
+	 * @covers Date::seconds
+	 */
+	public function test_seconds($expected, $step = 1, $start = 0, $end = 60)
+	{
+		$this->assertSame(
+			$expected,
+			Date::seconds($step, $start, $end)
+		);
+	}
+
+	/**
+	 * Provides test data for test_minutes
+	 *
+	 * @return array Test data
+	 */
+	public function provider_minutes()
+	{
+		return array(
+			array(
+				array(
+					0 => '00', 5 => '05', 10 => '10',
+					15 => '15', 20 => '20', 25 => '25',
+					30 => '30', 35 => '35', 40 => '40',
+					45 => '45', 50 => '50', 55 => '55',
+				),
+				5,
+			),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_minutes
+	 */
+	public function test_minutes($expected, $step)
+	{
+		$this->assertSame(
+			$expected,
+			Date::minutes($step)
+		);
+	}
+
+	/**
+	 * This tests that the minutes helper defaults to using a $step of 5
+	 * and thus returns an array of 5 minute itervals
+	 *
+	 * @test
+	 * @covers Date::minutes
+	 */
+	public function test_minutes_defaults_to_using_step_of5()
+	{
+		$minutes = array(
+			0 => '00', 5 => '05', 10 => '10',
+			15 => '15', 20 => '20', 25 => '25',
+			30 => '30', 35 => '35', 40 => '40',
+			45 => '45', 50 => '50', 55 => '55',
+		);
+
+		$this->assertSame(
+			$minutes,
+			Date::minutes()
+		);
+	}
+
+	/**
+	 * Provids for test_unix2dos
+	 *
+	 * @return array Test Data
+	 */
+	public function provider_unix2dos()
+	{
+		return array(
+			array(
+				1024341746,
+				1281786936
+			),
+			array(
+				2162688,
+				315554400
+			)
+		);
+	}
+
+	/**
+	 * Test Date::unix2dos()
+	 *
+	 * You should always pass a timestamp as otherwise the current
+	 * date/time would be used and that's oviously variable
+	 *
+	 * Geert seems to be the only person who knows how unix2dos() works
+	 * so we just throw in some random values and see what happens
+	 *
+	 * @test
+	 * @dataProvider provider_unix2dos
+	 * @covers Date::unix2dos
+	 * @param integer $expected  Expected output
+	 * @param integer $timestamp Input timestamp
+	 */
+	public function test_unix2dos($expected, $timestamp)
+	{
+		$this->assertSame($expected, Date::unix2dos($timestamp));
+	}
+
+	/**
+	 * Provides test data for test_dos2unix
+	 *
+	 * @return array Test data
+	 */
+	public function provider_dos2unix()
+	{
+		return array(
+			array(
+				1281786936,
+				1024341746,
+			),
+			array(
+				315554400,
+				2162688,
+			),
+		);
+	}
+
+	/**
+	 * Tests Date::dos2unix
+	 *
+	 * @test
+	 * @dataProvider provider_dos2unix
+	 * @param integer $expected  Expected output
+	 * @param integer $timestamp Input timestamp
+	 */
+	public function test_dos2unix($expected, $timestamp)
+	{
+		$this->assertEquals($expected, Date::dos2unix($timestamp));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/DebugTest.php b/includes/kohana/system/tests/kohana/DebugTest.php
new file mode 100644
index 0000000..a422b58
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/DebugTest.php
@@ -0,0 +1,113 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana Core
+ *
+ * @TODO Use a virtual filesystem (see phpunit doc on mocking fs) for find_file etc.
+ *
+ * @group kohana
+ * @group kohana.debug
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_DebugTest extends Unittest_TestCase
+{
+
+	/**
+	 * Provides test data for test_debug()
+	 *
+	 * @return array
+	 */
+	public function provider_vars()
+	{
+		return array(
+			// $exception_type, $message, $is_cli, $expected
+			array(array('foobar'), "<pre class=\"debug\"><small>array</small><span>(1)</span> <span>(\n    0 => <small>string</small><span>(6)</span> \"foobar\"\n)</span></pre>"),
+		);
+	}
+
+	/**
+	 * Tests Debug::vars()
+	 *
+	 * @test
+	 * @dataProvider provider_vars
+	 * @covers Debug::vars
+	 * @param boolean $thing    The thing to debug
+	 * @param boolean $expected Output for Debug::vars
+	 */
+	public function test_var($thing, $expected)
+	{
+		$this->assertEquals($expected, Debug::vars($thing));
+	}
+
+	/**
+	 * Provides test data for testDebugPath()
+	 *
+	 * @return array
+	 */
+	public function provider_debug_path()
+	{
+		return array(
+			array(
+				SYSPATH.'classes'.DIRECTORY_SEPARATOR.'kohana'.EXT,
+				'SYSPATH'.DIRECTORY_SEPARATOR.'classes'.DIRECTORY_SEPARATOR.'kohana.php'
+			),
+			array(
+				MODPATH.$this->dirSeparator('unittest/classes/kohana/unittest/runner').EXT,
+				$this->dirSeparator('MODPATH/unittest/classes/kohana/unittest/runner').EXT
+			),
+		);
+	}
+
+	/**
+	 * Tests Debug::path()
+	 *
+	 * @test
+	 * @dataProvider provider_debug_path
+	 * @covers Debug::path
+	 * @param boolean $path     Input for Debug::path
+	 * @param boolean $expected Output for Debug::path
+	 */
+	public function test_debug_path($path, $expected)
+	{
+		$this->assertEquals($expected, Debug::path($path));
+	}
+
+	/**
+	 * Provides test data for test_dump()
+	 *
+	 * @return array
+	 */
+	public function provider_dump()
+	{
+		return array(
+			array('foobar', 128, '<small>string</small><span>(6)</span> "foobar"'),
+			array('foobar', 2, '<small>string</small><span>(6)</span> "fo&nbsp;&hellip;"'),
+			array(NULL, 128, '<small>NULL</small>'),
+			array(TRUE, 128, '<small>bool</small> TRUE'),
+			array(array('foobar'), 128, "<small>array</small><span>(1)</span> <span>(\n    0 => <small>string</small><span>(6)</span> \"foobar\"\n)</span>"),
+			array(new StdClass, 128, "<small>object</small> <span>stdClass(0)</span> <code>{\n}</code>"),
+			array("fo\x6F\xFF\x00bar\x8F\xC2\xB110", 128, '<small>string</small><span>(10)</span> "foobar±10"'),
+		);
+	}
+
+	/**
+	 * Tests Debug::dump()
+	 *
+	 * @test
+	 * @dataProvider provider_dump
+	 * @covers Debug::dump
+	 * @covers Debug::_dump
+	 * @param object $exception exception to test
+	 * @param string $expected  expected output
+	 */
+	public function test_dump($input, $length, $expected)
+	{
+		$this->assertEquals($expected, Debug::dump($input, $length));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/ExceptionTest.php b/includes/kohana/system/tests/kohana/ExceptionTest.php
new file mode 100644
index 0000000..f75a5d5
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ExceptionTest.php
@@ -0,0 +1,92 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana Exception Class
+ *
+ * @group kohana
+ * @group kohana.exception
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ExceptionTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_constructor()
+	 *
+	 * @return array
+	 */
+	public function provider_constructor()
+	{
+		return array(
+			array(array(''), '', 0),
+			array(array(':a'), ':a', 0),
+
+			array(array(':a', NULL), ':a', 0),
+			array(array(':a', array()), ':a', 0),
+			array(array(':a', array(':a' => 'b')), 'b', 0),
+			array(array(':a :b', array(':a' => 'c', ':b' => 'd')), 'c d', 0),
+
+			array(array(':a', NULL, 5), ':a', 5),
+			// #3927
+			array(array(':a', NULL, 'b'), ':a', 'b'),
+		);
+	}
+
+	/**
+	 * Tests Kohana_Kohana_Exception::__construct()
+	 *
+	 * @test
+	 * @dataProvider provider_constructor
+	 * @covers Kohana_Kohana_Exception::__construct
+	 * @param array             $arguments          Arguments
+	 * @param string            $expected_message   Value from getMessage()
+	 * @param integer|string    $expected_code      Value from getCode()
+	 */
+	public function test_constructor($arguments, $expected_message, $expected_code)
+	{
+		switch (count($arguments))
+		{
+			case 1:
+				$exception = new Kohana_Exception(reset($arguments));
+			break;
+			case 2:
+				$exception = new Kohana_Exception(reset($arguments), next($arguments));
+			break;
+			default:
+				$exception = new Kohana_Exception(reset($arguments), next($arguments), next($arguments));
+		}
+
+		$this->assertSame($expected_code, $exception->getCode());
+		$this->assertSame($expected_message, $exception->getMessage());
+	}
+
+	/**
+	 * Provides test data for test_text()
+	 *
+	 * @return array
+	 */
+	public function provider_text()
+	{
+		return array(
+			array(new Kohana_Exception('foobar'), $this->dirSeparator('Kohana_Exception [ 0 ]: foobar ~ SYSPATH/tests/kohana/ExceptionTest.php [ '.__LINE__.' ]')),
+		);
+	}
+
+	/**
+	 * Tests Kohana_Exception::text()
+	 *
+	 * @test
+	 * @dataProvider provider_text
+	 * @covers Kohana_Exception::text
+	 * @param object $exception exception to test
+	 * @param string $expected  expected output
+	 */
+	public function test_text($exception, $expected)
+	{
+		$this->assertEquals($expected, Kohana_Exception::text($exception));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/FeedTest.php b/includes/kohana/system/tests/kohana/FeedTest.php
new file mode 100644
index 0000000..7b349a0
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/FeedTest.php
@@ -0,0 +1,125 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Test for feed helper
+ *
+ * @group kohana
+ * @group kohana.feed
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_FeedTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_parse()
+	 *
+	 * @return array
+	 */
+	public function provider_parse()
+	{
+		return array(
+			// $source, $expected
+			array('http://dev.kohanaframework.org/projects/kohana3/activity.atom', 15),
+		);
+	}
+
+	/**
+	 * Tests that Feed::parse gets the correct number of elements
+	 *
+	 * @test
+	 * @dataProvider provider_parse
+	 * @covers feed::parse
+	 * @param string  $source   URL to test
+	 * @param integer $expected Count of items
+	 */
+	public function test_parse($source, $expected)
+	{
+		if ( ! $this->hasInternet())
+		{
+			$this->markTestSkipped('An internet connection is required for this test');
+		}
+
+		$this->assertEquals($expected, count(feed::parse($source)));
+	}
+
+	/**
+	 * Provides test data for test_create()
+	 *
+	 * @return array
+	 */
+	public function provider_create()
+	{
+		$info = array('pubDate' => 123, 'image' => array('link' => 'http://kohanaframework.org/image.png', 'url' => 'http://kohanaframework.org/', 'title' => 'title'));
+
+		return array(
+			// $source, $expected
+			array($info, array('foo' => array('foo' => 'bar', 'pubDate' => 123, 'link' => 'foo')), array('_SERVER' => array('HTTP_HOST' => 'localhost')+$_SERVER),
+				array(
+					'tag' => 'channel',
+					'descendant' => array(
+						'tag' => 'item',
+						'child' => array(
+							'tag' => 'foo',
+							'content' => 'bar'
+						)
+					)
+				),
+				array(
+					$this->matcher_composer($info, 'image', 'link'),
+					$this->matcher_composer($info, 'image', 'url'),
+					$this->matcher_composer($info, 'image', 'title')
+				)
+			),
+		);
+	}
+
+	/**
+	 * Helper for handy matcher composing
+	 *
+	 * @param array $data
+	 * @param string $tag
+	 * @param string $child
+	 * @return array
+	 */
+	private function matcher_composer($data, $tag, $child)
+	{
+		return array(
+			'tag' => 'channel',
+			'descendant' => array(
+				'tag' => $tag,
+				'child' => array(
+					'tag' => $child,
+					'content' => $data[$tag][$child]
+				)
+			)
+		);
+	}
+
+	/**
+	 * @test
+	 *
+	 * @dataProvider provider_create
+	 *
+	 * @covers feed::create
+	 *
+	 * @param string  $info     info to pass
+	 * @param integer $items    items to add
+	 * @param integer $matcher  output
+	 */
+	public function test_create($info, $items, $enviroment, $matcher_item, $matchers_image)
+	{
+		$this->setEnvironment($enviroment);
+
+		$this->assertTag($matcher_item, feed::create($info, $items), '', FALSE);
+
+		foreach ($matchers_image as $matcher_image)
+		{
+			$this->assertTag($matcher_image, feed::create($info, $items), '', FALSE);
+		}
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/FileTest.php b/includes/kohana/system/tests/kohana/FileTest.php
new file mode 100644
index 0000000..a6899f8
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/FileTest.php
@@ -0,0 +1,77 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana File helper
+ *
+ * @group kohana
+ * @group kohana.url
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_FileTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_sanitize()
+	 *
+	 * @return array
+	 */
+	public function provider_mime()
+	{
+		return array(
+			// $value, $result
+			array(Kohana::find_file('classes', 'file')),
+			array(Kohana::find_file('tests', 'test_data/github', 'png')),
+		);
+	}
+
+	/**
+	 * Tests File::mime()
+	 *
+	 * @test
+	 * @dataProvider provider_mime
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_mime($input)
+	{
+		$this->assertSame(1, preg_match('/^(?:application|audio|image|message|multipart|text|video)\/[a-z.+0-9-]+$/i', File::mime($input)));
+	}
+
+	/**
+	 * Provides test data for test_split_join()
+	 *
+	 * @return array
+	 */
+	public function provider_split_join()
+	{
+		return array(
+			// $value, $result
+			array(Kohana::find_file('tests', 'test_data/github', 'png'), .01, 1),
+		);
+	}
+
+	/**
+	 * Tests File::mime()
+	 *
+	 * @test
+	 * @dataProvider provider_split_join
+	 * @param boolean $input    Input for File::split
+	 * @param boolean $peices   Input for File::split
+	 * @param boolean $expected Output for File::splut
+	 */
+	public function test_split_join($input, $peices, $expected)
+	{
+		$this->assertSame($expected, File::split($input, $peices));
+		$this->assertSame($expected, File::join($input));
+
+		foreach (glob(Kohana::find_file('tests', 'test_data/github', 'png').'.*') as $file)
+		{
+			unlink($file);
+		}
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/FormTest.php b/includes/kohana/system/tests/kohana/FormTest.php
new file mode 100644
index 0000000..075f95a
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/FormTest.php
@@ -0,0 +1,393 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana Form helper
+ *
+ * @group kohana
+ * @group kohana.form
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_FormTest extends Unittest_TestCase
+{
+	/**
+	 * Defaults for this test
+	 * @var array
+	 */
+	protected $environmentDefault = array(
+		'Kohana::$base_url' => '/',
+		'HTTP_HOST' => 'kohanaframework.org',
+	);
+
+	/**
+	 * Provides test data for test_open()
+	 *
+	 * @return array
+	 */
+	public function provider_open()
+	{
+		return array(
+			// $value, $result
+			array(NULL, NULL, '<form action="/" method="post" accept-charset="utf-8">'),
+			array('foo', NULL),
+			array('', NULL),
+			array('foo', array('method' => 'get')),
+		);
+	}
+
+	/**
+	 * Tests Form::open()
+	 *
+	 * @test
+	 * @dataProvider provider_open
+	 * @param boolean $input  Input for Form::open
+	 * @param boolean $expected Output for Form::open
+	 */
+	public function test_open($action, $attributes)
+	{
+		$tag = Form::open($action, $attributes);
+
+		$matcher = array(
+			'tag' => 'form',
+			'attributes' => array(
+				'method' => 'post',
+				'accept-charset' => 'utf-8',
+			),
+		);
+
+		if ($attributes !== NULL)
+		{
+			$matcher['attributes'] = $attributes + $matcher['attributes'];
+		}
+
+		$this->assertTag($matcher, $tag);
+	}
+
+	/**
+	 * Tests Form::close()
+	 *
+	 * @test
+	 */
+	public function test_close()
+	{
+		$this->assertSame('</form>', Form::close());
+	}
+
+	/**
+	 * Provides test data for test_input()
+	 *
+	 * @return array
+	 */
+	public function provider_input()
+	{
+		return array(
+			// $value, $result
+			array('input',    'foo', 'bar', NULL, 'input'),
+			array('input',    'foo',  NULL, NULL, 'input'),
+			array('hidden',   'foo', 'bar', NULL, 'hidden'),
+			array('password', 'foo', 'bar', NULL, 'password'),
+		);
+	}
+
+	/**
+	 * Tests Form::input()
+	 *
+	 * @test
+	 * @dataProvider provider_input
+	 * @param boolean $input  Input for Form::input
+	 * @param boolean $expected Output for Form::input
+	 */
+	public function test_input($type, $name, $value, $attributes)
+	{
+		$matcher = array(
+			'tag' => 'input',
+			'attributes' => array('name' => $name, 'type' => $type)
+		);
+
+		// Form::input creates a text input
+		if ($type === 'input')
+		{
+			$matcher['attributes']['type'] = 'text';
+		}
+
+		// NULL just means no value
+		if ($value !== NULL)
+		{
+			$matcher['attributes']['value'] = $value;
+		}
+
+		// Add on any attributes
+		if (is_array($attributes))
+		{
+			$matcher['attributes'] = $attributes + $matcher['attributes'];
+		}
+
+		$tag = Form::$type($name, $value, $attributes);
+
+		$this->assertTag($matcher, $tag, $tag);
+	}
+
+	/**
+	 * Provides test data for test_file()
+	 *
+	 * @return array
+	 */
+	public function provider_file()
+	{
+		return array(
+			// $value, $result
+			array('foo', NULL, '<input type="file" name="foo" />'),
+		);
+	}
+
+	/**
+	 * Tests Form::file()
+	 *
+	 * @test
+	 * @dataProvider provider_file
+	 * @param boolean $input  Input for Form::file
+	 * @param boolean $expected Output for Form::file
+	 */
+	public function test_file($name, $attributes, $expected)
+	{
+		$this->assertSame($expected, Form::file($name, $attributes));
+	}
+
+	/**
+	 * Provides test data for test_check()
+	 *
+	 * @return array
+	 */
+	public function provider_check()
+	{
+		return array(
+			// $value, $result
+			array('checkbox', 'foo', NULL, FALSE, NULL),
+			array('checkbox', 'foo', NULL, TRUE, NULL),
+			array('checkbox', 'foo', 'bar', TRUE, NULL),
+
+			array('radio', 'foo', NULL, FALSE, NULL),
+			array('radio', 'foo', NULL, TRUE, NULL),
+			array('radio', 'foo', 'bar', TRUE, NULL),
+		);
+	}
+
+	/**
+	 * Tests Form::check()
+	 *
+	 * @test
+	 * @dataProvider provider_check
+	 * @param boolean $input  Input for Form::check
+	 * @param boolean $expected Output for Form::check
+	 */
+	public function test_check($type, $name, $value, $checked, $attributes)
+	{
+		$matcher = array('tag' => 'input', 'attributes' => array('name' => $name, 'type' => $type));
+
+		if ($value !== NULL)
+		{
+			$matcher['attributes']['value'] = $value;
+		}
+
+		if (is_array($attributes))
+		{
+			$matcher['attributes'] = $attributes + $matcher['attributes'];
+		}
+
+		if ($checked === TRUE)
+		{
+			$matcher['attributes']['checked'] = 'checked';
+		}
+
+		$tag = Form::$type($name, $value, $checked, $attributes);
+		$this->assertTag($matcher, $tag, $tag);
+	}
+
+	/**
+	 * Provides test data for test_text()
+	 *
+	 * @return array
+	 */
+	public function provider_text()
+	{
+		return array(
+			// $value, $result
+			array('textarea', 'foo', 'bar', NULL),
+			array('textarea', 'foo', 'bar', array('rows' => 20, 'cols' => 20)),
+			array('button', 'foo', 'bar', NULL),
+			array('label', 'foo', 'bar', NULL),
+			array('label', 'foo', NULL, NULL),
+		);
+	}
+
+	/**
+	 * Tests Form::textarea()
+	 *
+	 * @test
+	 * @dataProvider provider_text
+	 * @param boolean $input  Input for Form::textarea
+	 * @param boolean $expected Output for Form::textarea
+	 */
+	public function test_text($type, $name, $body, $attributes)
+	{
+		$matcher = array(
+			'tag' => $type,
+			'attributes' => array(),
+			'content' => $body,
+		);
+
+		if ($type !== 'label')
+		{
+			$matcher['attributes'] = array('name' => $name);
+		}
+		else
+		{
+			$matcher['attributes'] = array('for' => $name);
+		}
+
+
+		if (is_array($attributes))
+		{
+			$matcher['attributes'] = $attributes + $matcher['attributes'];
+		}
+
+		$tag = Form::$type($name, $body, $attributes);
+
+		$this->assertTag($matcher, $tag, $tag);
+	}
+
+
+	/**
+	 * Provides test data for test_select()
+	 *
+	 * @return array
+	 */
+	public function provider_select()
+	{
+		return array(
+			// $value, $result
+			array('foo', NULL, NULL, "<select name=\"foo\"></select>"),
+			array('foo', array('bar' => 'bar'), NULL, "<select name=\"foo\">\n<option value=\"bar\">bar</option>\n</select>"),
+			array('foo', array('bar' => 'bar'), 'bar', "<select name=\"foo\">\n<option value=\"bar\" selected=\"selected\">bar</option>\n</select>"),
+			array('foo', array('bar' => array('foo' => 'bar')), NULL, "<select name=\"foo\">\n<optgroup label=\"bar\">\n<option value=\"foo\">bar</option>\n</optgroup>\n</select>"),
+			array('foo', array('bar' => array('foo' => 'bar')), 'foo', "<select name=\"foo\">\n<optgroup label=\"bar\">\n<option value=\"foo\" selected=\"selected\">bar</option>\n</optgroup>\n</select>"),
+			// #2286
+			array('foo', array('bar' => 'bar', 'unit' => 'test', 'foo' => 'foo'), array('bar', 'foo'), "<select name=\"foo\" multiple=\"multiple\">\n<option value=\"bar\" selected=\"selected\">bar</option>\n<option value=\"unit\">test</option>\n<option value=\"foo\" selected=\"selected\">foo</option>\n</select>"),
+		);
+	}
+
+	/**
+	 * Tests Form::select()
+	 *
+	 * @test
+	 * @dataProvider provider_select
+	 * @param boolean $input  Input for Form::select
+	 * @param boolean $expected Output for Form::select
+	 */
+	public function test_select($name, $options, $selected, $expected)
+	{
+		// Much more efficient just to assertSame() rather than assertTag() on each element
+		$this->assertSame($expected, Form::select($name, $options, $selected));
+	}
+
+	/**
+	 * Provides test data for test_submit()
+	 *
+	 * @return array
+	 */
+	public function provider_submit()
+	{
+		return array(
+			// $value, $result
+			array('foo', 'Foobar!', '<input type="submit" name="foo" value="Foobar!" />'),
+		);
+	}
+
+	/**
+	 * Tests Form::submit()
+	 *
+	 * @test
+	 * @dataProvider provider_submit
+	 * @param boolean $input  Input for Form::submit
+	 * @param boolean $expected Output for Form::submit
+	 */
+	public function test_submit($name, $value, $expected)
+	{
+		$matcher = array(
+			'tag' => 'input',
+			'attributes' => array('name' => $name, 'type' => 'submit', 'value' => $value)
+		);
+
+		$this->assertTag($matcher, Form::submit($name, $value));
+	}
+
+
+	/**
+	 * Provides test data for test_image()
+	 *
+	 * @return array
+	 */
+	public function provider_image()
+	{
+		return array(
+			// $value, $result
+			array('foo', 'bar', array('src' => 'media/img/login.png'), '<input type="image" name="foo" value="bar" src="/media/img/login.png" />'),
+		);
+	}
+
+	/**
+	 * Tests Form::image()
+	 *
+	 * @test
+	 * @dataProvider provider_image
+	 * @param boolean $name         Input for Form::image
+	 * @param boolean $value        Input for Form::image
+	 * @param boolean $attributes  Input for Form::image
+	 * @param boolean $expected    Output for Form::image
+	 */
+	public function test_image($name, $value, $attributes, $expected)
+	{
+		$this->assertSame($expected, Form::image($name, $value, $attributes));
+	}
+
+	/**
+	 * Provides test data for test_label()
+	 *
+	 * @return array
+	 */
+	function provider_label()
+	{
+		return array(
+			// $value, $result
+			// Single for provided
+			array('email', NULL, NULL, '<label for="email">Email</label>'),
+			array('email_address', NULL, NULL, '<label for="email_address">Email Address</label>'),
+			array('email-address', NULL, NULL, '<label for="email-address">Email Address</label>'),
+			// For and text values provided
+			array('name', 'First name', NULL, '<label for="name">First name</label>'),
+			// with attributes
+			array('lastname', 'Last name', array('class' => 'text'), '<label class="text" for="lastname">Last name</label>'),
+			array('lastname', 'Last name', array('class' => 'text', 'id'=>'txt_lastname'), '<label id="txt_lastname" class="text" for="lastname">Last name</label>'),
+		);
+	}
+
+	/**
+	 * Tests Form::label()
+	 *
+	 * @test
+	 * @dataProvider provider_label
+	 * @param boolean $for         Input for Form::label
+	 * @param boolean $text        Input for Form::label
+	 * @param boolean $attributes  Input for Form::label
+	 * @param boolean $expected    Output for Form::label
+	 */
+	function test_label($for, $text, $attributes, $expected)
+	{
+		$this->assertSame($expected, Form::label($for, $text, $attributes));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/HTMLTest.php b/includes/kohana/system/tests/kohana/HTMLTest.php
new file mode 100644
index 0000000..38f1b84
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/HTMLTest.php
@@ -0,0 +1,308 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests HTML
+ *
+ * @group kohana
+ * @group kohana.html
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_HTMLTest extends Unittest_TestCase
+{
+	protected $environmentDefault = array(
+		'Kohana::$base_url'    => '/kohana/',
+		'Kohana::$index_file'  => 'index.php',
+		'HTTP_HOST'	=> 'www.kohanaframework.org',
+	);
+
+	/**
+	 * Provides test data for test_attributes()
+	 *
+	 * @return array
+	 */
+	public function provider_attributes()
+	{
+		return array(
+			array(
+				array('name' => 'field', 'random' => 'not_quite', 'id' => 'unique_field'),
+				' id="unique_field" name="field" random="not_quite"'
+			),
+			array(
+				array('invalid' => NULL),
+				''
+			),
+			array(
+				array(),
+				''
+			),
+			array(
+				array('name' => 'field', 'checked'),
+				' name="field" checked="checked"',
+			),
+		);
+	}
+
+	/**
+	 * Tests HTML::attributes()
+	 *
+	 * @test
+	 * @dataProvider provider_attributes
+	 * @param array  $attributes  Attributes to use
+	 * @param string $expected    Expected output
+	 */
+	public function test_attributes($attributes, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			HTML::attributes($attributes)
+		);
+	}
+
+	/**
+	 * Provides test data for test_script
+	 *
+	 * @return array Array of test data
+	 */
+	public function provider_script()
+	{
+		return array(
+			array(
+				'<script type="text/javascript" src="http://google.com/script.js"></script>',
+				'http://google.com/script.js',
+			),
+			array(
+				'<script type="text/javascript" src="http://www.kohanaframework.org/kohana/index.php/my/script.js"></script>',
+				'my/script.js',
+				NULL,
+				'http',
+				TRUE
+			),
+			array(
+				'<script type="text/javascript" src="https://www.kohanaframework.org/kohana/my/script.js"></script>',
+				'my/script.js',
+				NULL,
+				'https',
+				FALSE
+			),
+
+		);
+	}
+
+	/**
+	 * Tests HTML::script()
+	 *
+	 * @test
+	 * @dataProvider  provider_script
+	 * @param string  $expected       Expected output
+	 * @param string  $file           URL to script
+	 * @param array   $attributes     HTML attributes for the anchor
+	 * @param string  $protocol       Protocol to use
+	 * @param bool    $index          Should the index file be included in url?
+	 */
+	public function test_script($expected, $file, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			HTML::script($file, $attributes, $protocol, $index)
+		);
+	}
+
+	/**
+	 * Data provider for the style test
+	 *
+	 * @return array Array of test data
+	 */
+	public function provider_style()
+	{
+		return array(
+			array(
+				'<link type="text/css" href="http://google.com/style.css" rel="stylesheet" />',
+				'http://google.com/style.css',
+				array(),
+				NULL,
+				FALSE
+			),
+			array(
+				'<link type="text/css" href="/kohana/my/style.css" rel="stylesheet" />',
+				'my/style.css',
+				array(),
+				NULL,
+				FALSE
+			),
+			array(
+				'<link type="text/css" href="https://www.kohanaframework.org/kohana/my/style.css" rel="stylesheet" />',
+				'my/style.css',
+				array(),
+				'https',
+				FALSE
+			),
+			array(
+				'<link type="text/css" href="https://www.kohanaframework.org/kohana/index.php/my/style.css" rel="stylesheet" />',
+				'my/style.css',
+				array(),
+				'https',
+				TRUE
+			),
+		);
+	}
+
+	/**
+	 * Tests HTML::style()
+	 *
+	 * @test
+	 * @dataProvider  provider_style
+	 * @param string  $expected     The expected output
+	 * @param string  $file         The file to link to
+	 * @param array   $attributes   Any extra attributes for the link
+	 * @param string  $protocol     Protocol to use
+	 * @param bool    $index        Whether the index file should be added to the link
+	 */
+	public function test_style($expected, $file, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			HTML::style($file, $attributes, $protocol, $index)
+		);
+	}
+
+	/**
+	 * Provides test data for test_obfuscate
+	 *
+	 * @return array Array of test data
+	 */
+	public function provider_obfuscate()
+	{
+		return array(
+			array('something crazy'),
+			array('me@google.com'),
+		);
+	}
+
+	/**
+	 * Tests HTML::obfuscate
+	 *
+	 * @test
+	 * @dataProvider   provider_obfuscate
+	 * @param string   $string            The string to obfuscate
+	 */
+	public function test_obfuscate($string)
+	{
+		$this->assertNotSame(
+			$string,
+			HTML::obfuscate($string)
+		);
+	}
+
+	/**
+	 * Provides test data for test_anchor
+	 *
+	 * @return array Test data
+	 */
+	public function provider_anchor()
+	{
+		return array(
+			array(
+				'<a href="http://kohanaframework.org">Kohana</a>',
+				array(),
+				'http://kohanaframework.org',
+				'Kohana',
+			),
+			array(
+				'<a href="http://google.com" target="_blank">GOOGLE</a>',
+				array(),
+				'http://google.com',
+				'GOOGLE',
+				array('target' => '_blank'),
+				'http',
+			),
+			array(
+				'<a href="https://www.kohanaframework.org/kohana/users/example">Kohana</a>',
+				array(),
+				'users/example',
+				'Kohana',
+				NULL,
+				'https',
+				FALSE,
+			),
+			array(
+				'<a href="https://www.kohanaframework.org/kohana/index.php/users/example">Kohana</a>',
+				array(),
+				'users/example',
+				'Kohana',
+				NULL,
+				'https',
+				TRUE,
+			),
+		);
+	}
+
+	/**
+	 * Tests HTML::anchor
+	 *
+	 * @test
+	 * @dataProvider provider_anchor
+	 */
+	public function test_anchor($expected, array $options, $uri, $title = NULL, array $attributes = NULL, $protocol = NULL, $index = FALSE)
+	{
+		// $this->setEnvironment($options);
+
+		$this->assertSame(
+			$expected,
+			HTML::anchor($uri, $title, $attributes, $protocol, $index)
+		);
+	}
+
+	/**
+	 * Data provider for test_file_anchor
+	 *
+	 * @return array
+	 */
+	public function provider_file_anchor()
+	{
+		return array(
+			array(
+				'<a href="/kohana/mypic.png">My picture file</a>',
+				array(),
+				'mypic.png',
+				'My picture file',
+			),
+			array(
+				'<a href="https://www.kohanaframework.org/kohana/index.php/mypic.png" attr="value">My picture file</a>',
+				array('attr' => 'value'),
+				'mypic.png',
+				'My picture file',
+				'https',
+				TRUE
+			),
+			array(
+				'<a href="ftp://www.kohanaframework.org/kohana/mypic.png">My picture file</a>',
+				array(),
+				'mypic.png',
+				'My picture file',
+				'ftp',
+				FALSE
+			)
+		);
+	}
+
+	/**
+	 * Test for HTML::file_anchor()
+	 *
+	 * @test
+	 * @covers HTML::file_anchor
+	 * @dataProvider provider_file_anchor
+	 */
+	public function test_file_anchor($expected, array $attributes, $file, $title = NULL, $protocol = NULL, $index = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			HTML::file_anchor($file, $title, $attributes, $protocol, $index)
+		);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/Http/Header/ValueTest.php b/includes/kohana/system/tests/kohana/Http/Header/ValueTest.php
new file mode 100644
index 0000000..28ed15a
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/Http/Header/ValueTest.php
@@ -0,0 +1,164 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Unit tests for Kohana_HTTP_Header_Value
+ *
+ * @group kohana
+ * @group kohana.http
+ * @group kohana.http.header
+ * @group kohana.http.header.value
+ *
+ * @see CLI
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_HTTP_Header_ValueTest extends Unittest_TestCase
+{
+	/**
+	 * If the header value is composed of a key value pair then the parser
+	 * should return an array of key => value
+	 *
+	 * @test
+	 */
+	public function test_parser_returns_array_if_header_contains_key_val()
+	{
+		$key_val = Kohana_HTTP_Header_Value::parse_key_value('name=kohana');
+		$this->assertSame(array('name' => 'kohana'), $key_val);
+	}
+
+	/**
+	 * If the parser is passed a header which doesn't contain a key then it should
+	 * return the header key as a string
+	 *
+	 * @test
+	 * @covers Kohana_HTTP_Header_Value::parse_key_value
+	 */
+	public function test_parser_returns_key_as_array_if_value_isnt_present()
+	{
+		$this->assertSame(
+			array('kohana'),
+			Kohana_HTTP_Header_Value::parse_key_value('kohana')
+		);
+	}
+
+	/**
+	 * Provides test data for test_parsing_only_splits_on_first_separator()
+	 *
+	 * @return array
+	 */
+	public function provider_test_parsing_only_splits_on_first_separator()
+	{
+		return array(
+			array('='),
+			array('+')
+		);
+	}
+
+	/**
+	 * If we pass in a string containing multiple occurences of the separator then
+	 * the string should only be split on the first occurence
+	 *
+	 * @test
+	 * @dataProvider provider_test_parsing_only_splits_on_first_separator
+	 * @covers Kohana_HTTP_Header_Value::parse_key_value
+	 */
+	public function test_parsing_only_splits_on_first_separator($separator)
+	{
+		$key = 'some_value';
+		$val = 'pie,pizza'.$separator.'cheese';
+
+		$key_value = Kohana_HTTP_Header_Value::parse_key_value($key.$separator.$val, $separator);
+
+		$this->assertSame(array($key => $val), $key_value);
+	}
+
+	/**
+	 * Provides test data
+	 *
+	 * @return array
+	 */
+	public function provider_constructor_throws_exception_if_header_value_type_not_allowed()
+	{
+		return array(
+			array(42),
+			array(new ArrayObject),
+		);
+	}
+	/**
+	 * If the constructor is passed a value of type other than string|array then it should
+	 * throw a HTTP_Exception_500
+	 *
+	 * @test
+	 * @dataProvider provider_constructor_throws_exception_if_header_value_type_not_allowed
+	 * @expectedException HTTP_Exception_500
+	 * @param mixed The header value to pass to the constructor
+	 */
+	public function test_constructor_throws_exception_if_header_value_type_not_allowed($header)
+	{
+		new Kohana_HTTP_Header_Value($header);
+	}
+
+	/**
+	 * When the constructor is passed an array of values it should extract the appropriate values
+	 * and set them in the object's properties
+	 *
+	 * @test
+	 * @covers Kohana_HTTP_Header_Value
+	 */
+	public function test_constructor_allows_and_parses_header_in_array_format()
+	{
+		$input = array(
+			'key'        => 'name',
+			'value'      => 'kohana',
+			'properties' => array(
+				'ttl' => '60'
+			)
+		);
+		$header = new Kohana_HTTP_Header_Value($input);
+
+		$this->assertSame($input['key'],        $header->key);
+		$this->assertSame($input['value'],      $header->value);
+		$this->assertSame($input['properties'], $header->properties);
+	}
+
+	/**
+	 * Provides test data
+	 *
+	 * @return array
+	 */
+	public function provider_compiles_down_to_valid_header_when_cast_to_string()
+	{
+		return array(
+			// Basic test, try and achieve what the doccomment says it can do
+			array(
+				'name=value; property; another_property=property_value',
+				array(
+					'key'  => 'name',
+					'value' => 'value',
+					'properties' => array('property', 'another_property' => 'property_value')
+				),
+			),
+		);
+	}
+
+	/**
+	 * When we cast a Kohana_HTTP_Header_Value object to a string it should generate
+	 * a valid header
+	 *
+	 * @test
+	 * @covers Kohana_HTTP_Header_Value::__toString
+	 * @dataProvider provider_compiles_down_to_valid_header_when_cast_to_string
+	 * @param string       Expected compiled header
+	 * @param array|string The compiled header
+	 */
+	public function test_compiles_down_to_valid_header_when_cast_to_string($expected, $input)
+	{
+		$header = new Kohana_HTTP_Header_Value($input);
+
+		$this->assertSame($expected, (string) $header);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/Http/HeaderTest.php b/includes/kohana/system/tests/kohana/Http/HeaderTest.php
new file mode 100644
index 0000000..7b00c1d
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/Http/HeaderTest.php
@@ -0,0 +1,129 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Unit Tests for Kohana_HTTP_Header
+ *
+ * @group kohana
+ * @group kohana.http
+ * @group kohana.http.header
+ * @group kohana.http.header
+ * 
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+class Kohana_HTTP_HeaderTest extends Unittest_TestCase {
+
+	/**
+	 * Provides test data for test_parse_header_values()
+	 *
+	 * @return  array
+	 */
+	public function provider_parse_header_values()
+	{
+		return array(
+			array(
+				array(
+					'Date'             => 'Sun, 13 Mar 2011 16:02:19 GMT',
+					'Expires'          => '-1',
+					'Cache-Control'    => 'private, max-age=0',
+					'Content-Type'     => 'text/html; charset=ISO-8859-1',
+					'Server'           => 'Apache'
+				),
+				array(
+					'date'             => new HTTP_Header_Value('Sun, 13 Mar 2011 16:02:19 GMT'),
+					'expires'          => new HTTP_Header_Value('-1'),
+					'cache-control'    => array(new HTTP_Header_Value('private'), 'max-age' => new HTTP_Header_Value('max-age=0')),
+					'content-type'     => new HTTP_Header_Value('text/html; charset=ISO-8859-1'),
+					'server'           => new HTTP_Header_Value('Apache')
+				)
+			),
+			array(
+				array(
+					'Date'             => 'Sun, 13 Mar 2011 16:02:19 GMT',
+					'Expires'          => '-1',
+					'Cache-Control'    => 'private, max-age=0',
+					'Content-Type'     => 'text/html; charset=ISO-8859-1',
+					'Server'           => 'Apache',
+					'Set-Cookie'       => array(
+						'PREF=ID=dbfa7be8975d02f9:FF=0:TM=1300032139:LM=1300032139:S=ufhpKoOHVm55WY6v; expires=Tue, 12-Mar-2013 16:02:19 GMT; path=/; domain=.google.co.uk',
+						'NID=44=CxNpOQbQ7fFoxIDZWRHQJaKXgZvi76heU9OfsVi75gUH2Ik0p6tAuqW9AmTwvsE1oy0XBHDgIgMq-301hvAiyHC1sgI71pKcMUEf5VCRvCwHxJH9ZR-tlJdDD-df1vnz; expires=Mon, 12-Sep-2011 16:02:19 GMT; path=/; domain=.google.co.uk; HttpOnly'
+					)
+				),
+				array(
+					'date'             => new HTTP_Header_Value('Sun, 13 Mar 2011 16:02:19 GMT'),
+					'expires'          => new HTTP_Header_Value('-1'),
+					'cache-control'    => array(
+						new HTTP_Header_Value('private'), 
+						'max-age'            => new HTTP_Header_Value('max-age=0'
+					)),
+					'content-type'     => new HTTP_Header_Value('text/html; charset=ISO-8859-1'),
+					'server'           => new HTTP_Header_Value('Apache'),
+					'set-cookie'       => array(
+						new HTTP_Header_Value(array(
+							'key'        => 'PREF',
+							'value'      => 'ID=dbfa7be8975d02f9:FF=0:TM=1300032139:LM=1300032139:S=ufhpKoOHVm55WY6v',
+							'properties' => array(
+								'expires'    => 'Tue, 12-Mar-2013 16:02:19 GMT',
+								'path'       => '/',
+								'domain'     => '.google.co.uk'
+							)
+						)),
+						new HTTP_Header_Value(array(
+							'key'        => 'NID',
+							'value'      => '44=CxNpOQbQ7fFoxIDZWRHQJaKXgZvi76heU9OfsVi75gUH2Ik0p6tAuqW9AmTwvsE1oy0XBHDgIgMq-301hvAiyHC1sgI71pKcMUEf5VCRvCwHxJH9ZR-tlJdDD-df1vnz',
+							'properties' => array(
+								'expires'    => 'Mon, 12-Sep-2011 16:02:19 GMT',
+								'path'       => '/',
+								'domain'     => '.google.co.uk',
+								'HttpOnly'
+							)
+						))
+					)
+				)
+			),
+		);
+	}
+
+	/**
+	 * Tests the parse_header_values() method.
+	 * 
+	 * @dataProvider provider_parse_header_values
+	 *
+	 * @param   array    header array to parse
+	 * @param   array    expected result
+	 * @return  void
+	 */
+	public function test_parse_header_values($header_array, $expected)
+	{
+		$header = HTTP_Header::parse_header_values($header_array);
+
+		// Test the correct type is returned
+		$this->assertTrue(is_array($header));
+
+		foreach ($header as $key => $value)
+		{
+			if ($value instanceof HTTP_Header_Value)
+			{
+				$this->assertSame($value->value(), $expected[$key]->value());
+				$this->assertSame($value->key(), $expected[$key]->key());
+				$this->assertSame($value->properties(), $expected[$key]->properties());
+			}
+			elseif (is_array($value))
+			{
+				foreach ($value as $k => $v)
+				{
+					$this->assertSame($v->value(), $expected[$key][$k]->value());
+					$this->assertSame($v->key(), $expected[$key][$k]->key());
+					$this->assertSame($v->properties(), $expected[$key][$k]->properties());
+				}
+			}
+			else
+			{
+				$this->fail('Unexpected value in HTTP_Header::parse_header_values() return value.');
+			}
+		}
+	}
+
+} // End Kohana_HTTP_HeaderTest
\ No newline at end of file
diff --git a/includes/kohana/system/tests/kohana/I18nTest.php b/includes/kohana/system/tests/kohana/I18nTest.php
new file mode 100644
index 0000000..476effb
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/I18nTest.php
@@ -0,0 +1,80 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana i18n class
+ *
+ * @group kohana
+ * @group kohana.i18n
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_I18nTest extends Unittest_TestCase
+{
+
+	/**
+	 * Provides test data for test_lang()
+	 * 
+	 * @return array
+	 */
+	public function provider_lang()
+	{
+		return array(
+			// $value, $result
+			array(NULL, 'en-us'),
+			array('es-es', 'es-es'),
+			array(NULL, 'es-es'),
+		);
+	}
+
+	/**
+	 * Tests i18n::lang()
+	 *
+	 * @test
+	 * @dataProvider provider_lang
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_open($input, $expected)
+	{
+		$this->assertSame($expected, I18n::lang($input));
+	}
+
+	/**
+	 * Provides test data for test_get()
+	 * 
+	 * @return array
+	 */
+	public function provider_get()
+	{
+		return array(
+			// $value, $result
+			array('en-us', 'Hello, world!', 'Hello, world!'),
+			array('es-es', 'Hello, world!', '¡Hola, mundo!'),
+			array('fr-fr', 'Hello, world!', 'Bonjour, monde!'),
+		);
+	}
+
+	/**
+	 * Tests i18n::get()
+	 *
+	 * @test
+	 * @dataProvider provider_get
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_get($lang, $input, $expected)
+	{
+		I18n::lang($lang);
+		$this->assertSame($expected, I18n::get($input));
+
+		// Test immediate translation, issue #3085
+		I18n::lang('en-us');
+		$this->assertSame($expected, I18n::get($input, $lang));
+	}
+
+}
diff --git a/includes/kohana/system/tests/kohana/InflectorTest.php b/includes/kohana/system/tests/kohana/InflectorTest.php
new file mode 100644
index 0000000..fdc263f
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/InflectorTest.php
@@ -0,0 +1,185 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana inflector class
+ *
+ * @group kohana
+ * @group kohana.inflector
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_InflectorTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_lang()
+	 * 
+	 * @return array
+	 */
+	public function provider_uncountable()
+	{
+		return array(
+			// $value, $result
+			array('fish', TRUE),
+			array('cat', FALSE),
+			array('deer', TRUE),
+			array('bison', TRUE),
+			array('friend', FALSE),
+		);
+	}
+
+	/**
+	 * Tests Inflector::uncountable
+	 *
+	 * @test
+	 * @dataProvider provider_uncountable
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_uncountable($input, $expected)
+	{
+		$this->assertSame($expected, Inflector::uncountable($input));
+	}
+
+	/**
+	 * Provides test data for test_lang()
+	 * 
+	 * @return array
+	 */
+	public function provider_singular()
+	{
+		return array(
+			// $value, $result
+			array('fish', NULL, 'fish'),
+			array('cats', NULL, 'cat'),
+			array('cats', 2, 'cats'),
+			array('cats', '2', 'cats'),
+			array('children', NULL, 'child'),
+			array('meters', 0.6, 'meters'),
+			array('meters', 1.6, 'meters'),
+			array('meters', 1.0, 'meter'),
+			array('status', NULL, 'status'),
+			array('statuses', NULL, 'status'),
+			array('heroes', NULL, 'hero'),
+		);
+	}
+
+	/**
+	 * Tests Inflector::singular
+	 *
+	 * @test
+	 * @dataProvider provider_singular
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_singular($input, $count, $expected)
+	{
+		$this->assertSame($expected, Inflector::singular($input, $count));
+	}
+
+	/**
+	 * Provides test data for test_lang()
+	 * 
+	 * @return array
+	 */
+	public function provider_plural()
+	{
+		return array(
+			// $value, $result
+			array('fish', NULL, 'fish'),
+			array('cat', NULL, 'cats'),
+			array('cats', 1, 'cats'),
+			array('cats', '1', 'cats'),
+			array('movie', NULL, 'movies'),
+			array('meter', 0.6, 'meters'),
+			array('meter', 1.6, 'meters'),
+			array('meter', 1.0, 'meter'),
+			array('hero', NULL, 'heroes'),
+			array('Dog', NULL, 'Dogs'), // Titlecase
+			array('DOG', NULL, 'DOGS'), // Uppercase
+		);
+	}
+
+	/**
+	 * Tests Inflector::plural
+	 *
+	 * @test
+	 * @dataProvider provider_plural
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_plural($input, $count, $expected)
+	{
+		$this->assertSame($expected, Inflector::plural($input, $count));
+	}
+
+	/**
+	 * Provides test data for test_camelize()
+	 * 
+	 * @return array
+	 */
+	public function provider_camelize()
+	{
+		return array(
+			// $value, $result
+			array('mother cat', 'camelize', 'motherCat'),
+			array('kittens in bed', 'camelize', 'kittensInBed'),
+			array('mother cat', 'underscore', 'mother_cat'),
+			array('kittens in bed', 'underscore', 'kittens_in_bed'),
+			array('kittens-are-cats', 'humanize', 'kittens are cats'),
+			array('dogs_as_well', 'humanize', 'dogs as well'),
+		);
+	}
+
+	/**
+	 * Tests Inflector::camelize
+	 *
+	 * @test
+	 * @dataProvider provider_camelize
+	 * @param boolean $input  Input for File::mime
+	 * @param boolean $expected Output for File::mime
+	 */
+	public function test_camelize($input, $method, $expected)
+	{
+		$this->assertSame($expected, Inflector::$method($input));
+	}
+
+	/**
+	 * Provides data for test_decamelize()
+	 *
+	 * @return array
+	 */
+	public function provider_decamelize()
+	{
+		return array(
+			array('getText', '_', 'get_text'),
+			array('getJSON', '_', 'get_json'),
+			array('getLongText', '_', 'get_long_text'),
+			array('getI18N', '_', 'get_i18n'),
+			array('getL10n', '_', 'get_l10n'),
+			array('getTe5t1ng', '_', 'get_te5t1ng'),
+			array('OpenFile', '_', 'open_file'),
+			array('CloseIoSocket', '_', 'close_io_socket'),
+			array('fooBar', ' ', 'foo bar'),
+			array('camelCase', '+', 'camel+case'),
+		);
+	}
+
+	/**
+	 * Tests Inflector::decamelize()
+	 *
+	 * @test
+	 * @dataProvider provider_decamelize
+	 * @param string Camelized string
+	 * @param string Glue
+	 * @param string Expected string
+	 */
+	public function test_decamelize($input, $glue, $expected)
+	{
+		$this->assertSame($expected, Inflector::decamelize($input, $glue));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/LogTest.php b/includes/kohana/system/tests/kohana/LogTest.php
new file mode 100644
index 0000000..ccebeb6
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/LogTest.php
@@ -0,0 +1,110 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana Logging API
+ *
+ * @group kohana
+ * @group kohana.logging
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Matt Button <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_LogTest extends Unittest_TestCase
+{
+
+	/**
+	 * Tests that when a new logger is created the list of messages is initially
+	 * empty
+	 *
+	 * @test
+	 * @covers Log
+	 */
+	public function test_messages_is_initially_empty()
+	{
+		$logger = new Log;
+
+		$this->assertAttributeSame(array(), '_messages', $logger);
+	}
+
+	/**
+	 * Tests that when a new logger is created the list of writers is initially
+	 * empty
+	 *
+	 * @test
+	 * @covers Log
+	 */
+	public function test_writers_is_initially_empty()
+	{
+		$logger = new Log;
+
+		$this->assertAttributeSame(array(), '_writers', $logger);
+	}
+
+	/**
+	 * Test that attaching a log writer using an array of levels adds it to the array of log writers
+	 *
+	 * @TODO Is this test too specific?
+	 *
+	 * @test
+	 * @covers Log::attach
+	 */
+	public function test_attach_attaches_log_writer_and_returns_this()
+	{
+		$logger = new Log;
+		$writer = $this->getMockForAbstractClass('Log_Writer');
+
+		$this->assertSame($logger, $logger->attach($writer));
+
+		$this->assertAttributeSame(
+			array(spl_object_hash($writer) => array('object' => $writer, 'levels' => array())),
+			'_writers',
+			$logger
+		);
+	}
+
+	/**
+	 * Test that attaching a log writer using a min/max level adds it to the array of log writers
+	 *
+	 * @TODO Is this test too specific?
+	 *
+	 * @test
+	 * @covers Log::attach
+	 */
+	public function test_attach_attaches_log_writer_min_max_and_returns_this()
+	{
+		$logger = new Log;
+		$writer = $this->getMockForAbstractClass('Log_Writer');
+
+		$this->assertSame($logger, $logger->attach($writer, Log::NOTICE, Log::CRITICAL));
+
+		$this->assertAttributeSame(
+			array(spl_object_hash($writer) => array('object' => $writer, 'levels' => array(Log::CRITICAL, Log::ERROR, Log::WARNING, Log::NOTICE))),
+			'_writers',
+			$logger
+		);
+	}
+
+	/**
+	 * When we call detach() we expect the specified log writer to be removed
+	 *
+	 * @test
+	 * @covers Log::detach
+	 */
+	public function test_detach_removes_log_writer_and_returns_this()
+	{
+		$logger = new Log;
+		$writer = $this->getMockForAbstractClass('Log_Writer');
+
+		$logger->attach($writer);
+
+		$this->assertSame($logger, $logger->detach($writer));
+
+		$this->assertAttributeSame(array(), '_writers', $logger);
+	}
+
+
+}
diff --git a/includes/kohana/system/tests/kohana/ModelTest.php b/includes/kohana/system/tests/kohana/ModelTest.php
new file mode 100644
index 0000000..6862168
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ModelTest.php
@@ -0,0 +1,35 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * This test only really exists for code coverage.
+ *
+ * @group kohana
+ * @group kohana.model
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ModelTest extends Unittest_TestCase
+{
+	/**
+	 * Test the model's factory.
+	 *
+	 * @test
+	 * @covers Model::factory
+	 */
+	public function test_create()
+	{
+		$foobar = Model::factory('Foobar');
+
+		$this->assertEquals(TRUE, $foobar instanceof Model);
+	}
+}
+
+class Model_Foobar extends Model
+{
+
+}
diff --git a/includes/kohana/system/tests/kohana/NumTest.php b/includes/kohana/system/tests/kohana/NumTest.php
new file mode 100644
index 0000000..ce09542
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/NumTest.php
@@ -0,0 +1,200 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Num
+ *
+ * @group      kohana
+ * @group      kohana.num
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_NumTest extends Unittest_TestCase
+{
+	protected $default_locale;
+
+	/**
+	 * SetUp test enviroment
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		setlocale(LC_ALL, 'English');
+	}
+
+	/**
+	 * Tear down environment
+	 */
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		setlocale(LC_ALL, $this->default_locale);
+	}
+
+	/**
+	 * Provides test data for test_bytes()
+	 *
+	 * @return array
+	 */
+	public function provider_bytes()
+	{
+		return array(
+			array(204800.0, '200K'),
+			array(5242880.0, '5MiB'),
+			array(1000.0, 1000),
+			array(2684354560.0, '2.5GB'),
+		);
+	}
+	
+	/**
+	 * Tests Num::bytes()
+	 *
+	 * @test
+	 * @covers Num::bytes
+	 * @dataProvider provider_bytes
+	 * @param integer Expected Value
+	 * @param string  Input value
+	 */
+	public function test_bytes($expected, $size)
+	{
+		$this->assertSame($expected, Num::bytes($size));
+	}
+	
+	/**
+	 * Provides test data for test_ordinal()
+	 * @return array
+	 */
+	public function provider_ordinal()
+	{
+		return array(
+			array(0, 'th'),
+			array(1, 'st'),
+			array(21, 'st'),
+			array(112, 'th'),
+			array(23, 'rd'),
+			array(42, 'nd'),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_ordinal
+	 * @param integer $number
+	 * @param <type> $expected
+	 */
+	public function test_ordinal($number, $expected)
+	{
+		$this->assertSame($expected, Num::ordinal($number));
+	}
+
+	/**
+	 * Provides test data for test_format()
+	 * @return array
+	 */
+	public function provider_format()
+	{
+		return array(
+			// English
+			array(10000, 2, FALSE, '10,000.00'),
+			array(10000, 2, TRUE, '10,000.00'),
+
+			// Additional dp's should be removed
+			array(123.456, 2, FALSE, '123.46'),
+			array(123.456, 2, TRUE, '123.46'),
+		);
+	}
+
+	/**
+	 * @todo test locales
+	 * @test
+	 * @dataProvider provider_format
+	 * @param integer $number
+	 * @param integer $places
+	 * @param boolean $monetary
+	 * @param string $expected
+	 */
+	public function test_format($number, $places, $monetary, $expected)
+	{
+		$this->assertSame($expected, Num::format($number, $places, $monetary));
+	}
+
+	/**
+	 * Provides data for test_round()
+	 * @return array
+	 */
+	function provider_round()
+	{
+		return array(
+			array(5.5, 0, array(
+				6.0,
+				5.0,
+				6.0,
+				5.0,
+			)),
+			array(42.5, 0, array(
+				43.0,
+				42.0,
+				42.0,
+				43.0,
+			)),
+			array(10.4, 0, array(
+				10.0,
+				10.0,
+				10.0,
+				10.0,
+			)),
+			array(10.8, 0, array(
+				11.0,
+				11.0,
+				11.0,
+				11.0,
+			)),
+			array(-5.5, 0, array(
+				-6.0,
+				-5.0,
+				-6.0,
+				-5.0,
+			)),
+			array(-10.5, 0, array(
+				-11.0,
+				-10.0,
+				-10.0,
+				-11.0,
+			)),
+			array(26.12375, 4, array(
+				26.1238,
+				26.1237,
+				26.1238,
+				26.1237,
+			)),
+			array(26.12325, 4, array(
+				26.1233,
+				26.1232,
+				26.1232,
+				26.1233,
+			)),
+		);
+	}
+
+	/**
+	 * @test
+	 * @dataProvider provider_round
+	 * @param number $input
+	 * @param integer $precision
+	 * @param integer $mode
+	 * @param number $expected
+	 */
+	function test_round($input, $precision, $expected)
+	{
+		foreach (array(Num::ROUND_HALF_UP, Num::ROUND_HALF_DOWN, Num::ROUND_HALF_EVEN, Num::ROUND_HALF_ODD) as $i => $mode)
+		{
+			$this->assertSame($expected[$i], Num::round($input, $precision, $mode, false));
+		}
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/RequestTest.php b/includes/kohana/system/tests/kohana/RequestTest.php
new file mode 100644
index 0000000..e772aed
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/RequestTest.php
@@ -0,0 +1,853 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Unit tests for request class
+ *
+ * @group kohana
+ * @group kohana.request
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_RequestTest extends Unittest_TestCase
+{
+	public function test_initial()
+	{
+		$original = array(
+			'Kohana::$is_cli' => Kohana::$is_cli,
+			'Request::$initial' => Request::$initial,
+			'Request::$client_ip' => Request::$client_ip,
+			'Request::$user_agent' => Request::$user_agent,
+			'_SERVER' => $_SERVER,
+			'_GET' => $_GET,
+			'_POST' => $_POST,
+		);
+
+		$this->setEnvironment(array(
+			'Kohana::$is_cli' => FALSE,
+			'Request::$initial' => NULL,
+			'Request::$client_ip' => NULL,
+			'Request::$user_agent' => NULL,
+			'_SERVER' => array(
+				'HTTPS' => NULL,
+				'PATH_INFO' => '/',
+				'HTTP_REFERER' => 'http://example.com/',
+				'HTTP_USER_AGENT' => 'whatever (Mozilla 5.0/compatible)',
+				'REMOTE_ADDR' => '127.0.0.1',
+				'REQUEST_METHOD' => 'GET',
+				'HTTP_X_REQUESTED_WITH' => 'ajax-or-something',
+			),
+			'_GET' => array(),
+			'_POST' => array(),
+		));
+
+		$request = Request::factory();
+
+		$this->assertEquals(Request::$initial, $request);
+
+		$this->assertEquals(Request::$client_ip, '127.0.0.1');
+
+		$this->assertEquals(Request::$user_agent, 'whatever (Mozilla 5.0/compatible)');
+
+		$this->assertEquals($request->protocol(), 'http');
+
+		$this->assertEquals($request->referrer(), 'http://example.com/');
+
+		$this->assertEquals($request->requested_with(), 'ajax-or-something');
+
+		$this->assertEquals($request->query(), array());
+
+		$this->assertEquals($request->post(), array());
+
+		$this->setEnvironment($original);
+	}
+
+	/**
+	 * Tests that an initial request won't use an external client
+	 * 
+	 * @expectedException HTTP_Exception_404
+	 *
+	 * @return null
+	 */
+	public function test_initial_request_only_loads_internal()
+	{
+		$this->setEnvironment(
+			array(
+				'Kohana::$is_cli' => FALSE,
+				'Request::$initial' => NULL,
+			)
+		);
+
+		$request = new Request('http://www.google.com/');
+	}
+
+	/**
+	 * Tests that with an empty request, cli requests are routed properly
+	 *
+	 * @return null
+	 */
+	public function test_empty_cli_requests_route_properly()
+	{
+		$this->setEnvironment(
+			array(
+				'Kohana::$is_cli' => TRUE,
+				'Request::$initial' => NULL,
+			)
+		);
+
+		$route = new Route('(<controller>(/<action>))');
+		$route->defaults(array(
+			'controller' => 'welcome',
+			'action'     => 'index',
+		));
+
+		$request = Request::factory(TRUE, NULL, array($route));
+		$response = $request->execute();
+	}
+
+	/**
+	 * Provides the data for test_create()
+	 * @return  array
+	 */
+	public function provider_create()
+	{
+		return array(
+			array('foo/bar', 'Request_Client_Internal'),
+			array('http://google.com', 'Request_Client_External'),
+		);
+	}
+
+	/**
+	 * Ensures the create class is created with the correct client
+	 *
+	 * @test
+	 * @dataProvider provider_create
+	 */
+	public function test_create($uri, $client_class)
+	{
+		$request = Request::factory($uri);
+
+		$this->assertInstanceOf($client_class, $request->get_client());
+	}
+
+	/**
+	 * Ensure that parameters can be read
+	 *
+	 * @test
+	 */
+	public function test_param()
+	{
+		$uri = 'foo/bar/id';
+		$request = Request::factory($uri);
+
+		$this->assertArrayHasKey('id', $request->param());
+		$this->assertArrayNotHasKey('foo', $request->param());
+		$this->assertEquals($request->uri(), $uri);
+
+		// Ensure the params do not contain contamination from controller, action, route, uri etc etc
+		$params = $request->param();
+
+		// Test for illegal components
+		$this->assertArrayNotHasKey('controller', $params);
+		$this->assertArrayNotHasKey('action', $params);
+		$this->assertArrayNotHasKey('directory', $params);
+		$this->assertArrayNotHasKey('uri', $params);
+		$this->assertArrayNotHasKey('route', $params);
+
+		$route = new Route('(<uri>)', array('uri' => '.+'));
+		$route->defaults(array('controller' => 'foobar', 'action' => 'index'));
+		$request = Request::factory('foobar', NULL, array($route));
+
+		$this->assertSame('foobar', $request->param('uri'));
+	}
+
+	/**
+	 * Provides data for Request::create_response()
+	 */
+	public function provider_create_response()
+	{
+		return array(
+			array('foo/bar', TRUE, TRUE),
+			array('foo/bar', FALSE, FALSE)
+		);
+	}
+
+	/**
+	 * Ensures a request creates an empty response, and binds correctly
+	 *
+	 * @test
+	 * @dataProvider  provider_create_response
+	 */
+	public function test_create_response($uri, $bind, $equality)
+	{
+		$request = Request::factory($uri);
+		$response = $request->create_response($bind);
+
+		$this->assertEquals(($request->response() === $response), $equality);
+	}
+
+	/**
+	 * Tests Request::response()
+	 *
+	 * @test
+	 */
+	public function test_response()
+	{
+		$request = Request::factory('foo/bar');
+		$response = $request->create_response(FALSE);
+
+		$this->assertEquals($request->response(), NULL);
+		$this->assertEquals(($request->response($response) === $request), TRUE);
+		$this->assertEquals(($request->response() === $response), TRUE);
+	}
+
+	/**
+	 * Tests Request::method()
+	 *
+	 * @test
+	 */
+	public function test_method()
+	{
+		$request = Request::factory('foo/bar');
+
+		$this->assertEquals($request->method(), 'GET');
+		$this->assertEquals(($request->method('post') === $request), TRUE);
+		$this->assertEquals(($request->method() === 'POST'), TRUE);
+	}
+
+	/**
+	 * Tests Request::route()
+	 *
+	 * @test
+	 */
+	public function test_route()
+	{
+		$request = Request::factory(''); // This should always match something, no matter what changes people make
+
+		$this->assertInstanceOf('Route', $request->route());
+	}
+
+	/**
+	 * Tests Request::accept_type()
+	 *
+	 * @test
+	 * @covers Request::accept_type
+	 */
+	public function test_accept_type()
+	{
+		$this->assertEquals(array('*/*' => 1), Request::accept_type());
+	}
+
+	/**
+	 * Provides test data for Request::accept_lang()
+	 * @return array
+	 */
+	public function provider_accept_lang()
+	{
+		return array(
+			array('en-us', 1, array('_SERVER' => array('HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5'))),
+			array('en-us', 1, array('_SERVER' => array('HTTP_ACCEPT_LANGUAGE' => 'en-gb'))),
+			array('en-us', 1, array('_SERVER' => array('HTTP_ACCEPT_LANGUAGE' => 'sp-sp;q=0.5')))
+		);
+	}
+
+	/**
+	 * Tests Request::accept_lang()
+	 *
+	 * @test
+	 * @covers Request::accept_lang
+	 * @dataProvider provider_accept_lang
+	 * @param array $params Query string
+	 * @param string $expected Expected result
+	 * @param array $enviroment Set environment
+	 */
+	public function test_accept_lang($params, $expected, $enviroment)
+	{
+		$this->setEnvironment($enviroment);
+
+		$this->assertEquals(
+			$expected,
+			Request::accept_lang($params)
+		);
+	}
+
+	/**
+	 * Provides test data for Request::url()
+	 * @return array
+	 */
+	public function provider_url()
+	{
+		return array(
+			array(
+				'foo/bar',
+				array(),
+				'http',
+				TRUE,
+				'http://localhost/kohana/foo/bar'
+			),
+			array(
+				'foo',
+				array('action' => 'bar'),
+				'http',
+				TRUE,
+				'http://localhost/kohana/foo/bar'
+			),
+		);
+	}
+
+	/**
+	 * Tests Request::url()
+	 *
+	 * @test
+	 * @dataProvider provider_url
+	 * @covers Request::url
+	 * @param string $route the route to use
+	 * @param array $params params to pass to route::uri
+	 * @param string $protocol the protocol to use
+	 * @param array $expected The string we expect
+	 */
+	public function test_url($uri, $params, $protocol, $is_cli, $expected)
+	{
+		$this->setEnvironment(array(
+			'Kohana::$base_url'  => '/kohana/',
+			'_SERVER'            => array('HTTP_HOST' => 'localhost', 'argc' => $_SERVER['argc']),
+			'Kohana::$index_file' => FALSE,
+			'Kohana::$is_cli'    => $is_cli,
+		));
+
+		$this->assertEquals(Request::factory($uri)->url($params, $protocol), $expected);
+	}
+
+	/**
+	 * Tests that request caching works
+	 *
+	 * @return null
+	 */
+	public function test_cache()
+	{
+		/**
+		 * Sets up a mock cache object, asserts that:
+		 *
+		 *  1. The cache set() method gets called
+		 *  2. The cache get() method will return the response above when called
+		 */
+		$cache = $this->getMock('Cache_File', array('get', 'set'), array(), 'Cache');
+		$cache->expects($this->once())
+			->method('set');
+
+		$foo = Request::factory('', $cache);
+		$response = $foo->create_response(TRUE);
+
+		$response->headers('Cache-Control', 'max-age=100');
+		$foo->response($response);
+		$foo->execute();
+
+		/**
+		 * Set up a mock response object to test with
+		 */
+		$response = $this->getMock('Response');
+		$response->expects($this->any())
+			->method('body')
+			->will($this->returnValue('Foo'));
+
+		$cache->expects($this->any())
+			->method('get')
+			->will($this->returnValue($response));
+
+		$foo = Request::factory('', $cache)->execute();
+		$this->assertSame('Foo', $foo->body());
+	}
+
+	/**
+	 * Data provider for test_set_cache
+	 *
+	 * @return array
+	 */
+	public function provider_set_cache()
+	{
+		return array(
+			array(
+				array('cache-control' => 'no-cache'),
+				array('no-cache' => NULL),
+				FALSE,
+			),
+			array(
+				array('cache-control' => 'no-store'),
+				array('no-store' => NULL),
+				FALSE,
+			),
+			array(
+				array('cache-control' => 'max-age=100'),
+				array('max-age' => '100'),
+				TRUE
+			),
+			array(
+				array('cache-control' => 'private'),
+				array('private' => NULL),
+				FALSE
+			),
+			array(
+				array('cache-control' => 'private, max-age=100'),
+				array('private' => NULL, 'max-age' => '100'),
+				FALSE
+			),
+			array(
+				array('cache-control' => 'private, s-maxage=100'),
+				array('private' => NULL, 's-maxage' => '100'),
+				TRUE
+			),
+			array(
+				array(
+					'expires' => date('m/d/Y', strtotime('-1 day')),
+				),
+				array(),
+				FALSE
+			),
+			array(
+				array(
+					'expires' => date('m/d/Y', strtotime('+1 day')),
+				),
+				array(),
+				TRUE
+			),
+			array(
+				array(),
+				array(),
+				TRUE
+			),
+		);
+	}
+
+	/**
+	 * Tests the set_cache() method
+	 *
+	 * @test
+	 * @dataProvider provider_set_cache
+	 *
+	 * @return null
+	 */
+	public function test_set_cache($headers, $cache_control, $expected)
+	{
+		/**
+		 * Set up a mock response object to test with
+		 */
+		$response = $this->getMock('Response');
+		$response->expects($this->any())
+			->method('parse_cache_control')
+			->will($this->returnValue($cache_control));
+		$response->expects($this->any())
+			->method('headers')
+			->will($this->returnValue($headers));
+
+		$request = new Request_Client_Internal;
+		$this->assertEquals($request->set_cache($response), $expected);
+	}
+
+	/**
+	 * Data provider for test_set_protocol() test
+	 *
+	 * @return array
+	 */
+	public function provider_set_protocol()
+	{
+		return array(
+			array(
+				'http',
+				'http',
+			),
+			array(
+				'FTP',
+				'ftp',
+			),
+			array(
+				'hTTps',
+				'https',
+			),
+		);
+	}
+
+	/**
+	 * Tests the protocol() method
+	 *
+	 * @dataProvider provider_set_protocol
+	 *
+	 * @return null
+	 */
+	public function test_set_protocol($protocol, $expected)
+	{
+		$request = Request::factory();
+
+		// Set the supplied protocol
+		$result = $request->protocol($protocol);
+
+		// Test the set value
+		$this->assertSame($request->protocol(), $expected);
+
+		// Test the return value
+		$this->assertTrue($request instanceof $result);
+	}
+
+	/**
+	 * Provides data for test_post_max_size_exceeded()
+	 * 
+	 * @return  array
+	 */
+	public function provider_post_max_size_exceeded()
+	{
+		// Get the post max size
+		$post_max_size = Num::bytes(ini_get('post_max_size'));
+
+		return array(
+			array(
+				$post_max_size+200000,
+				TRUE
+			),
+			array(
+				$post_max_size-20,
+				FALSE
+			),
+			array(
+				$post_max_size,
+				FALSE
+			)
+		);
+	}
+
+	/**
+	 * Tests the post_max_size_exceeded() method
+	 * 
+	 * @dataProvider provider_post_max_size_exceeded
+	 *
+	 * @param   int      content_length 
+	 * @param   bool     expected 
+	 * @return  void
+	 */
+	public function test_post_max_size_exceeded($content_length, $expected)
+	{
+		// Ensure the request method is set to POST
+		Request::$initial->method(HTTP_Request::POST);
+
+		// Set the content length
+		$_SERVER['CONTENT_LENGTH'] = $content_length;
+
+		// Test the post_max_size_exceeded() method
+		$this->assertSame(Request::post_max_size_exceeded(), $expected);
+	}
+
+	/**
+	 * Provides data for test_uri_only_trimed_on_internal()
+	 *
+	 * @return  array
+	 */
+	public function provider_uri_only_trimed_on_internal()
+	{
+		$old_request = Request::$initial;
+		Request::$initial = new Request('foo/bar');
+
+		$result = array(
+			array(
+				new Request('http://www.google.com'),
+				'http://www.google.com'
+			),
+			array(
+				new Request('http://www.google.com/'),
+				'http://www.google.com/'
+			),
+			array(
+				new Request('foo/bar/'),
+				'foo/bar'
+			),
+			array(
+				new Request('foo/bar'),
+				'foo/bar'
+			)
+		);
+
+		Request::$initial = $old_request;
+		return $result;
+	}
+
+	/**
+	 * Tests that the uri supplied to Request is only trimed
+	 * for internal requests.
+	 * 
+	 * @dataProvider provider_uri_only_trimed_on_internal
+	 *
+	 * @return void
+	 */
+	public function test_uri_only_trimed_on_internal(Request $request, $expected)
+	{
+		$this->assertSame($request->uri(), $expected);
+	}
+
+	/**
+	 * Data provider for test_options_set_to_external_client()
+	 *
+	 * @return  array
+	 */
+	public function provider_options_set_to_external_client()
+	{
+		$provider = array(
+			array(
+				array(
+					CURLOPT_PROXYPORT   => 8080,
+					CURLOPT_PROXYTYPE   => CURLPROXY_HTTP,
+					CURLOPT_VERBOSE     => TRUE
+				),
+				array(
+					CURLOPT_PROXYPORT   => 8080,
+					CURLOPT_PROXYTYPE   => CURLPROXY_HTTP,
+					CURLOPT_VERBOSE     => TRUE
+				)
+			)
+		);
+
+		if (extension_loaded('http'))
+		{
+			$provider[] = array(
+				array(
+					'proxyhost'         => 'http://localhost:8080',
+					'proxytype'         => HTTP_PROXY_HTTP,
+					'redirect'          => 2
+				),
+				array(
+					'proxyhost'         => 'http://localhost:8080',
+					'proxytype'         => HTTP_PROXY_HTTP,
+					'redirect'          => 2
+				)
+			);
+		}
+
+		return $provider;
+	}
+
+	/**
+	 * Test for Request_Client_External::options() to ensure options
+	 * can be set to the external client (for cURL and PECL_HTTP)
+	 *
+	 * @dataProvider provider_options_set_to_external_client
+	 * 
+	 * @param   array    settings 
+	 * @param   array    expected 
+	 * @return void
+	 */
+	public function test_options_set_to_external_client($settings, $expected)
+	{
+		$request = Request::factory('http://www.kohanaframework.org');
+		$request_client = $request->get_client();
+
+		// Test for empty array
+		$this->assertSame($request_client->options(), array());
+
+		// Test that set works as expected
+		$this->assertSame($request_client->options($settings), $request_client);
+
+		// Test that each setting is present and returned
+		foreach ($expected as $key => $value)
+		{
+			$this->assertSame($request_client->options($key), $value);
+		}
+	}
+
+	/**
+	 * Provides data for test_headers_get()
+	 *
+	 * @return  array
+	 */
+	public function provider_headers_get()
+	{
+		$x_powered_by = 'Kohana Unit Test';
+		$content_type = 'application/x-www-form-urlencoded';
+
+		return array(
+			array(
+				$request = Request::factory('foo/bar')
+					->headers(array(
+						'x-powered-by' => $x_powered_by,
+						'content-type' => $content_type
+					)
+				),
+			array(
+				'x-powered-by' => $x_powered_by,
+				'content-type' => $content_type
+				)
+			)
+		);
+	}
+
+	/**
+	 * Tests getting headers from the Request object
+	 * 
+	 * @dataProvider provider_headers_get
+	 *
+	 * @param   Request  request to test
+	 * @param   array    headers to test against
+	 * @return  void
+	 */
+	public function test_headers_get($request, $headers)
+	{
+		foreach ($headers as $key => $expected_value)
+		{
+			$this->assertSame((string) $request->headers($key), $expected_value);
+		}
+	}
+
+	/**
+	 * Provides data for test_headers_set
+	 *
+	 * @return  array
+	 */
+	public function provider_headers_set()
+	{
+		return array(
+			array(
+				new Request('foo/bar'),
+				array(
+					'content-type'  => 'application/x-www-form-urlencoded',
+					'x-test-header' => 'foo'
+				),
+				"content-type: application/x-www-form-urlencoded\r\nx-test-header: foo\r\n\n"
+			),
+			array(
+				new Request('foo/bar'),
+				array(
+					'content-type'  => 'application/json',
+					'x-powered-by'  => 'kohana'
+				),
+				"content-type: application/json\r\nx-powered-by: kohana\r\n\n"
+			)
+		);
+	}
+
+	/**
+	 * Tests the setting of headers to the request object
+	 * 
+	 * @dataProvider provider_headers_set
+	 *
+	 * @param   Request    request object
+	 * @param   array      header(s) to set to the request object
+	 * @param   string     expected http header
+	 * @return  void
+	 */
+	public function test_headers_set(Request $request, $headers, $expected)
+	{
+		$request->headers($headers);
+		$this->assertSame($expected, (string) $request->headers());
+	}
+
+	/**
+	 * Provides test data for test_query_parameter_parsing()
+	 *
+	 * @return  array
+	 */
+	public function provider_query_parameter_parsing()
+	{
+		return array(
+			array(
+				new Request('foo/bar'),
+				array(
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+				array(
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+			),
+			array(
+				new Request('foo/bar?john=wayne&peggy=sue'),
+				array(
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+				array(
+					'john'  => 'wayne',
+					'peggy' => 'sue',
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+			),
+			array(
+				new Request('http://host.tld/foo/bar?john=wayne&peggy=sue'),
+				array(
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+				array(
+					'john'  => 'wayne',
+					'peggy' => 'sue',
+					'foo'   => 'bar',
+					'sna'   => 'fu'
+				),
+			),
+		);
+	}
+
+	/**
+	 * Tests that query parameters are parsed correctly
+	 * 
+	 * @dataProvider provider_query_parameter_parsing
+	 *
+	 * @param   Request   request 
+	 * @param   array     query 
+	 * @param   array    expected 
+	 * @return  void
+	 */
+	public function test_query_parameter_parsing(Request $request, $query, $expected)
+	{
+		foreach ($query as $key => $value)
+		{
+			$request->query($key, $value);
+		}
+
+		$this->assertSame($expected, $request->query());
+	}
+
+	/**
+	 * Provider for test_uri_without_query_parameters
+	 *
+	 * @return  array
+	 */
+	public function provider_uri_without_query_parameters()
+	{
+		return array(
+			array(
+				new Request('foo/bar?foo=bar&bar=foo'),
+				array(),
+				'foo/bar'
+			),
+			array(
+				new Request('foo/bar'),
+				array('bar' => 'foo', 'foo' => 'bar'),
+				'foo/bar'
+			),
+			array(
+				new Request('foo/bar'),
+				array(),
+				'foo/bar'
+			)
+		);
+	}
+
+	/**
+	 * Tests that the [Request::uri()] method does not return
+	 * query parameters
+	 *
+	 * @dataProvider provider_uri_without_query_parameters
+	 * 
+	 * @param   Request   request 
+	 * @param   array     query 
+	 * @param   string    expected 
+	 * @return  void
+	 */
+	public function test_uri_without_query_parameters(Request $request, $query, $expected)
+	{
+		$request->query($query);
+
+		$this->assertSame($expected, $request->uri());
+	}
+} // End Kohana_RequestTest
\ No newline at end of file
diff --git a/includes/kohana/system/tests/kohana/ResponseTest.php b/includes/kohana/system/tests/kohana/ResponseTest.php
new file mode 100644
index 0000000..36c39ee
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ResponseTest.php
@@ -0,0 +1,244 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Unit tests for response class
+ *
+ * @group kohana
+ * @group kohana.response
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ResponseTest extends Unittest_TestCase
+{
+	/**
+	 * Ensures that Kohana::$expose adds the x-powered-by header and
+	 * makes sure it's set to the correct Kohana Framework string
+	 *
+	 * @test
+	 */
+	public function test_expose()
+	{
+		Kohana::$expose = TRUE;
+		$response = new Response;
+		$headers = $response->send_headers()->headers();
+		$this->assertArrayHasKey('x-powered-by', (array) $headers);
+
+		if (isset($headers['x-powered-by']))
+		{
+			$this->assertSame($headers['x-powered-by']->value, 'Kohana Framework '.Kohana::VERSION.' ('.Kohana::CODENAME.')');
+		}
+
+		Kohana::$expose = FALSE;
+		$response = new Response;
+		$headers = $response->send_headers()->headers();
+		$this->assertArrayNotHasKey('x-powered-by', (array) $headers);
+	}
+
+	/**
+	 * Provider for test_body
+	 *
+	 * @return array
+	 */
+	public function provider_body()
+	{
+		$view = $this->getMock('View');
+		$view->expects($this->any())
+			->method('__toString')
+			->will($this->returnValue('foo'));
+
+		return array(
+			array('unit test', 'unit test'),
+			array($view, 'foo'),
+		);
+	}
+
+	/**
+	 * Tests that we can set and read a body of a response
+	 * 
+	 * @test
+	 * @dataProvider provider_body
+	 *
+	 * @return null
+	 */
+	public function test_body($source, $expected)
+	{
+		$response = new Response;
+		$response->body($source);
+		$this->assertSame($response->body(), $expected);
+
+		$response = (string) $response;
+		$this->assertSame($response, $expected);
+	}
+
+	/**
+	 * Provides data for test_body_string_zero()
+	 *
+	 * @return array
+	 */
+	public function provider_body_string_zero()
+	{
+		return array(
+			array('0', '0'),
+			array("0", '0'),
+			array(0, '0')
+		);
+	}
+
+	/**
+	 * Test that Response::body() handles numerics correctly
+	 *
+	 * @test
+	 * @dataProvider provider_body_string_zero
+	 * @param string $string 
+	 * @param string $expected 
+	 * @return void
+	 */
+	public function test_body_string_zero($string, $expected)
+	{
+		$response = new Response;
+		$response->body($string);
+
+		$this->assertSame($expected, $response->body());
+	}
+
+	/**
+	 * provider for test_cookie_set()
+	 *
+	 * @return array
+	 */
+	public function provider_cookie_set()
+	{
+		return array(
+			array(
+				'test1',
+				'foo',
+				array(
+					'test1' => array(
+						'value' => 'foo',
+						'expiration' => Cookie::$expiration
+					),
+				)
+			),
+			array(
+				array(
+					'test2' => 'stfu',
+					'test3' => array(
+						'value' => 'snafu',
+						'expiration' => 123456789
+					)
+				),
+				NULL,
+				array(
+					'test2' => array(
+						'value' => 'stfu',
+						'expiration' => Cookie::$expiration
+					),
+					'test3' => array(
+						'value' => 'snafu',
+						'expiration' => 123456789
+					)
+				)
+			)
+		);
+	}
+
+	/**
+	 * Tests the Response::cookie() method, ensures
+	 * correct values are set, including defaults
+	 *
+	 * @test
+	 * @dataProvider provider_cookie_set
+	 * @param string $key 
+	 * @param string $value 
+	 * @param string $expected 
+	 * @return void
+	 */
+	public function test_cookie_set($key, $value, $expected)
+	{
+		// Setup the Response and apply cookie
+		$response = new Response;
+		$response->cookie($key, $value);
+
+		foreach ($expected as $_key => $_value)
+		{
+			$cookie = $response->cookie($_key);
+
+			$this->assertSame($_value['value'], $cookie['value']);
+			$this->assertSame($_value['expiration'], $cookie['expiration']);
+		}
+	}
+
+	/**
+	 * Tests the Response::cookie() get functionality
+	 *
+	 * @return void
+	 */
+	public function test_cookie_get()
+	{
+		$response = new Response;
+
+		// Test for empty cookies
+		$this->assertSame(array(), $response->cookie());
+
+		// Test for no specific cookie
+		$this->assertNull($response->cookie('foobar'));
+
+		$response->cookie('foo', 'bar');
+		$cookie = $response->cookie('foo');
+
+		$this->assertSame('bar', $cookie['value']);
+		$this->assertSame(Cookie::$expiration, $cookie['expiration']);
+	}
+
+	/**
+	 * Tests that the headers are not sent by PHP in CLI mode
+	 *
+	 * @return void
+	 */
+	public function test_send_headers_cli()
+	{
+		if (Kohana::$is_cli)
+		{
+			$content_type = 'application/json';
+			$response = new Response;
+			$response->headers('content-type', $content_type)
+				->send_headers();
+
+			$this->assertFalse(headers_sent());
+		}
+		else
+		{
+			$this->markTestSkipped('Unable to perform test outside of CLI mode');
+		}
+	}
+
+	/**
+	 * Test the content type is sent when set
+	 * 
+	 * @test
+	 */
+	public function test_content_type_when_set()
+	{
+		$content_type = 'application/json';
+		$response = new Response;
+		$response->headers('content-type', $content_type);
+		$headers  = $response->send_headers()->headers();
+		$this->assertSame($content_type, (string) $headers['content-type']);
+	}
+
+	/**
+	 * Tests that the default content type is sent if not set
+	 * 
+	 * @test
+	 */
+	public function test_default_content_type_when_not_set()
+	{
+		$response = new Response;
+		$headers = $response->send_headers()->headers();
+		$this->assertSame(Kohana::$content_type.'; charset='.Kohana::$charset, (string) $headers['content-type']);
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/system/tests/kohana/RouteTest.php b/includes/kohana/system/tests/kohana/RouteTest.php
new file mode 100644
index 0000000..348b412
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/RouteTest.php
@@ -0,0 +1,715 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Description of RouteTest
+ *
+ * @group kohana
+ * @group kohana.route
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+
+include Kohana::find_file('tests', 'test_data/callback_routes');
+
+class Kohana_RouteTest extends Unittest_TestCase
+{
+	/**
+	 * Remove all caches
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->cleanCacheDir();
+	}
+
+	/**
+	 * Removes cache files created during tests
+	 */
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		$this->cleanCacheDir();
+	}
+
+	/**
+	 * If Route::get() is asked for a route that does not exist then
+	 * it should throw a Kohana_Exception
+	 *
+	 * Note use of @expectedException
+	 *
+	 * @test
+	 * @covers Route::get
+	 * @expectedException Kohana_Exception
+	 */
+	public function test_get_throws_exception_if_route_dnx()
+	{
+		Route::get('HAHAHAHAHAHAHAHAHA');
+	}
+
+	/**
+	 * Route::all() should return all routes defined via Route::set()
+	 * and not through new Route()
+	 *
+	 * @test
+	 * @covers Route::all
+	 */
+	public function test_all_returns_all_defined_routes()
+	{
+		$defined_routes = self::readAttribute('Route', '_routes');
+
+		$this->assertSame($defined_routes, Route::all());
+	}
+
+	/**
+	 * Route::name() should fetch the name of a passed route
+	 * If route is not found then it should return FALSE
+	 *
+	 * @TODO: This test needs to segregate the Route::$_routes singleton
+	 * @test
+	 * @covers Route::name
+	 */
+	public function test_name_returns_routes_name_or_false_if_dnx()
+	{
+		$route = Route::set('flamingo_people', 'flamingo/dance');
+
+		$this->assertSame('flamingo_people', Route::name($route));
+
+		$route = new Route('dance/dance');
+
+		$this->assertFalse(Route::name($route));
+	}
+
+	/**
+	 * If Route::cache() was able to restore routes from the cache then
+	 * it should return TRUE and load the cached routes
+	 *
+	 * @test
+	 * @covers Route::cache
+	 */
+	public function test_cache_stores_route_objects()
+	{
+		$routes = Route::all();
+
+		// First we create the cache
+		Route::cache(TRUE);
+
+		// Now lets modify the "current" routes
+		Route::set('nonsensical_route', 'flabbadaga/ding_dong');
+
+		// Then try and load said cache
+		$this->assertTrue(Route::cache());
+
+		// Check the route cache flag
+		$this->assertTrue(Route::$cache);
+
+		// And if all went ok the nonsensical route should be gone...
+		$this->assertEquals($routes, Route::all());
+	}
+
+	/**
+	 * Route::cache() should return FALSE if cached routes could not be found
+	 *
+	 * The cache is cleared before and after each test in setUp tearDown
+	 * by cleanCacheDir()
+	 *
+	 * @test
+	 * @covers Route::cache
+	 */
+	public function test_cache_returns_false_if_cache_dnx()
+	{
+		$this->assertSame(FALSE, Route::cache(), 'Route cache was not empty');
+
+		// Check the route cache flag
+		$this->assertFalse(Route::$cache);
+	}
+
+	/**
+	 * If the constructor is passed a NULL uri then it should assume it's
+	 * being loaded from the cache & therefore shouldn't override the cached attributes
+	 *
+	 * @test
+	 * @covers Route::__construct
+	 */
+	public function test_constructor_returns_if_uri_is_null()
+	{
+		// We use a mock object to make sure that the route wasn't recompiled
+		$route = $this->getMock('Route', array('_compile'), array(), '', FALSE);
+
+		$route
+			->expects($this->never())
+			->method('_compile');
+
+		$route->__construct(NULL,NULL);
+
+		$this->assertAttributeSame('', '_uri', $route);
+		$this->assertAttributeSame(array(), '_regex', $route);
+		$this->assertAttributeSame(array('action' => 'index', 'host' => FALSE), '_defaults', $route);
+		$this->assertAttributeSame(NULL, '_route_regex', $route);
+	}
+
+	/**
+	 * Provider for test_constructor_only_changes_custom_regex_if_passed
+	 *
+	 * @return array
+	 */
+	public function provider_constructor_only_changes_custom_regex_if_passed()
+	{
+		return array(
+			array('<controller>/<action>', '<controller>/<action>'),
+			array(array('Route_Holder', 'default_callback'), array('Route_Holder', 'default_callback')),
+		);
+	}
+
+	/**
+	 * The constructor should only use custom regex if passed a non-empty array
+	 *
+	 * Technically we can't "test" this as the default regex is an empty array, this
+	 * is purely for improving test coverage
+	 *
+	 * @dataProvider provider_constructor_only_changes_custom_regex_if_passed
+	 *
+	 * @test
+	 * @covers Route::__construct
+	 */
+	public function test_constructor_only_changes_custom_regex_if_passed($uri, $uri2)
+	{
+		$route = new Route($uri, array());
+
+		$this->assertAttributeSame(array(), '_regex', $route);
+
+		$route = new Route($uri2, NULL);
+
+		$this->assertAttributeSame(array(), '_regex', $route);
+	}
+
+	/**
+	 * When we pass custom regex to the route's constructor it should it
+	 * in leu of the default. This does not apply to callback/lambda routes
+	 *
+	 * @test
+	 * @covers Route::__construct
+	 * @covers Route::compile
+	 */
+	public function test_route_uses_custom_regex_passed_to_constructor()
+	{
+		$regex = array('id' => '[0-9]{1,2}');
+
+		$route = new Route('<controller>(/<action>(/<id>))', $regex);
+
+		$this->assertAttributeSame($regex, '_regex', $route);
+		$this->assertAttributeContains(
+			$regex['id'],
+			'_route_regex',
+			$route
+		);
+	}
+
+	/**
+	 * Provider for test_matches_returns_false_on_failure
+	 *
+	 * @return array
+	 */
+	public function provider_matches_returns_false_on_failure()
+	{
+		return array(
+			array('projects/(<project_id>/(<controller>(/<action>(/<id>))))', 'apple/pie'),
+			array(array('Route_Holder', 'default_callback'), 'apple/pie'),
+		);
+	}
+
+	/**
+	 * Route::matches() should return false if the route doesn't match against a uri
+	 *
+	 * @dataProvider provider_matches_returns_false_on_failure
+	 *
+	 * @test
+	 * @covers Route::matches
+	 */
+	public function test_matches_returns_false_on_failure($uri, $match)
+	{
+		$route = new Route($uri);
+
+		$this->assertSame(FALSE, $route->matches($match));
+	}
+
+	/**
+	 * Provider for test_matches_returns_array_of_parameters_on_successful_match
+	 *
+	 * @return array
+	 */
+	public function provider_matches_returns_array_of_parameters_on_successful_match()
+	{
+		return array(
+			array(
+				'(<controller>(/<action>(/<id>)))',
+				'welcome/index',
+				'welcome',
+				'index',
+			),
+			array(
+				array('Route_Holder', 'matches_returns_array_of_parameters_on_successful_match'),
+				'apple/pie',
+				'welcome',
+				'index',
+			),
+		);
+	}
+
+	/**
+	 * Route::matches() should return an array of parameters when a match is made
+	 * An parameters that are not matched should not be present in the array of matches
+	 *
+	 * @dataProvider provider_matches_returns_array_of_parameters_on_successful_match
+	 *
+	 * @test
+	 * @covers Route::matches
+	 */
+	public function test_matches_returns_array_of_parameters_on_successful_match($uri, $m, $c, $a)
+	{
+		$route = new Route($uri);
+
+		$matches = $route->matches($m);
+
+		$this->assertInternalType('array', $matches);
+		$this->assertArrayHasKey('controller', $matches);
+		$this->assertArrayHasKey('action', $matches);
+		$this->assertArrayNotHasKey('id', $matches);
+		// $this->assertSame(5, count($matches));
+		$this->assertSame($c, $matches['controller']);
+		$this->assertSame($a, $matches['action']);
+	}
+
+	/**
+	 * Provider for test_matches_returns_array_of_parameters_on_successful_match
+	 *
+	 * @return array
+	 */
+	public function provider_defaults_are_used_if_params_arent_specified()
+	{
+		return array(
+			array(
+				'<controller>(/<action>(/<id>))',
+				NULL,
+				array('controller' => 'welcome', 'action' => 'index'),
+				'welcome',
+				'index',
+				'unit/test/1',
+				array(
+					'controller' => 'unit',
+					'action' => 'test',
+					'id' => '1'
+				),
+				'welcome',
+			),
+			array(
+				'(<controller>(/<action>(/<id>)))',
+				NULL,
+				array('controller' => 'welcome', 'action' => 'index'),
+				'welcome',
+				'index',
+				'unit/test/1',
+				array(
+					'controller' => 'unit',
+					'action' => 'test',
+					'id' => '1'
+				),
+				'',
+			),
+			array(
+				array('Route_Holder', 'default_return_callback'),
+				'(<controller>(/<action>(/<id>)))',
+				array('controller' => 'welcome', 'action' => 'index'),
+				'welcome',
+				'index',
+				'unit/test/1',
+				array(
+					'controller' => 'unit',
+					'action' => 'test',
+					'id' => '1'
+				),
+				'',
+			),
+		);
+	}
+
+	/**
+	 * Defaults specified with defaults() should be used if their values aren't
+	 * present in the uri
+	 *
+	 * @dataProvider provider_defaults_are_used_if_params_arent_specified
+	 *
+	 * @test
+	 * @covers Route::matches
+	 */
+	public function test_defaults_are_used_if_params_arent_specified($uri, $regex, $defaults, $c, $a, $test_uri, $test_uri_array, $default_uri)
+	{
+		$route = new Route($uri, $regex);
+		$route->defaults($defaults);
+
+		$matches = $route->matches($default_uri);
+
+		$this->assertInternalType('array', $matches);
+		$this->assertArrayHasKey('controller', $matches);
+		$this->assertArrayHasKey('action', $matches);
+		$this->assertArrayNotHasKey('id', $matches);
+		// $this->assertSame(4, count($matches));
+		$this->assertSame($c, $matches['controller']);
+		$this->assertSame($a, $matches['action']);
+		$this->assertSame($test_uri, $route->uri($test_uri_array));
+		$this->assertSame($default_uri, $route->uri());
+	}
+
+	/**
+	 * Provider for test_required_parameters_are_needed
+	 *
+	 * @return array
+	 */
+	public function provider_required_parameters_are_needed()
+	{
+		return array(
+			array(
+				'admin(/<controller>(/<action>(/<id>)))',
+				'admin',
+				'admin/users/add',
+			),
+			array(
+				array('Route_Holder', 'required_parameters_are_needed'),
+				'admin',
+				'admin/users/add',
+			),
+		);
+	}
+
+	/**
+	 * This tests that routes with required parameters will not match uris without them present
+	 *
+	 * @dataProvider provider_required_parameters_are_needed
+	 *
+	 * @test
+	 * @covers Route::matches
+	 */
+	public function test_required_parameters_are_needed($uri, $matches_route1, $matches_route2)
+	{
+		$route = new Route($uri);
+
+		$this->assertFalse($route->matches(''));
+
+		$matches = $route->matches($matches_route1);
+
+		$this->assertInternalType('array', $matches);
+
+		$matches = $route->matches($matches_route2);
+
+		$this->assertInternalType('array', $matches);
+		// $this->assertSame(5, count($matches));
+		$this->assertArrayHasKey('controller', $matches);
+		$this->assertArrayHasKey('action', $matches);
+	}
+
+	/**
+	 * Provider for test_required_parameters_are_needed
+	 *
+	 * @return array
+	 */
+	public function provider_reverse_routing_returns_routes_uri_if_route_is_static()
+	{
+		return array(
+			array(
+				'info/about_us',
+				NULL,
+				'info/about_us',
+				array('some' => 'random', 'params' => 'to confuse'),
+			),
+			array(
+				array('Route_Holder', 'reverse_routing_returns_routes_uri_if_route_is_static'),
+				'info/about_us',
+				'info/about_us',
+				array('some' => 'random', 'params' => 'to confuse'),
+			),
+		);
+	}
+
+	/**
+	 * This tests the reverse routing returns the uri specified in the route
+	 * if it's a static route
+	 *
+	 * A static route is a route without any parameters
+	 *
+	 * @dataProvider provider_reverse_routing_returns_routes_uri_if_route_is_static
+	 *
+	 * @test
+	 * @covers Route::uri
+	 */
+	public function test_reverse_routing_returns_routes_uri_if_route_is_static($uri, $regex, $target_uri, $uri_params)
+	{
+		$route = new Route($uri, $regex);
+
+		$this->assertSame($target_uri, $route->uri($uri_params));
+	}
+
+	/**
+	 * Provider for test_uri_throws_exception_if_required_params_are_missing
+	 *
+	 * @return array
+	 */
+	public function provider_uri_throws_exception_if_required_params_are_missing()
+	{
+		return array(
+			array(
+				'<controller>(/<action)',
+				NULL,
+				array('action' => 'awesome-action'),
+			),
+			array(
+				array('Route_Holder', 'default_return_callback'),
+				'<controller>(/<action)',
+				array('action' => 'awesome-action'),
+			),
+		);
+	}
+
+	/**
+	 * When Route::uri is working on a uri that requires certain parameters to be present
+	 * (i.e. <controller> in '<controller(/<action)') then it should throw an exception
+	 * if the param was not provided
+	 *
+	 * @dataProvider provider_uri_throws_exception_if_required_params_are_missing
+	 *
+	 * @test
+	 * @covers Route::uri
+	 */
+	public function test_uri_throws_exception_if_required_params_are_missing($uri, $regex, $uri_array)
+	{
+		$route = new Route($uri, $regex);
+
+		try
+		{
+			$route->uri($uri_array);
+
+			$this->fail('Route::uri should throw exception if required param is not provided');
+		}
+		catch(Exception $e)
+		{
+			$this->assertInstanceOf('Kohana_Exception', $e);
+			// Check that the error in question is about the controller param
+			$this->assertContains('controller', $e->getMessage());
+		}
+	}
+
+	/**
+	 * Provider for test_uri_fills_required_uri_segments_from_params
+	 *
+	 * @return array
+	 */
+	public function provider_uri_fills_required_uri_segments_from_params()
+	{
+		return array(
+			array(
+				'<controller>/<action>(/<id>)',
+				NULL,
+				'users/edit',
+				array(
+					'controller' => 'users',
+					'action'     => 'edit',
+				),
+				'users/edit/god',
+				array(
+					'controller' => 'users',
+					'action'     => 'edit',
+					'id'         => 'god',
+				),
+			),
+			array(
+				array('Route_Holder', 'default_return_callback'),
+				'<controller>/<action>(/<id>)',
+				'users/edit',
+				array(
+					'controller' => 'users',
+					'action'     => 'edit',
+				),
+				'users/edit/god',
+				array(
+					'controller' => 'users',
+					'action'     => 'edit',
+					'id'         => 'god',
+				),
+			),
+		);
+	}
+
+	/**
+	 * The logic for replacing required segments is separate (but similar) to that for
+	 * replacing optional segments.
+	 *
+	 * This test asserts that Route::uri will replace required segments with provided
+	 * params
+	 *
+	 * @dataProvider provider_uri_fills_required_uri_segments_from_params
+	 *
+	 * @test
+	 * @covers Route::uri
+	 */
+	public function test_uri_fills_required_uri_segments_from_params($uri, $regex, $uri_string1, $uri_array1, $uri_string2, $uri_array2)
+	{
+		$route = new Route($uri, $regex);
+
+		$this->assertSame(
+			$uri_string1,
+			$route->uri($uri_array1)
+		);
+
+		$this->assertSame(
+			$uri_string2,
+			$route->uri($uri_array2)
+		);
+	}
+
+	/**
+	 * Provides test data for test_composing_url_from_route()
+	 * @return array
+	 */
+	public function provider_composing_url_from_route()
+	{
+		return array(
+			array('/'),
+			array('/news/view/42', array('controller' => 'news', 'action' => 'view', 'id' => 42)),
+			array('http://kohanaframework.org/news', array('controller' => 'news'), 'http')
+		);
+	}
+
+	/**
+	 * Tests Route::url()
+	 *
+	 * Checks the url composing from specific route via Route::url() shortcut
+	 *
+	 * @test
+	 * @dataProvider provider_composing_url_from_route
+	 * @param string $expected
+	 * @param array $params
+	 * @param boolean $protocol
+	 */
+	public function test_composing_url_from_route($expected, $params = NULL, $protocol = NULL)
+	{
+		Route::set('foobar', '(<controller>(/<action>(/<id>)))')
+			->defaults(array(
+				'controller' => 'welcome',
+			)
+		);
+
+		$this->setEnvironment(array(
+			'_SERVER' => array('HTTP_HOST' => 'kohanaframework.org'),
+			'Kohana::$base_url' => '/',
+			'Kohana::$index_file' => '',
+		));
+
+		$this->assertSame($expected, Route::url('foobar', $params, $protocol));
+	}
+
+	/**
+	 * Tests Route::compile()
+	 *
+	 * Makes sure that compile will use custom regex if specified
+	 *
+	 * @test
+	 * @covers Route::compile
+	 */
+	public function test_compile_uses_custom_regex_if_specificed()
+	{
+		$compiled = Route::compile(
+			'<controller>(/<action>(/<id>))',
+			array(
+				'controller' => '[a-z]+',
+				'id' => '\d+',
+			)
+		);
+
+		$this->assertSame('#^(?P<controller>[a-z]+)(?:/(?P<action>[^/.,;?\n]++)(?:/(?P<id>\d+))?)?$#uD', $compiled);
+	}
+
+	/**
+	 * Tests Route::is_external(), ensuring the host can return
+	 * whether internal or external host
+	 */
+	public function test_is_external_route_from_host()
+	{
+		// Setup local route
+		Route::set('internal', 'local/test/route')
+			->defaults(array(
+				'controller' => 'foo',
+				'action'     => 'bar'
+				)
+			);
+
+		// Setup external route
+		Route::set('external', 'local/test/route')
+			->defaults(array(
+				'controller' => 'foo',
+				'action'     => 'bar',
+				'host'       => 'http://kohanaframework.org'
+				)
+			);
+
+		// Test internal route
+		$this->assertFalse(Route::get('internal')->is_external());
+
+		// Test external route
+		$this->assertTrue(Route::get('external')->is_external());
+	}
+
+	/**
+	 * Provider for test_external_route_includes_params_in_uri
+	 *
+	 * @return array
+	 */
+	public function provider_external_route_includes_params_in_uri()
+	{
+		return array(
+			array(
+				'<controller>/<action>',
+				array(
+					'controller'  => 'foo',
+					'action'      => 'bar',
+					'host'        => 'kohanaframework.org'
+				),
+				'http://kohanaframework.org/foo/bar'
+			),
+			array(
+				'<controller>/<action>',
+				array(
+					'controller'  => 'foo',
+					'action'      => 'bar',
+					'host'        => 'http://kohanaframework.org'
+				),
+				'http://kohanaframework.org/foo/bar'
+			),
+			array(
+				'foo/bar',
+				array(
+					'controller'  => 'foo',
+					'host'        => 'http://kohanaframework.org'
+				),
+				'http://kohanaframework.org/foo/bar'
+			),
+		);
+	}
+
+	/**
+	 * Tests the external route include route parameters
+	 *
+	 * @dataProvider provider_external_route_includes_params_in_uri
+	 */
+	public function test_external_route_includes_params_in_uri($route, $defaults, $expected_uri)
+	{
+		Route::set('test', $route)
+			->defaults($defaults);
+
+		$this->assertSame($expected_uri, Route::get('test')->uri());
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/SecurityTest.php b/includes/kohana/system/tests/kohana/SecurityTest.php
new file mode 100644
index 0000000..4194f98
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/SecurityTest.php
@@ -0,0 +1,93 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana_Security
+ *
+ * @group kohana
+ * @group kohana.security
+ *
+ * @package    Kohana
+ * @category   Tests
+ */
+
+class Kohana_SecurityTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_envode_php_tags()
+	 *
+	 * @return array Test data sets
+	 */
+	public function provider_encode_php_tags()
+	{
+		return array(
+			array("&lt;?php echo 'helloo'; ?&gt;", "<?php echo 'helloo'; ?>"),
+		);
+	}
+
+	/**
+	 * Tests Security::encode_php_tags()
+	 *
+	 * @test
+	 * @dataProvider provider_encode_php_tags
+	 * @covers Security::encode_php_tags
+	 */
+	public function test_encode_php_tags($expected, $input)
+	{
+		$this->assertSame($expected, Security::encode_php_tags($input));
+	}
+
+	/**
+	 * Provides test data for test_strip_image_tags()
+	 *
+	 * @return array Test data sets
+	 */
+	public function provider_strip_image_tags()
+	{
+		return array(
+			array('foo', '<img src="foo" />'),
+		);
+	}
+
+	/**
+	 * Tests Security::strip_image_tags()
+	 *
+	 * @test
+	 * @dataProvider provider_strip_image_tags
+	 * @covers Security::strip_image_tags
+	 */
+	public function test_strip_image_tags($expected, $input)
+	{
+		$this->assertSame($expected, Security::strip_image_tags($input));
+	}
+
+	/**
+	 * Provides test data for Security::token()
+	 *
+	 * @return array Test data sets
+	 */
+	public function provider_csrf_token()
+	{
+		$array = array();
+		for ($i = 0; $i <= 4; $i++)
+		{
+			Security::$token_name = 'token_'.$i;
+			$array[] = array(Security::token(TRUE), Security::check(Security::token(FALSE)), $i);
+		}
+		return $array;
+	}
+
+	/**
+	 * Tests Security::token()
+	 *
+	 * @test
+	 * @dataProvider provider_csrf_token
+	 * @covers Security::token
+	 */
+	public function test_csrf_token($expected, $input, $iteration)
+	{
+		Security::$token_name = 'token_'.$iteration;
+		$this->assertSame(TRUE, $input);
+		$this->assertSame($expected, Security::token(FALSE));
+		Session::instance()->delete(Security::$token_name);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/SessionTest.php b/includes/kohana/system/tests/kohana/SessionTest.php
new file mode 100644
index 0000000..bc6e0b0
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/SessionTest.php
@@ -0,0 +1,499 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the session class
+ *
+ * @group kohana
+ * @group kohana.session
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_SessionTest extends Unittest_TestCase
+{
+
+	/**
+	 * Gets a mock of the session class
+	 *
+	 * @return Session
+	 */
+	public function getMockSession(array $config = array())
+	{
+		return $this->getMockForAbstractClass('Session', array($config));
+	}
+
+	/**
+	 * Provides test data for
+	 *
+	 * test_constructor_uses_name_from_config_and_casts()
+	 *
+	 * @return array
+	 */
+	public function provider_constructor_uses_settings_from_config_and_casts()
+	{
+		return array(
+			// array(expected, input)
+			// data set 0
+			array(
+				array(
+					'name'      => 'awesomeness',
+					'lifetime'  =>  1231456421,
+					'encrypted' =>  FALSE
+				),
+				array(
+					'name'      => 'awesomeness',
+					'lifetime'  => '1231456421',
+					'encrypted' =>  FALSE,
+				),
+			),
+			// data set 1
+			array(
+				array(
+					'name'       => '123',
+					'encrypted'  => 'default',
+				),
+				array(
+					'name'       =>  123,
+					'encrypted'  =>  TRUE,
+				),
+			),
+		);
+	}
+
+	/**
+	 * The constructor should change its attributes based on config
+	 * passed as the first parameter
+	 *
+	 * @test
+	 * @dataProvider provider_constructor_uses_settings_from_config_and_casts
+	 * @covers Session::__construct
+	 */
+	public function test_constructor_uses_settings_from_config_and_casts($expected, $config)
+	{
+		$session = $this->getMockForAbstractClass('Session', array($config));
+
+		foreach ($expected as $var => $value)
+		{
+			$this->assertAttributeSame($value, '_'.$var, $session);
+		}
+	}
+
+	/**
+	 * Check that the constructor will load a session if it's provided
+	 * witha session id
+	 *
+	 * @test
+	 * @covers Session::__construct
+	 * @covers Session::read
+	 */
+	public function test_constructor_loads_session_with_session_id()
+	{
+		$this->markTestIncomplete(
+			'Need to work out why constructor is not being called'
+		);
+
+		$config = array();
+		$session_id = 'lolums';
+
+		// Don't auto-call constructor, we need to setup the mock first
+		$session = $this->getMockForAbstractClass(
+			'Session',
+			array(),
+			'',
+			FALSE
+		);
+
+		$session
+			->expects($this->once())
+			->method('read')
+			->with($session_id);
+
+		$session->__construct($config, $session_id);
+	}
+
+	/**
+	 * Calling $session->bind() should allow you to bind a variable
+	 * to a session variable
+	 *
+	 * @test
+	 * @covers Session::bind
+	 * @ticket 3164
+	 */
+	public function test_bind_actually_binds_variable()
+	{
+		$session = $this->getMockForAbstractClass('Session');
+
+		$var = 'asd';
+
+		$session->bind('our_var', $var);
+
+		$var = 'foobar';
+
+		$this->assertSame('foobar', $session->get('our_var'));
+	}
+
+
+	/**
+	 * When a session is initially created it should have no data
+	 *
+	 *
+	 * @test
+	 * @covers Session::__construct
+	 * @covers Session::set
+	 */
+	public function test_initially_session_has_no_data()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertAttributeSame(array(), '_data', $session);
+	}
+
+	/**
+	 * Make sure that the default session name (the one used if the
+	 * driver does not set one) is 'session'
+	 *
+	 * @test
+	 * @covers Session::__construct
+	 */
+	public function test_default_session_name_is_set()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertAttributeSame('session', '_name', $session);
+	}
+
+	/**
+	 * By default sessions are unencrypted
+	 *
+	 * @test
+	 * @covers Session::__construct
+	 */
+	public function test_default_session_is_unencrypted()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertAttributeSame(FALSE, '_encrypted', $session);
+	}
+
+	/**
+	 * A new session should not be classed as destroyed
+	 *
+	 * @test
+	 * @covers Session::__construct
+	 */
+	public function test_default_session_is_not_classed_as_destroyed()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertAttributeSame(FALSE, '_destroyed', $session);
+	}
+
+	/**
+	 * Provides test data for test_get_returns_default_if_var_dnx()
+	 *
+	 * @return array
+	 */
+	public function provider_get_returns_default_if_var_dnx()
+	{
+		return array(
+			array('something_crazy', FALSE),
+			array('a_true', TRUE),
+			array('an_int', 158163158),
+		);
+	}
+
+	/**
+	 * Make sure that get() is using the default value we provide and
+	 * isn't tampering with it
+	 *
+	 * @test
+	 * @dataProvider provider_get_returns_default_if_var_dnx
+	 * @covers Session::get
+	 */
+	public function test_get_returns_default_if_var_dnx($var, $default)
+	{
+		$session = $this->getMockSession();
+
+		$this->assertSame($default, $session->get($var, $default));
+	}
+
+	/**
+	 * By default get() should be using null as the var DNX return value
+	 *
+	 * @test
+	 * @covers Session::get
+	 */
+	public function test_get_uses_null_as_default_return_value()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertSame(NULL, $session->get('level_of_cool'));
+	}
+
+	/**
+	 * This test makes sure that session is using array_key_exists
+	 * as isset will return FALSE if the value is NULL
+	 *
+	 * @test
+	 * @covers Session::get
+	 */
+	public function test_get_returns_value_if_it_equals_null()
+	{
+		$session = $this->getMockSession();
+
+		$session->set('arkward', NULL);
+
+		$this->assertSame(NULL, $session->get('arkward', 'uh oh'));
+	}
+
+	/**
+	 * as_array() should return the session data by reference.
+	 *
+	 * i.e. if we modify the returned data, the session data also changes
+	 *
+	 * @test
+	 * @covers Session::as_array
+	 */
+	public function test_as_array_returns_data_by_ref_or_copy()
+	{
+		$session = $this->getMockSession();
+
+		$data_ref =& $session->as_array();
+
+		$data_ref['something'] = 'pie';
+
+		$this->assertAttributeSame($data_ref, '_data', $session);
+
+		$data_copy = $session->as_array();
+
+		$data_copy['pie'] = 'awesome';
+
+		$this->assertAttributeNotSame($data_copy, '_data', $session);
+	}
+
+	/**
+	 * set() should add new session data and modify existing ones
+	 *
+	 * Also makes sure that set() returns $this
+	 *
+	 * @test
+	 * @covers Session::set
+	 */
+	public function test_set_adds_and_modifies_to_session_data()
+	{
+		$session = $this->getMockSession();
+
+		$this->assertSame($session, $session->set('pork', 'pie'));
+
+		$this->assertAttributeSame(
+			array('pork' => 'pie'),
+			'_data',
+			$session
+		);
+
+		$session->set('pork', 'delicious');
+
+		$this->assertAttributeSame(
+			array('pork' => 'delicious'),
+			'_data',
+			$session
+		);
+	}
+
+	/**
+	 * This tests that delete() removes specified session data
+	 *
+	 * @test
+	 * @covers Session::delete
+	 */
+	public function test_delete_removes_select_session_data()
+	{
+		$session = $this->getMockSession();
+
+		// Bit of a hack for mass-loading session data
+		$data =& $session->as_array();
+
+		$data += array(
+			'a' => 'A',
+			'b' => 'B',
+			'c' => 'C',
+			'easy' => '123'
+		);
+
+		// Make a copy of $data for testing purposes
+		$copy = $data;
+
+		// First we make sure we can delete one item
+		// Also, check that delete returns $this
+		$this->assertSame($session, $session->delete('a'));
+
+		unset($copy['a']);
+
+		// We could test against $data but then we'd be testing
+		// that as_array() is returning by ref
+		$this->assertAttributeSame($copy, '_data', $session);
+
+		// Now we make sure we can delete multiple items
+		// We're checking $this is returned just in case
+		$this->assertSame($session, $session->delete('b', 'c'));
+		unset($copy['b'], $copy['c']);
+
+		$this->assertAttributeSame($copy, '_data', $session);
+	}
+
+	/**
+	 * Provides test data for test_read_loads_session_data()
+	 *
+	 * @return array
+	 */
+	public function provider_read_loads_session_data()
+	{
+		return array(
+			// If driver returns array then just load it up
+			array(
+				array(),
+				'wacka_wacka',
+				array()
+			),
+			array(
+				array('the it' => 'crowd'),
+				'the_it_crowd',
+				array('the it' => 'crowd'),
+			),
+			// If it's a string an encrpytion is disabled (by default) base64decode and unserialize
+			array(
+				array('dead' => 'arrival'),
+				'lolums',
+				'YToxOntzOjQ6ImRlYWQiO3M6NzoiYXJyaXZhbCI7fQ=='
+			),
+		);
+	}
+
+	/**
+	 * This is one of the "big" tests for the session lib
+	 *
+	 * The test makes sure that
+	 *
+	 * 1. Session asks the driver for the data relating to $session_id
+	 * 2. That it will load the returned data into the session
+	 *
+	 * @test
+	 * @dataProvider provider_read_loads_session_data
+	 * @covers Session::read
+	 */
+	public function test_read_loads_session_data($expected_data, $session_id, $driver_data, array $config = array())
+	{
+		$session = $this->getMockSession($config);
+
+		$session->expects($this->once())
+				->method('_read')
+				->with($session_id)
+				->will($this->returnValue($driver_data));
+
+		$session->read($session_id);
+		$this->assertAttributeSame($expected_data, '_data', $session);
+	}
+
+	/**
+	 * regenerate() should tell the driver to regenerate its id
+	 *
+	 * @test
+	 * @covers Session::regenerate
+	 */
+	public function test_regenerate_tells_driver_to_regenerate()
+	{
+		$session = $this->getMockSession();
+
+		$new_session_id = 'asdnoawdnoainf';
+
+		$session->expects($this->once())
+				->method('_regenerate')
+				->with()
+				->will($this->returnValue($new_session_id));
+
+		$this->assertSame($new_session_id, $session->regenerate());
+	}
+
+	/**
+	 * If the driver destroys the session then all session data should be
+	 * removed
+	 *
+	 * @test
+	 * @covers Session::destroy
+	 */
+	public function test_destroy_deletes_data_if_driver_destroys_session()
+	{
+		$session = $this->getMockSession();
+
+		$session
+			->set('asd', 'dsa')
+			->set('dog', 'god');
+
+		$session
+			->expects($this->once())
+			->method('_destroy')
+			->with()
+			->will($this->returnValue(TRUE));
+
+		$this->assertTrue($session->destroy());
+
+		$this->assertAttributeSame(array(), '_data', $session);
+	}
+
+	/**
+	 * The session data should only be deleted if the driver reports
+	 * that the session was destroyed ok
+	 *
+	 * @test
+	 * @covers Session::destroy
+	 */
+	public function test_destroy_only_deletes_data_if_driver_destroys_session()
+	{
+		$session = $this->getMockSession();
+
+		$session
+			->set('asd', 'dsa')
+			->set('dog', 'god');
+
+		$session
+			->expects($this->once())
+			->method('_destroy')
+			->with()
+			->will($this->returnValue(FALSE));
+
+		$this->assertFalse($session->destroy());
+		$this->assertAttributeSame(
+			array('asd' => 'dsa', 'dog' => 'god'),
+			'_data',
+			$session
+		);
+	}
+
+	/**
+	 * If a session variable exists then get_once should get it then remove it.
+	 * If the variable does not exist then it should return the default
+	 *
+	 * @test
+	 * @covers Session::get_once
+	 */
+	public function test_get_once_gets_once_or_returns_default()
+	{
+		$session = $this->getMockSession();
+
+		$session->set('foo', 'bar');
+
+		// Test that a default is returned
+		$this->assertSame('mud', $session->get_once('fud', 'mud'));
+
+		// Now test that it actually removes the value
+		$this->assertSame('bar', $session->get_once('foo'));
+
+		$this->assertAttributeSame(array(), '_data', $session);
+
+		$this->assertSame('maybe', $session->get_once('foo', 'maybe'));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/TextTest.php b/includes/kohana/system/tests/kohana/TextTest.php
new file mode 100644
index 0000000..f215e53
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/TextTest.php
@@ -0,0 +1,600 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the kohana text class (Kohana_Text)
+ *
+ * @group kohana
+ * @group kohana.text
+ *
+ * @package    Kohana
+ * @category   Tests
+ */
+class Kohana_TextTest extends Unittest_TestCase
+{
+
+	/**
+	 * Sets up the test enviroment
+	 */
+	function setUp()
+	{
+		parent::setUp();
+
+		Text::alternate();
+	}
+
+	/**
+	 * This test makes sure that auto_p returns an empty string if
+	 * an empty input was provided
+	 *
+	 * @test
+	 * @covers Text::auto_p
+	 */
+	function test_auto_para_returns_empty_string_on_empty_input()
+	{
+		$this->assertSame('', Text::auto_p(''));
+	}
+
+	/**
+	 *
+	 * @return array Test Data
+	 */
+	function provider_auto_para_does_not_enclose_html_tags_in_paragraphs()
+	{
+		return array(
+			array(
+				array('div'),
+				'<div>Pick a plum of peppers</div>',
+			),
+			array(
+				array('div'),
+				'<div id="awesome">Tangas</div>',
+			),
+		);
+	}
+
+	/**
+	 * This test makes sure that auto_p doesn't enclose HTML tags
+	 * in paragraphs
+	 *
+	 * @test
+	 * @covers Text::auto_p
+	 * @dataProvider provider_auto_para_does_not_enclose_html_tags_in_paragraphs
+	 */
+	function test_auto_para_does_not_enclose_html_tags_in_paragraphs(array $tags, $text)
+	{
+		$output = Text::auto_p($text);
+
+		foreach ($tags as $tag)
+		{
+			$this->assertNotTag(
+				array('tag' => $tag, 'ancestor' => array('tag' => 'p')),
+				$output
+			);
+		}
+	}
+
+	/**
+	 * This test makes sure that auto_p surrounds a single line of text
+	 * with paragraph tags
+	 *
+	 * @test
+	 * @covers Text::auto_p
+	 */
+	function test_auto_para_encloses_slot_in_paragraph()
+	{
+		$text = 'Pick a pinch of purple pepper';
+
+		$this->assertSame('<p>'.$text.'</p>', Text::auto_p($text));
+	}
+
+	/**
+	 * Make sure that multiple new lines are replaced with paragraph tags
+	 *
+	 * @test
+	 * @covers Text::auto_p
+	 */
+	public function test_auto_para_replaces_multiple_newlines_with_paragraph()
+	{
+		$this->assertSame(
+			"<p>My name is john</p>\n\n<p>I'm a developer</p>",
+			Text::auto_p("My name is john\n\n\n\nI'm a developer")
+		);
+	}
+
+	/**
+	 * Data provider for test_limit_words
+	 *
+	 * @return array Array of test data
+	 */
+	function provider_limit_words()
+	{
+		return array
+		(
+			array('', '', 100, NULL),
+			array('…', 'The rain in spain', -10, NULL),
+			array('The rain…', 'The rain in spain', 2, NULL),
+			array('The rain...', 'The rain in spain', 2, '...'),
+		);
+	}
+
+	/**
+	 *
+	 * @test
+	 * @dataProvider provider_limit_words
+	 */
+	function test_limit_words($expected, $str, $limit, $end_char)
+	{
+		$this->assertSame($expected, Text::limit_words($str, $limit, $end_char));
+	}
+
+	/**
+	 * Provides test data for test_limit_chars()
+	 *
+	 * @return array Test data
+	 */
+	function provider_limit_chars()
+	{
+		return array
+		(
+			array('', '', 100, NULL, FALSE),
+			array('…', 'BOO!', -42, NULL, FALSE),
+			array('making php bet…', 'making php better for the sane', 14, NULL, FALSE),
+			array('Garçon! Un café s.v.p.', 'Garçon! Un café s.v.p.', 50, '__', FALSE),
+			array('Garçon!__', 'Garçon! Un café s.v.p.', 8, '__', FALSE),
+			// @issue 3238
+			array('making php…', 'making php better for the sane', 14, NULL, TRUE),
+			array('Garçon!__', 'Garçon! Un café s.v.p.', 9, '__', TRUE),
+			array('Garçon!__', 'Garçon! Un café s.v.p.', 7, '__', TRUE),
+			array('__', 'Garçon! Un café s.v.p.', 5, '__', TRUE),
+		);
+	}
+
+	/**
+	 * Tests Text::limit_chars()
+	 *
+	 * @test
+	 * @dataProvider provider_limit_chars
+	 */
+	function test_limit_chars($expected, $str, $limit, $end_char, $preserve_words)
+	{
+		$this->assertSame($expected, Text::limit_chars($str, $limit, $end_char, $preserve_words));
+	}
+
+	/**
+	 * Test Text::alternate()
+	 *
+	 * @test
+	 */
+	function test_alternate_alternates_between_parameters()
+	{
+		list($val_a, $val_b, $val_c) = array('good', 'bad', 'ugly');
+
+		$this->assertSame('good', Text::alternate($val_a, $val_b, $val_c));
+		$this->assertSame('bad',  Text::alternate($val_a, $val_b, $val_c));
+		$this->assertSame('ugly', Text::alternate($val_a, $val_b, $val_c));
+
+		$this->assertSame('good', Text::alternate($val_a, $val_b, $val_c));
+	}
+
+	/**
+	 * Tests Text::alternate()
+	 *
+	 * @test
+	 * @covers Text::alternate
+	 */
+	function test_alternate_resets_when_called_with_no_params_and_returns_empty_string()
+	{
+		list($val_a, $val_b, $val_c) = array('yes', 'no', 'maybe');
+
+		$this->assertSame('yes', Text::alternate($val_a, $val_b, $val_c));
+
+		$this->assertSame('', Text::alternate());
+
+		$this->assertSame('yes', Text::alternate($val_a, $val_b, $val_c));
+	}
+
+	/**
+	 * Provides test data for test_reducde_slashes()
+	 *
+	 * @returns array Array of test data
+	 */
+	function provider_reduce_slashes()
+	{
+		return array
+			(
+				array('/', '//'),
+				array('/google/php/kohana/', '//google/php//kohana//'),
+			);
+	}
+
+	/**
+	 * Covers Text::reduce_slashes()
+	 *
+	 * @test
+	 * @dataProvider provider_reduce_slashes
+	 */
+	function test_reduce_slashes($expected, $str)
+	{
+		$this->assertSame($expected, Text::reduce_slashes($str));
+	}
+
+	/**
+	 * Provides test data for test_censor()
+	 *
+	 * @return array Test data
+	 */
+	function provider_censor()
+	{
+
+		return array
+			(
+				// If the replacement is 1 character long it should be repeated for the length of the removed word
+				array("A donkey is also an ***", 'A donkey is also an ass', array('ass'), '*', TRUE),
+				array("Cake### isn't nearly as good as kohana###", "CakePHP isn't nearly as good as kohanaphp", array('php'), '#', TRUE),
+				// If it's > 1 then it's just replaced straight out
+				array("If you're born out of wedlock you're a --expletive--", "If you're born out of wedlock you're a child", array('child'), '--expletive--', TRUE),
+
+				array('class', 'class', array('ass'), '*', FALSE),
+			);
+	}
+
+	/**
+	 * Tests Text::censor
+	 *
+	 * @test
+	 * @dataProvider provider_censor
+	 */
+	function test_censor($expected, $str, $badwords, $replacement, $replace_partial_words)
+	{
+		$this->assertSame($expected, Text::censor($str, $badwords, $replacement, $replace_partial_words));
+	}
+
+	/**
+	 * Provides test data for test_random
+	 *
+	 * @return array Test Data
+	 */
+	function provider_random()
+	{
+		return array(
+			array('alnum', 8),
+			array('alpha', 10),
+			array('hexdec', 20),
+			array('nozero', 5),
+			array('numeric', 14),
+			array('distinct', 12),
+			array('aeiou', 4),
+			array('‹¡›«¿»', 8), // UTF8 characters
+			array(NULL, 8), // Issue #3256
+		);
+	}
+
+	/**
+	 * Tests Text::random() as well as possible
+	 *
+	 * Obviously you can't compare a randomly generated string against a
+	 * pre-generated one and check that they are the same as this goes
+	 * against the whole ethos of random.
+	 *
+	 * This test just makes sure that the value returned is of the correct
+	 * values and length
+	 *
+	 * @test
+	 * @dataProvider provider_random
+	 */
+	function test_random($type, $length)
+	{
+		if ($type === NULL)
+		{
+			$type = 'alnum';
+		}
+
+		$pool = (string) $type;
+
+		switch ($pool)
+		{
+			case 'alnum':
+				$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+			break;
+			case 'alpha':
+				$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+			break;
+			case 'hexdec':
+				$pool = '0123456789abcdef';
+			break;
+			case 'numeric':
+				$pool = '0123456789';
+			break;
+			case 'nozero':
+				$pool = '123456789';
+			break;
+			case 'distinct':
+				$pool = '2345679ACDEFHJKLMNPRSTUVWXYZ';
+			break;
+		}
+
+		$this->assertRegExp('/^['.$pool.']{'.$length.'}$/u', Text::random($type, $length));
+	}
+
+	/**
+	 * Provides test data for test_similar
+	 *
+	 * @return array
+	 */
+	function provider_similar()
+	{
+		return array
+			(
+				// TODO: add some more cases
+				array('foo', array('foobar', 'food', 'fooberry')),
+			);
+	}
+
+	/**
+	 * Tests Text::similar()
+	 *
+	 * @test
+	 * @dataProvider provider_similar
+	 * @covers Text::similar
+	 */
+	function test_similar($expected, $words)
+	{
+		$this->assertSame($expected, Text::similar($words));
+	}
+
+	/**
+	 * Provides test data for test_bytes
+	 *
+	 * @return array
+	 */
+	public function provider_bytes()
+	{
+		return array
+			(
+				// TODO: cover the other units
+				array('256.00 B', 256, NULL, NULL, TRUE),
+				array('1.02 kB', 1024, NULL, NULL, TRUE),
+
+				// In case you need to know the size of a floppy disk in petabytes
+				array('0.00147 GB', 1.44 * 1000 * 1024, 'GB', '%01.5f %s', TRUE),
+
+				// SI is the standard, but lets deviate slightly
+				array('1.00 MiB', 1024 * 1024, 'MiB', NULL, FALSE),
+			);
+	}
+
+	/**
+	 * Tests Text::bytes()
+	 *
+	 * @test
+	 * @dataProvider provider_bytes
+	 */
+	function test_bytes($expected, $bytes, $force_unit, $format, $si)
+	{
+		$this->assertSame($expected, Text::bytes($bytes, $force_unit, $format, $si));
+	}
+
+	/**
+	 * Provides test data for test_widont()
+	 *
+	 * @return array Test data
+	 */
+	function provider_widont()
+	{
+		return array
+			(
+				array('No gain, no&nbsp;pain', 'No gain, no pain'),
+				array("spaces?what'rethey?", "spaces?what'rethey?"),
+				array('', ''),
+			);
+	}
+
+	/**
+	 * Tests Text::widont()
+	 *
+	 * @test
+	 * @dataProvider provider_widont
+	 */
+	function test_widont($expected, $string)
+	{
+		$this->assertSame($expected, Text::widont($string));
+	}
+
+
+	/**
+	 * This checks that auto_link_emails() respects word boundaries and does not
+	 * just blindly replace all occurences of the email address in the text.
+	 *
+	 * In the sample below the algorithm was replacing all occurences of voorzitter@xxxx.com
+	 * inc the copy in the second list item.
+	 *
+	 * It was updated in 6c199366efc1115545ba13108b876acc66c54b2d to respect word boundaries
+	 *
+	 * @test
+	 * @covers Text::auto_link_emails
+	 * @ticket 2772
+	 */
+	function test_auto_link_emails_respects_word_boundaries()
+	{
+		$original = '<ul>
+						<li>voorzitter@xxxx.com</li>
+						<li>vicevoorzitter@xxxx.com</li>
+					</ul>';
+
+		$this->assertFalse(strpos('vice', Text::auto_link_emails($original)));
+	}
+
+
+	/**
+	 * Provides some test data for test_number()
+	 *
+	 * @return array
+	 */
+	public function provider_number()
+	{
+		return array(
+			array('one', 1),
+			array('twenty-three', 23),
+			array('fourty-two', 42),
+			array('five million, six hundred and thirty-two', 5000632),
+			array('five million, six hundred and thirty', 5000630),
+			array('nine hundred million', 900000000),
+			array('thirty-seven thousand', 37000),
+			array('one thousand and twenty-four', 1024),
+		);
+	}
+
+	/**
+	 * Checks that Text::number formats a number into english text
+	 *
+	 * @test
+	 * @dataProvider provider_number
+	 */
+	public function test_number($expected, $number)
+	{
+		$this->assertSame($expected, Text::number($number));
+	}
+
+	/**
+	 * Provides test data for test_auto_link_urls()
+	 *
+	 * @return array
+	 */
+	public function provider_auto_link_urls()
+	{
+		return array(
+			// First we try with the really obvious url
+			array(
+				'Some random text <a href="http://www.google.com">http://www.google.com</a>',
+				'Some random text http://www.google.com',
+			),
+			// Then we try with varying urls
+			array(
+				'Some random <a href="http://www.google.com">www.google.com</a>',
+				'Some random www.google.com',
+			),
+			array(
+				'Some random google.com',
+				'Some random google.com',
+			),
+			// Check that it doesn't link urls in a href
+			array(
+				'Look at me <a href="http://google.com">Awesome stuff</a>',
+				'Look at me <a href="http://google.com">Awesome stuff</a>',
+			),
+			array(
+				'Look at me <a href="http://www.google.com">http://www.google.com</a>',
+				'Look at me <a href="http://www.google.com">http://www.google.com</a>',
+			),
+			// @issue 3190
+			array(
+				'<a href="http://www.google.com/">www.google.com</a>',
+				'<a href="http://www.google.com/">www.google.com</a>',
+			),
+			array(
+				'<a href="http://www.google.com/">www.google.com</a> <a href="http://www.google.com/">http://www.google.com/</a>',
+				'<a href="http://www.google.com/">www.google.com</a> http://www.google.com/',
+			),
+		);
+	}
+
+	/**
+	 * Runs tests for Test::auto_link_urls
+	 *
+	 * @test
+	 * @dataProvider provider_auto_link_urls
+	 */
+	public function test_auto_link_urls($expected, $text)
+	{
+		$this->assertSame($expected, Text::auto_link_urls($text));
+	}
+
+	/**
+	 * Provides test data for test_auto_link_emails()
+	 *
+	 * @return array
+	 */
+	public function provider_auto_link_emails()
+	{
+		return array(
+			// @issue 3162
+			array(
+				'<span class="broken"><a href="mailto:info@test.com">info@test.com</a></span>',
+				'<span class="broken">info@test.com</span>',
+			),
+			array(
+				'<a href="mailto:info@test.com">info@test.com</a>',
+				'<a href="mailto:info@test.com">info@test.com</a>',
+			),
+			// @issue 3189
+			array(
+				'<a href="mailto:email@address.com">email@address.com</a> <a href="mailto:email@address.com">email@address.com</a>',
+				'<a href="mailto:email@address.com">email@address.com</a> email@address.com',
+			),
+		);
+	}
+
+	/**
+	 * Runs tests for Test::auto_link_emails
+	 *
+	 * @test
+	 * @dataProvider provider_auto_link_emails
+	 */
+	public function test_auto_link_emails($expected, $text)
+	{
+		// Use html_entity_decode because emails will be randomly encoded by HTML::mailto
+		$this->assertSame($expected, html_entity_decode(Text::auto_link_emails($text)));
+	}
+
+	/**
+	 * Provides test data for test_auto_link
+	 *
+	 * @return array Test data
+	 */
+	public function provider_auto_link()
+	{
+		return array(
+			array(
+				'Hi there, my site is kohanaframework.org and you can email me at nobody@kohanaframework.org',
+				array('kohanaframework.org'),
+			),
+
+			array(
+				'Hi my.domain.com@domain.com you came from',
+				FALSE,
+				array('my.domain.com@domain.com'),
+			),
+		);
+	}
+
+	/**
+	 * Tests Text::auto_link()
+	 *
+	 * @test
+	 * @dataProvider provider_auto_link
+	 */
+	public function test_auto_link($text, $urls = array(), $emails = array())
+	{
+		$linked_text = Text::auto_link($text);
+
+		if ($urls === FALSE)
+		{
+			$this->assertNotContains('http://', $linked_text);
+		}
+		elseif (count($urls))
+		{
+			foreach ($urls as $url)
+			{
+				// Assert that all the urls have been caught by text auto_link_urls()
+				$this->assertContains(Text::auto_link_urls($url), $linked_text);
+			}
+		}
+
+		foreach ($emails as $email)
+		{
+			$this->assertNotContains($email, $linked_text);
+		}
+
+	}
+
+}
diff --git a/includes/kohana/system/tests/kohana/URLTest.php b/includes/kohana/system/tests/kohana/URLTest.php
new file mode 100644
index 0000000..a41710c
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/URLTest.php
@@ -0,0 +1,272 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests URL
+ *
+ * @group kohana
+ * @group kohana.url
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_URLTest extends Unittest_TestCase
+{
+	/**
+	 * Default values for the environment, see setEnvironment
+	 * @var array
+	 */
+	protected $environmentDefault =	array(
+		'Kohana::$base_url'	=> '/kohana/',
+		'Kohana::$index_file'=> 'index.php',
+		'HTTP_HOST' => 'example.com',
+		'_GET'		=> array(),
+	);
+
+	/**
+	 * Provides test data for test_base()
+	 *
+	 * @return array
+	 */
+	public function provider_base()
+	{
+		return array(
+			// $protocol, $index, $expected, $enviroment
+
+			// Test with different combinations of parameters for max code coverage
+			array(NULL,    FALSE, '/kohana/'),
+			array('http',  FALSE, 'http://example.com/kohana/'),
+			array(NULL,    TRUE,  '/kohana/index.php/'),
+			array(NULL,    TRUE,  '/kohana/index.php/'),
+			array('http',  TRUE,  'http://example.com/kohana/index.php/'),
+			array('https', TRUE,  'https://example.com/kohana/index.php/'),
+			array('ftp',   TRUE,  'ftp://example.com/kohana/index.php/'),
+
+			// Test for automatic protocol detection, protocol = TRUE
+			array(TRUE,    TRUE,  'cli://example.com/kohana/index.php/', array('HTTPS' => FALSE)),
+
+			// Change base url'
+			array('https', FALSE, 'https://example.com/kohana/', array('Kohana::$base_url' => 'omglol://example.com/kohana/')),
+
+			// Use port in base url, issue #3307
+			array('http', FALSE, 'http://example.com:8080/', array('Kohana::$base_url' => 'example.com:8080/')),
+
+			// Use protocol from base url if none specified
+			array(NULL,  FALSE, 'http://www.example.com/', array('Kohana::$base_url' => 'http://www.example.com/')),
+
+			// Use HTTP_HOST before SERVER_NAME
+			array('http', FALSE, 'http://example.com/kohana/', array('HTTP_HOST' => 'example.com', 'SERVER_NAME' => 'example.org')),
+
+			// Use SERVER_NAME if HTTP_HOST DNX
+			array('http',  FALSE, 'http://example.org/kohana/', array('HTTP_HOST' => NULL, 'SERVER_NAME' => 'example.org')),
+		);
+	}
+
+	/**
+	 * Tests URL::base()
+	 *
+	 * @test
+	 * @dataProvider provider_base
+	 * @param boolean $protocol    Parameter for Url::base()
+	 * @param boolean $index       Parameter for Url::base()
+	 * @param string  $expected    Expected url
+	 * @param array   $enviroment  Array of enviroment vars to change @see Kohana_URLTest::setEnvironment()
+	 */
+	public function test_base($protocol, $index, $expected, array $enviroment = array())
+	{
+		$this->setEnvironment($enviroment);
+
+		$this->assertSame(
+			$expected,
+			URL::base($protocol, $index)
+		);
+	}
+
+	/**
+	 * Provides test data for test_site()
+	 *
+	 * @return array
+	 */
+	public function provider_site()
+	{
+		return array(
+			array('', NULL,		'/kohana/index.php/'),
+			array('', 'http',			'http://example.com/kohana/index.php/'),
+
+			array('my/site', NULL, '/kohana/index.php/my/site'),
+			array('my/site', 'http',  'http://example.com/kohana/index.php/my/site'),
+
+			// @ticket #3110
+			array('my/site/page:5', NULL, '/kohana/index.php/my/site/page:5'),
+			array('my/site/page:5', 'http', 'http://example.com/kohana/index.php/my/site/page:5'),
+
+			array('my/site?var=asd&kohana=awesome', NULL,  '/kohana/index.php/my/site?var=asd&kohana=awesome'),
+			array('my/site?var=asd&kohana=awesome', 'http',  'http://example.com/kohana/index.php/my/site?var=asd&kohana=awesome'),
+
+			array('?kohana=awesome&life=good', NULL, '/kohana/index.php/?kohana=awesome&life=good'),
+			array('?kohana=awesome&life=good', 'http', 'http://example.com/kohana/index.php/?kohana=awesome&life=good'),
+
+			array('?kohana=awesome&life=good#fact', NULL, '/kohana/index.php/?kohana=awesome&life=good#fact'),
+			array('?kohana=awesome&life=good#fact', 'http', 'http://example.com/kohana/index.php/?kohana=awesome&life=good#fact'),
+
+			array('some/long/route/goes/here?kohana=awesome&life=good#fact', NULL, '/kohana/index.php/some/long/route/goes/here?kohana=awesome&life=good#fact'),
+			array('some/long/route/goes/here?kohana=awesome&life=good#fact', 'http', 'http://example.com/kohana/index.php/some/long/route/goes/here?kohana=awesome&life=good#fact'),
+
+			array('/route/goes/here?kohana=awesome&life=good#fact', 'https', 'https://example.com/kohana/index.php/route/goes/here?kohana=awesome&life=good#fact'),
+			array('/route/goes/here?kohana=awesome&life=good#fact', 'ftp', 'ftp://example.com/kohana/index.php/route/goes/here?kohana=awesome&life=good#fact'),
+		);
+	}
+
+	/**
+	 * Tests URL::site()
+	 *
+	 * @test
+	 * @dataProvider provider_site
+	 * @param string          $uri         URI to use
+	 * @param boolean|string  $protocol    Protocol to use
+	 * @param string          $expected    Expected result
+	 * @param array           $enviroment  Array of enviroment vars to set
+	 */
+	public function test_site($uri, $protocol, $expected, array $enviroment = array())
+	{
+		$this->setEnvironment($enviroment);
+
+		$this->assertSame(
+			$expected,
+			URL::site($uri, $protocol)
+		);
+	}
+
+	/**
+	 * Provides test data for test_site_url_encode_uri()
+	 * See issue #2680
+	 *
+	 * @return array
+	 */
+	public function provider_site_url_encode_uri()
+	{
+		$provider = array(
+			array('test', 'encode'),
+			array('test', 'éñçø∂ë∂'),
+			array('†é߆', 'encode'),
+			array('†é߆', 'éñçø∂ë∂', 'µåñ¥'),
+		);
+
+		foreach ($provider as $i => $params)
+		{
+			// Every non-ASCII character except for forward slash should be encoded...
+			$expected = implode('/', array_map('rawurlencode', $params));
+
+			// ... from a URI that is not encoded
+			$uri = implode('/', $params);
+
+			$provider[$i] = array("/kohana/index.php/{$expected}", $uri);
+		}
+
+		return $provider;
+	}
+
+	/**
+	 * Tests URL::site for proper URL encoding when working with non-ASCII characters.
+	 *
+	 * @test
+	 * @dataProvider provider_site_url_encode_uri
+	 */
+	public function test_site_url_encode_uri($expected, $uri)
+	{
+		$this->assertSame($expected, URL::site($uri, FALSE));
+	}
+
+	/**
+	 * Provides test data for test_title()
+	 * @return array
+	 */
+	public function provider_title()
+	{
+		return array(
+			// Tests that..
+			// Title is converted to lowercase
+			array('we-shall-not-be-moved', 'WE SHALL NOT BE MOVED', '-'),
+			// Excessive white space is removed and replaced with 1 char
+			array('thissssss-is-it', 'THISSSSSS         IS       IT  ', '-'),
+			// separator is either - (dash) or _ (underscore) & others are converted to underscores
+			array('some-title', 'some title', '-'),
+			array('some_title', 'some title', '_'),
+			array('some!title', 'some title', '!'),
+			array('some:title', 'some title', ':'),
+			// Numbers are preserved
+			array('99-ways-to-beat-apple', '99 Ways to beat apple', '-'),
+			// ... with lots of spaces & caps
+			array('99_ways_to_beat_apple', '99    ways   TO beat      APPLE', '_'),
+			array('99-ways-to-beat-apple', '99    ways   TO beat      APPLE', '-'),
+			// Invalid characters are removed
+			array('each-gbp-is-now-worth-32-usd', 'Each GBP(£) is now worth 32 USD($)', '-'),
+			// ... inc. separator
+			array('is-it-reusable-or-re-usable', 'Is it reusable or re-usable?', '-'),
+			// Doing some crazy UTF8 tests
+			array('espana-wins', 'España-wins', '-', TRUE),
+		);
+	}
+
+	/**
+	 * Tests URL::title()
+	 *
+	 * @test
+	 * @dataProvider provider_title
+	 * @param string $title        Input to convert
+	 * @param string $separator    Seperate to replace invalid characters with
+	 * @param string $expected     Expected result
+	 */
+	public function test_title($expected, $title, $separator, $ascii_only = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			URL::title($title, $separator, $ascii_only)
+		);
+	}
+
+	/**
+	 * Provides test data for URL::query()
+	 * @return array
+	 */
+	public function provider_query()
+	{
+		return array(
+			array(array(), '', NULL),
+			array(array('_GET' => array('test' => 'data')), '?test=data', NULL),
+			array(array(), '?test=data', array('test' => 'data')),
+			array(array('_GET' => array('more' => 'data')), '?more=data&test=data', array('test' => 'data')),
+			array(array('_GET' => array('sort' => 'down')), '?test=data', array('test' => 'data'), FALSE),
+
+			// http://dev.kohanaframework.org/issues/3362
+			array(array(), '', array('key' => NULL)),
+			array(array(), '?key=0', array('key' => FALSE)),
+			array(array(), '?key=1', array('key' => TRUE)),
+			array(array('_GET' => array('sort' => 'down')), '?sort=down&key=1', array('key' => TRUE)),
+			array(array('_GET' => array('sort' => 'down')), '?sort=down&key=0', array('key' => FALSE)),
+		);
+	}
+
+	/**
+	 * Tests URL::query()
+	 *
+	 * @test
+	 * @dataProvider provider_query
+	 * @param array $enviroment Set environment
+	 * @param string $expected Expected result
+	 * @param array $params Query string
+	 * @param boolean $use_get Combine with GET parameters
+	 */
+	public function test_query($enviroment, $expected, $params, $use_get = TRUE)
+	{
+		$this->setEnvironment($enviroment);
+
+		$this->assertSame(
+			$expected,
+			URL::query($params, $use_get)
+		);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/UTF8Test.php b/includes/kohana/system/tests/kohana/UTF8Test.php
new file mode 100644
index 0000000..f974b17
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/UTF8Test.php
@@ -0,0 +1,630 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+/**
+ * Tests Kohana_UTF8 class
+ *
+ * @group kohana
+ * @group kohana.utf8
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_UTF8Test extends Unittest_TestCase
+{
+
+	/**
+	 * Provides test data for test_clean()
+	 */
+	public function provider_clean()
+	{
+		return array(
+			array("\0", ''),
+			array("→foo\021", '→foo'),
+			array("\x7Fbar", 'bar'),
+			array("\xFF", ''),
+			array("\x41", 'A'),
+			array(array("→foo\021", "\x41"), array('→foo', 'A')),
+		);
+	}
+
+	/**
+	 * Tests UTF8::clean
+	 *
+	 * @test
+	 * @dataProvider provider_clean
+	 */
+	public function test_clean($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::clean($input));
+	}
+
+	/**
+	 * Provides test data for test_is_ascii()
+	 */
+	public function provider_is_ascii()
+	{
+		return array(
+			array("\0", TRUE),
+			array("\$eno\r", TRUE),
+			array('Señor', FALSE),
+			array(array('Se', 'nor'), TRUE),
+			array(array('Se', 'ñor'), FALSE),
+		);
+	}
+
+	/**
+	 * Tests UTF8::is_ascii
+	 *
+	 * @test
+	 * @dataProvider provider_is_ascii
+	 */
+	public function test_is_ascii($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::is_ascii($input));
+	}
+
+	/**
+	 * Provides test data for test_strip_ascii_ctrl()
+	 */
+	public function provider_strip_ascii_ctrl()
+	{
+		return array(
+			array("\0", ''),
+			array("→foo\021", '→foo'),
+			array("\x7Fbar", 'bar'),
+			array("\xFF", "\xFF"),
+			array("\x41", 'A'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strip_ascii_ctrl
+	 *
+	 * @test
+	 * @dataProvider provider_strip_ascii_ctrl
+	 */
+	public function test_strip_ascii_ctrl($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strip_ascii_ctrl($input));
+	}
+
+	/**
+	 * Provides test data for test_strip_non_ascii()
+	 */
+	public function provider_strip_non_ascii()
+	{
+		return array(
+			array("\0\021\x7F", "\0\021\x7F"),
+			array('I ♥ cocoñùт', 'I  coco'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strip_non_ascii
+	 *
+	 * @test
+	 * @dataProvider provider_strip_non_ascii
+	 */
+	public function test_strip_non_ascii($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strip_non_ascii($input));
+	}
+
+	/**
+	 * Provides test data for test_transliterate_to_ascii()
+	 */
+	public function provider_transliterate_to_ascii()
+	{
+		return array(
+			array('Cocoñùт', -1, 'Coconuт'),
+			array('COCOÑÙТ', -1, 'COCOÑÙТ'),
+			array('Cocoñùт', 0, 'Coconuт'),
+			array('COCOÑÙТ', 0, 'COCONUТ'),
+			array('Cocoñùт', 1, 'Cocoñùт'),
+			array('COCOÑÙТ', 1, 'COCONUТ'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::transliterate_to_ascii
+	 *
+	 * @test
+	 * @dataProvider provider_transliterate_to_ascii
+	 */
+	public function test_transliterate_to_ascii($input, $case, $expected)
+	{
+		$this->assertSame($expected, UTF8::transliterate_to_ascii($input, $case));
+	}
+
+	/**
+	 * Provides test data for test_strlen()
+	 */
+	public function provider_strlen()
+	{
+		return array(
+			array('Cocoñùт', 7),
+			array('Coconut', 7),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strlen
+	 *
+	 * @test
+	 * @dataProvider provider_strlen
+	 */
+	public function test_strlen($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strlen($input));
+	}
+
+	/**
+	 * Provides test data for test_strpos()
+	 */
+	public function provider_strpos()
+	{
+		return array(
+			array('Cocoñùт', 'o', 0, 1),
+			array('Cocoñùт', 'ñ', 1, 4),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strpos
+	 *
+	 * @test
+	 * @dataProvider provider_strpos
+	 */
+	public function test_strpos($input, $str, $offset, $expected)
+	{
+		$this->assertSame($expected, UTF8::strpos($input, $str, $offset));
+	}
+
+	/**
+	 * Provides test data for test_strrpos()
+	 */
+	public function provider_strrpos()
+	{
+		return array(
+			array('Cocoñùт', 'o', 0, 3),
+			array('Cocoñùт', 'ñ', 2, 4),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strrpos
+	 *
+	 * @test
+	 * @dataProvider provider_strrpos
+	 */
+	public function test_strrpos($input, $str, $offset, $expected)
+	{
+		$this->assertSame($expected, UTF8::strrpos($input, $str, $offset));
+	}
+
+	/**
+	 * Provides test data for test_substr()
+	 */
+	public function provider_substr()
+	{
+		return array(
+			array('Cocoñùт', 3, 2, 'oñ'),
+			array('Cocoñùт', 3, 9, 'oñùт'),
+			array('Cocoñùт', 3, NULL, 'oñùт'),
+			array('Cocoñùт', 3, -2, 'oñ'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::substr
+	 *
+	 * @test
+	 * @dataProvider provider_substr
+	 */
+	public function test_substr($input, $offset, $length, $expected)
+	{
+		$this->assertSame($expected, UTF8::substr($input, $offset, $length));
+	}
+
+	/**
+	 * Provides test data for test_substr_replace()
+	 */
+	public function provider_substr_replace()
+	{
+		return array(
+			array('Cocoñùт', 'šš', 3, 2, 'Cocššùт'),
+			array('Cocoñùт', 'šš', 3, 9, 'Cocšš'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::substr_replace
+	 *
+	 * @test
+	 * @dataProvider provider_substr_replace
+	 */
+	public function test_substr_replace($input, $replacement, $offset, $length, $expected)
+	{
+		$this->assertSame($expected, UTF8::substr_replace($input, $replacement, $offset, $length));
+	}
+
+	/**
+	 * Provides test data for test_strtolower()
+	 */
+	public function provider_strtolower()
+	{
+		return array(
+			array('COCOÑÙТ', 'cocoñùт'),
+			array('JÄGER',   'jäger'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strtolower
+	 *
+	 * @test
+	 * @dataProvider provider_strtolower
+	 */
+	public function test_strtolower($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strtolower($input));
+	}
+
+	/**
+	 * Provides test data for test_strtoupper()
+	 */
+	public function provider_strtoupper()
+	{
+		return array(
+			array('Cocoñùт', 'COCOÑÙТ'),
+			array('jäger',   'JÄGER'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strtoupper
+	 *
+	 * @test
+	 * @dataProvider provider_strtoupper
+	 */
+	public function test_strtoupper($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strtoupper($input));
+	}
+
+	/**
+	 * Provides test data for test_ucfirst()
+	 */
+	public function provider_ucfirst()
+	{
+		return array(
+			array('ñùт', 'Ñùт'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::ucfirst
+	 *
+	 * @test
+	 * @dataProvider provider_ucfirst
+	 */
+	public function test_ucfirst($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::ucfirst($input));
+	}
+
+	/**
+	 * Provides test data for test_strip_non_ascii()
+	 */
+	public function provider_ucwords()
+	{
+		return array(
+			array('ExAmple', 'ExAmple'),
+			array('i ♥ Cocoñùт', 'I ♥ Cocoñùт'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::ucwords
+	 *
+	 * @test
+	 * @dataProvider provider_ucwords
+	 */
+	public function test_ucwords($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::ucwords($input));
+	}
+
+	/**
+	 * Provides test data for test_strcasecmp()
+	 */
+	public function provider_strcasecmp()
+	{
+		return array(
+			array('Cocoñùт',   'Cocoñùт', 0),
+			array('Čau',       'Čauo',   -1),
+			array('Čau',       'Ča',      1),
+			array('Cocoñùт',   'Cocoñ',   4),
+			array('Cocoñùт',   'Coco',    6),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strcasecmp
+	 *
+	 * @test
+	 * @dataProvider provider_strcasecmp
+	 */
+	public function test_strcasecmp($input, $input2, $expected)
+	{
+		$this->assertSame($expected, UTF8::strcasecmp($input, $input2));
+	}
+
+	/**
+	 * Provides test data for test_str_ireplace()
+	 */
+	public function provider_str_ireplace()
+	{
+		return array(
+			array('т', 't', 'cocoñuт', 'cocoñut'),
+			array('Ñ', 'N', 'cocoñuт', 'cocoNuт'),
+			array(array('т', 'Ñ', 'k' => 'k'), array('t', 'N', 'K'), array('cocoñuт'), array('cocoNut')),
+			array(array('ñ'), 'n', 'cocoñuт', 'coconuт'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::str_ireplace
+	 *
+	 * @test
+	 * @dataProvider provider_str_ireplace
+	 */
+	public function test_str_ireplace($search, $replace, $subject, $expected)
+	{
+		$this->assertSame($expected, UTF8::str_ireplace($search, $replace, $subject));
+	}
+
+	/**
+	 * Provides test data for test_stristr()
+	 */
+	public function provider_stristr()
+	{
+		return array(
+			array('Cocoñùт',   'oñ', 'oñùт'),
+			array('Cocoñùт',   'o', 'ocoñùт'),
+			array('Cocoñùт',   'k', FALSE),
+		);
+	}
+
+	/**
+	 * Tests UTF8::stristr
+	 *
+	 * @test
+	 * @dataProvider provider_stristr
+	 */
+	public function test_stristr($input, $input2, $expected)
+	{
+		$this->assertSame($expected, UTF8::stristr($input, $input2));
+	}
+
+	/**
+	 * Provides test data for test_strspn()
+	 */
+	public function provider_strspn()
+	{
+		return array(
+			array("foo", "o", 1, 2, 2),
+			array('Cocoñùт', 'oñ', NULL, NULL, 1),
+			array('Cocoñùт', 'oñ', 2, 4, 1),
+			array('Cocoñùт', 'šš', 3, 9, 4),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strspn
+	 *
+	 * @test
+	 * @dataProvider provider_strspn
+	 */
+	public function test_strspn($input, $mask, $offset, $length, $expected)
+	{
+		$this->assertSame($expected, UTF8::strspn($input, $mask, $offset, $length));
+	}
+
+	/**
+	 * Provides test data for test_strcspn()
+	 */
+	public function provider_strcspn()
+	{
+		return array(
+			array('Cocoñùт', 'oñ', NULL, NULL, 1),
+			array('Cocoñùт', 'oñ', 2, 4, 1),
+			array('Cocoñùт', 'šš', 3, 9, 4),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strcspn
+	 *
+	 * @test
+	 * @dataProvider provider_strcspn
+	 */
+	public function test_strcspn($input, $mask, $offset, $length, $expected)
+	{
+		$this->assertSame($expected, UTF8::strcspn($input, $mask, $offset, $length));
+	}
+
+	/**
+	 * Provides test data for test_str_pad()
+	 */
+	public function provider_str_pad()
+	{
+		return array(
+			array('Cocoñùт', 10, 'š', STR_PAD_RIGHT, 'Cocoñùтššš'),
+			array('Cocoñùт', 10, 'š', STR_PAD_LEFT,  'šššCocoñùт'),
+			array('Cocoñùт', 10, 'š', STR_PAD_BOTH,  'šCocoñùтšš'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::str_pad
+	 *
+	 * @test
+	 * @dataProvider provider_str_pad
+	 */
+	public function test_str_pad($input, $length, $pad, $type, $expected)
+	{
+		$this->assertSame($expected, UTF8::str_pad($input, $length, $pad, $type));
+	}
+
+        /**
+	 * Tests UTF8::str_pad error
+	 *
+	 * @test
+	 * @expectedException Exception
+	 */
+	public function test_str_pad_error()
+	{
+		UTF8::str_pad('Cocoñùт', 10, 'š', 15,  'šCocoñùтšš');
+	}
+
+	/**
+	 * Provides test data for test_str_split()
+	 */
+	public function provider_str_split()
+	{
+		return array(
+			array('Bár',     1, array('B', 'á', 'r')),
+			array('Cocoñùт', 2, array('Co', 'co', 'ñù', 'т')),
+			array('Cocoñùт', 3, array('Coc', 'oñù', 'т')),
+		);
+	}
+
+	/**
+	 * Tests UTF8::str_split
+	 *
+	 * @test
+	 * @dataProvider provider_str_split
+	 */
+	public function test_str_split($input, $split_length, $expected)
+	{
+		$this->assertSame($expected, UTF8::str_split($input, $split_length));
+	}
+
+	/**
+	 * Provides test data for test_strrev()
+	 */
+	public function provider_strrev()
+	{
+		return array(
+			array('Cocoñùт', 'тùñocoC'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::strrev
+	 *
+	 * @test
+	 * @dataProvider provider_strrev
+	 */
+	public function test_strrev($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::strrev($input));
+	}
+
+	/**
+	 * Provides test data for test_trim()
+	 */
+	public function provider_trim()
+	{
+		return array(
+			array(' bar ', NULL, 'bar'),
+			array('bar',   'b',  'ar'),
+			array('barb',  'b',  'ar'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::trim
+	 *
+	 * @test
+	 * @dataProvider provider_trim
+	 */
+	public function test_trim($input, $input2, $expected)
+	{
+		$this->assertSame($expected, UTF8::trim($input, $input2));
+	}
+
+	/**
+	 * Provides test data for test_ltrim()
+	 */
+	public function provider_ltrim()
+	{
+		return array(
+			array(' bar ', NULL, 'bar '),
+			array('bar',   'b',  'ar'),
+			array('barb',  'b',  'arb'),
+			array('ñùт',   'ñ',  'ùт'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::ltrim
+	 *
+	 * @test
+	 * @dataProvider provider_ltrim
+	 */
+	public function test_ltrim($input, $charlist, $expected)
+	{
+		$this->assertSame($expected, UTF8::ltrim($input, $charlist));
+	}
+
+	/**
+	 * Provides test data for test_rtrim()
+	 */
+	public function provider_rtrim()
+	{
+		return array(
+			array(' bar ', NULL, ' bar'),
+			array('bar',   'b',  'bar'),
+			array('barb',  'b',  'bar'),
+			array('Cocoñùт',  'т',  'Cocoñù'),
+		);
+	}
+
+	/**
+	 * Tests UTF8::rtrim
+	 *
+	 * @test
+	 * @dataProvider provider_rtrim
+	 */
+	public function test_rtrim($input, $input2, $expected)
+	{
+		$this->assertSame($expected, UTF8::rtrim($input, $input2));
+	}
+
+	/**
+	 * Provides test data for test_ord()
+	 */
+	public function provider_ord()
+	{
+		return array(
+			array('f', 102),
+			array('ñ', 241),
+			array('Ñ', 209),
+		);
+	}
+
+	/**
+	 * Tests UTF8::ord
+	 *
+	 * @test
+	 * @dataProvider provider_ord
+	 */
+	public function test_ord($input, $expected)
+	{
+		$this->assertSame($expected, UTF8::ord($input));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/UploadTest.php b/includes/kohana/system/tests/kohana/UploadTest.php
new file mode 100644
index 0000000..7ffda3c
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/UploadTest.php
@@ -0,0 +1,224 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests Kohana upload class
+ *
+ * @group kohana
+ * @group kohana.upload
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     Jeremy Bush <contractfrombelow@gmail.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_UploadTest extends Unittest_TestCase
+{
+	/**
+	 * Provides test data for test_size()
+	 * 
+	 * @return array
+	 */
+	public function provider_size()
+	{
+		return array(
+			// $field, $bytes, $environment, $expected
+			array(
+				'unit_test', 
+				5, 
+				array('_FILES' => array('unit_test' => array('error' => UPLOAD_ERR_INI_SIZE))), 
+				FALSE
+			),
+			array(
+				'unit_test', 
+				5, 
+				array('_FILES' => array('unit_test' => array('error' => UPLOAD_ERR_NO_FILE))), 
+				TRUE
+			),
+			array(
+				'unit_test', 
+				'6K', 
+				array('_FILES' => array(
+					'unit_test' => array(
+						'error' => UPLOAD_ERR_OK,
+						'name' => 'Unit_Test File',
+						'type' => 'image/png',
+						'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+						'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+						)
+					)
+				), 
+				TRUE
+			),
+			array(
+				'unit_test', 
+				'1B', 
+				array('_FILES' => array(
+						'unit_test' => array(
+							'error' => UPLOAD_ERR_OK,
+							'name' => 'Unit_Test File',
+							'type' => 'image/png',
+							'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+							'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+						)
+					)
+				), 
+				FALSE
+			),
+		);
+	}
+
+	/**
+	 * Tests Upload::size
+	 *
+	 * @test
+	 * @dataProvider provider_size
+	 * @covers upload::size
+	 * @param string $field the files field to test
+	 * @param string $bytes valid bite size
+	 * @param array $environment set the $_FILES array
+	 * @param $expected what to expect
+	 */
+	public function test_size($field, $bytes, $environment, $expected)
+	{
+		$this->setEnvironment($environment);
+
+		$this->assertSame($expected, Upload::size($_FILES[$field], $bytes));
+	}
+
+	/**
+	 * size() should throw an exception of the supplied max size is invalid
+	 *
+	 * @test
+	 * @covers upload::size
+	 * @expectedException Kohana_Exception
+	 */
+	public function test_size_throws_exception_for_invalid_size()
+	{
+		$this->setEnvironment(array(
+			'_FILES' => array(
+				'unit_test' => array(
+					'error' => UPLOAD_ERR_OK,
+					'name' => 'Unit_Test File',
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			)
+		));
+
+		Upload::size($_FILES['unit_test'], '1DooDah');
+	}
+
+	/**
+	 * Provides test data for test_vali()
+	 *
+	 * @test
+	 * @return array
+	 */
+	public function provider_valid()
+	{
+		return array(
+			array(
+				TRUE,
+				array(
+					'error' => UPLOAD_ERR_OK,
+					'name' => 'Unit_Test File',
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			),
+			array(
+				FALSE,
+				array(
+					'name' => 'Unit_Test File',
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			),
+			array(
+				FALSE,
+				array(
+					'error' => UPLOAD_ERR_OK,
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			),
+			array(
+				FALSE,
+				array(
+					'name' => 'Unit_Test File',
+					'error' => UPLOAD_ERR_OK,
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			),
+			array(
+				FALSE,
+				array(
+					'error' => UPLOAD_ERR_OK,
+					'name' => 'Unit_Test File',
+					'type' => 'image/png',
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			),
+			array(
+				FALSE,
+				array(
+					'error' => UPLOAD_ERR_OK,
+					'name' => 'Unit_Test File',
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+				)
+			),
+			
+		);
+	}
+
+	/**
+	 * Test Upload::valid
+	 *
+	 * @test
+	 * @dataProvider provider_valid
+	 * @covers Upload::valid
+	 */
+	public function test_valid($expected, $file)
+	{
+		$this->setEnvironment(array(
+			'_FILES' => array(
+				'unit_test' => $file,
+			),
+		));
+
+		$this->assertSame($expected, Upload::valid($_FILES['unit_test']));
+	}
+
+	/**
+	 * Tests Upload::type
+	 *
+	 * @test
+	 * @covers Upload::type
+	 */
+	public function test_type()
+	{
+		$this->setEnvironment(array(
+			'_FILES' => array(
+				'unit_test' => array(
+					'error' => UPLOAD_ERR_OK,
+					'name' => 'github.png',
+					'type' => 'image/png',
+					'tmp_name' => Kohana::find_file('tests', 'test_data/github', 'png'),
+					'size' => filesize(Kohana::find_file('tests', 'test_data/github', 'png')),
+				)
+			)
+		));
+		
+		$this->assertTrue(Upload::type($_FILES['unit_test'], array('jpg', 'png', 'gif')));
+
+		$this->assertFalse(Upload::type($_FILES['unit_test'], array('docx')));
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/ValidTest.php b/includes/kohana/system/tests/kohana/ValidTest.php
new file mode 100644
index 0000000..a86c39b
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ValidTest.php
@@ -0,0 +1,882 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the Valid class
+ *
+ * @group kohana
+ * @group kohana.valid
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ValidTest extends Unittest_TestCase
+{
+
+	/**
+	 * Provides test data for test_alpha()
+	 * @return array
+	 */
+	public function provider_alpha()
+	{
+		return array(
+			array('asdavafaiwnoabwiubafpowf', TRUE),
+			array('!aidhfawiodb', FALSE),
+			array('51535oniubawdawd78', FALSE),
+			array('!"£$(G$W£(HFW£F(HQ)"n', FALSE),
+			// UTF-8 tests
+			array('あいうえお', TRUE, TRUE),
+			array('¥', FALSE, TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::alpha()
+	 *
+	 * Checks whether a string consists of alphabetical characters only.
+	 *
+	 * @test
+	 * @dataProvider provider_alpha
+	 * @param string  $string
+	 * @param boolean $expected
+	 */
+	public function test_alpha($string, $expected, $utf8 = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::alpha($string, $utf8)
+		);
+	}
+
+	/*
+	 * Provides test data for test_alpha_numeric
+	 */
+	public function provide_alpha_numeric()
+	{
+		return array(
+			array('abcd1234',  TRUE),
+		    array('abcd',      TRUE),
+		    array('1234',      TRUE),
+		    array('abc123&^/-', FALSE),
+			// UTF-8 tests
+			array('あいうえお', TRUE, TRUE),
+			array('零一二三四五', TRUE, TRUE),
+			array('あい四五£^£^', FALSE, TRUE),
+		);
+	}
+
+	/**
+	 * Tests Valid::alpha_numberic()
+	 *
+	 * Checks whether a string consists of alphabetical characters and numbers only.
+	 *
+	 * @test
+	 * @dataProvider provide_alpha_numeric
+	 * @param string  $input     The string to test
+	 * @param boolean $expected  Is $input valid
+	 */
+	public function test_alpha_numeric($input, $expected, $utf8 = FALSE)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::alpha_numeric($input, $utf8)
+		);
+	}
+
+	/**
+	 * Provides test data for test_alpha_dash
+	 */
+	public function provider_alpha_dash()
+	{
+		return array(
+			array('abcdef',     TRUE),
+		    array('12345',      TRUE),
+		    array('abcd1234',   TRUE),
+		    array('abcd1234-',  TRUE),
+		    array('abc123&^/-', FALSE)
+		);
+	}
+
+	/**
+	 * Tests Valid::alpha_dash()
+	 *
+	 * Checks whether a string consists of alphabetical characters, numbers, underscores and dashes only.
+	 *
+	 * @test
+	 * @dataProvider provider_alpha_dash
+	 * @param string  $input          The string to test
+	 * @param boolean $contains_utf8  Does the string contain utf8 specific characters
+	 * @param boolean $expected       Is $input valid?
+	 */
+	public function test_alpha_dash($input, $expected, $contains_utf8 = FALSE)
+	{
+		if ( ! $contains_utf8)
+		{
+			$this->assertSame(
+				$expected,
+				Valid::alpha_dash($input)
+			);
+		}
+
+		$this->assertSame(
+			$expected,
+			Valid::alpha_dash($input, TRUE)
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::date() test
+	 */
+	public function provider_date()
+	{
+		return array(
+			array('now',TRUE),
+			array('10 September 2010',TRUE),
+			array('+1 day',TRUE),
+			array('+1 week',TRUE),
+			array('+1 week 2 days 4 hours 2 seconds',TRUE),
+			array('next Thursday',TRUE),
+			array('last Monday',TRUE),
+
+			array('blarg',FALSE),
+			array('in the year 2000',FALSE),
+			array('324824',FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::date()
+	 *
+	 * @test
+	 * @dataProvider provider_date
+	 * @param string  $date  The date to validate
+	 * @param integer $expected
+	 */
+	public function test_date($date, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::date($date, $expected)
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::decimal() test
+	 */
+	public function provider_decimal()
+	{
+		return array(
+			array('45.1664',  3,    NULL, FALSE),
+			array('45.1664',  4,    NULL, TRUE),
+			array('45.1664',  4,    2,    TRUE),
+		);
+	}
+
+	/**
+	 * Tests Valid::decimal()
+	 *
+	 * @test
+	 * @dataProvider provider_decimal
+	 * @param string  $decimal  The decimal to validate
+	 * @param integer $places   The number of places to check to
+	 * @param integer $digits   The number of digits preceding the point to check
+	 * @param boolean $expected Whether $decimal conforms to $places AND $digits
+	 */
+	public function test_decimal($decimal, $places, $digits, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::decimal($decimal, $places, $digits),
+			'Decimal: "'.$decimal.'" to '.$places.' places and '.$digits.' digits (preceeding period)'
+		);
+	}
+
+	/**
+	 * Provides test data for test_digit
+	 * @return array
+	 */
+	public function provider_digit()
+	{
+		return array(
+			array('12345',    TRUE),
+			array('10.5',     FALSE),
+			array('abcde',    FALSE),
+			array('abcd1234', FALSE),
+			array('-5',       FALSE),
+			array(-5,         FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::digit()
+	 *
+	 * @test
+	 * @dataProvider provider_digit
+	 * @param mixed   $input     Input to validate
+	 * @param boolean $expected  Is $input valid
+	 */
+	public function test_digit($input, $expected, $contains_utf8 = FALSE)
+	{
+		if ( ! $contains_utf8)
+		{
+			$this->assertSame(
+				$expected,
+				Valid::digit($input)
+			);
+		}
+
+		$this->assertSame(
+			$expected,
+			Valid::digit($input, TRUE)
+		);
+
+	}
+
+	/**
+	 * DataProvider for the valid::color() test
+	 */
+	public function provider_color()
+	{
+		return array(
+			array('#000000', TRUE),
+			array('#GGGGGG', FALSE),
+			array('#AbCdEf', TRUE),
+			array('#000', TRUE),
+			array('#abc', TRUE),
+			array('#DEF', TRUE),
+			array('000000', TRUE),
+			array('GGGGGG', FALSE),
+			array('AbCdEf', TRUE),
+			array('000', TRUE),
+			array('DEF', TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::color()
+	 *
+	 * @test
+	 * @dataProvider provider_color
+	 * @param string  $color     The color to test
+	 * @param boolean $expected  Is $color valid
+	 */
+	public function test_color($color, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::color($color)
+		);
+	}
+
+	/**
+	 * Provides test data for test_credit_card()
+	 */
+	public function provider_credit_card()
+	{
+		return array(
+			array('4222222222222',    'visa',       TRUE),
+		    array('4012888888881881', 'visa',       TRUE),
+		    array('4012888888881881', NULL,         TRUE),
+		    array('4012888888881881', array('mastercard', 'visa'), TRUE),
+		    array('4012888888881881', array('discover', 'mastercard'), FALSE),
+		    array('4012888888881881', 'mastercard', FALSE),
+		    array('5105105105105100', 'mastercard', TRUE),
+		    array('6011111111111117', 'discover',   TRUE),
+		    array('6011111111111117', 'visa',       FALSE)
+		);
+	}
+
+	/**
+	 * Tests Valid::credit_card()
+	 *
+	 * @test
+	 * @covers Valid::credit_card
+	 * @dataProvider  provider_credit_card()
+	 * @param string  $number   Credit card number
+	 * @param string  $type	    Credit card type
+	 * @param boolean $expected
+	 */
+	public function test_credit_card($number, $type, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::credit_card($number, $type)
+		);
+	}
+
+	/**
+	 * Provides test data for test_credit_card()
+	 */
+	public function provider_luhn()
+	{
+		return array(
+			array('4222222222222', TRUE),
+			array('4012888888881881', TRUE),
+			array('5105105105105100', TRUE),
+			array('6011111111111117', TRUE),
+			array('60111111111111.7', FALSE),
+			array('6011111111111117X', FALSE),
+			array('6011111111111117 ', FALSE),
+			array('WORD ', FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::luhn()
+	 *
+	 * @test
+	 * @covers Valid::luhn
+	 * @dataProvider  provider_luhn()
+	 * @param string  $number   Credit card number
+	 * @param boolean $expected
+	 */
+	public function test_luhn($number, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::luhn($number)
+		);
+	}
+
+	/**
+	 * Provides test data for test_email()
+	 *
+	 * @return array
+	 */
+	public function provider_email()
+	{
+		return array(
+			array('foo', TRUE,  FALSE),
+			array('foo', FALSE, FALSE),
+
+			// RFC is less strict than the normal regex, presumably to allow
+			//  admin@localhost, therefore we IGNORE IT!!!
+			array('foo@bar', FALSE, FALSE),
+			array('foo@bar.com', FALSE, TRUE),
+			array('foo@bar.sub.com', FALSE, TRUE),
+			array('foo+asd@bar.sub.com', FALSE, TRUE),
+			array('foo.asd@bar.sub.com', FALSE, TRUE),
+		);
+	}
+
+	/**
+	 * Tests Valid::email()
+	 *
+	 * Check an email address for correct format.
+	 *
+	 * @test
+	 * @dataProvider provider_email
+	 * @param string  $email   Address to check
+	 * @param boolean $strict  Use strict settings
+	 * @param boolean $correct Is $email address valid?
+	 */
+	public function test_email($email, $strict, $correct)
+	{
+		$this->assertSame(
+			$correct,
+			Valid::email($email, $strict)
+		);
+	}
+
+	/**
+	 * Returns test data for test_email_domain()
+	 *
+	 * @return array
+	 */
+	public function provider_email_domain()
+	{
+		return array(
+			array('google.com', TRUE),
+			// Don't anybody dare register this...
+			array('DAWOMAWIDAIWNDAIWNHDAWIHDAIWHDAIWOHDAIOHDAIWHD.com', FALSE)
+		);
+	}
+
+	/**
+	 * Tests Valid::email_domain()
+	 *
+	 * Validate the domain of an email address by checking if the domain has a
+	 * valid MX record.
+	 *
+	 * Test skips on windows
+	 *
+	 * @test
+	 * @dataProvider provider_email_domain
+	 * @param string  $email   Email domain to check
+	 * @param boolean $correct Is it correct?
+	 */
+	public function test_email_domain($email, $correct)
+	{
+		if ( ! $this->hasInternet())
+		{
+			$this->markTestSkipped('An internet connection is required for this test');
+		}
+
+		if ( ! Kohana::$is_windows OR version_compare(PHP_VERSION, '5.3.0', '>='))
+		{
+			$this->assertSame(
+				$correct,
+				Valid::email_domain($email)
+			);
+		}
+		else
+		{
+			$this->markTestSkipped('checkdnsrr() was not added on windows until PHP 5.3');
+		}
+	}
+
+	/**
+	 * Provides data for test_exact_length()
+	 *
+	 * @return array
+	 */
+	public function provider_exact_length()
+	{
+		return array(
+			array('somestring', 10, TRUE),
+			array('anotherstring', 13, TRUE),
+		);
+	}
+
+	/**
+	 *
+	 * Tests Valid::exact_length()
+	 *
+	 * Checks that a field is exactly the right length.
+	 *
+	 * @test
+	 * @dataProvider provider_exact_length
+	 * @param string  $string  The string to length check
+	 * @param integer $length  The length of the string
+	 * @param boolean $correct Is $length the actual length of the string?
+	 * @return bool
+	 */
+	public function test_exact_length($string, $length, $correct)
+	{
+		return $this->assertSame(
+			$correct,
+			Valid::exact_length($string, $length),
+			'Reported string length is not correct'
+		);
+	}
+
+	/**
+	 * Provides data for test_equals()
+	 *
+	 * @return array
+	 */
+	public function provider_equals()
+	{
+		return array(
+			array('foo', 'foo', TRUE),
+			array('1', '1', TRUE),
+			array(1, '1', FALSE),
+			array('011', 011, FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::equals()
+	 *
+	 * @test
+	 * @dataProvider provider_equals
+	 * @param   string   $string    value to check
+	 * @param   integer  $required  required value
+	 * @param   boolean  $correct   is $string the same as $required?
+	 * @return  boolean
+	 */
+	public function test_equals($string, $required, $correct)
+	{
+		return $this->assertSame(
+			$correct,
+			Valid::equals($string, $required),
+			'Values are not equal'
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::ip() test
+	 * @return array
+	 */
+	public function provider_ip()
+	{
+		return array(
+			array('75.125.175.50',   FALSE, TRUE),
+			// PHP 5.3.6 fixed a bug that allowed 127.0.0.1 as a public ip: http://bugs.php.net/53150
+		    array('127.0.0.1',       FALSE, version_compare(PHP_VERSION, '5.3.6', '<')),
+		    array('256.257.258.259', FALSE, FALSE),
+		    array('255.255.255.255', FALSE, FALSE),
+		    array('192.168.0.1',     FALSE, FALSE),
+		    array('192.168.0.1',     TRUE,  TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::ip()
+	 *
+	 * @test
+	 * @dataProvider  provider_ip
+	 * @param string  $input_ip
+	 * @param boolean $allow_private
+	 * @param boolean $expected_result
+	 */
+	public function test_ip($input_ip, $allow_private, $expected_result)
+	{
+		$this->assertEquals(
+			$expected_result,
+			Valid::ip($input_ip, $allow_private)
+		);
+	}
+
+	/**
+	 * Returns test data for test_max_length()
+	 *
+	 * @return array
+	 */
+	public function provider_max_length()
+	{
+		return array(
+			// Border line
+			array('some', 4, TRUE),
+			// Exceeds
+			array('KOHANARULLLES', 2, FALSE),
+			// Under
+			array('CakeSucks', 10, TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::max_length()
+	 *
+	 * Checks that a field is short enough.
+	 *
+	 * @test
+	 * @dataProvider provider_max_length
+	 * @param string  $string    String to test
+	 * @param integer $maxlength Max length for this string
+	 * @param boolean $correct   Is $string <= $maxlength
+	 */
+	public function test_max_length($string, $maxlength, $correct)
+	{
+		 $this->assertSame(
+			$correct,
+			Valid::max_length($string, $maxlength)
+		);
+	}
+
+	/**
+	 * Returns test data for test_min_length()
+	 *
+	 * @return array
+	 */
+	public function provider_min_length()
+	{
+		return array(
+			array('This is obviously long enough', 10, TRUE),
+			array('This is not', 101, FALSE),
+			array('This is on the borderline', 25, TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::min_length()
+	 *
+	 * Checks that a field is long enough.
+	 *
+	 * @test
+	 * @dataProvider provider_min_length
+	 * @param string  $string     String to compare
+	 * @param integer $minlength  The minimum allowed length
+	 * @param boolean $correct    Is $string 's length >= $minlength
+	 */
+	public function test_min_length($string, $minlength, $correct)
+	{
+		$this->assertSame(
+			$correct,
+			Valid::min_length($string, $minlength)
+		);
+	}
+
+	/**
+	 * Returns test data for test_not_empty()
+	 *
+	 * @return array
+	 */
+	public function provider_not_empty()
+	{
+		// Create a blank arrayObject
+		$ao = new ArrayObject;
+
+		// arrayObject with value
+		$ao1 = new ArrayObject;
+		$ao1['test'] = 'value';
+
+		return array(
+			array(array(),      FALSE),
+			array(NULL,         FALSE),
+			array('',           FALSE),
+			array($ao,          FALSE),
+			array($ao1,         TRUE),
+			array(array(NULL),  TRUE),
+			array(0,            TRUE),
+			array('0',          TRUE),
+			array('Something',  TRUE),
+		);
+	}
+
+	/**
+	 * Tests Valid::not_empty()
+	 *
+	 * Checks if a field is not empty.
+	 *
+	 * @test
+	 * @dataProvider provider_not_empty
+	 * @param mixed   $value  Value to check
+	 * @param boolean $empty  Is the value really empty?
+	 */
+	public function test_not_empty($value, $empty)
+	{
+		return $this->assertSame(
+			$empty,
+			Valid::not_empty($value)
+		);
+	}
+
+	/**
+	 * DataProvider for the Valid::numeric() test
+	 */
+	public function provider_numeric()
+	{
+		return array(
+			array(12345,   TRUE),
+			array(123.45,  TRUE),
+			array('12345', TRUE),
+			array('10.5',  TRUE),
+			array('-10.5', TRUE),
+			array('10.5a', FALSE),
+			// @issue 3240
+			array(.4,      TRUE),
+			array(-.4,     TRUE),
+			array(4.,      TRUE),
+			array(-4.,     TRUE),
+			array('.5',    TRUE),
+			array('-.5',   TRUE),
+			array('5.',    TRUE),
+			array('-5.',   TRUE),
+			array('.',     FALSE),
+			array('1.2.3', FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::numeric()
+	 *
+	 * @test
+	 * @dataProvider provider_numeric
+	 * @param string  $input     Input to test
+	 * @param boolean $expected  Whether or not $input is numeric
+	 */
+	public function test_numeric($input, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::numeric($input)
+		);
+	}
+
+	/**
+	 * Provides test data for test_phone()
+	 * @return array
+	 */
+	public function provider_phone()
+	{
+		return array(
+			array('0163634840',       NULL, TRUE),
+		    array('+27173634840',     NULL, TRUE),
+		    array('123578',           NULL, FALSE),
+			// Some uk numbers
+			array('01234456778',      NULL, TRUE),
+			array('+0441234456778',   NULL, FALSE),
+			// Google UK case you're interested
+			array('+44 20-7031-3000', array(12), TRUE),
+			// BT Corporate
+			array('020 7356 5000',	  NULL, TRUE),
+		);
+	}
+
+	/**
+	 * Tests Valid::phone()
+	 *
+	 * @test
+	 * @dataProvider  provider_phone
+	 * @param string  $phone     Phone number to test
+	 * @param boolean $expected  Is $phone valid
+	 */
+	public function test_phone($phone, $lengths, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::phone($phone, $lengths)
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::regex() test
+	 */
+	public function provider_regex()
+	{
+		return array(
+			array('hello world', '/[a-zA-Z\s]++/', TRUE),
+			array('123456789', '/[0-9]++/', TRUE),
+			array('£$%£%', '/[abc]/', FALSE),
+			array('Good evening',  '/hello/',  FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::range()
+	 *
+	 * Tests if a number is within a range.
+	 *
+	 * @test
+	 * @dataProvider provider_regex
+	 * @param string Value to test against
+	 * @param string Valid pcre regular expression
+	 * @param bool Does the value match the expression?
+	 */
+	public function test_regex($value, $regex, $expected)
+	{
+		$this->AssertSame(
+			$expected,
+			Valid::regex($value, $regex)
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::range() test
+	 */
+	public function provider_range()
+	{
+		return array(
+			array(1,  0,  2, TRUE),
+			array(-1, -5, 0, TRUE),
+			array(-1, 0,  1, FALSE),
+			array(1,  0,  0, FALSE),
+			array(2147483647, 0, 200000000000000, TRUE),
+			array(-2147483647, -2147483655, 2147483645, TRUE)
+		);
+	}
+
+	/**
+	 * Tests Valid::range()
+	 *
+	 * Tests if a number is within a range.
+	 *
+	 * @test
+	 * @dataProvider provider_range
+	 * @param integer $number    Number to test
+	 * @param integer $min       Lower bound
+	 * @param integer $max       Upper bound
+	 * @param boolean $expected  Is Number within the bounds of $min && $max
+	 */
+	public function test_range($number, $min, $max, $expected)
+	{
+		$this->AssertSame(
+			$expected,
+			Valid::range($number, $min, $max)
+		);
+	}
+
+	/**
+	 * Provides test data for test_url()
+	 *
+	 * @return array
+	 */
+	public function provider_url()
+	{
+		$data = array(
+			array('http://google.com', TRUE),
+			array('http://google.com/', TRUE),
+			array('http://google.com/?q=abc', TRUE),
+			array('http://google.com/#hash', TRUE),
+			array('http://localhost', TRUE),
+			array('http://hello-world.pl', TRUE),
+			array('http://hello--world.pl', TRUE),
+			array('http://h.e.l.l.0.pl', TRUE),
+			array('http://server.tld/get/info', TRUE),
+			array('http://127.0.0.1', TRUE),
+			array('http://127.0.0.1:80', TRUE),
+			array('http://user@127.0.0.1', TRUE),
+			array('http://user:pass@127.0.0.1', TRUE),
+			array('ftp://my.server.com', TRUE),
+			array('rss+xml://rss.example.com', TRUE),
+
+			array('http://google.2com', FALSE),
+			array('http://google.com?q=abc', FALSE),
+			array('http://google.com#hash', FALSE),
+			array('http://hello-.pl', FALSE),
+			array('http://hel.-lo.world.pl', FALSE),
+			array('http://ww£.google.com', FALSE),
+			array('http://127.0.0.1234', FALSE),
+			array('http://127.0.0.1.1', FALSE),
+			array('http://user:@127.0.0.1', FALSE),
+			array("http://finalnewline.com\n", FALSE),
+		);
+
+		$data[] = array('http://'.str_repeat('123456789.', 25).'com/', TRUE); // 253 chars
+		$data[] = array('http://'.str_repeat('123456789.', 25).'info/', FALSE); // 254 chars
+
+		return $data;
+	}
+
+	/**
+	 * Tests Valid::url()
+	 *
+	 * @test
+	 * @dataProvider provider_url
+	 * @param string  $url       The url to test
+	 * @param boolean $expected  Is it valid?
+	 */
+	public function test_url($url, $expected)
+	{
+		$this->assertSame(
+			$expected,
+			Valid::url($url)
+		);
+	}
+
+	/**
+	 * DataProvider for the valid::matches() test
+	 */
+	public function provider_matches()
+	{
+		return array(
+			array(array('a' => 'hello', 'b' => 'hello'), 'a', 'b', TRUE),
+			array(array('a' => 'hello', 'b' => 'hello '), 'a', 'b', FALSE),
+			array(array('a' => '1', 'b' => 1), 'a', 'b', FALSE),
+		);
+	}
+
+	/**
+	 * Tests Valid::matches()
+	 *
+	 * Tests if a field matches another from an array of data
+	 *
+	 * @test
+	 * @dataProvider provider_matches
+	 * @param array   $data      Array of fields
+	 * @param integer $field     First field name
+	 * @param integer $match     Field name that must match $field in $data
+	 * @param boolean $expected  Do the two fields match?
+	 */
+	public function test_matches($data, $field, $match, $expected)
+	{
+		$this->AssertSame(
+			$expected,
+			Valid::matches($data, $field, $match)
+		);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/ValidationTest.php b/includes/kohana/system/tests/kohana/ValidationTest.php
new file mode 100644
index 0000000..5753869
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ValidationTest.php
@@ -0,0 +1,495 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the Validation lib that's shipped with Kohana
+ *
+ * @group kohana
+ * @group kohana.validation
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @author     BRMatt <matthew@sigswitch.com>
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ValidationTest extends Unittest_TestCase
+{
+	/**
+	 * Tests Validation::factory()
+	 *
+	 * Makes sure that the factory method returns an instance of Validation lib
+	 * and that it uses the variables passed
+	 *
+	 * @test
+	 */
+	public function test_factory_method_returns_instance_with_values()
+	{
+		$values = array(
+			'this'			=> 'something else',
+			'writing tests' => 'sucks',
+			'why the hell'	=> 'amIDoingThis',
+		);
+
+		$instance = Validation::factory($values);
+
+		$this->assertTrue($instance instanceof Validation);
+
+		$this->assertSame(
+			$values,
+			$instance->as_array()
+		);
+	}
+
+	/**
+	 * When we copy() a validation object, we should have a new validation object
+	 * with the exact same attributes, apart from the data, which should be the
+	 * same as the array we pass to copy()
+	 *
+	 * @test
+	 * @covers Validation::copy
+	 */
+	public function test_copy_copies_all_attributes_except_data()
+	{
+		$validation = new Validation(array('foo' => 'bar', 'fud' => 'fear, uncertainty, doubt', 'num' => 9));
+
+		$validation->rule('num', 'is_int')->rule('foo', 'is_string');
+
+		$copy_data = array('foo' => 'no', 'fud' => 'maybe', 'num' => 42);
+
+		$copy = $validation->copy($copy_data);
+
+		$this->assertNotSame($validation, $copy);
+
+		foreach (array('_rules', '_bound', '_labels', '_empty_rules', '_errors') as $attribute)
+		{
+			// This is just an easy way to check that the attributes are identical
+			// Without hardcoding the expected values
+			$this->assertAttributeSame(
+				self::readAttribute($validation, $attribute),
+				$attribute,
+				$copy
+			);
+		}
+
+		$this->assertSame($copy_data, $copy->as_array());
+	}
+
+	/**
+	 * When the validation object is initially created there should be no labels
+	 * specified
+	 *
+	 * @test
+	 */
+	public function test_initially_there_are_no_labels()
+	{
+		$validation = new Validation(array());
+
+		$this->assertAttributeSame(array(), '_labels', $validation);
+	}
+
+	/**
+	 * Adding a label to a field should set it in the labels array
+	 * If the label already exists it should overwrite it
+	 *
+	 * In both cases thefunction should return a reference to $this
+	 *
+	 * @test
+	 * @covers Validation::label
+	 */
+	public function test_label_adds_and_overwrites_label_and_returns_this()
+	{
+		$validation = new Validation(array());
+
+		$this->assertSame($validation, $validation->label('email', 'Email Address'));
+
+		$this->assertAttributeSame(array('email' => 'Email Address'), '_labels', $validation);
+
+		$this->assertSame($validation, $validation->label('email', 'Your Email'));
+
+		$validation->label('name', 'Your Name');
+
+		$this->assertAttributeSame(
+			array('email' => 'Your Email', 'name' => 'Your Name'),
+			'_labels',
+			$validation
+		);
+	}
+
+	/**
+	 * Using labels() we should be able to add / overwrite multiple labels
+	 *
+	 * The function should also return $this for chaining purposes
+	 *
+	 * @test
+	 * @covers Validation::labels
+	 */
+	public function test_labels_adds_and_overwrites_multiple_labels_and_returns_this()
+	{
+		$validation = new Validation(array());
+		$initial_data = array('kung fu' => 'fighting', 'fast' => 'cheetah');
+
+		$this->assertSame($validation, $validation->labels($initial_data));
+
+		$this->assertAttributeSame($initial_data, '_labels', $validation);
+
+		$this->assertSame($validation, $validation->labels(array('fast' => 'lightning')));
+
+		$this->assertAttributeSame(
+			array('fast' => 'lightning', 'kung fu' => 'fighting'),
+			'_labels',
+			$validation
+		);
+	}
+
+	/**
+	 * Using bind() we should be able to add / overwrite multiple bound variables
+	 *
+	 * The function should also return $this for chaining purposes
+	 *
+	 * @test
+	 * @covers Validation::bind
+	 */
+	public function test_bind_adds_and_overwrites_multiple_variables_and_returns_this()
+	{
+		$validation = new Validation(array());
+		$data = array('kung fu' => 'fighting', 'fast' => 'cheetah');
+		$bound = array(':foo' => 'some value');
+
+		// Test binding an array of values
+		$this->assertSame($validation, $validation->bind($bound));
+		$this->assertAttributeSame($bound, '_bound', $validation);
+
+		// Test binding one value
+		$this->assertSame($validation, $validation->bind(':foo', 'some other value'));
+		$this->assertAttributeSame(array(':foo' => 'some other value'), '_bound', $validation);
+	}
+
+	/**
+	 * Provides test data for test_check
+	 *
+	 * @return array
+	 */
+	public function provider_check()
+	{
+		// $data_array, $rules, $labels, $first_expected, $expected_error
+		return array(
+			array(
+				array('foo' => 'bar'),
+				array('foo' => array(array('not_empty', NULL))),
+				array(),
+				TRUE,
+				array(),
+			),
+			array(
+				array('unit' => 'test'),
+				array(
+					'foo'  => array(array('not_empty', NULL)),
+					'unit' => array(array('min_length', array(':value', 6))
+					),
+				),
+				array(),
+				FALSE,
+				array(
+					'foo' => 'foo must not be empty',
+					'unit' => 'unit must be at least 6 characters long'
+				),
+			),
+			array(
+				array('foo' => 'bar'),
+				array(
+					// Tests wildcard rules
+					TRUE => array(array('min_length', array(':value', 4))),
+					'foo'  => array(
+						array('not_empty', NULL),
+						// Tests the array syntax for callbacks
+						array(array('Valid', 'exact_length'), array(':value', 3)),
+						// Tests the Class::method syntax for callbacks
+						array('Valid::exact_length', array(':value', 3)),
+						// Tests the lambda function syntax for callbacks
+						// Commented out for PHP 5.2 support
+						// array(function($value){return TRUE;}, array(':value')),
+						// Tests using a function as a rule
+						array('is_string', array(':value')),
+					),
+					// Tests that rules do not run on empty fields unless they are in _empty_rules
+					'unit' => array(array('exact_length', array(':value', 4))),
+				),
+				array(),
+				FALSE,
+				array('foo' => 'foo must be at least 4 characters long'),
+			),
+			// Switch things around and make :value an array
+			array(
+				array('foo' => array('test', 'data')),
+				array('foo' => array(array('in_array', array('kohana', ':value')))),
+				array(),
+				FALSE,
+				array('foo' => 'foo must be one of the available options'),
+			),
+			// Test wildcard rules with no other rules
+			array(
+				array('foo' => array('test')),
+				array(TRUE => array(array('is_string', array(':value')))),
+				array('foo' => 'foo'),
+				FALSE,
+				array('foo' => '1.foo.is_string'),
+			),
+			// Test array rules use method as error name
+			array(
+				array('foo' => 'test'),
+				array('foo' => array(array(array('Valid', 'min_length'), array(':value', 10)))),
+				array(),
+				FALSE,
+				array('foo' => 'foo must be at least 10 characters long'),
+			),
+		);
+	}
+
+	/**
+	 * Tests Validation::check()
+	 *
+	 * @test
+	 * @covers Validation::check
+	 * @covers Validation::rule
+	 * @covers Validation::rules
+	 * @covers Validation::errors
+	 * @covers Validation::error
+	 * @dataProvider provider_check
+	 * @param array   $array            The array of data
+	 * @param array   $rules            The array of rules
+	 * @param array   $labels           The array of labels
+	 * @param boolean $expected         Is it valid?
+	 * @param boolean $expected_errors  Array of expected errors
+	 */
+	public function test_check($array, $rules, $labels, $expected, $expected_errors)
+	{
+		$validation = new Validation($array);
+
+		foreach ($labels as $field => $label)
+		{
+			$validation->label($field, $label);
+		}
+
+		foreach ($rules as $field => $field_rules)
+		{
+			foreach ($field_rules as $rule)
+				$validation->rule($field, $rule[0], $rule[1]);
+		}
+
+		$status = $validation->check();
+		$errors = $validation->errors(TRUE);
+		$this->assertSame($expected, $status);
+		$this->assertSame($expected_errors, $errors);
+
+		$validation = new validation($array);
+		foreach ($rules as $field => $rules)
+		{
+			$validation->rules($field, $rules);
+		}
+		$validation->labels($labels);
+
+		$this->assertSame($expected, $validation->check());
+	}
+
+	/**
+	 * Provides test data for test_errors()
+	 *
+	 * @return array
+	 */
+	public function provider_errors()
+	{
+		// [data, rules, expected], ...
+		return array(
+			// No Error
+			array(
+				array('username' => 'frank'),
+				array('username' => array(array('not_empty', NULL))),
+				array(),
+			),
+			// Error from message file
+			array(
+				array('username' => ''),
+				array('username' => array(array('not_empty', NULL))),
+				array('username' => 'username must not be empty'),
+			),
+			// No error message exists, display the path expected
+			array(
+				array('username' => 'John'),
+				array('username' => array(array('strpos', array(':value', 'Kohana')))),
+				array('username' => 'Validation.username.strpos'),
+			),
+		);
+	}
+
+	/**
+	 * Tests Validation::errors()
+	 *
+	 * @test
+	 * @covers Validation::errors
+	 * @dataProvider provider_errors
+	 * @param array $array     The array of data
+	 * @param array $rules     The array of rules
+	 * @param array $expected  Array of expected errors
+	 */
+	public function test_errors($array, $rules, $expected)
+	{
+		$validation = Validation::factory($array);
+
+		foreach ($rules as $field => $field_rules)
+		{
+			$validation->rules($field, $field_rules);
+		}
+
+		$validation->check();
+
+		$this->assertSame($expected, $validation->errors('Validation', FALSE));
+		// Should be able to get raw errors array
+		$this->assertAttributeSame($validation->errors(NULL), '_errors', $validation);
+	}
+
+	/**
+	 * Provides test data for test_translated_errors()
+	 *
+	 * @return array
+	 */
+	public function provider_translated_errors()
+	{
+		// [data, rules, expected], ...
+		return array(
+			array(
+				array('Spanish' => ''),
+				array('Spanish' => array(array('not_empty', NULL))),
+				// Errors are not translated yet so only the label will translate
+				array('Spanish' => 'Español must not be empty'),
+				array('Spanish' => 'Spanish must not be empty'),
+			),
+		);
+	}
+
+	/**
+	 * Tests Validation::errors()
+	 *
+	 * @test
+	 * @covers Validation::errors
+	 * @dataProvider provider_translated_errors
+	 * @param array   $data                   The array of data to test
+	 * @param array   $rules                  The array of rules to add
+	 * @param array   $translated_expected    The array of expected errors when translated
+	 * @param array   $untranslated_expected  The array of expected errors when not translated
+	 */
+	public function test_translated_errors($data, $rules, $translated_expected, $untranslated_expected)
+	{
+		$validation = Validation::factory($data);
+
+		$current = i18n::lang();
+		i18n::lang('es');
+
+		foreach($rules as $field => $field_rules)
+		{
+			$validation->rules($field, $field_rules);
+		}
+
+		$validation->check();
+
+		$result_1 = $validation->errors('Validation', TRUE);
+		$result_2 = $validation->errors('Validation', 'en');
+		$result_3 = $validation->errors('Validation', FALSE);
+
+		// Restore the current language
+		i18n::lang($current);
+
+		$this->assertSame($translated_expected, $result_1);
+		$this->assertSame($translated_expected, $result_2);
+		$this->assertSame($untranslated_expected, $result_3);
+	}
+
+	/**
+	 * Tests Validation::errors()
+	 *
+	 * @test
+	 * @covers Validation::errors
+	 */
+	public function test_parameter_labels()
+	{
+		$validation = Validation::factory(array('foo' => 'bar'))
+			->rule('foo', 'equals', array(':value', 'something'))
+			->label('something', 'Spanish');
+
+		$current = i18n::lang();
+		i18n::lang('es');
+
+		$validation->check();
+
+		$translated_expected = array('foo' => 'foo must equal Español');
+		$untranslated_expected = array('foo' => 'foo must equal Spanish');
+
+		$result_1 = $validation->errors('Validation', TRUE);
+		$result_2 = $validation->errors('Validation', 'en');
+		$result_3 = $validation->errors('Validation', FALSE);
+
+		// Restore the current language
+		i18n::lang($current);
+
+		$this->assertSame($translated_expected, $result_1);
+		$this->assertSame($translated_expected, $result_2);
+		$this->assertSame($untranslated_expected, $result_3);
+	}
+
+	/**
+	 * Tests Validation::errors()
+	 *
+	 * @test
+	 * @covers Validation::errors
+	 */
+	public function test_arrays_in_parameters()
+	{
+		$validation = Validation::factory(array('foo' => 'bar'))
+			->rule('foo', 'equals', array(':value', array('one', 'two')));
+
+		$validation->check();
+
+		$expected = array('foo' => 'foo must equal one, two');
+
+		$this->assertSame($expected, $validation->errors('Validation', FALSE));
+	}
+
+	/**
+	 * Tests Validation::check()
+	 *
+	 * @test
+	 * @covers Validation::check
+	 */
+	public function test_data_stays_unaltered()
+	{
+		$validation = Validation::factory(array('foo' => 'bar'))
+			->rule('something', 'not_empty');
+
+		$before = $validation->as_array();
+		$validation->check();
+		$after = $validation->as_array();
+
+		$expected = array('foo' => 'bar');
+
+		$this->assertSame($expected, $before);
+		$this->assertSame($expected, $after);
+	}
+
+	/**
+	 * Tests Validation::errors()
+	 *
+	 * @test
+	 * @covers Validation::errors
+	 */
+	public function test_object_parameters_not_in_messages()
+	{
+		$validation = Validation::factory(array('foo' => 'foo'))
+			->rule('bar', 'matches', array(':validation', 'foo', ':field'));
+
+		$validation->check();
+		$errors = $validation->errors('validation');
+		$expected = array('bar' => 'bar must be the same as foo');
+
+		$this->assertSame($expected, $errors);
+	}
+}
diff --git a/includes/kohana/system/tests/kohana/ViewTest.php b/includes/kohana/system/tests/kohana/ViewTest.php
new file mode 100644
index 0000000..8ed8d7e
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/ViewTest.php
@@ -0,0 +1,78 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Tests the View class
+ *
+ * @group kohana
+ * @group kohana.view
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_ViewTest extends Unittest_TestCase
+{
+	protected static $old_modules = array();
+
+	/**
+	 * Setups the filesystem for test view files
+	 *
+	 * @return null
+	 */
+	public static function setupBeforeClass()
+	{
+		self::$old_modules = Kohana::modules();
+
+		$new_modules = self::$old_modules+array(
+			'test_views' => realpath(__DIR__.'/../test_data/')
+		);
+		Kohana::modules($new_modules);
+	}
+
+	/**
+	 * Restores the module list
+	 *
+	 * @return null
+	 */
+	public static function teardownAfterClass()
+	{
+		Kohana::modules(self::$old_modules);
+	}
+
+	/**
+	 * Provider for test_instaniate
+	 *
+	 * @return array
+	 */
+	public function provider_instantiate()
+	{
+		return array(
+			array('kohana/error', FALSE),
+			array('test.css', FALSE),
+			array('doesnt_exist', TRUE),
+		);
+	}
+
+	/**
+	 * Tests that we can instantiate a view file
+	 * 
+	 * @test
+	 * @dataProvider provider_instantiate
+	 *
+	 * @return null
+	 */
+	public function test_instantiate($path, $expects_exception)
+	{
+		try
+		{
+			$view = new View($path);
+			$this->assertSame(FALSE, $expects_exception);
+		}
+		catch(Kohana_View_Exception $e)
+		{
+			$this->assertSame(TRUE, $expects_exception);
+		}
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/system/tests/kohana/request/client/internal.php b/includes/kohana/system/tests/kohana/request/client/internal.php
new file mode 100644
index 0000000..1e3b825
--- /dev/null
+++ b/includes/kohana/system/tests/kohana/request/client/internal.php
@@ -0,0 +1,89 @@
+<?php defined('SYSPATH') OR die('Kohana bootstrap needs to be included before tests run');
+
+/**
+ * Unit tests for internal request client
+ *
+ * @group kohana
+ * @group kohana.request
+ * @group kohana.request.client
+ * @group kohana.request.client.internal
+ *
+ * @package    Kohana
+ * @category   Tests
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Request_Client_InternalTest extends Unittest_TestCase
+{
+	public function provider_exceptions()
+	{
+		return array(
+			array('', 'welcome', 'missing_action', 'welcome/missing_action',
+				  'The requested URL welcome/missing_action was not found on this server.'),
+			array('kohana3', 'missing_controller', 'index', 'kohana3/missing_controller/index',
+				  'The requested URL kohana3/missing_controller/index was not found on this server.'),
+			array('', 'template', 'missing_action', 'kohana3/template/missing_action',
+				  'Cannot create instances of abstract controller_template'),
+		);
+	}
+
+	/**
+	 * Tests for correct exception messages
+	 *
+	 * @test
+	 * @dataProvider provider_exceptions
+	 *
+	 * @return null
+	 */
+	public function test_exceptions($directory, $controller, $action, $uri, $expected)
+	{
+		// Mock for request object
+		$request = $this->getMock('Request', array(), array($uri));
+
+		$request->expects($this->any())
+			->method('directory')
+			->will($this->returnValue($directory));
+
+		$request->expects($this->any())
+			->method('controller')
+			->will($this->returnValue($controller));
+
+		$request->expects($this->any())
+			->method('action')
+			->will($this->returnValue($action));
+
+		$request->expects($this->any())
+			->method('uri')
+			->will($this->returnValue($uri));
+
+		$request->expects($this->any())
+			->method('response')
+			->will($this->returnValue($this->getMock('Response')));
+
+		$internal_client = new Request_Client_Internal;
+
+		try
+		{
+			$internal_client->execute($request);
+		}
+		catch(HTTP_Exception_404 $e)
+		{
+			if ($e->getMessage() !== $expected)
+			{
+				$this->fail('Was expecting "'.$expected.'" but got "'.$e->getMessage().'" instead.');
+			}
+			return;
+		}
+		catch(Kohana_Exception $e)
+		{
+			if ($e->getMessage() !== $expected)
+			{
+				$this->fail('Was expecting "'.$expected.'" but got "'.$e->getMessage().'" instead.');
+			}
+			return;
+		}
+
+		$this->fail('A HTTP_Exception_404 or Kohana_Exception exception was expected.');
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/system/tests/test_data/callback_routes.php b/includes/kohana/system/tests/test_data/callback_routes.php
new file mode 100644
index 0000000..2197e10
--- /dev/null
+++ b/includes/kohana/system/tests/test_data/callback_routes.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * A holding class for route callback tests
+ *
+ * @group kohana
+ *
+ * @package    Unittest
+ * @author     Kohana Team
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Route_Holder
+{
+	/**
+	 * Just an empty callback that doesn't match anything
+	 */
+	public static function default_callback($uri)
+	{
+		
+	}
+
+	/**
+	 * Just an empty callback that matches everything
+	 *
+	 * @return array
+	 */
+	public static function default_return_callback($uri)
+	{
+		return array(
+			
+		);
+	}
+
+	/**
+	 * Route callback for test_matches_returns_array_of_parameters_on_successful_match
+	 *
+	 * @return array
+	 */
+	public static function matches_returns_array_of_parameters_on_successful_match($uri)
+	{
+		return array(
+			'controller' => 'welcome',
+			'action' => 'index',
+		);
+	}
+
+	/**
+	 * Route callback for test_required_parameters_are_needed
+	 *
+	 * @return array
+	 */
+	public static function required_parameters_are_needed($uri)
+	{
+		if (substr($uri, 0, 5) == 'admin')
+		{
+			return array(
+				'controller' => 'foo',
+				'action' => 'bar',
+			);
+		}
+	}
+
+	/**
+	 * Route callback for test reverse_routing_returns_routes_uri_if_route_is_static
+	 *
+	 * @return array
+	 */
+	public static function reverse_routing_returns_routes_uri_if_route_is_static($uri)
+	{
+		if ($uri == 'info/about_us')
+		{
+			return array(
+				
+			);
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/includes/kohana/system/tests/test_data/github.png b/includes/kohana/system/tests/test_data/github.png
new file mode 100644
index 0000000..8117684
Binary files /dev/null and b/includes/kohana/system/tests/test_data/github.png differ
diff --git a/includes/kohana/system/tests/test_data/views/test.css.php b/includes/kohana/system/tests/test_data/views/test.css.php
new file mode 100644
index 0000000..5c294dc
--- /dev/null
+++ b/includes/kohana/system/tests/test_data/views/test.css.php
@@ -0,0 +1 @@
+This is a view with a dot in the filename.
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/from_unicode.php b/includes/kohana/system/utf8/from_unicode.php
new file mode 100644
index 0000000..acfb5cc
--- /dev/null
+++ b/includes/kohana/system/utf8/from_unicode.php
@@ -0,0 +1,68 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::from_unicode
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _from_unicode($arr)
+{
+	ob_start();
+
+	$keys = array_keys($arr);
+
+	foreach ($keys as $k)
+	{
+		// ASCII range (including control chars)
+		if (($arr[$k] >= 0) AND ($arr[$k] <= 0x007f))
+		{
+			echo chr($arr[$k]);
+		}
+		// 2 byte sequence
+		elseif ($arr[$k] <= 0x07ff)
+		{
+			echo chr(0xc0 | ($arr[$k] >> 6));
+			echo chr(0x80 | ($arr[$k] & 0x003f));
+		}
+		// Byte order mark (skip)
+		elseif ($arr[$k] == 0xFEFF)
+		{
+			// nop -- zap the BOM
+		}
+		// Test for illegal surrogates
+		elseif ($arr[$k] >= 0xD800 AND $arr[$k] <= 0xDFFF)
+		{
+			// Found a surrogate
+			trigger_error('UTF8::from_unicode: Illegal surrogate at index: '.$k.', value: '.$arr[$k], E_USER_WARNING);
+			return FALSE;
+		}
+		// 3 byte sequence
+		elseif ($arr[$k] <= 0xffff)
+		{
+			echo chr(0xe0 | ($arr[$k] >> 12));
+			echo chr(0x80 | (($arr[$k] >> 6) & 0x003f));
+			echo chr(0x80 | ($arr[$k] & 0x003f));
+		}
+		// 4 byte sequence
+		elseif ($arr[$k] <= 0x10ffff)
+		{
+			echo chr(0xf0 | ($arr[$k] >> 18));
+			echo chr(0x80 | (($arr[$k] >> 12) & 0x3f));
+			echo chr(0x80 | (($arr[$k] >> 6) & 0x3f));
+			echo chr(0x80 | ($arr[$k] & 0x3f));
+		}
+		// Out of range
+		else
+		{
+			trigger_error('UTF8::from_unicode: Codepoint out of Unicode range at index: '.$k.', value: '.$arr[$k], E_USER_WARNING);
+			return FALSE;
+		}
+	}
+
+	$result = ob_get_contents();
+	ob_end_clean();
+	return $result;
+}
diff --git a/includes/kohana/system/utf8/ltrim.php b/includes/kohana/system/utf8/ltrim.php
new file mode 100644
index 0000000..2a81da9
--- /dev/null
+++ b/includes/kohana/system/utf8/ltrim.php
@@ -0,0 +1,22 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::ltrim
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _ltrim($str, $charlist = NULL)
+{
+	if ($charlist === NULL)
+		return ltrim($str);
+
+	if (UTF8::is_ascii($charlist))
+		return ltrim($str, $charlist);
+
+	$charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist);
+
+	return preg_replace('/^['.$charlist.']+/u', '', $str);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/ord.php b/includes/kohana/system/utf8/ord.php
new file mode 100644
index 0000000..0f7e0a7
--- /dev/null
+++ b/includes/kohana/system/utf8/ord.php
@@ -0,0 +1,76 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::ord
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _ord($chr)
+{
+	$ord0 = ord($chr);
+
+	if ($ord0 >= 0 AND $ord0 <= 127)
+		return $ord0;
+
+	if ( ! isset($chr[1]))
+	{
+		trigger_error('Short sequence - at least 2 bytes expected, only 1 seen', E_USER_WARNING);
+		return FALSE;
+	}
+
+	$ord1 = ord($chr[1]);
+
+	if ($ord0 >= 192 AND $ord0 <= 223)
+		return ($ord0 - 192) * 64 + ($ord1 - 128);
+
+	if ( ! isset($chr[2]))
+	{
+		trigger_error('Short sequence - at least 3 bytes expected, only 2 seen', E_USER_WARNING);
+		return FALSE;
+	}
+
+	$ord2 = ord($chr[2]);
+
+	if ($ord0 >= 224 AND $ord0 <= 239)
+		return ($ord0 - 224) * 4096 + ($ord1 - 128) * 64 + ($ord2 - 128);
+
+	if ( ! isset($chr[3]))
+	{
+		trigger_error('Short sequence - at least 4 bytes expected, only 3 seen', E_USER_WARNING);
+		return FALSE;
+	}
+
+	$ord3 = ord($chr[3]);
+
+	if ($ord0 >= 240 AND $ord0 <= 247)
+		return ($ord0 - 240) * 262144 + ($ord1 - 128) * 4096 + ($ord2-128) * 64 + ($ord3 - 128);
+
+	if ( ! isset($chr[4]))
+	{
+		trigger_error('Short sequence - at least 5 bytes expected, only 4 seen', E_USER_WARNING);
+		return FALSE;
+	}
+
+	$ord4 = ord($chr[4]);
+
+	if ($ord0 >= 248 AND $ord0 <= 251)
+		return ($ord0 - 248) * 16777216 + ($ord1-128) * 262144 + ($ord2 - 128) * 4096 + ($ord3 - 128) * 64 + ($ord4 - 128);
+
+	if ( ! isset($chr[5]))
+	{
+		trigger_error('Short sequence - at least 6 bytes expected, only 5 seen', E_USER_WARNING);
+		return FALSE;
+	}
+
+	if ($ord0 >= 252 AND $ord0 <= 253)
+		return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (ord($chr[5]) - 128);
+
+	if ($ord0 >= 254 AND $ord0 <= 255)
+	{
+		trigger_error('Invalid UTF-8 with surrogate ordinal '.$ord0, E_USER_WARNING);
+		return FALSE;
+	}
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/rtrim.php b/includes/kohana/system/utf8/rtrim.php
new file mode 100644
index 0000000..8fbd158
--- /dev/null
+++ b/includes/kohana/system/utf8/rtrim.php
@@ -0,0 +1,22 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::rtrim
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _rtrim($str, $charlist = NULL)
+{
+	if ($charlist === NULL)
+		return rtrim($str);
+
+	if (UTF8::is_ascii($charlist))
+		return rtrim($str, $charlist);
+
+	$charlist = preg_replace('#[-\[\]:\\\\^/]#', '\\\\$0', $charlist);
+
+	return preg_replace('/['.$charlist.']++$/uD', '', $str);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/str_ireplace.php b/includes/kohana/system/utf8/str_ireplace.php
new file mode 100644
index 0000000..407b1e6
--- /dev/null
+++ b/includes/kohana/system/utf8/str_ireplace.php
@@ -0,0 +1,70 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::str_ireplace
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _str_ireplace($search, $replace, $str, & $count = NULL)
+{
+	if (UTF8::is_ascii($search) AND UTF8::is_ascii($replace) AND UTF8::is_ascii($str))
+		return str_ireplace($search, $replace, $str, $count);
+
+	if (is_array($str))
+	{
+		foreach ($str as $key => $val)
+		{
+			$str[$key] = UTF8::str_ireplace($search, $replace, $val, $count);
+		}
+		return $str;
+	}
+
+	if (is_array($search))
+	{
+		$keys = array_keys($search);
+
+		foreach ($keys as $k)
+		{
+			if (is_array($replace))
+			{
+				if (array_key_exists($k, $replace))
+				{
+					$str = UTF8::str_ireplace($search[$k], $replace[$k], $str, $count);
+				}
+				else
+				{
+					$str = UTF8::str_ireplace($search[$k], '', $str, $count);
+				}
+			}
+			else
+			{
+				$str = UTF8::str_ireplace($search[$k], $replace, $str, $count);
+			}
+		}
+		return $str;
+	}
+
+	$search = UTF8::strtolower($search);
+	$str_lower = UTF8::strtolower($str);
+
+	$total_matched_strlen = 0;
+	$i = 0;
+
+	while (preg_match('/(.*?)'.preg_quote($search, '/').'/s', $str_lower, $matches))
+	{
+		$matched_strlen = strlen($matches[0]);
+		$str_lower = substr($str_lower, $matched_strlen);
+
+		$offset = $total_matched_strlen + strlen($matches[1]) + ($i * (strlen($replace) - 1));
+		$str = substr_replace($str, $replace, $offset, strlen($search));
+
+		$total_matched_strlen += $matched_strlen;
+		$i++;
+	}
+
+	$count += $i;
+	return $str;
+}
diff --git a/includes/kohana/system/utf8/str_pad.php b/includes/kohana/system/utf8/str_pad.php
new file mode 100644
index 0000000..d1f4b01
--- /dev/null
+++ b/includes/kohana/system/utf8/str_pad.php
@@ -0,0 +1,50 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::str_pad
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_RIGHT)
+{
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($pad_str))
+		return str_pad($str, $final_str_length, $pad_str, $pad_type);
+
+	$str_length = UTF8::strlen($str);
+
+	if ($final_str_length <= 0 OR $final_str_length <= $str_length)
+		return $str;
+
+	$pad_str_length = UTF8::strlen($pad_str);
+	$pad_length = $final_str_length - $str_length;
+
+	if ($pad_type == STR_PAD_RIGHT)
+	{
+		$repeat = ceil($pad_length / $pad_str_length);
+		return UTF8::substr($str.str_repeat($pad_str, $repeat), 0, $final_str_length);
+	}
+
+	if ($pad_type == STR_PAD_LEFT)
+	{
+		$repeat = ceil($pad_length / $pad_str_length);
+		return UTF8::substr(str_repeat($pad_str, $repeat), 0, floor($pad_length)).$str;
+	}
+
+	if ($pad_type == STR_PAD_BOTH)
+	{
+		$pad_length /= 2;
+		$pad_length_left = floor($pad_length);
+		$pad_length_right = ceil($pad_length);
+		$repeat_left = ceil($pad_length_left / $pad_str_length);
+		$repeat_right = ceil($pad_length_right / $pad_str_length);
+
+		$pad_left = UTF8::substr(str_repeat($pad_str, $repeat_left), 0, $pad_length_left);
+		$pad_right = UTF8::substr(str_repeat($pad_str, $repeat_right), 0, $pad_length_right);
+		return $pad_left.$str.$pad_right;
+	}
+
+	trigger_error('UTF8::str_pad: Unknown padding type ('.$pad_type.')', E_USER_ERROR);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/str_split.php b/includes/kohana/system/utf8/str_split.php
new file mode 100644
index 0000000..4d6a4b9
--- /dev/null
+++ b/includes/kohana/system/utf8/str_split.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::str_split
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _str_split($str, $split_length = 1)
+{
+	$split_length = (int) $split_length;
+
+	if (UTF8::is_ascii($str))
+		return str_split($str, $split_length);
+
+	if ($split_length < 1)
+		return FALSE;
+
+	if (UTF8::strlen($str) <= $split_length)
+		return array($str);
+
+	preg_match_all('/.{'.$split_length.'}|[^\x00]{1,'.$split_length.'}$/us', $str, $matches);
+
+	return $matches[0];
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strcasecmp.php b/includes/kohana/system/utf8/strcasecmp.php
new file mode 100644
index 0000000..c064bcf
--- /dev/null
+++ b/includes/kohana/system/utf8/strcasecmp.php
@@ -0,0 +1,19 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strcasecmp
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strcasecmp($str1, $str2)
+{
+	if (UTF8::is_ascii($str1) AND UTF8::is_ascii($str2))
+		return strcasecmp($str1, $str2);
+
+	$str1 = UTF8::strtolower($str1);
+	$str2 = UTF8::strtolower($str2);
+	return strcmp($str1, $str2);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strcspn.php b/includes/kohana/system/utf8/strcspn.php
new file mode 100644
index 0000000..5951cb7
--- /dev/null
+++ b/includes/kohana/system/utf8/strcspn.php
@@ -0,0 +1,30 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strcspn
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strcspn($str, $mask, $offset = NULL, $length = NULL)
+{
+	if ($str == '' OR $mask == '')
+		return 0;
+
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($mask))
+		return ($offset === NULL) ? strcspn($str, $mask) : (($length === NULL) ? strcspn($str, $mask, $offset) : strcspn($str, $mask, $offset, $length));
+
+	if ($offset !== NULL OR $length !== NULL)
+	{
+		$str = UTF8::substr($str, $offset, $length);
+	}
+
+	// Escape these characters:  - [ ] . : \ ^ /
+	// The . and : are escaped to prevent possible warnings about POSIX regex elements
+	$mask = preg_replace('#[-[\].:\\\\^/]#', '\\\\$0', $mask);
+	preg_match('/^[^'.$mask.']+/u', $str, $matches);
+
+	return isset($matches[0]) ? UTF8::strlen($matches[0]) : 0;
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/stristr.php b/includes/kohana/system/utf8/stristr.php
new file mode 100644
index 0000000..b62440f
--- /dev/null
+++ b/includes/kohana/system/utf8/stristr.php
@@ -0,0 +1,28 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::stristr
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _stristr($str, $search)
+{
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($search))
+		return stristr($str, $search);
+
+	if ($search == '')
+		return $str;
+
+	$str_lower = UTF8::strtolower($str);
+	$search_lower = UTF8::strtolower($search);
+
+	preg_match('/^(.*?)'.preg_quote($search_lower, '/').'/s', $str_lower, $matches);
+
+	if (isset($matches[1]))
+		return substr($str, strlen($matches[1]));
+
+	return FALSE;
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strlen.php b/includes/kohana/system/utf8/strlen.php
new file mode 100644
index 0000000..e4ca3d5
--- /dev/null
+++ b/includes/kohana/system/utf8/strlen.php
@@ -0,0 +1,17 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strlen
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strlen($str)
+{
+	if (UTF8::is_ascii($str))
+		return strlen($str);
+
+	return strlen(utf8_decode($str));
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strpos.php b/includes/kohana/system/utf8/strpos.php
new file mode 100644
index 0000000..837d833
--- /dev/null
+++ b/includes/kohana/system/utf8/strpos.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strpos
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strpos($str, $search, $offset = 0)
+{
+	$offset = (int) $offset;
+
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($search))
+		return strpos($str, $search, $offset);
+
+	if ($offset == 0)
+	{
+		$array = explode($search, $str, 2);
+		return isset($array[1]) ? UTF8::strlen($array[0]) : FALSE;
+	}
+
+	$str = UTF8::substr($str, $offset);
+	$pos = UTF8::strpos($str, $search);
+	return ($pos === FALSE) ? FALSE : ($pos + $offset);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strrev.php b/includes/kohana/system/utf8/strrev.php
new file mode 100644
index 0000000..f4e4e29
--- /dev/null
+++ b/includes/kohana/system/utf8/strrev.php
@@ -0,0 +1,18 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strrev
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strrev($str)
+{
+	if (UTF8::is_ascii($str))
+		return strrev($str);
+
+	preg_match_all('/./us', $str, $matches);
+	return implode('', array_reverse($matches[0]));
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strrpos.php b/includes/kohana/system/utf8/strrpos.php
new file mode 100644
index 0000000..0115583
--- /dev/null
+++ b/includes/kohana/system/utf8/strrpos.php
@@ -0,0 +1,27 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strrpos
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strrpos($str, $search, $offset = 0)
+{
+	$offset = (int) $offset;
+
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($search))
+		return strrpos($str, $search, $offset);
+
+	if ($offset == 0)
+	{
+		$array = explode($search, $str, -1);
+		return isset($array[0]) ? UTF8::strlen(implode($search, $array)) : FALSE;
+	}
+
+	$str = UTF8::substr($str, $offset);
+	$pos = UTF8::strrpos($str, $search);
+	return ($pos === FALSE) ? FALSE : ($pos + $offset);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strspn.php b/includes/kohana/system/utf8/strspn.php
new file mode 100644
index 0000000..8c7a7f5
--- /dev/null
+++ b/includes/kohana/system/utf8/strspn.php
@@ -0,0 +1,30 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strspn
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strspn($str, $mask, $offset = NULL, $length = NULL)
+{
+	if ($str == '' OR $mask == '')
+		return 0;
+
+	if (UTF8::is_ascii($str) AND UTF8::is_ascii($mask))
+		return ($offset === NULL) ? strspn($str, $mask) : (($length === NULL) ? strspn($str, $mask, $offset) : strspn($str, $mask, $offset, $length));
+
+	if ($offset !== NULL OR $length !== NULL)
+	{
+		$str = UTF8::substr($str, $offset, $length);
+	}
+
+	// Escape these characters:  - [ ] . : \ ^ /
+	// The . and : are escaped to prevent possible warnings about POSIX regex elements
+	$mask = preg_replace('#[-[\].:\\\\^/]#', '\\\\$0', $mask);
+	preg_match('/^[^'.$mask.']+/u', $str, $matches);
+
+	return isset($matches[0]) ? UTF8::strlen($matches[0]) : 0;
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strtolower.php b/includes/kohana/system/utf8/strtolower.php
new file mode 100644
index 0000000..f74565e
--- /dev/null
+++ b/includes/kohana/system/utf8/strtolower.php
@@ -0,0 +1,81 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strtolower
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strtolower($str)
+{
+	if (UTF8::is_ascii($str))
+		return strtolower($str);
+
+	static $utf8_upper_to_lower = NULL;
+
+	if ($utf8_upper_to_lower === NULL)
+	{
+		$utf8_upper_to_lower = array(
+			0x0041=>0x0061, 0x03A6=>0x03C6, 0x0162=>0x0163, 0x00C5=>0x00E5, 0x0042=>0x0062,
+			0x0139=>0x013A, 0x00C1=>0x00E1, 0x0141=>0x0142, 0x038E=>0x03CD, 0x0100=>0x0101,
+			0x0490=>0x0491, 0x0394=>0x03B4, 0x015A=>0x015B, 0x0044=>0x0064, 0x0393=>0x03B3,
+			0x00D4=>0x00F4, 0x042A=>0x044A, 0x0419=>0x0439, 0x0112=>0x0113, 0x041C=>0x043C,
+			0x015E=>0x015F, 0x0143=>0x0144, 0x00CE=>0x00EE, 0x040E=>0x045E, 0x042F=>0x044F,
+			0x039A=>0x03BA, 0x0154=>0x0155, 0x0049=>0x0069, 0x0053=>0x0073, 0x1E1E=>0x1E1F,
+			0x0134=>0x0135, 0x0427=>0x0447, 0x03A0=>0x03C0, 0x0418=>0x0438, 0x00D3=>0x00F3,
+			0x0420=>0x0440, 0x0404=>0x0454, 0x0415=>0x0435, 0x0429=>0x0449, 0x014A=>0x014B,
+			0x0411=>0x0431, 0x0409=>0x0459, 0x1E02=>0x1E03, 0x00D6=>0x00F6, 0x00D9=>0x00F9,
+			0x004E=>0x006E, 0x0401=>0x0451, 0x03A4=>0x03C4, 0x0423=>0x0443, 0x015C=>0x015D,
+			0x0403=>0x0453, 0x03A8=>0x03C8, 0x0158=>0x0159, 0x0047=>0x0067, 0x00C4=>0x00E4,
+			0x0386=>0x03AC, 0x0389=>0x03AE, 0x0166=>0x0167, 0x039E=>0x03BE, 0x0164=>0x0165,
+			0x0116=>0x0117, 0x0108=>0x0109, 0x0056=>0x0076, 0x00DE=>0x00FE, 0x0156=>0x0157,
+			0x00DA=>0x00FA, 0x1E60=>0x1E61, 0x1E82=>0x1E83, 0x00C2=>0x00E2, 0x0118=>0x0119,
+			0x0145=>0x0146, 0x0050=>0x0070, 0x0150=>0x0151, 0x042E=>0x044E, 0x0128=>0x0129,
+			0x03A7=>0x03C7, 0x013D=>0x013E, 0x0422=>0x0442, 0x005A=>0x007A, 0x0428=>0x0448,
+			0x03A1=>0x03C1, 0x1E80=>0x1E81, 0x016C=>0x016D, 0x00D5=>0x00F5, 0x0055=>0x0075,
+			0x0176=>0x0177, 0x00DC=>0x00FC, 0x1E56=>0x1E57, 0x03A3=>0x03C3, 0x041A=>0x043A,
+			0x004D=>0x006D, 0x016A=>0x016B, 0x0170=>0x0171, 0x0424=>0x0444, 0x00CC=>0x00EC,
+			0x0168=>0x0169, 0x039F=>0x03BF, 0x004B=>0x006B, 0x00D2=>0x00F2, 0x00C0=>0x00E0,
+			0x0414=>0x0434, 0x03A9=>0x03C9, 0x1E6A=>0x1E6B, 0x00C3=>0x00E3, 0x042D=>0x044D,
+			0x0416=>0x0436, 0x01A0=>0x01A1, 0x010C=>0x010D, 0x011C=>0x011D, 0x00D0=>0x00F0,
+			0x013B=>0x013C, 0x040F=>0x045F, 0x040A=>0x045A, 0x00C8=>0x00E8, 0x03A5=>0x03C5,
+			0x0046=>0x0066, 0x00DD=>0x00FD, 0x0043=>0x0063, 0x021A=>0x021B, 0x00CA=>0x00EA,
+			0x0399=>0x03B9, 0x0179=>0x017A, 0x00CF=>0x00EF, 0x01AF=>0x01B0, 0x0045=>0x0065,
+			0x039B=>0x03BB, 0x0398=>0x03B8, 0x039C=>0x03BC, 0x040C=>0x045C, 0x041F=>0x043F,
+			0x042C=>0x044C, 0x00DE=>0x00FE, 0x00D0=>0x00F0, 0x1EF2=>0x1EF3, 0x0048=>0x0068,
+			0x00CB=>0x00EB, 0x0110=>0x0111, 0x0413=>0x0433, 0x012E=>0x012F, 0x00C6=>0x00E6,
+			0x0058=>0x0078, 0x0160=>0x0161, 0x016E=>0x016F, 0x0391=>0x03B1, 0x0407=>0x0457,
+			0x0172=>0x0173, 0x0178=>0x00FF, 0x004F=>0x006F, 0x041B=>0x043B, 0x0395=>0x03B5,
+			0x0425=>0x0445, 0x0120=>0x0121, 0x017D=>0x017E, 0x017B=>0x017C, 0x0396=>0x03B6,
+			0x0392=>0x03B2, 0x0388=>0x03AD, 0x1E84=>0x1E85, 0x0174=>0x0175, 0x0051=>0x0071,
+			0x0417=>0x0437, 0x1E0A=>0x1E0B, 0x0147=>0x0148, 0x0104=>0x0105, 0x0408=>0x0458,
+			0x014C=>0x014D, 0x00CD=>0x00ED, 0x0059=>0x0079, 0x010A=>0x010B, 0x038F=>0x03CE,
+			0x0052=>0x0072, 0x0410=>0x0430, 0x0405=>0x0455, 0x0402=>0x0452, 0x0126=>0x0127,
+			0x0136=>0x0137, 0x012A=>0x012B, 0x038A=>0x03AF, 0x042B=>0x044B, 0x004C=>0x006C,
+			0x0397=>0x03B7, 0x0124=>0x0125, 0x0218=>0x0219, 0x00DB=>0x00FB, 0x011E=>0x011F,
+			0x041E=>0x043E, 0x1E40=>0x1E41, 0x039D=>0x03BD, 0x0106=>0x0107, 0x03AB=>0x03CB,
+			0x0426=>0x0446, 0x00DE=>0x00FE, 0x00C7=>0x00E7, 0x03AA=>0x03CA, 0x0421=>0x0441,
+			0x0412=>0x0432, 0x010E=>0x010F, 0x00D8=>0x00F8, 0x0057=>0x0077, 0x011A=>0x011B,
+			0x0054=>0x0074, 0x004A=>0x006A, 0x040B=>0x045B, 0x0406=>0x0456, 0x0102=>0x0103,
+			0x039B=>0x03BB, 0x00D1=>0x00F1, 0x041D=>0x043D, 0x038C=>0x03CC, 0x00C9=>0x00E9,
+			0x00D0=>0x00F0, 0x0407=>0x0457, 0x0122=>0x0123,
+		);
+	}
+
+	$uni = UTF8::to_unicode($str);
+
+	if ($uni === FALSE)
+		return FALSE;
+
+	for ($i = 0, $c = count($uni); $i < $c; $i++)
+	{
+		if (isset($utf8_upper_to_lower[$uni[$i]]))
+		{
+			$uni[$i] = $utf8_upper_to_lower[$uni[$i]];
+		}
+	}
+
+	return UTF8::from_unicode($uni);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/strtoupper.php b/includes/kohana/system/utf8/strtoupper.php
new file mode 100644
index 0000000..68fe691
--- /dev/null
+++ b/includes/kohana/system/utf8/strtoupper.php
@@ -0,0 +1,81 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::strtoupper
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _strtoupper($str)
+{
+	if (UTF8::is_ascii($str))
+		return strtoupper($str);
+
+	static $utf8_lower_to_upper = NULL;
+
+	if ($utf8_lower_to_upper === NULL)
+	{
+		$utf8_lower_to_upper = array(
+			0x0061=>0x0041, 0x03C6=>0x03A6, 0x0163=>0x0162, 0x00E5=>0x00C5, 0x0062=>0x0042,
+			0x013A=>0x0139, 0x00E1=>0x00C1, 0x0142=>0x0141, 0x03CD=>0x038E, 0x0101=>0x0100,
+			0x0491=>0x0490, 0x03B4=>0x0394, 0x015B=>0x015A, 0x0064=>0x0044, 0x03B3=>0x0393,
+			0x00F4=>0x00D4, 0x044A=>0x042A, 0x0439=>0x0419, 0x0113=>0x0112, 0x043C=>0x041C,
+			0x015F=>0x015E, 0x0144=>0x0143, 0x00EE=>0x00CE, 0x045E=>0x040E, 0x044F=>0x042F,
+			0x03BA=>0x039A, 0x0155=>0x0154, 0x0069=>0x0049, 0x0073=>0x0053, 0x1E1F=>0x1E1E,
+			0x0135=>0x0134, 0x0447=>0x0427, 0x03C0=>0x03A0, 0x0438=>0x0418, 0x00F3=>0x00D3,
+			0x0440=>0x0420, 0x0454=>0x0404, 0x0435=>0x0415, 0x0449=>0x0429, 0x014B=>0x014A,
+			0x0431=>0x0411, 0x0459=>0x0409, 0x1E03=>0x1E02, 0x00F6=>0x00D6, 0x00F9=>0x00D9,
+			0x006E=>0x004E, 0x0451=>0x0401, 0x03C4=>0x03A4, 0x0443=>0x0423, 0x015D=>0x015C,
+			0x0453=>0x0403, 0x03C8=>0x03A8, 0x0159=>0x0158, 0x0067=>0x0047, 0x00E4=>0x00C4,
+			0x03AC=>0x0386, 0x03AE=>0x0389, 0x0167=>0x0166, 0x03BE=>0x039E, 0x0165=>0x0164,
+			0x0117=>0x0116, 0x0109=>0x0108, 0x0076=>0x0056, 0x00FE=>0x00DE, 0x0157=>0x0156,
+			0x00FA=>0x00DA, 0x1E61=>0x1E60, 0x1E83=>0x1E82, 0x00E2=>0x00C2, 0x0119=>0x0118,
+			0x0146=>0x0145, 0x0070=>0x0050, 0x0151=>0x0150, 0x044E=>0x042E, 0x0129=>0x0128,
+			0x03C7=>0x03A7, 0x013E=>0x013D, 0x0442=>0x0422, 0x007A=>0x005A, 0x0448=>0x0428,
+			0x03C1=>0x03A1, 0x1E81=>0x1E80, 0x016D=>0x016C, 0x00F5=>0x00D5, 0x0075=>0x0055,
+			0x0177=>0x0176, 0x00FC=>0x00DC, 0x1E57=>0x1E56, 0x03C3=>0x03A3, 0x043A=>0x041A,
+			0x006D=>0x004D, 0x016B=>0x016A, 0x0171=>0x0170, 0x0444=>0x0424, 0x00EC=>0x00CC,
+			0x0169=>0x0168, 0x03BF=>0x039F, 0x006B=>0x004B, 0x00F2=>0x00D2, 0x00E0=>0x00C0,
+			0x0434=>0x0414, 0x03C9=>0x03A9, 0x1E6B=>0x1E6A, 0x00E3=>0x00C3, 0x044D=>0x042D,
+			0x0436=>0x0416, 0x01A1=>0x01A0, 0x010D=>0x010C, 0x011D=>0x011C, 0x00F0=>0x00D0,
+			0x013C=>0x013B, 0x045F=>0x040F, 0x045A=>0x040A, 0x00E8=>0x00C8, 0x03C5=>0x03A5,
+			0x0066=>0x0046, 0x00FD=>0x00DD, 0x0063=>0x0043, 0x021B=>0x021A, 0x00EA=>0x00CA,
+			0x03B9=>0x0399, 0x017A=>0x0179, 0x00EF=>0x00CF, 0x01B0=>0x01AF, 0x0065=>0x0045,
+			0x03BB=>0x039B, 0x03B8=>0x0398, 0x03BC=>0x039C, 0x045C=>0x040C, 0x043F=>0x041F,
+			0x044C=>0x042C, 0x00FE=>0x00DE, 0x00F0=>0x00D0, 0x1EF3=>0x1EF2, 0x0068=>0x0048,
+			0x00EB=>0x00CB, 0x0111=>0x0110, 0x0433=>0x0413, 0x012F=>0x012E, 0x00E6=>0x00C6,
+			0x0078=>0x0058, 0x0161=>0x0160, 0x016F=>0x016E, 0x03B1=>0x0391, 0x0457=>0x0407,
+			0x0173=>0x0172, 0x00FF=>0x0178, 0x006F=>0x004F, 0x043B=>0x041B, 0x03B5=>0x0395,
+			0x0445=>0x0425, 0x0121=>0x0120, 0x017E=>0x017D, 0x017C=>0x017B, 0x03B6=>0x0396,
+			0x03B2=>0x0392, 0x03AD=>0x0388, 0x1E85=>0x1E84, 0x0175=>0x0174, 0x0071=>0x0051,
+			0x0437=>0x0417, 0x1E0B=>0x1E0A, 0x0148=>0x0147, 0x0105=>0x0104, 0x0458=>0x0408,
+			0x014D=>0x014C, 0x00ED=>0x00CD, 0x0079=>0x0059, 0x010B=>0x010A, 0x03CE=>0x038F,
+			0x0072=>0x0052, 0x0430=>0x0410, 0x0455=>0x0405, 0x0452=>0x0402, 0x0127=>0x0126,
+			0x0137=>0x0136, 0x012B=>0x012A, 0x03AF=>0x038A, 0x044B=>0x042B, 0x006C=>0x004C,
+			0x03B7=>0x0397, 0x0125=>0x0124, 0x0219=>0x0218, 0x00FB=>0x00DB, 0x011F=>0x011E,
+			0x043E=>0x041E, 0x1E41=>0x1E40, 0x03BD=>0x039D, 0x0107=>0x0106, 0x03CB=>0x03AB,
+			0x0446=>0x0426, 0x00FE=>0x00DE, 0x00E7=>0x00C7, 0x03CA=>0x03AA, 0x0441=>0x0421,
+			0x0432=>0x0412, 0x010F=>0x010E, 0x00F8=>0x00D8, 0x0077=>0x0057, 0x011B=>0x011A,
+			0x0074=>0x0054, 0x006A=>0x004A, 0x045B=>0x040B, 0x0456=>0x0406, 0x0103=>0x0102,
+			0x03BB=>0x039B, 0x00F1=>0x00D1, 0x043D=>0x041D, 0x03CC=>0x038C, 0x00E9=>0x00C9,
+			0x00F0=>0x00D0, 0x0457=>0x0407, 0x0123=>0x0122,
+		);
+	}
+
+	$uni = UTF8::to_unicode($str);
+
+	if ($uni === FALSE)
+		return FALSE;
+
+	for ($i = 0, $c = count($uni); $i < $c; $i++)
+	{
+		if (isset($utf8_lower_to_upper[$uni[$i]]))
+		{
+			$uni[$i] = $utf8_lower_to_upper[$uni[$i]];
+		}
+	}
+
+	return UTF8::from_unicode($uni);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/substr.php b/includes/kohana/system/utf8/substr.php
new file mode 100644
index 0000000..b9fd44e
--- /dev/null
+++ b/includes/kohana/system/utf8/substr.php
@@ -0,0 +1,72 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::substr
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _substr($str, $offset, $length = NULL)
+{
+	if (UTF8::is_ascii($str))
+		return ($length === NULL) ? substr($str, $offset) : substr($str, $offset, $length);
+
+	// Normalize params
+	$str    = (string) $str;
+	$strlen = UTF8::strlen($str);
+	$offset = (int) ($offset < 0) ? max(0, $strlen + $offset) : $offset; // Normalize to positive offset
+	$length = ($length === NULL) ? NULL : (int) $length;
+
+	// Impossible
+	if ($length === 0 OR $offset >= $strlen OR ($length < 0 AND $length <= $offset - $strlen))
+		return '';
+
+	// Whole string
+	if ($offset == 0 AND ($length === NULL OR $length >= $strlen))
+		return $str;
+
+	// Build regex
+	$regex = '^';
+
+	// Create an offset expression
+	if ($offset > 0)
+	{
+		// PCRE repeating quantifiers must be less than 65536, so repeat when necessary
+		$x = (int) ($offset / 65535);
+		$y = (int) ($offset % 65535);
+		$regex .= ($x == 0) ? '' : ('(?:.{65535}){'.$x.'}');
+		$regex .= ($y == 0) ? '' : ('.{'.$y.'}');
+	}
+
+	// Create a length expression
+	if ($length === NULL)
+	{
+		$regex .= '(.*)'; // No length set, grab it all
+	}
+	// Find length from the left (positive length)
+	elseif ($length > 0)
+	{
+		// Reduce length so that it can't go beyond the end of the string
+		$length = min($strlen - $offset, $length);
+
+		$x = (int) ($length / 65535);
+		$y = (int) ($length % 65535);
+		$regex .= '(';
+		$regex .= ($x == 0) ? '' : ('(?:.{65535}){'.$x.'}');
+		$regex .= '.{'.$y.'})';
+	}
+	// Find length from the right (negative length)
+	else
+	{
+		$x = (int) (-$length / 65535);
+		$y = (int) (-$length % 65535);
+		$regex .= '(.*)';
+		$regex .= ($x == 0) ? '' : ('(?:.{65535}){'.$x.'}');
+		$regex .= '.{'.$y.'}';
+	}
+
+	preg_match('/'.$regex.'/us', $str, $matches);
+	return $matches[1];
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/substr_replace.php b/includes/kohana/system/utf8/substr_replace.php
new file mode 100644
index 0000000..2439c44
--- /dev/null
+++ b/includes/kohana/system/utf8/substr_replace.php
@@ -0,0 +1,22 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::substr_replace
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _substr_replace($str, $replacement, $offset, $length = NULL)
+{
+	if (UTF8::is_ascii($str))
+		return ($length === NULL) ? substr_replace($str, $replacement, $offset) : substr_replace($str, $replacement, $offset, $length);
+
+	$length = ($length === NULL) ? UTF8::strlen($str) : (int) $length;
+	preg_match_all('/./us', $str, $str_array);
+	preg_match_all('/./us', $replacement, $replacement_array);
+
+	array_splice($str_array[0], $offset, $length, $replacement_array[0]);
+	return implode('', $str_array[0]);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/to_unicode.php b/includes/kohana/system/utf8/to_unicode.php
new file mode 100644
index 0000000..fe8f6c1
--- /dev/null
+++ b/includes/kohana/system/utf8/to_unicode.php
@@ -0,0 +1,144 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::to_unicode
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _to_unicode($str)
+{
+	// Cached expected number of octets after the current octet until the beginning of the next UTF8 character sequence
+	$m_state = 0;
+	// Cached Unicode character
+	$m_ucs4  = 0;
+	// Cached expected number of octets in the current sequence
+	$m_bytes = 1;
+
+	$out = array();
+
+	$len = strlen($str);
+
+	for ($i = 0; $i < $len; $i++)
+	{
+		$in = ord($str[$i]);
+
+		if ($m_state == 0)
+		{
+			// When m_state is zero we expect either a US-ASCII character or a multi-octet sequence.
+			if (0 == (0x80 & $in))
+			{
+				// US-ASCII, pass straight through.
+				$out[] = $in;
+				$m_bytes = 1;
+			}
+			elseif (0xC0 == (0xE0 & $in))
+			{
+				// First octet of 2 octet sequence
+				$m_ucs4 = $in;
+				$m_ucs4 = ($m_ucs4 & 0x1F) << 6;
+				$m_state = 1;
+				$m_bytes = 2;
+			}
+			elseif (0xE0 == (0xF0 & $in))
+			{
+				// First octet of 3 octet sequence
+				$m_ucs4 = $in;
+				$m_ucs4 = ($m_ucs4 & 0x0F) << 12;
+				$m_state = 2;
+				$m_bytes = 3;
+			}
+			elseif (0xF0 == (0xF8 & $in))
+			{
+				// First octet of 4 octet sequence
+				$m_ucs4 = $in;
+				$m_ucs4 = ($m_ucs4 & 0x07) << 18;
+				$m_state = 3;
+				$m_bytes = 4;
+			}
+			elseif (0xF8 == (0xFC & $in))
+			{
+				/** First octet of 5 octet sequence.
+				 *
+				 * This is illegal because the encoded codepoint must be either
+				 * (a) not the shortest form or
+				 * (b) outside the Unicode range of 0-0x10FFFF.
+				 * Rather than trying to resynchronize, we will carry on until the end
+				 * of the sequence and let the later error handling code catch it.
+				 **/
+				$m_ucs4 = $in;
+				$m_ucs4 = ($m_ucs4 & 0x03) << 24;
+				$m_state = 4;
+				$m_bytes = 5;
+			}
+			elseif (0xFC == (0xFE & $in))
+			{
+				// First octet of 6 octet sequence, see comments for 5 octet sequence.
+				$m_ucs4 = $in;
+				$m_ucs4 = ($m_ucs4 & 1) << 30;
+				$m_state = 5;
+				$m_bytes = 6;
+			}
+			else
+			{
+				// Current octet is neither in the US-ASCII range nor a legal first octet of a multi-octet sequence.
+				trigger_error('UTF8::to_unicode: Illegal sequence identifier in UTF-8 at byte '.$i, E_USER_WARNING);
+				return FALSE;
+			}
+		}
+		else
+		{
+			// When m_state is non-zero, we expect a continuation of the multi-octet sequence
+			if (0x80 == (0xC0 & $in))
+			{
+				// Legal continuation
+				$shift = ($m_state - 1) * 6;
+				$tmp = $in;
+				$tmp = ($tmp & 0x0000003F) << $shift;
+				$m_ucs4 |= $tmp;
+
+				// End of the multi-octet sequence. mUcs4 now contains the final Unicode codepoint to be output
+				if (0 == --$m_state)
+				{
+					// Check for illegal sequences and codepoints
+
+					// From Unicode 3.1, non-shortest form is illegal
+					if (((2 == $m_bytes) AND ($m_ucs4 < 0x0080)) OR
+						((3 == $m_bytes) AND ($m_ucs4 < 0x0800)) OR
+						((4 == $m_bytes) AND ($m_ucs4 < 0x10000)) OR
+						(4 < $m_bytes) OR
+						// From Unicode 3.2, surrogate characters are illegal
+						(($m_ucs4 & 0xFFFFF800) == 0xD800) OR
+						// Codepoints outside the Unicode range are illegal
+						($m_ucs4 > 0x10FFFF))
+					{
+						trigger_error('UTF8::to_unicode: Illegal sequence or codepoint in UTF-8 at byte '.$i, E_USER_WARNING);
+						return FALSE;
+					}
+
+					if (0xFEFF != $m_ucs4)
+					{
+						// BOM is legal but we don't want to output it
+						$out[] = $m_ucs4;
+					}
+
+					// Initialize UTF-8 cache
+					$m_state = 0;
+					$m_ucs4  = 0;
+					$m_bytes = 1;
+				}
+			}
+			else
+			{
+				// ((0xC0 & (*in) != 0x80) AND (m_state != 0))
+				// Incomplete multi-octet sequence
+				trigger_error('UTF8::to_unicode: Incomplete multi-octet sequence in UTF-8 at byte '.$i, E_USER_WARNING);
+				return FALSE;
+			}
+		}
+	}
+
+	return $out;
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/transliterate_to_ascii.php b/includes/kohana/system/utf8/transliterate_to_ascii.php
new file mode 100644
index 0000000..9c05d2f
--- /dev/null
+++ b/includes/kohana/system/utf8/transliterate_to_ascii.php
@@ -0,0 +1,77 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::transliterate_to_ascii
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _transliterate_to_ascii($str, $case = 0)
+{
+	static $utf8_lower_accents = NULL;
+	static $utf8_upper_accents = NULL;
+
+	if ($case <= 0)
+	{
+		if ($utf8_lower_accents === NULL)
+		{
+			$utf8_lower_accents = array(
+				'à' => 'a',  'ô' => 'o',  'ď' => 'd',  'ḟ' => 'f',  'ë' => 'e',  'š' => 's',  'ơ' => 'o',
+				'ß' => 'ss', 'ă' => 'a',  'ř' => 'r',  'ț' => 't',  'ň' => 'n',  'ā' => 'a',  'ķ' => 'k',
+				'ŝ' => 's',  'ỳ' => 'y',  'ņ' => 'n',  'ĺ' => 'l',  'ħ' => 'h',  'ṗ' => 'p',  'ó' => 'o',
+				'ú' => 'u',  'ě' => 'e',  'é' => 'e',  'ç' => 'c',  'ẁ' => 'w',  'ċ' => 'c',  'õ' => 'o',
+				'ṡ' => 's',  'ø' => 'o',  'ģ' => 'g',  'ŧ' => 't',  'ș' => 's',  'ė' => 'e',  'ĉ' => 'c',
+				'ś' => 's',  'î' => 'i',  'ű' => 'u',  'ć' => 'c',  'ę' => 'e',  'ŵ' => 'w',  'ṫ' => 't',
+				'ū' => 'u',  'č' => 'c',  'ö' => 'o',  'è' => 'e',  'ŷ' => 'y',  'ą' => 'a',  'ł' => 'l',
+				'ų' => 'u',  'ů' => 'u',  'ş' => 's',  'ğ' => 'g',  'ļ' => 'l',  'ƒ' => 'f',  'ž' => 'z',
+				'ẃ' => 'w',  'ḃ' => 'b',  'å' => 'a',  'ì' => 'i',  'ï' => 'i',  'ḋ' => 'd',  'ť' => 't',
+				'ŗ' => 'r',  'ä' => 'a',  'í' => 'i',  'ŕ' => 'r',  'ê' => 'e',  'ü' => 'u',  'ò' => 'o',
+				'ē' => 'e',  'ñ' => 'n',  'ń' => 'n',  'ĥ' => 'h',  'ĝ' => 'g',  'đ' => 'd',  'ĵ' => 'j',
+				'ÿ' => 'y',  'ũ' => 'u',  'ŭ' => 'u',  'ư' => 'u',  'ţ' => 't',  'ý' => 'y',  'ő' => 'o',
+				'â' => 'a',  'ľ' => 'l',  'ẅ' => 'w',  'ż' => 'z',  'ī' => 'i',  'ã' => 'a',  'ġ' => 'g',
+				'ṁ' => 'm',  'ō' => 'o',  'ĩ' => 'i',  'ù' => 'u',  'į' => 'i',  'ź' => 'z',  'á' => 'a',
+				'û' => 'u',  'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u',  'ĕ' => 'e',  'ı' => 'i',
+			);
+		}
+
+		$str = str_replace(
+			array_keys($utf8_lower_accents),
+			array_values($utf8_lower_accents),
+			$str
+		);
+	}
+
+	if ($case >= 0)
+	{
+		if ($utf8_upper_accents === NULL)
+		{
+			$utf8_upper_accents = array(
+				'À' => 'A',  'Ô' => 'O',  'Ď' => 'D',  'Ḟ' => 'F',  'Ë' => 'E',  'Š' => 'S',  'Ơ' => 'O',
+				'Ă' => 'A',  'Ř' => 'R',  'Ț' => 'T',  'Ň' => 'N',  'Ā' => 'A',  'Ķ' => 'K',  'Ĕ' => 'E',
+				'Ŝ' => 'S',  'Ỳ' => 'Y',  'Ņ' => 'N',  'Ĺ' => 'L',  'Ħ' => 'H',  'Ṗ' => 'P',  'Ó' => 'O',
+				'Ú' => 'U',  'Ě' => 'E',  'É' => 'E',  'Ç' => 'C',  'Ẁ' => 'W',  'Ċ' => 'C',  'Õ' => 'O',
+				'Ṡ' => 'S',  'Ø' => 'O',  'Ģ' => 'G',  'Ŧ' => 'T',  'Ș' => 'S',  'Ė' => 'E',  'Ĉ' => 'C',
+				'Ś' => 'S',  'Î' => 'I',  'Ű' => 'U',  'Ć' => 'C',  'Ę' => 'E',  'Ŵ' => 'W',  'Ṫ' => 'T',
+				'Ū' => 'U',  'Č' => 'C',  'Ö' => 'O',  'È' => 'E',  'Ŷ' => 'Y',  'Ą' => 'A',  'Ł' => 'L',
+				'Ų' => 'U',  'Ů' => 'U',  'Ş' => 'S',  'Ğ' => 'G',  'Ļ' => 'L',  'Ƒ' => 'F',  'Ž' => 'Z',
+				'Ẃ' => 'W',  'Ḃ' => 'B',  'Å' => 'A',  'Ì' => 'I',  'Ï' => 'I',  'Ḋ' => 'D',  'Ť' => 'T',
+				'Ŗ' => 'R',  'Ä' => 'A',  'Í' => 'I',  'Ŕ' => 'R',  'Ê' => 'E',  'Ü' => 'U',  'Ò' => 'O',
+				'Ē' => 'E',  'Ñ' => 'N',  'Ń' => 'N',  'Ĥ' => 'H',  'Ĝ' => 'G',  'Đ' => 'D',  'Ĵ' => 'J',
+				'Ÿ' => 'Y',  'Ũ' => 'U',  'Ŭ' => 'U',  'Ư' => 'U',  'Ţ' => 'T',  'Ý' => 'Y',  'Ő' => 'O',
+				'Â' => 'A',  'Ľ' => 'L',  'Ẅ' => 'W',  'Ż' => 'Z',  'Ī' => 'I',  'Ã' => 'A',  'Ġ' => 'G',
+				'Ṁ' => 'M',  'Ō' => 'O',  'Ĩ' => 'I',  'Ù' => 'U',  'Į' => 'I',  'Ź' => 'Z',  'Á' => 'A',
+				'Û' => 'U',  'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'İ' => 'I',
+			);
+		}
+
+		$str = str_replace(
+			array_keys($utf8_upper_accents),
+			array_values($utf8_upper_accents),
+			$str
+		);
+	}
+
+	return $str;
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/trim.php b/includes/kohana/system/utf8/trim.php
new file mode 100644
index 0000000..aa2bc31
--- /dev/null
+++ b/includes/kohana/system/utf8/trim.php
@@ -0,0 +1,17 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::trim
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _trim($str, $charlist = NULL)
+{
+	if ($charlist === NULL)
+		return trim($str);
+
+	return UTF8::ltrim(UTF8::rtrim($str, $charlist), $charlist);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/ucfirst.php b/includes/kohana/system/utf8/ucfirst.php
new file mode 100644
index 0000000..6896fab
--- /dev/null
+++ b/includes/kohana/system/utf8/ucfirst.php
@@ -0,0 +1,18 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::ucfirst
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _ucfirst($str)
+{
+	if (UTF8::is_ascii($str))
+		return ucfirst($str);
+
+	preg_match('/^(.?)(.*)$/us', $str, $matches);
+	return UTF8::strtoupper($matches[1]).$matches[2];
+}
\ No newline at end of file
diff --git a/includes/kohana/system/utf8/ucwords.php b/includes/kohana/system/utf8/ucwords.php
new file mode 100644
index 0000000..a3b7e1b
--- /dev/null
+++ b/includes/kohana/system/utf8/ucwords.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * UTF8::ucwords
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2005 Harry Fuecks
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ */
+function _ucwords($str)
+{
+	if (UTF8::is_ascii($str))
+		return ucwords($str);
+
+	// [\x0c\x09\x0b\x0a\x0d\x20] matches form feeds, horizontal tabs, vertical tabs, linefeeds and carriage returns.
+	// This corresponds to the definition of a 'word' defined at http://php.net/ucwords
+	return preg_replace(
+		'/(?<=^|[\x0c\x09\x0b\x0a\x0d\x20])[^\x0c\x09\x0b\x0a\x0d\x20]/ue',
+		'UTF8::strtoupper(\'$0\')',
+		$str
+	);
+}
\ No newline at end of file
diff --git a/includes/kohana/system/views/kohana/error.php b/includes/kohana/system/views/kohana/error.php
new file mode 100644
index 0000000..e9f991b
--- /dev/null
+++ b/includes/kohana/system/views/kohana/error.php
@@ -0,0 +1,128 @@
+<?php
+
+// Unique error identifier
+$error_id = uniqid('error');
+
+?>
+<style type="text/css">
+#kohana_error { background: #ddd; font-size: 1em; font-family:sans-serif; text-align: left; color: #111; }
+#kohana_error h1,
+#kohana_error h2 { margin: 0; padding: 1em; font-size: 1em; font-weight: normal; background: #911; color: #fff; }
+	#kohana_error h1 a,
+	#kohana_error h2 a { color: #fff; }
+#kohana_error h2 { background: #222; }
+#kohana_error h3 { margin: 0; padding: 0.4em 0 0; font-size: 1em; font-weight: normal; }
+#kohana_error p { margin: 0; padding: 0.2em 0; }
+#kohana_error a { color: #1b323b; }
+#kohana_error pre { overflow: auto; white-space: pre-wrap; }
+#kohana_error table { width: 100%; display: block; margin: 0 0 0.4em; padding: 0; border-collapse: collapse; background: #fff; }
+	#kohana_error table td { border: solid 1px #ddd; text-align: left; vertical-align: top; padding: 0.4em; }
+#kohana_error div.content { padding: 0.4em 1em 1em; overflow: hidden; }
+#kohana_error pre.source { margin: 0 0 1em; padding: 0.4em; background: #fff; border: dotted 1px #b7c680; line-height: 1.2em; }
+	#kohana_error pre.source span.line { display: block; }
+	#kohana_error pre.source span.highlight { background: #f0eb96; }
+		#kohana_error pre.source span.line span.number { color: #666; }
+#kohana_error ol.trace { display: block; margin: 0 0 0 2em; padding: 0; list-style: decimal; }
+	#kohana_error ol.trace li { margin: 0; padding: 0; }
+.js .collapsed { display: none; }
+</style>
+<script type="text/javascript">
+document.documentElement.className = document.documentElement.className + ' js';
+function koggle(elem)
+{
+	elem = document.getElementById(elem);
+
+	if (elem.style && elem.style['display'])
+		// Only works with the "style" attr
+		var disp = elem.style['display'];
+	else if (elem.currentStyle)
+		// For MSIE, naturally
+		var disp = elem.currentStyle['display'];
+	else if (window.getComputedStyle)
+		// For most other browsers
+		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+
+	// Toggle the state of the "display" style
+	elem.style.display = disp == 'block' ? 'none' : 'block';
+	return false;
+}
+</script>
+<div id="kohana_error">
+	<h1><span class="type"><?php echo $type ?> [ <?php echo $code ?> ]:</span> <span class="message"><?php echo html::chars($message) ?></span></h1>
+	<div id="<?php echo $error_id ?>" class="content">
+		<p><span class="file"><?php echo Debug::path($file) ?> [ <?php echo $line ?> ]</span></p>
+		<?php echo Debug::source($file, $line) ?>
+		<ol class="trace">
+		<?php foreach (Debug::trace($trace) as $i => $step): ?>
+			<li>
+				<p>
+					<span class="file">
+						<?php if ($step['file']): $source_id = $error_id.'source'.$i; ?>
+							<a href="#<?php echo $source_id ?>" onclick="return koggle('<?php echo $source_id ?>')"><?php echo Debug::path($step['file']) ?> [ <?php echo $step['line'] ?> ]</a>
+						<?php else: ?>
+							{<?php echo __('PHP internal call') ?>}
+						<?php endif ?>
+					</span>
+					&raquo;
+					<?php echo $step['function'] ?>(<?php if ($step['args']): $args_id = $error_id.'args'.$i; ?><a href="#<?php echo $args_id ?>" onclick="return koggle('<?php echo $args_id ?>')"><?php echo __('arguments') ?></a><?php endif ?>)
+				</p>
+				<?php if (isset($args_id)): ?>
+				<div id="<?php echo $args_id ?>" class="collapsed">
+					<table cellspacing="0">
+					<?php foreach ($step['args'] as $name => $arg): ?>
+						<tr>
+							<td><code><?php echo $name ?></code></td>
+							<td><pre><?php echo Debug::dump($arg) ?></pre></td>
+						</tr>
+					<?php endforeach ?>
+					</table>
+				</div>
+				<?php endif ?>
+				<?php if (isset($source_id)): ?>
+					<pre id="<?php echo $source_id ?>" class="source collapsed"><code><?php echo $step['source'] ?></code></pre>
+				<?php endif ?>
+			</li>
+			<?php unset($args_id, $source_id); ?>
+		<?php endforeach ?>
+		</ol>
+	</div>
+	<h2><a href="#<?php echo $env_id = $error_id.'environment' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Environment') ?></a></h2>
+	<div id="<?php echo $env_id ?>" class="content collapsed">
+		<?php $included = get_included_files() ?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment_included' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Included files') ?></a> (<?php echo count($included) ?>)</h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($included as $file): ?>
+				<tr>
+					<td><code><?php echo Debug::path($file) ?></code></td>
+				</tr>
+				<?php endforeach ?>
+			</table>
+		</div>
+		<?php $included = get_loaded_extensions() ?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment_loaded' ?>" onclick="return koggle('<?php echo $env_id ?>')"><?php echo __('Loaded extensions') ?></a> (<?php echo count($included) ?>)</h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($included as $file): ?>
+				<tr>
+					<td><code><?php echo Debug::path($file) ?></code></td>
+				</tr>
+				<?php endforeach ?>
+			</table>
+		</div>
+		<?php foreach (array('_SESSION', '_GET', '_POST', '_FILES', '_COOKIE', '_SERVER') as $var): ?>
+		<?php if (empty($GLOBALS[$var]) OR ! is_array($GLOBALS[$var])) continue ?>
+		<h3><a href="#<?php echo $env_id = $error_id.'environment'.strtolower($var) ?>" onclick="return koggle('<?php echo $env_id ?>')">$<?php echo $var ?></a></h3>
+		<div id="<?php echo $env_id ?>" class="collapsed">
+			<table cellspacing="0">
+				<?php foreach ($GLOBALS[$var] as $key => $value): ?>
+				<tr>
+					<td><code><?php echo HTML::chars($key) ?></code></td>
+					<td><pre><?php echo Debug::dump($value) ?></pre></td>
+				</tr>
+				<?php endforeach ?>
+			</table>
+		</div>
+		<?php endforeach ?>
+	</div>
+</div>
diff --git a/includes/kohana/system/views/kohana/generate_logo.php b/includes/kohana/system/views/kohana/generate_logo.php
new file mode 100644
index 0000000..a85eb65
--- /dev/null
+++ b/includes/kohana/system/views/kohana/generate_logo.php
@@ -0,0 +1,14 @@
+<?php
+
+// Get the latest logo contents
+$data = base64_encode(file_get_contents('http://kohanaframework.org/media/img/kohana.png'));
+
+// Create the logo file
+file_put_contents('logo.php', "<?php
+/**
+ * Kohana Logo, base64_encoded PNG
+ * 
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+return array('mime' => 'image/png', 'data' => '{$data}'); ?>");
\ No newline at end of file
diff --git a/includes/kohana/system/views/kohana/logo.php b/includes/kohana/system/views/kohana/logo.php
new file mode 100644
index 0000000..9c670b8
--- /dev/null
+++ b/includes/kohana/system/views/kohana/logo.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Kohana Logo, base64_encoded PNG
+ * 
+ * @copyright  (c) 2008-2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+return array('mime' => 'image/png', 'data' => 'iVBORw0KGgoAAAANSUhEUgAAAL8AAAA+CAYAAAB6Bsp7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACtppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDQuMi4yLWMwNjMgNTMuMzUyNjI0LCAyMDA4LzA3LzMwLTE4OjA1OjQxICAgICAgICAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICAgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIKICAgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiCiAgIHhtcFJpZ2h0czpXZWJTdGF0ZW1lbnQ9IiI+CiAgIDxkYzpyaWdodHM+CiAgICA8cmRmOkFsdD4KICAgICA8cmRmOmxpIHhtbDpsYW5nPSJ4LWRlZmF1bHQiLz4KICAgIDwvcmRmOkFsdD4KICAgPC9kYzpyaWdodHM+CiAgIDx4bXBSaWdodHM6VXNhZ2VUZXJtcz4KICAgIDxyZGY6QWx0PgogICAgIDxyZGY6bGkgeG1sOmxhbmc9IngtZGVmYXVsdCIvPgogICAgPC9yZGY6QWx0PgogICA8L3htcFJpZ2h0czpVc2FnZVRlcm1zPgogIDwvcmRmOkRlc2NyaXB0aW9uPgogPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+yvyVbAAAFqJJREFUeNrsXQ1wHMWV7l3tjyzLklb4D6M/y+bniDkLywQCBsOh4OQghalgCFwdYEiZ4yoXE3KFuaPgHEhV7FTAQAIE+y4EX0GIfSRgDrCxD/NjA0kwJ0sG/4CEtRLYxrJ3Ja2k/Zvp6zfTo+3pHe282V1ppUNd1V7v7nS/9/q9fu97r2dWLkopmWim9jPWF/GOabt4/5eJpRv95jqzIfuxE8Y/1Gayvon1i7Mc/w7r17F+dGIpx4fxuyeWb6g9mYPhEz72yYllHEcbB+H5c4EB+YAQl7Pe5HAeuxbmnhpo/Zz1a1nfPEprPloyZpI3V/2SLHS6lvMxqvKyyPDzbIz/r1h/KkcYkO3YFtbvYv0+1hePsDECrZ2srzQ+UE5sJYlDPyaEKplH0iTxnrGOFE37TrZ0H2T9bNZ/MooOD+jewXooR/06bZ18A5xSCHnZJnjXifG/OQqGNyZbrHkpUXo/IESN2gVOkpx0Dik7/43xKOZbXzH9/pBtgF9iMP/dX1XDh6b27WX/JJhnJ7bdM9BKlNA741HMr5p+H6MHmxeIH3iGudCEw5JHN5HEp6ttYQBlnrJ4wRbinjI/ZUjhd0ls3/dREMJTdyfx1vxT2ldAX+neps3FiOSe6HjKiKfqNuKp/od0NqJBRoLRUBXETMz6XW4S2/s94iqarEUCu+u9dXdZ0032kPiBu/ImY7q8tzK6d1h+j9UvfO//640k0fUfSD4po/t9Rvd2xkN5weUdjMYeZy/fsIM9A6xPMt5EdzcSNX6UGUQsM1xIUOKfez8pmbsy9dmHACH2MCA9mHFskq27UnYJCVzwB/OcrbcRNfS2trEYE/YKQq2OG1aIFAUWEX/DJrPXD+0m0b03MGYGRqC8oNN1l55Dis/bZpa/8ymSaF/DxBvIj4xW8k67kvjnbUj7GqtfmMflPYWx169fa8cnp+uaVEeK5/+OvdYWXN6fPrHh1vseffzp4WDPQtHw1b5WQuMnmDHEbSGAwmRQpb2k9u5FjmX/FFWYxsb330nUEzsJTfSy1RrUvTECith28OxKgiSPv0HinRvN/A4G2TU0P3SGoav2fEhi7Y+ZPWE8zGwglj8ZLegmjvwxXV4H+oV5aKwbrwtOl/Z/Svr33TUm5J1+SiWcxVQNZ/z1JiYHO9lcCvO8VItOmbqaZPZbUieMDerjFMV2rAJjJ6XGJr/4PUkeeZlB7wHUeOddlyfS/luzUoBnRR0Bema6vQcfTdt0I0czRXfw6JskW/2m5qHO6DLHFmV0aSJccHkXzju7hr1cMRzmrzcrpSPlCW0aeH7R+NW+fTp+RoyFy4omC2Gx6zm2aFF9R41QA7GS0R4zHwNBtLw5UGbOM2xeu569KS84cmRJPLSXZKvfXAiDfhOMtm/64oLKW1c1axZ7gQ1QZWX8ATP2YJADIIlNTgJwB2TxBYRkd6BDt2pEPgOwzyNunJ4WPRxQe7qDMeZZWNR2s3xzkp/x4HVp/7fdcLD2RRIfA526vA7oQispZnQ9LlKEODOHsWk5XuAK0t35sZb7YBvQ0+gi5U3Cck4yJ55Y/Wq5QZwymSE/o6TE7yJ+n4t4ipAVNEbb5a0ouLwDg1Ej+ayxMv5GM2Zv5Z6B2hqSp6TW/GGiRzd+m7GUY37D8wP00CZEeP04U0jCU0dmXPIb4j+lgUQ/eZQkDz2AWkyIVO7SGsn4O/SdaMOzTDf++Usk3nwrLkIysdyTzGtVcvb9pJZ1p82JvCpbY2/FfJKNfhWAEFFKpix4mJSffgtR+g+TgV2XE5oME5fLPsKqKjVF9kLJ2xbsOmIYvy3mV/uDPJMlGbuqQR6zQtX+TttxxlgXS3Y9pXVD0IOqFDUWDGnKnJs1A4TmP+0apgw/aixgUX+gQTB8RjcW1jXtkK7vtKvRdEFeWSnZNkfysu6ZXEey0W8ywcaWN2iGD62IzeMNnEdc1IXWr9tXUXB5O48eDfH/nmrl+WebFicSROF2JUm1BZEXliJgT1quEG5FjdPPFpghlQpJNkQbhmUwpWOg6xNCsbbptGSXZkeXpVDUrlxoeCRprbKGtVAJI14cXYg4XrMBovXLeJ40c7FEO8K8epF2RmMHP9wlY0PecG+fAXsGPBZlTgF3txoxC5Ww+ksl42dGTNAbp9ZsSCouCdMiTmmtiWeKTOA0zyAaMBi/k+ReoEu1RJmgk/t8eEEwhPihh1BrnOK5Liv9UgueaT+uOACbXcwFCyUvtEOHOwzPf8RjB3moERIxCetksyHp9VYFtbD+SgF+iHAJkWSbDDjeg06ytdKssOl0mKbi6LKxPoFnfa2c0K2zVG6ycxNJtG/Q6uCochXzgFq9nCIuhUhXOT8/+mUOisZ6dIjo0MkUSl5or7z5joH5T9obv2YMFLHLqNkD87EYCAGeweVNZeVKfwcbp9jSBb25WJ4heiSdLrUdq/Ik2zNF8IRAV6EouqKsqTwFv1ayUpTud0l0z0rtEEkv8cZJPuuAmo16yi3WKkv9cmhKMahA0m+h5I3GYtH2zi4D9sQ8GcucGn6m6F0mGpJi4HZkeDJ570gQFdpUCXcbdDGQCfh1M08mG4N+QmJPV06kNAig4kqk2nhx0/XsI4Pv3czA8YBuCCNQ/FatvC94WyzPkn71jaNkpd9CydsdCoeEt2me31TmVELMkBQE/FDhVgopm9eqJvb1Y2pACF410RY1GkaFU/AosoC0t0NfbYTxeyusxqooDCvTVSPc+B0m95pH+vMPmCGCIQySkWqwxumVHiS8VPSEVdSvDi+d67eQ8n554qRo/JkxP+0Log0pzRiwC6vqhx9uf4XgQXGhGIoMpqQzjsehsgE7GSvTTa0VYuOAIUwXcgXmYNTez9icsRE97QR50woSJ1txOY6Vo4DNrjjXbyHl/fzYl4bxR62qPaYyp9KHK4Mlk1SDECbifbgyp1YGE0NiJDh0X4bjcNofHLr3xHGVKNSKHqtYJNlKXwdqreCwxyfCQ6CrJPVk2abFEoQMximJs/WG085JPhd7JbaHTEPyTjFvWI1nhHNTLCKdEhHOYhxUXAopb8cXRwzj1149w5U5NciDrNbAJN5p89OMX48a1HaH+qYKFYgIVwgyUTbhUM2TIccmpbEa3WR2dPu518dUtthYt688K3mjMUpKG1eTysY7tfeRt5YTJfii/WMEVjwbMA3Js0cyJPVEC1K/4ChqCy6vVObUbuhy20IexEmah21F9+dbUnnUgQ0pCGF7yso2jqgUoIs6neULWyZ44Fg4VW5EnDqKi0NjvSkM65RuXzAFHxAnw54s5FU5XcMQoPmmLWRe0JuVvJqjwK6VxLMGEbW8DHHyLzuZAskLbe+BQ4bxn5Q9f705rOllP+xDNsnufaT32WoWa4q1RwD1e7VxEMJUcenF1cuTYIieFJZMQS2CSsIUyYAV5skwY63oOlkr7VR5WoNzeS0ObNS+TiaL2x56GJtOlFfjWcXDyzIraIqDlybjL5C80N7+y55hYY+5zBntQWE6bk66wcMNICTiqBabSABkEo2hA504+qebf7BIOdGKuwNVSsJSMA2R/FnQxa7VUMlQNCR0hYnRnZqlvBBdp2bHM7XiGblWQ8Y/BuTtOnrsiFjmlI3fXObsbkVVa3JpMYbp3JUNQ8akh1MH1RppZ6s9uDKn9uBMudVYZJlTootdKzn5cyIvRBZvlvJqxlCWXpDIphqnj+1AlzlFD1xIeaUyZygj7NEERCaA2bRogpL+KCFVlz8iGFELx87OF8eEQ4l9EuYXEnQnY2E90g0Jt1YyXafyFvkrsuJZz6ukSk93i/Vzp1aOokK6VZ3lc5iTcH3jlBMPdzSFlFcoc1p6fnOZs4djszzbfiypl6/A+Kuvf4kUz5Dxr4LGoUVlEpZE4lC4xlM+22QI6DInPJQh3eClhDtQa0Ulj+REXigJi/I64RmildsfsOAZ50XFHEXj5XgrvsxZMTbk7YlEjB9hOiJWKdPLnN0cWyHCE1wywIwZjLrIRUiJz0W8HpL2pE0kygyeXQM12+mX/YRUn7uc5cbSXYJahYigb7TyltdJngyPQ01hvFeobGGSv3KL6gUSqolKcSKvFjWmN0g84+SVkz8nPIOxectnW8MPDPY2VeMKIy+0tmCnqcwpGr8Z8vR2oI0BnmiigQYy+4aXNGOO7F5NEh8+klaLhd0+9+6ezAL3BtF5BtRo3cWiAXeicOjQ4ggGrONQgk7+/EK0Uo63oO8ilTeOgvSgmqLYenpMXrQLLW8uPMuOwkl+ROSKWoHkhfbG+3/5QoQ8Yp3fbPw9QfQT+glmSJUX/GjIixfX/g3ULtOum+x1kfinWzKHui9bmE5wv5xQzMKMenwv9/ofkXj7Via0/VhYGEU2hl7cLwlocBOSP3HT9eB/7QE2nU+k29OBHgvyGusH8sb2P4+SV+HymgzJAc9JyVHo0IWixielSFcoeaUy54Ds+U0ASYXwpBLc3ZxwL/6pDabDIhcpSjv4c7ncZGDrCjLgXQnPtGmTe2YsIKVXb3aczafmu53Nxw9B4FwB8cC7Ful9ZgNW2KajyLs5vQEp2YWDNQd3c3pNRtiBfjDDtH6ap4jqzxY6jDZOeB7S70ypFI184AfG+sSxBZL3ZE+P+LBAGuwxlznBGBA3l2nZvK9cUqhxdyNNi4HaXXwJ404+Fwnt30aKFx8e2qV04KRuwLhTAmk+XIP1851mDolq+DB/1B9xVF8hl9+Gkzd9rTzl0s1wmryIClMO8iYSDLPXNmTNM+jX7CiMk2Fc4inaRqHkPdz1xRdi4Scz7Al3oB9a90q7zAht9mOpHlKFxXFXztN/uU4dmQ704OdGJp+11JSE0UH8rRhpXjQcRD/w7ikzJ46uyVW8ZDhy8sbihJSde4tZR8daUDxb6VeNhpH6TXcWhZL3g30fB+Uyp2j8s9PKYIC9KcnYYQ2KKmanGQM8B4sZK3tR39yrhkKt3XinPcEU0RelxH/GNaS8cbkpFGv5DYJnwLAyz8ljLai1gi7CQ2j+r/3dEBwaSXlL6i9LL3PCr7Rlo1/IFxD0tdsTpI1TKHlf3/1eUIY8hvHPsSpj0aRq68mg0lMkn3aGO9CesEjyhMVfX0ko/AZOgqOfPHgDmGeALUq4n4XDudeQ065/RjLevagoB7dhAF/+medK8EFFRklqgg+6vHcSd9WleZU3aSNvzvoNBdFRQ1yrQsm7a8//Nr+wbccRucZvYP421gETzdJ2A8OlibIzyMnPmjMiM9htxQw7ly9cbioZapAJk9TA+Fnpf0xs6q1vkdCudeTE2+tIIhImuTbgs2TOpWTm15eTsnnXpJfUqi8mkaSfRHoHbRPWwHnLiX+WuVqD/pUJNf2BEGiVN7xEwkze7jzJC+yUzVtKZp5zjaW8uehX3zyH0fqViwOFkPeRZ579s/A2KBs/NCi5DP2u+PTb3ibTszE04wef0Ac+1j/fEVj0I62PRoMTyOq7g9ktvBblHJwtBGZbflfBZK0YJXlz0i/cDDcQzlm/oyXv+t+/8Jrg9dOM38D8u/JBzOUv1+KdXkbL3OGJJivPMJ6ay1/GZE2iZIXun9UwvuUtLtchEwK0F1q/YPi33/+g6PWbWe+yMv7/ggiR++JUkKLqi/TDP0zCW2lenCPHu4+N9KLsPXDowLU//Of1LQcPHcx1Lm/tJXAHla28WvIXSK89j6a8W9/Z/X5eImX1hTrkR8hcSP1Khq8VfdJkWb16tfH/bRtffNl3tPuEr9jnKyorLZ1iRwjukX6vueXjuTXVVUO7aepZJNL6B6ImYtodDlZPnMWh5MiSnmlLHiAub/HQ5w1XX/dEoGzKoMvlSpZPKZ3sYS0fC9Le2RV8Z8+HrY9tfO7N2+5dvWt/W3vk17/bvK+++rSkE1owTywRj5eWlEzWNrunmFBfOen7+DUGcV2aJ3FZYOdYknnB2ZeRKeekMOn+ts/az1xy9UanPDiR9951v9q68qdr3wd5n93yahul9Hg8kYjkol9P1QUk8vGrRB3s0Z6lHVa/rM9Yav4DHGULLnxotOSVLnmd9Y/SnLX4Z4lcZzZ8jb0sc0L4H2+8bvbj//avN5kqKKHD5MTOh0noT09bnoUATD71ygfI1EtTuO9od/fxUy9qemKsh/5n1j540U1Lv9MkfjbYtpOE3n+a9LT80fKcDCJizd9vJJNPv0wMy1uZd/rTWJfXSr/qYJicfOth0r1zHVq/YKBzmq56ugAigOG/a4lU5L/JxTbAt9nL+U5mf3XDr6749iWLvpELh1veeHPX1Xfc+T/8LYTHGSO8KIdYf5t1hl3IGU4GfvL6y7fMra2uzYU4hGaejEHtOTqK8p7jVL/Pr1u7+Pq/XXLpONVv17Aw3eoP0vEIUMP7qQhCRzrf2nZL1cwZF2TDJWDBWYuafi18BH81e4HAQ3GeFiTI+2f0YHObIO8iJ7SWfeubiV+s+vHymlkz52TDBNSeL75x+Uv87QHGy/NOeXAoL9DoykW/h17fcu3ptTVN+dAv42X1SMubyejlUqcZpx5s/sgKI2VMds9s2PHcQz/b8N0lTRf5vF6fk4W55xePviJ81M3oD+SrAoUq4R1sdkyr6pIr3mUe8eFFjec6KuFAon3lih/8t1x+y4aHHOTNSr9Prr73se9d+a1FFWVTynLQb17lZXxlP5bS/D2qBZDpwnPnL1m1YnnjvNPn1tRXV9VkSlL2ffJpUAiFQ46RLcyOcVH6O7PhVrbZz79p6VVnZ5IXfiD10OGOYPP+g8GbV923W/r630WvPMblvYxFuyW/vO+ei8aKfseM8XNmbnSKoYV2jC3Mk2ScNCYr4NYreejOpjUzeV8k46gxmb/L84Yxod9cjN+d78Vhwj3HXnaynnC6MKy/Mp4MgckKPP8n0Q9QsknIxpW8XOYX2MtrrPeNd/3m3fMLO7JSSlozJinjBepkkBdq4WfZyBsV5N01zuUtYS8XFlq/Ywr2TLRRafD8BVSroNrUnsd5V7EOFZ1vjkGZgbc1rK9n/XanfFttEveEHU20sYyyuFFDW8H6PYLhU/5Z1s0zsb4TbSyjK+n9nhxylQnPP04b/MDAdpL6e4+bLMK+8V0b95Zr+P+NBretnOSQyep6K2j1gXDddpL6oYM2iZ/h5pD5/oDPu53zB62Rf7dKkKVN8vxUGGfwDu0pYZwRHajAZ4DLbBkhJox/fLQ1XPlzuDcMSQpfIXy3lm+OzXyM8eMETfyzpmGuD0g0t3M6cE0l/36TtDmMOXYMM8cyTr9S8OIr+PXLBL5CAp+NHNfLEaCdY/q1wly38/dGW8+vWyHQD1nMN2H846g1CYqFdp3wXaOQAFPuDQO8i0a2jBv/cNc3SoZdzzE24Qa0VvLuIj/3WMxBOP12vjGe4sa6mY81NmajMHeAv+ZSGVovGf/64S6cMP7xA3syfbeZe0Ox7+CfrxA84A6b67H0sA0MfyH32O0CTDF4aRI2thEVQrlgez5XgM/VNGH8478ZRlwvwCDRuy6TqiIGRt4s4Oj1iOvFxLJdoBPgc+wQINcKwdOvGcZoDfxez737ZiES7eDftwubYZXAc7bNgDlGWTQ0fBZM6UQf+z3A+naaah/w13r+/Rrhu5OsrxDGPiVdm+n6VZwO/L9RoEP558YcbRI/8L5pGN63D0MrwD9bI9CmnK4xlgrzyjSMeVdJfBu80ww8aX3ikGuiZdPauCdfP0b5M4oACzNdNFHnn2j/HzdmvZ3hQ/s/AQYA0JN3gGAK3/0AAAAASUVORK5CYII='); ?>
\ No newline at end of file
diff --git a/includes/kohana/system/views/profiler/stats.php b/includes/kohana/system/views/profiler/stats.php
new file mode 100644
index 0000000..ebfb489
--- /dev/null
+++ b/includes/kohana/system/views/profiler/stats.php
@@ -0,0 +1,74 @@
+<?php defined('SYSPATH') or die('No direct script access.') ?>
+
+<style type="text/css">
+<?php include Kohana::find_file('views', 'profiler/style', 'css') ?>
+</style>
+
+<?php
+$group_stats      = Profiler::group_stats();
+$group_cols       = array('min', 'max', 'average', 'total');
+$application_cols = array('min', 'max', 'average', 'current');
+?>
+
+<div class="kohana">
+	<?php foreach (Profiler::groups() as $group => $benchmarks): ?>
+	<table class="profiler">
+		<tr class="group">
+			<th class="name" rowspan="2"><?php echo __(ucfirst($group)) ?></th>
+			<td class="time" colspan="4"><?php echo number_format($group_stats[$group]['total']['time'], 6) ?> <abbr title="seconds">s</abbr></td>
+		</tr>
+		<tr class="group">
+			<td class="memory" colspan="4"><?php echo number_format($group_stats[$group]['total']['memory'] / 1024, 4) ?> <abbr title="kilobyte">kB</abbr></td>
+		</tr>
+		<tr class="headers">
+			<th class="name"><?php echo __('Benchmark') ?></th>
+			<?php foreach ($group_cols as $key): ?>
+			<th class="<?php echo $key ?>"><?php echo __(ucfirst($key)) ?></th>
+			<?php endforeach ?>
+		</tr>
+		<?php foreach ($benchmarks as $name => $tokens): ?>
+		<tr class="mark time">
+			<?php $stats = Profiler::stats($tokens) ?>
+			<th class="name" rowspan="2" scope="rowgroup"><?php echo HTML::chars($name), ' (', count($tokens), ')' ?></th>
+			<?php foreach ($group_cols as $key): ?>
+			<td class="<?php echo $key ?>">
+				<div>
+					<div class="value"><?php echo number_format($stats[$key]['time'], 6) ?> <abbr title="seconds">s</abbr></div>
+					<?php if ($key === 'total'): ?>
+						<div class="graph" style="left: <?php echo max(0, 100 - $stats[$key]['time'] / $group_stats[$group]['max']['time'] * 100) ?>%"></div>
+					<?php endif ?>
+				</div>
+			</td>
+			<?php endforeach ?>
+		</tr>
+		<tr class="mark memory">
+			<?php foreach ($group_cols as $key): ?>
+			<td class="<?php echo $key ?>">
+				<div>
+					<div class="value"><?php echo number_format($stats[$key]['memory'] / 1024, 4) ?> <abbr title="kilobyte">kB</abbr></div>
+					<?php if ($key === 'total'): ?>
+						<div class="graph" style="left: <?php echo max(0, 100 - $stats[$key]['memory'] / $group_stats[$group]['max']['memory'] * 100) ?>%"></div>
+					<?php endif ?>
+				</div>
+			</td>
+			<?php endforeach ?>
+		</tr>
+		<?php endforeach ?>
+	</table>
+	<?php endforeach ?>
+
+	<table class="profiler">
+		<?php $stats = Profiler::application() ?>
+		<tr class="final mark time">
+			<th class="name" rowspan="2" scope="rowgroup"><?php echo __('Application Execution').' ('.$stats['count'].')' ?></th>
+			<?php foreach ($application_cols as $key): ?>
+			<td class="<?php echo $key ?>"><?php echo number_format($stats[$key]['time'], 6) ?> <abbr title="seconds">s</abbr></td>
+			<?php endforeach ?>
+		</tr>
+		<tr class="final mark memory">
+			<?php foreach ($application_cols as $key): ?>
+			<td class="<?php echo $key ?>"><?php echo number_format($stats[$key]['memory'] / 1024, 4) ?> <abbr title="kilobyte">kB</abbr></td>
+			<?php endforeach ?>
+		</tr>
+	</table>
+</div>
\ No newline at end of file
diff --git a/includes/kohana/system/views/profiler/style.css b/includes/kohana/system/views/profiler/style.css
new file mode 100644
index 0000000..e6af3a0
--- /dev/null
+++ b/includes/kohana/system/views/profiler/style.css
@@ -0,0 +1,27 @@
+.kohana table.profiler { width: 99%; margin: 0 auto 1em; border-collapse: collapse; }
+.kohana table.profiler th,
+.kohana table.profiler td { padding: 0.2em 0.4em; background: #fff; border: solid 1px #999; border-width: 1px 0; text-align: left; font-weight: normal; font-size: 1em; color: #111; vertical-align: top; text-align: right; }
+.kohana table.profiler th.name { text-align: left; }
+.kohana table.profiler tr.group th { font-size: 1.4em; background: #222; color: #eee; border-color: #222; }
+.kohana table.profiler tr.group td { background: #222; color: #777; border-color: #222; }
+.kohana table.profiler tr.group td.time { padding-bottom: 0; }
+.kohana table.profiler tr.headers th { text-transform: lowercase; font-variant: small-caps; background: #ddd; color: #777; }
+.kohana table.profiler tr.mark th.name { width: 40%; font-size: 1.2em; background: #fff; vertical-align: middle; }
+.kohana table.profiler tr.mark td { padding: 0; }
+.kohana table.profiler tr.mark.final td { padding: 0.2em 0.4em; }
+.kohana table.profiler tr.mark td > div { position: relative; padding: 0.2em 0.4em; }
+.kohana table.profiler tr.mark td div.value { position: relative; z-index: 2; }
+.kohana table.profiler tr.mark td div.graph { position: absolute; top: 0; bottom: 0; right: 0; left: 100%; background: #71bdf0; z-index: 1; }
+.kohana table.profiler tr.mark.memory td div.graph { background: #acd4f0; }
+.kohana table.profiler tr.mark td.current { background: #eddecc; }
+.kohana table.profiler tr.mark td.min { background: #d2f1cb; }
+.kohana table.profiler tr.mark td.max { background: #ead3cb; }
+.kohana table.profiler tr.mark td.average { background: #ddd; }
+.kohana table.profiler tr.mark td.total { background: #d0e3f0; }
+.kohana table.profiler tr.time td { border-bottom: 0; font-weight: bold; }
+.kohana table.profiler tr.memory td { border-top: 0; }
+.kohana table.profiler tr.final th.name { background: #222; color: #fff; }
+.kohana table.profiler abbr { border: 0; color: #777; font-weight: normal; }
+.kohana table.profiler:hover tr.group td { color: #ccc; }
+.kohana table.profiler:hover tr.mark td div.graph { background: #1197f0; }
+.kohana table.profiler:hover tr.mark.memory td div.graph { background: #7cc1f0; }
\ No newline at end of file
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..96cbe16
--- /dev/null
+++ b/index.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * The directory in which your application specific resources are located.
+ * The application directory must contain the bootstrap.php file.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#application
+ */
+$application = 'application';
+
+/**
+ * The directory in which your modules are located.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#modules
+ */
+$modules = 'modules';
+
+/**
+ * The directory in which upstream Kohana resources (modules) are located.
+ */
+$sysmodules = 'includes/kohana/modules';
+
+/**
+ * The directory in which the Kohana resources are located. The system
+ * directory must contain the classes/kohana.php file.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#system
+ */
+$system = 'includes/kohana/system';
+
+/**
+ * The default extension of resource files. If you change this, all resources
+ * must be renamed to use the new extension.
+ *
+ * @see  http://kohanaframework.org/guide/about.install#ext
+ */
+define('EXT', '.php');
+
+/**
+ * Set the PHP error reporting level. If you set this in php.ini, you remove this.
+ * @see  http://php.net/error_reporting
+ *
+ * When developing your application, it is highly recommended to enable notices
+ * and strict warnings. Enable them by using: E_ALL | E_STRICT
+ *
+ * In a production environment, it is safe to ignore notices and strict warnings.
+ * Disable them by using: E_ALL ^ E_NOTICE
+ *
+ * When using a legacy application with PHP >= 5.3, it is recommended to disable
+ * deprecated notices. Disable with: E_ALL & ~E_DEPRECATED
+ */
+error_reporting(E_ALL | E_STRICT);
+
+/**
+ * End of standard configuration! Changing any of the code below should only be
+ * attempted by those with a working knowledge of Kohana internals.
+ *
+ * @see  http://kohanaframework.org/guide/using.configuration
+ */
+
+// Set the full path to the docroot
+define('DOCROOT', realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR);
+
+// Make the application relative to the docroot, for symlink'd index.php
+if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
+	$application = DOCROOT.$application;
+
+// Make the modules relative to the docroot, for symlink'd index.php
+if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
+	$modules = DOCROOT.$modules;
+
+// Make the system relative to the docroot, for symlink'd index.php
+if ( ! is_dir($sysmodules) AND is_dir(DOCROOT.$sysmodules))
+	$sysmodules = DOCROOT.$sysmodules;
+
+// Make the system relative to the docroot, for symlink'd index.php
+if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
+	$system = DOCROOT.$system;
+
+// Define the absolute paths for configured directories
+define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
+define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
+define('SMDPATH', realpath($sysmodules).DIRECTORY_SEPARATOR);
+define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
+
+// Clean up the configuration vars
+unset($application, $modules, $sysmodules, $system);
+
+if (file_exists('install'.EXT))
+{
+	// Load the installation check
+	return include 'install'.EXT;
+}
+
+/**
+ * Define the start time of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_TIME'))
+{
+	define('KOHANA_START_TIME', microtime(TRUE));
+}
+
+/**
+ * Define the memory usage at the start of the application, used for profiling.
+ */
+if ( ! defined('KOHANA_START_MEMORY'))
+{
+	define('KOHANA_START_MEMORY', memory_get_usage());
+}
+
+// Bootstrap the application
+require APPPATH.'bootstrap'.EXT;
+
+/**
+ * Execute the main request. A source of the URI can be passed, eg: $_SERVER['PATH_INFO'].
+ * If no source is specified, the URI will be automatically detected.
+ */
+echo Request::factory()
+	->execute()
+	->send_headers()
+	->body();