diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..dec0ebf3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.idea/
+*.iml
+target
+.classpath
+.project
+.settings/
+logs/
+error-reports/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..76219841
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,51 @@
+#CONTRIBUTING
+
+We welcome new contributors. Here you can read our guidelines to contribute to the IRIS project.
+
+## Found a bug
+
+If you found a bug in our software or mistakes in the documentation there are two ways to help us:
+
+1. [Submit an issue](#submitting-an-issue) which explains the bug to our [GitHub Repository](https://github.com/Contargo/iris/issues/).
+2. [Submit a pull request](#pull-requests) that fixes the bug.
+
+
+## Want a new Feature
+
+If you want a new Feature in IRIS there are two ways to get it done:
+
+1. Request the new feature by [submitting an issue](#submitting-an-issue) to our [GitHub Repository](https://github.com/Contargo/iris/issues/).
+2. [Submit a Pull Request](#pull-requests) that contains the new feature.
+
+
+## Submission Guidelines
+
+### Submitting an Issue
+
+Before you submit an issue check the [GitHub Repository](https://github.com/Contargo/iris/issues/) to see if someone else reported the same issue.
+
+If you submit a bug, provide as much information as needed for us to reproduce the bug.
+
+
+### Pull Requests
+
+Before submitting a pull request do following things:
+
+* If you are not familiar with GitHubs pull requests take a look at their documentation of [Using pull requests](https://help.github.com/articles/using-pull-requests/).
+* Search our [GitHub Repository](https://github.com/Contargo/iris) for pull requests doing the same, so you don't have to put effort in something that's already done.
+* If there is no active pull request implementing your feature then fork [IRIS](https://github.com/Contargo/iris)
+* Create a new branch:
+```
+    git checkout -b my-branch master
+```
+* Make your changes.
+* Write Unit-Tests for all your changes.
+* Run the full test suite to verify you did not broke anything:
+```
+    mvn clean verify
+```
+* Commit your changes. Write a commit message that explains what your changes are for, so everyone can understand what it does. See [this](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) explanation for how to right commit message. If your changes are related to an open issue, reference the issue number in the last line of your commit message. Example: ```References #12```.
+* Push the branch with your changes to GitHub. ```git push origin my-branch```
+* In GitHub, send a pull request to ```iris:master```
+
+If you want to learn more about, how to write a good pull request, read [this](https://github.com/blog/1943-how-to-write-the-perfect-pull-request) blog post of GitHub.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..dba13ed2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..7e61f5c7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,126 @@
+IRIS - Intermodal Routing Information System
+=========
+
+The goal of IRIS is to create a centralized and transparent database for distance calculations in short-haul goods transport.
+IRIS aims to provide such a platform, for both clients and service providers.
+
+IRIS is used to calculate truckings for transports from a hinterland terminal to the place of loading and the other way around.
+The place of loading can be set very detailed by adjusting its coordinates.
+IRIS uses these coordinates to calculate the truck route, distance, toll kilometers and the duration of the trucking.
+An extension for barge and rail routings is already planned.
+
+Example: A freight container arrives in Mannheim via cargo ship and needs to be transported to 48 Berliner Str., Heidelberg, Germany.
+After arriving at the Contargo terminal in Mannheim it needs to be loaded on a truck to be transported to its destination.
+There, the recipient unloads the content and the truck transports the empty container back to the terminal.
+
+# Features
+* Management of seaports, terminals and connections between them (GUI)
+* Automatic creation of truck and barge routes between seaports, terminals and destinations (GUI & REST-API)
+* Provision of detailed information for each route like distance, toll distance, duration, CO2 output (REST-API)
+* Support for different container sizes and states (REST-API)
+* Open Street Map Address resolution for destination points (GUI & REST-API)
+* Management and resolution of custom static addresses as destination points (GUI & REST-API)
+* Possibility to implement any authentication mechanism via Spring Security
+
+Further documentation about the IRIS-terminology can be found here: [terminology](docs/terminology.md).
+
+
+#Prerequisites
+ - MySQL/MariaDb 5.5 or higher
+ - Maven 3 or higher
+ - JDK 8 or higher
+
+
+#Getting started
+
+Simply clone this repository
+```sh
+$ git clone https://github.com/Contargo/iris.git
+```
+
+## Configuration
+
+Configuration is located in ```src/main/resources/```
+
+The "general" configuration file is ```src/main/resources/application.properties```
+
+
+### Environment Properties
+
+Environment (System) specific configurations go to ```src/main/resources/application-<envname>.properties``` 
+
+The environment-specific (e.g. ```application-dev.properties```) file overrides and adds to properties defined in the "general" properties-file (```application.properties```). Not overridden properties of ```application.properties``` remain valid.
+
+Default Environment is "dev" (so ```application-dev.properties``` is loaded by default). Environments can be set using System-Property "environment" 
+
+```sh
+mvn jetty:run -Denvironment=myenv  # -> leads to use application-myenv.properties
+```
+or environment-parameter environment:
+```sh
+export environment=superdev
+mvn jetty:run  # -> leads to use application-superdev.properties
+```
+
+#### Database
+
+All database connection settings are configured in ```application-<envname>.properties```. Adapt the corresponding properties to match your MySQL/MariaDb database connection settings.
+
+All needed database tables are created on application start using [Liquibase](http://www.liquibase.org/).
+
+
+### Roles
+
+There are two different roles defined in IRIS:
+
+- ROLE_ADMIN
+  - can do anything
+- ROLE_USER
+  - no GUI access
+  - limited REST Api access
+
+
+### User Credentials
+
+User Credentials are are located in ```src/main/resources/usercredentials-<envname>.properties```.
+
+For development IRIS ships with two predefined users:
+- admin@example.com with password admin: ROLE_ADMIN
+- user@example.com with password user: ROLE_USER
+
+These are located in ```src/main/resources/usercredentials-dev.properties```.
+
+To add own user credentials do the following:
+```sh
+$ echo -n "yourpassword" | sha256sum
+e3c652f0ba0b4801205814f8b6bc49672c4c74e25b497770bb89b22cdeb4e951  -
+```
+Edit the file ```src/main/resources/usercredentials-<envname>.properties``` and add your user like this:
+```
+youruser@example.com=e3c652f0ba0b4801205814f8b6bc49672c4c74e25b497770bb89b22cdeb4e951,ROLE_USER,enabled
+```
+
+You can specify login, password, role and set the enabled flag.
+
+
+## Application Start
+
+In order to build the application you need Maven 3 and Oracle JDK 7. You also need your MySQL/MariaDb database set up as described above. You can then start the local web server:
+```sh
+$ mvn jetty:run
+```
+You can run a full build including all tests with
+```sh
+$ mvn clean install
+```
+Finally, point your browser to the url http://localhost:8082/. IRIS has both a basic user interface and a JSON API. Documentation for the API is located at http://localhost:8082/api/docs.html.
+
+
+# Contributing
+
+If you want to contribute to IRIS, see our [contribution guidelines](CONTRIBUTING.md).
+
+
+# Licensing
+
+IRIS is licensed under the GNU Affero General Public License, Version 3. See [LICENCE](LICENSE) for the full license text.
diff --git a/docs/terminology.md b/docs/terminology.md
new file mode 100644
index 00000000..58f45e21
--- /dev/null
+++ b/docs/terminology.md
@@ -0,0 +1,50 @@
+#Terminology
+
+##Terminal
+
+*inland (hinterland) container terminal*
+
+A facility where cargo containers are handled between different transport vehicles for onward transportation. 
+The handling of containers is typically between barges or cargo trains and land vehicles (trucks).
+
+* **Region:** An area defined by specific parameters. 
+Usually geographical division. (*Oberrhein, Mittelrhein, Niederrhein*) / (*Rhein-Neckar, Rhein-Main*).
+Contargo uses three regions among other things to assign and store the CO₂-parameter of our barge fleet.
+
+
+##Seaport
+Location on a coast where sea vessels and barges can dock and transfer cargo from or to land. 
+Container seaports handle cargo in containers by different mechanical means. (crane, AGV, reach stacker)
+
+
+##Connections
+This shows the possibilities to connect a seaport and an inland terminal.
+Different and multiple connections are possible. For example barge or rail or both.
+
+* **Diesel-km:** The kilometers traveled on the train route or the barge route by use of diesel fuel.
+* **Electrical-km:** The kilometers on the train route traveled by use of electricity only.
+
+
+##Static Addresses
+A static address is a city with its corresponding postal code and country. For example *68159 Mannheim, Germany*.
+
+
+##Cloud distance
+A previously defined area (radius) around a static address.
+
+
+##Route types
+
+* **Barge:** Transport of goods / cargo on barge. 
+Barge transport only happens between seaports and inland terminals or between inland terminals that are connected by a major river or canals.
+* **Rail:** Transport of goods / cargo between seaports and inland terminals on a freight train using rail roads.
+* **Truck:** Transport of goods / cargo from and to seaports and inland terminals and the loading / unloading site.
+
+
+##Route Combination
+
+* **Waterway:** Transport per barge between seaport and inland terminal and additional transport per truck to the loading / unloading site.
+* **Railway:** Transport per rail between seaport and inland terminal and additional transport per truck to the loading / unloading site.
+* **Direct Truck:** Transport only per truck from or to the seaport and the loading site.
+* **Roundtrip:** Waterway, Railway or Direct Truck transport from seaport to loading / unloading site and back to seaports.
+* **All:** A list of all the possibilities for transport for a given loading site.
\ No newline at end of file
diff --git a/iris-api-tests/pom.xml b/iris-api-tests/pom.xml
new file mode 100644
index 00000000..283a935b
--- /dev/null
+++ b/iris-api-tests/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<modelVersion>4.0.0</modelVersion>
+
+<groupId>net.contargo</groupId>
+<artifactId>iris-api-tests</artifactId>
+<version>1.0-SNAPSHOT</version>
+
+<packaging>jar</packaging>
+
+<name>IRIS API Tests</name>
+
+<properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <spockCore>0.7-groovy-2.0</spockCore>
+    <groovyVersion>2.2.2</groovyVersion>
+    <gmavenVersion>1.5</gmavenVersion>
+    <gmavenProviderSelection>2.0</gmavenProviderSelection>
+    <junitVersion>4.11</junitVersion>
+    <jsonLibVersion>2.3</jsonLibVersion>
+    <ezMorphVersion>1.0.6</ezMorphVersion>
+    <httpBuilderVersion>0.7.1</httpBuilderVersion>
+</properties>
+
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+            <version>${gmavenVersion}</version>
+            <configuration>
+                <providerSelection>${gmavenProviderSelection}</providerSelection>
+                <sourceEncoding>UTF-8</sourceEncoding>
+                <source/>
+            </configuration>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>testCompile</goal>
+                    </goals>
+                </execution>
+            </executions>
+            <dependencies>
+                <dependency>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-all</artifactId>
+                    <version>${groovyVersion}</version>
+                </dependency>
+            </dependencies>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.10</version>
+            <configuration>
+                <skip>true</skip>
+            </configuration>
+            <executions>
+                <execution>
+                    <id>exec-specs</id>
+                    <phase>test</phase>
+                    <goals>
+                        <goal>test</goal>
+                    </goals>
+                    <configuration>
+                        <includes>
+                            <include>**/*Spec.java</include>
+                        </includes>
+                        <skip>false</skip>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+
+<dependencies>
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit-dep</artifactId>
+        <version>${junitVersion}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.groovy</groupId>
+        <artifactId>groovy-all</artifactId>
+        <version>${groovyVersion}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.spockframework</groupId>
+        <artifactId>spock-core</artifactId>
+        <version>${spockCore}</version>
+        <scope>test</scope>
+        <exclusions>
+            <exclusion>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>junit</groupId>
+                <artifactId>junit-dep</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.groovy.modules.http-builder</groupId>
+        <artifactId>http-builder</artifactId>
+        <version>${httpBuilderVersion}</version>
+    </dependency>
+</dependencies>
+</project>
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/address/AddressByAddressDetailsSpec.groovy b/iris-api-tests/src/test/groovy/address/AddressByAddressDetailsSpec.groovy
new file mode 100644
index 00000000..7974d934
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/AddressByAddressDetailsSpec.groovy
@@ -0,0 +1,80 @@
+package address
+
+import spock.lang.Specification
+import util.ClientFactory
+
+/**
+ * @author Arnold Franke - franke@synyx.de
+ */
+class AddressByAddressDetailsSpec extends Specification {
+
+    def "request for addresses by details like street, city etc. "() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+        
+        and: "address details city, postal code and street"
+        def urlParams = [
+                "city": "karlsruhe",
+                "postalcode": "76131",
+                "street": "hirtenweg",
+                "country": "DE"
+        ]
+
+        when: "addresses by city, postal code and street are requested"
+        def response = client.get(path: "/api/geocodes", query: urlParams);
+        def listOfAddressLists = response.data.geoCodeResponse.addresses
+        def staticAddressesObject = listOfAddressLists[0]
+        def nominatimAddressesObject = listOfAddressLists[1] 
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "the staticAddressesObject contains a parent address and a list of static addresses"
+        def parentAddressStatic = staticAddressesObject.parentAddress
+        def staticaddresses = staticAddressesObject.addresses
+        staticaddresses.size() >= 1
+
+        and: "the parent address object has certain attributes"
+        parentAddressStatic.size() == 10
+        parentAddressStatic.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+        parentAddressStatic.type == "ADDRESS"
+
+        and: "a static address contains certain attributes"
+        def staticaddress = staticaddresses[0]
+        staticaddress.size() == 10
+        staticaddress.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+
+        and: "the type of a static address is ADDRESS"
+        staticaddress.type == "ADDRESS"
+
+        and: "a static address contains a address map with certain attributes"
+        def addressmapStatic = staticaddress.address
+        addressmapStatic.size() == 6
+        addressmapStatic.keySet().containsAll("suburb", "static_id", "postcode", "country_code", "city", "hashkey")
+
+        and: "the nominatimAddressesObject contains a parent address and a list of static addresses"
+        def parentAddressNominatim = nominatimAddressesObject.parentAddress
+        def nominatimaddresses = nominatimAddressesObject.addresses
+        nominatimaddresses.size() >= 1
+
+        and: "the parent address object has certain attributes"
+        parentAddressNominatim.size() == 10
+        parentAddressNominatim.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+        parentAddressNominatim.type == "ADDRESS"
+
+        and: "a static address contains certain attributes"
+        def nominatimaddress = staticaddresses[0]
+        nominatimaddress.size() == 10
+        nominatimaddress.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+
+        and: "the type of a static address is ADDRESS"
+        nominatimaddress.type == "ADDRESS"
+
+        and: "a static address contains a address map with certain attributes"
+        def addressmapNominatim = staticaddress.address
+        addressmapNominatim.size() == 6
+        addressmapNominatim.keySet().containsAll("suburb", "static_id", "postcode", "country_code", "city", "hashkey")
+    
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/address/AddressByGeolocationSpec.groovy b/iris-api-tests/src/test/groovy/address/AddressByGeolocationSpec.groovy
new file mode 100644
index 00000000..6b6ae8ed
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/AddressByGeolocationSpec.groovy
@@ -0,0 +1,39 @@
+package address
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class AddressByGeolocationSpec extends Specification {
+
+    def "request for geolocation"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "geolocation with latitude 49.123 and longituide 8.12 is requested"
+        def response = client.get(path: "/api/reversegeocode/49.123:8.12/")
+        def address = response.data.reverseGeocodeResponse.address
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "the address should have certain attributes"
+        def addressAttributes = address.keySet()
+        addressAttributes.size() == 10
+        addressAttributes.containsAll("niceName", "address", "placeId", "countryCode", "osmId", "longitude", "latitude",
+                "type", "shortName", "displayName");
+
+        and: "the address is of type ADDRESS"
+        address.type == "ADDRESS"
+
+        and: "the address has the requested longitude and latitude"
+        address.latitude == 49.123
+        address.longitude == 8.12
+
+        and: "the address's actual address has certain attributes"
+        address.address.keySet().size() == 7
+        println address.address.keySet()
+        address.address.keySet().containsAll("country", "country_code", "farmyard", "county", "postcode", 
+                "state", "village")
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/address/AddressByOsmIdSpec.groovy b/iris-api-tests/src/test/groovy/address/AddressByOsmIdSpec.groovy
new file mode 100644
index 00000000..f9ae4e77
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/AddressByOsmIdSpec.groovy
@@ -0,0 +1,49 @@
+package address
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class AddressByOsmIdSpec extends Specification {
+
+    def "request for addresses with osm id "() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "address with osm id 90085697 is requested"
+        def response = client.get(path: "/api/osmaddresses/90085697")
+        def addresses = response.data.geoCodeResponse.addresses.addresses
+        def parentAddress = response.data.geoCodeResponse.addresses.parentAddress
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "there should be a parent address"
+        parentAddress.size() == 1
+
+        and: "that parent address should have certain attributes"
+        def parentAddressAttributes = parentAddress.get(0).keySet()
+        parentAddressAttributes.size() == 10
+        parentAddressAttributes.containsAll("niceName", "address", "placeId", "countryCode", "osmId", "longitude",
+                "latitude", "type", "shortName", "displayName")
+
+        and: "there should be exactly one address in the response"
+        def innerAddresses = addresses.get(0)
+        innerAddresses.size() == 1
+
+        and: "that address should have certain attributes"
+        def address = innerAddresses.get(0)
+        def addressAttributes = address.keySet()
+        addressAttributes.size() == 10
+        addressAttributes.containsAll("address", "displayName", "countryCode", "osmId", "latitude", "placeId", 
+                "niceName", "shortName", "type", "longitude");
+
+        and: "that address has the requested osmid"
+        address.osmId == 90085697
+
+        and: "that address's actual address has certain attributes"
+        address["address"].keySet().size() == 10
+        address["address"].keySet().containsAll("country", "country_code", "road", "city", "state_district", 
+                "postcode", "suburb", "house_number", "address29", "state")
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/address/AddressWherePlaceIsInSpec.groovy b/iris-api-tests/src/test/groovy/address/AddressWherePlaceIsInSpec.groovy
new file mode 100644
index 00000000..5aa1721b
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/AddressWherePlaceIsInSpec.groovy
@@ -0,0 +1,34 @@
+package address
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class AddressWherePlaceIsInSpec extends Specification {
+
+    def "request for addresses containing place"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "addresses with place id 50350574 are requested"
+        def response = client.get(path: "/api/places/50350574/addresses")
+        def addresses = response.data.addresses
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "there should be fifteen addresses in the response"
+        addresses.size() == 15
+
+        and: "an address should have certain attributes"
+        def address = addresses.get(0)
+        def addressAttributes = address.keySet()
+        addressAttributes.size() == 10
+        addressAttributes.containsAll("niceName", "address", "placeId", "countryCode", "osmId", "longitude", "latitude",
+                "type", "shortName", "displayName");
+
+        and: "that address has the requested placeid"
+        address.placeId == 50350574
+
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByBoundingBoxSpec.groovy b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByBoundingBoxSpec.groovy
new file mode 100644
index 00000000..b1e6aa0a
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByBoundingBoxSpec.groovy
@@ -0,0 +1,34 @@
+package address.staticsearch
+
+import spock.lang.Specification
+import util.ClientFactory
+
+/**
+ * @author Sandra Thieme - thieme@synyx.de
+ */
+class StaticAddressByBoundingBoxSpec extends Specification{
+
+    def "request for Static Addresses matching the given bounding box"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        and: "a bounding box definition"
+        def urlParams = [
+                "lat": "49.0126538640",
+                "lon": "8.3770751953",
+                "distance": "10"
+        ]
+
+        when: "static addresses are requested"
+        def response = client.get(path: "/api/staticaddresses", query: urlParams)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "response consists of a list of static address uids"
+        def uidList = response.data.uids
+        uidList.size() == 1
+
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByGeolocationSpec.groovy b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByGeolocationSpec.groovy
new file mode 100644
index 00000000..6d89c634
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByGeolocationSpec.groovy
@@ -0,0 +1,57 @@
+package address.staticsearch
+
+import spock.lang.Specification
+import util.ClientFactory
+
+/**
+ * @author Arnold Franke - franke@synyx.de
+ */
+class StaticAddressByGeolocationSpec extends Specification{
+
+    def "request for Static Addresses matching the given coordinates"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        and: "a geolocation (latitude, longitude)"
+        def urlParams = [
+                "lat": "49.0126538640",
+                "lon": "8.3770751953"
+        ]
+
+        when: "static addresses are requested"
+        def response = client.get(path: "/api/staticaddresses", query: urlParams)
+        print(response.data)
+        
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "response consists of a list of one addresslist object"
+        def addressListList = response.data.geoCodeResponse.addresses
+        addressListList.size() == 1
+
+        and: "the addresslistobject contains a parent address and a list of static addresses"
+        def addressListObject = addressListList[0]
+        def parentAddress = addressListObject.parentAddress
+        def staticaddresses = addressListObject.addresses
+        staticaddresses.size() == 1
+
+        and: "the parent address object has certain attributes"
+        parentAddress.size() == 10
+        parentAddress.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+        parentAddress.type == "ADDRESS"
+
+        and: "a static address contains certain attributes"
+        def staticaddress = staticaddresses[0]
+        staticaddress.size() == 10
+        staticaddress.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+
+        and: "the type of a static address is ADDRESS"
+        staticaddress.type == "ADDRESS"
+
+        and: "a static address contains a address map with certain attributes"
+        def addressmap = staticaddress.address
+        addressmap.size() == 6
+        addressmap.keySet().containsAll("suburb", "static_id", "postcode", "country_code", "city", "hashkey")
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByPostalCodeAndCityAndCountrySpec.groovy b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByPostalCodeAndCityAndCountrySpec.groovy
new file mode 100644
index 00000000..4a1f3a7d
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/address/staticsearch/StaticAddressByPostalCodeAndCityAndCountrySpec.groovy
@@ -0,0 +1,47 @@
+package address.staticsearch
+
+import spock.lang.Specification
+import util.ClientFactory
+
+/**
+ * @author Arnold Franke - franke@synyx.de
+ */
+class StaticAddressByPostalCodeAndCityAndCountrySpec extends Specification {
+
+    def "request for Static Addresses matching the given details"() {
+        
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        and: "address details (postalCode, city, country)"
+        def urlParams = [
+                "postalCode": "76131",
+                "city": "Karlsruhe",
+                "country": "DE"
+        ]
+
+        when: "static addresses are requested"
+        def response = client.get(path: "/api/staticaddresses", query: urlParams)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+        
+        and: "response consists of one address"
+        def staticAddresses = response.responseData
+        staticAddresses.size() == 1
+        
+        and: "a static address contains certain attributes"
+        def staticaddress = staticAddresses[0]
+        staticaddress.keySet().size() == 10
+        staticaddress.keySet().containsAll("countryCode", "niceName", "displayName", "osmId", "placeId", "shortName", "address", "type", "longitude", "latitude")
+
+        and: "a static address contains a address map with certain attributes"
+        def addressmap = staticaddress.address
+        addressmap.size() == 6
+        addressmap.keySet().containsAll("suburb", "static_id", "postcode", "country_code", "city", "hashkey")
+                                                       
+        and: "the type of a static address is ADDRESS"
+        staticaddress.type == "ADDRESS"
+        
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/authorization/AuthorizationSpec.groovy b/iris-api-tests/src/test/groovy/authorization/AuthorizationSpec.groovy
new file mode 100644
index 00000000..337c3aaf
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/authorization/AuthorizationSpec.groovy
@@ -0,0 +1,71 @@
+package authorization
+
+import groovyx.net.http.ContentType
+import groovyx.net.http.HttpResponseException
+import spock.lang.Specification
+import util.ClientFactory
+
+class AuthorizationSpec extends Specification {
+
+    def "request for api from non-authorized user"() {
+
+        given: "a REST client without login credentials"
+        def client = ClientFactory.newUnauthorizedClient()
+
+        when: "api is requested"
+        client.get(path: "/api/")
+
+        then: "the request fails"
+        def e = thrown(HttpResponseException)
+        def response = e.getResponse();
+
+        then: "response status code should be 401 (Unauthorized)"
+        response.status == 401
+
+        and: "response should have correct authentication header"
+        response.getFirstHeader("WWW-Authenticate").getValue() == "Basic realm=\"IRIS API\""
+    }
+
+    def "request for seaport synchronisation for non allowed user"() {
+
+        given: "a REST client with user login credentials"
+        def client = ClientFactory.newUserClient()
+
+        when: "seaport creation is requested"
+        def seaportUid = System.nanoTime()
+        def content = [
+                name: "seaport-${seaportUid}".toString(),
+                longitude: "8.${seaportUid}".toString(),
+                latitude: "49.${seaportUid}".toString()
+        ]
+        client.put(path: "/api/seaports/$seaportUid", body: content, contentType: ContentType.JSON)
+
+        then: "the request fails"
+        def e = thrown(HttpResponseException)
+
+        then: "response status code should be 403 (Forbidden)"
+        e.getResponse().status == 403
+    }
+
+    def "request for terminal synchronisation for non allowed user"() {
+
+        given: "a REST client with user login credentials"
+        def client = ClientFactory.newUserClient()
+
+        when: "terminal creation is requested"
+        def terminalUid = System.nanoTime()
+        def content = [
+                name: "terminal-${terminalUid}".toString(),
+                longitude: "8.${terminalUid}".toString(),
+                latitude: "49.${terminalUid}".toString(),
+                region: "NOT_SET"
+        ]
+        client.put(path: "/api/terminals/$terminalUid", body: content, contentType: ContentType.JSON)
+
+        then: "the request fails"
+        def e = thrown(HttpResponseException)
+
+        then: "response status code should be 403 (Forbidden)"
+        e.getResponse().status == 403
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/connection/ConnectionSpec.groovy b/iris-api-tests/src/test/groovy/connection/ConnectionSpec.groovy
new file mode 100644
index 00000000..8c315afa
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/ConnectionSpec.groovy
@@ -0,0 +1,25 @@
+package connection
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class ConnectionSpec extends Specification {
+
+    def "request for connections"() {
+
+        given: "a REST client"
+        def client = new ClientFactory().newAdminClient()
+
+        when: "connections for a specified terminal are requested"
+        def response = client.get(path: '/api/connections', query: [terminalUid: '1301000000000001'])
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "response body is as expected"
+        response.data[0].keySet() == ['routeType', 'terminalUid', 'seaportUid'] as Set
+        response.data[0].terminalUid == '1301000000000001'
+        response.data[0].seaportUid == '1301000000000002'
+        response.data[0].routeType == 'BARGE'
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/connection/ConnectionsForTerminalSpec.groovy b/iris-api-tests/src/test/groovy/connection/ConnectionsForTerminalSpec.groovy
new file mode 100644
index 00000000..d7641b53
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/ConnectionsForTerminalSpec.groovy
@@ -0,0 +1,36 @@
+package connection
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class ConnectionsForTerminalSpec extends Specification {
+
+    def "request for Connections belonging to specific Terminal"() {
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+        
+        and: "a Terminal Unique ID"
+        def urlParams = ["terminalUid": 1301000000000001]
+    
+        when: "connections are requested"
+        def response = client.get(path: "/api/connections", query: urlParams)        
+    
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "response consists at least one connection"
+        response.responseData.size() >= 1
+        
+        and: "a connection contains certain attributes"
+        def connection = response.responseData[0]
+        connection.keySet().size() == 3
+        connection.keySet().containsAll("seaportUid", "terminalUid", "routeType")
+        connection.terminalUid == "1301000000000001"
+        
+        and: "the attributes have certain types"
+        connection.seaportUid.isNumber()
+        connection.terminalUid.isNumber()
+        !connection.routeType.isNumber()
+        
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/connection/EnrichedRouteSpec.groovy b/iris-api-tests/src/test/groovy/connection/EnrichedRouteSpec.groovy
new file mode 100644
index 00000000..6340ac96
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/EnrichedRouteSpec.groovy
@@ -0,0 +1,64 @@
+package connection
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class EnrichedRouteSpec extends Specification {
+
+    def "request for enriched route"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        and: "a route specification"
+        def routeParams = [
+                "data.parts[0].origin.longitude": 8.544177,
+                "data.parts[0].origin.latitude": 50.08162,
+                "data.parts[0].destination.longitude": 8.4232,
+                "data.parts[0].destination.latitude": 49.01179,
+                "data.parts[0].routeType": "TRUCK",
+                "data.parts[0].containerType": "FORTY",
+                "data.parts[0].containerState": "EMPTY",
+                "data.parts[1].origin.longitude": 8.4232,
+                "data.parts[1].origin.latitude": 49.01179,
+                "data.parts[1].destination.longitude": 8.544177,
+                "data.parts[1].destination.latitude": 50.08162,
+                "data.parts[1].routeType": "TRUCK",
+                "data.parts[1].containerType": "FORTY",
+                "data.parts[1].containerState": "FULL",
+                "data.parts[2].origin.longitude": 8.544177,
+                "data.parts[2].origin.latitude": 50.08162,
+                "data.parts[2].destination.longitude": 4.3,
+                "data.parts[2].destination.latitude": 51.36833,
+                "data.parts[2].routeType": "BARGE",
+                "data.parts[2].containerType": "FORTY",
+                "data.parts[2].containerState": "FULL",
+        ]
+
+        when: "details are requested"
+        def response = client.get(path: "/api/routedetails", query: routeParams)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "the route has certain attributes"
+        def route = response.data.response.route
+        route.keySet().size() == 9
+        route.keySet().containsAll("product", "errors", "responsibleTerminal", "direction", "name", "roundTrip", "data", "shortName", "url")
+
+        and: "the route's data has certain attribures"
+        route.data.keySet().size() == 8
+        route.data.keySet().containsAll("co2", "parts", "totalRealTollDistance", "totalDuration", "totalDistance",
+                "totalTollDistance", "co2DirectTruck", "totalOnewayTruckDistance")
+
+        and: "each route part has certain attributes"
+        route.data.parts.each {
+            assert it.keySet().size() == 8
+            assert it.keySet().containsAll("containerType", "routeType", "direction", "name", "containerState", "origin",
+                    "data", "destination")
+            assert it.data.keySet().size() == 7
+            assert it.data.keySet().containsAll("electricDistance", "duration", "distance", "dieselDistance",
+                    "tollDistance", "airlineDistance", "co2")
+        }
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/connection/SeaportRouteSpec.groovy b/iris-api-tests/src/test/groovy/connection/SeaportRouteSpec.groovy
new file mode 100644
index 00000000..537e338f
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/SeaportRouteSpec.groovy
@@ -0,0 +1,45 @@
+package connection
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class SeaportRouteSpec extends Specification {
+
+    def "request for seaport routes"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "routes for a specified seaport are requested"
+        def requestUrl = String.format('/api/connections/%s/%s:%s/%s', 1301000000000002, 49.01179, 8.4232, false)
+        def params = [containerType: "TWENTY_LIGHT", isImport: false, combo: "WATERWAY"]
+        def response = client.get(path: requestUrl, query: params)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "there should be at least one route"
+        def routes = response.data.response.routes
+        !routes.isEmpty()
+
+        routes.each {
+            and: "each route has certain fields"
+            def routeAttributes = it.keySet()
+            assert routeAttributes.size() == 9
+            assert routeAttributes.containsAll("roundTrip", "product", "shortName", "name", "data", "errors", "direction", "url", "responsibleTerminal")
+
+            and: "each route's data field has certain fields"
+            def data = it.data
+            def dataAttributes = data.keySet()
+            assert dataAttributes.size() == 8
+            assert dataAttributes.containsAll("co2", "co2DirectTruck", "totalDistance", "totalOnewayTruckDistance",
+                    "totalRealTollDistance", "totalTollDistance", "totalDuration", "parts")
+
+            and: "the route parts have certain fields"
+            def partAttributes = data.parts.first().keySet()
+            assert partAttributes.size() == 8
+            assert partAttributes.containsAll("name", "data", "origin", "containerState", "containerType", "direction",
+                    "routeType", "destination")
+        }
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/connection/SeaportsInConnectionsSpec.groovy b/iris-api-tests/src/test/groovy/connection/SeaportsInConnectionsSpec.groovy
new file mode 100644
index 00000000..bc4066c0
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/SeaportsInConnectionsSpec.groovy
@@ -0,0 +1,49 @@
+package connection
+
+import spock.lang.*
+import util.ClientFactory
+import org.apache.http.client.HttpResponseException
+
+/**
+ * @author Oliver Messner - messner@synyx.de
+ */
+class SeaportsInConnectionsSpec extends Specification {
+
+    def "request for connected seaport"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+        
+        when: "request is sent to server"
+        def response = client.get(path: "/api/connections/seaports")
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "the seaport object has certain attributes"
+        def seaports = response.data.seaports
+        !seaports.isEmpty()
+        seaports.each {
+            assert it.keySet().size() == 6
+            assert it.keySet().containsAll("latitude", "longitude", "name", "enabled", "type", "uniqueId")
+        }
+        
+        and: "links are provided"
+        def links = response.data.links
+        !links.isEmpty()
+    }
+
+    def "request for undefined combo type"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+        
+        when: "an invalid combotype is requested"
+        client.get(path: "/api/connections/seaports", query: [combo: 'INVALID COMBO TYPE'])
+
+        then: "response status type is bad request"
+        def e = thrown(HttpResponseException)
+        e.message == 'Bad Request'
+        e.statusCode == 400
+    }
+}
\ No newline at end of file
diff --git a/iris-api-tests/src/test/groovy/connection/TerminalsConnectedToSeaportSpec.groovy b/iris-api-tests/src/test/groovy/connection/TerminalsConnectedToSeaportSpec.groovy
new file mode 100644
index 00000000..7b689dea
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/connection/TerminalsConnectedToSeaportSpec.groovy
@@ -0,0 +1,34 @@
+package connection
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class TerminalsConnectedToSeaportSpec extends Specification {
+
+    def "request for terminals connected to a seaport with route type BARGE"() {
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        and: "a seaport unique ID and a route type"
+        def urlParams = [
+                "seaportUid": 1301000000000002,
+                "routeType": "BARGE"
+        ]
+
+        when: "terminals for this combination are requested"
+        def response = client.get(path: "/api/terminals", query: urlParams)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "the response contains terminals"
+        def terminals = response.data.response.terminals
+        !terminals.isEmpty()
+
+        and: "the terminals contains certain attributes"
+        terminals.each {
+            assert it.keySet().size() == 7
+            assert it.keySet().containsAll("latitude", "longitude", "name", "enabled", "uniqueId", "type", "region")
+        }
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/countries/CountriesSpec.groovy b/iris-api-tests/src/test/groovy/countries/CountriesSpec.groovy
new file mode 100644
index 00000000..f4fe84f6
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/countries/CountriesSpec.groovy
@@ -0,0 +1,30 @@
+package countries
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class CountriesSpec extends Specification {
+
+    def "request for countries"() {
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "countries are requested"
+        def response = client.get(path: "/api/countries/")
+        def countries = response.data.countriesResponse.countries
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "countries amount should be 12"
+        countries.size() == 12
+
+        and: "Belgium should be in the list"
+        countries.contains([name: 'Belgium', value: 'BE']);   
+        
+        and: "Germany should be in the list"
+        countries.contains([name: 'Germany', value: 'DE']);
+    }
+
+}
diff --git a/iris-api-tests/src/test/groovy/distance/AirlineDistanceSpec.groovy b/iris-api-tests/src/test/groovy/distance/AirlineDistanceSpec.groovy
new file mode 100644
index 00000000..d1e16eb0
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/distance/AirlineDistanceSpec.groovy
@@ -0,0 +1,35 @@
+package distance
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class AirlineDistanceSpec extends Specification {
+
+    def "request for airline distance between karlsruhe and duisburg"() {
+
+        def latKA = 49.008085
+        def lonKA = 8.403756
+
+        def latDU = 51.435146
+        def lonDU = 6.762691
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "airline distance is requested"
+        def params = [alat:latKA, alon:lonKA, blat:latDU, blon:lonDU]
+        def response = client.get(path: "/api/airlineDistance", query: params)
+        def airlineDistance = response.data.airlineDistance
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        and: "airlineDistance should consist of unit and distance and links"
+        airlineDistance.keySet().size() == 3
+        airlineDistance.keySet().containsAll("unit", "distance", "links")
+
+        and: "unit is meter"
+        airlineDistance.unit == "meter"
+
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/distance/CloudDistanceSpec.groovy b/iris-api-tests/src/test/groovy/distance/CloudDistanceSpec.groovy
new file mode 100644
index 00000000..d2e82aa7
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/distance/CloudDistanceSpec.groovy
@@ -0,0 +1,38 @@
+package distance
+
+import spock.lang.Specification
+import util.ClientFactory
+
+class CloudDistanceSpec extends Specification {
+
+    def "request for cloud distance between karlsruhe and terminal one"() {
+
+        def idKarlsruhe = 1301000000000001
+        def idFrankfurt = 1301000000000001
+
+        given: "a REST client"
+        def client = ClientFactory.newAdminClient()
+
+        when: "distance is requested"
+        def params = [
+                terminal: idFrankfurt,
+                address: idKarlsruhe
+        ]
+        def response = client.get(path: "/api/distancecloudaddress", query: params)
+
+        then: "response status code should be 200 (OK)"
+        response.status == 200
+
+        def responseData = response.data
+
+        and: "responseData should consist of address and links"
+        responseData.keySet().size() == 2
+        responseData.keySet().containsAll("address", "links")
+
+        and: "address should consist of certain attributes"
+        def address = responseData.address
+        address.keySet().size() == 10
+        address.keySet().containsAll("country", "hashKey", "distance", "city", "postalcode", "airLineDistanceMeter",
+                "errorMessage", "suburb", "tollDistance", "uniqueId")
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/seaport/SeaportSpec.groovy b/iris-api-tests/src/test/groovy/seaport/SeaportSpec.groovy
new file mode 100644
index 00000000..8d8a79ef
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/seaport/SeaportSpec.groovy
@@ -0,0 +1,49 @@
+package seaport
+
+import groovyx.net.http.ContentType
+import spock.lang.Specification
+import util.ClientFactory
+
+class SeaportSpec extends Specification {
+
+    def 'create new seaport'() {
+
+        given: "a REST client"
+        def client = new ClientFactory().newAdminClient()
+
+        when: 'new seaport is created'
+        def seaportUid = System.nanoTime()
+        def content = [
+                name: "seaport-${seaportUid}".toString(),
+                longitude: "8.${seaportUid}".toString(),
+                latitude: "49.${seaportUid}".toString()
+        ]
+
+        def response = client.put(path: "/api/seaports/$seaportUid", body: content, contentType: ContentType.JSON)
+
+        then: 'response status code should be 201 (CREATED)'
+        response.status == 201
+    }
+
+    def 'create and update seaport'() {
+
+        given: "a REST client"
+        def client = new ClientFactory().newAdminClient()
+
+        and: 'a new seaport'
+        def seaportUid = System.nanoTime()
+        def content = [
+                name: "seaport-${seaportUid}".toString(),
+                longitude: "8.${seaportUid}".toString(),
+                latitude: "49.${seaportUid}".toString()
+        ]
+
+        client.put(path: "/api/seaports/$seaportUid", body: content, contentType: ContentType.JSON)
+
+        when: 'seaport is updated'
+        def response = client.put(path: "/api/seaports/$seaportUid", body: content, contentType: ContentType.JSON)
+
+        then: 'response status code should be 204 (NO CONTENT)'
+        response.status == 204
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/terminal/TerminalSpec.groovy b/iris-api-tests/src/test/groovy/terminal/TerminalSpec.groovy
new file mode 100644
index 00000000..6ec5c115
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/terminal/TerminalSpec.groovy
@@ -0,0 +1,51 @@
+package terminal
+
+import groovyx.net.http.ContentType
+import spock.lang.Specification
+import util.ClientFactory
+
+class TerminalSpec extends Specification {
+
+    def 'create new terminal'() {
+
+        given: "a REST client"
+        def client = new ClientFactory().newAdminClient()
+
+        when: 'new terminal is created'
+        def terminalUid = System.nanoTime()
+        def content = [
+                name: "terminal-${terminalUid}".toString(),
+                longitude: "8.${terminalUid}".toString(),
+                latitude: "49.${terminalUid}".toString(),
+                region: "NOT_SET"
+        ]
+
+        def response = client.put(path: "/api/terminals/$terminalUid", body: content, contentType: ContentType.JSON)
+
+        then: 'response status code should be 201 (CREATED)'
+        response.status == 201
+    }
+
+    def 'create and update terminal'() {
+
+        given: "a REST client"
+        def client = new ClientFactory().newAdminClient()
+
+        and: 'a new terminal'
+        def terminalUid = System.nanoTime()
+        def content = [
+                name: "terminal-${terminalUid}".toString(),
+                longitude: "8.${terminalUid}".toString(),
+                latitude: "49.${terminalUid}".toString(),
+                region: "NOT_SET"
+        ]
+
+        client.put(path: "/api/terminals/$terminalUid", body: content, contentType: ContentType.JSON)
+
+        when: 'terminal is updated'
+        def response = client.put(path: "/api/terminals/$terminalUid", body: content, contentType: ContentType.JSON)
+
+        then: 'response status code should be 204 (NO CONTENT)'
+        assert response.status == 204
+    }
+}
diff --git a/iris-api-tests/src/test/groovy/util/ClientFactory.groovy b/iris-api-tests/src/test/groovy/util/ClientFactory.groovy
new file mode 100644
index 00000000..a52a553e
--- /dev/null
+++ b/iris-api-tests/src/test/groovy/util/ClientFactory.groovy
@@ -0,0 +1,26 @@
+package util
+
+import groovyx.net.http.RESTClient
+
+class ClientFactory {
+
+    static final ENDPOINT = System.getProperty("endpoint") == null ? "http://localhost:8082" : System.getProperty("endpoint")
+
+    static def newAdminClient() {
+        def client = newUnauthorizedClient()
+
+        // prepare for preemptive authentication
+        client.headers['Authorization'] = 'Basic ' + "admin@example.com:admin".getBytes('UTF-8').encodeBase64()
+        return client
+    }
+
+    static def newUserClient() {
+        def client = newUnauthorizedClient()
+        client.headers['Authorization'] = 'Basic ' + "user@example.com:user".getBytes('UTF-8').encodeBase64()
+        return client
+    }
+
+    static def newUnauthorizedClient() {
+        return new RESTClient(ENDPOINT)
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..80e4605f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,816 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.contargo</groupId>
+    <artifactId>iris</artifactId>
+    <version>1.6</version>
+    <packaging>war</packaging>
+
+    <name>${project.groupId}:${project.artifactId}</name>
+
+    <description>Intermodal Routing Information System</description>
+    <url>https://github.com/Contargo/iris</url>
+
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License, Version 3</name>
+            <url>http://www.gnu.org/licenses/agpl-3.0.txt</url>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Contargo GmbH &amp; Co. KG</name>
+        <url>http://www.contargo.net</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <name>IRIS Development</name>
+            <email>iris.development@contargo.net</email>
+        </developer>
+    </developers>
+
+    <properties>
+        <java-version>1.8</java-version>
+        <buildTime>${maven.build.timestamp}</buildTime>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <org.springframework-version>4.1.6.RELEASE</org.springframework-version>
+        <org.springframework.security-version>3.2.7.RELEASE</org.springframework.security-version>
+        <org.springframework.data.jpa-version>1.8.0.RELEASE</org.springframework.data.jpa-version>
+
+        <org.slf4j-version>1.7.6</org.slf4j-version>
+
+        <jetty.version>8.1.14.v20131031</jetty.version>
+
+        <logback.version>1.1.2</logback.version>
+
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.jacoco.reportPath>target/jacoco.exec</sonar.jacoco.reportPath>
+        <sonar.surefire.reportsPath>target/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+        <sonar.javascript.lcov.reportPath>target/jasmine/total-coverage.dat</sonar.javascript.lcov.reportPath>
+
+        <srcDir>src/main/java</srcDir>
+    </properties>
+
+    <scm>
+        <url>https://github.com/Contargo/iris</url>
+        <connection>scm:git:https://github.com/Contargo/iris.git</connection>
+        <developerConnection>scm:git:https://github.com/Contargo/iris.git</developerConnection>
+    </scm>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>nexus.synyx.org</id>
+            <name>Synyx OpenSource Repository</name>
+            <url>http://repo.synyx.org</url>
+        </repository>
+        <repository>
+            <id>mapfish</id>
+            <name>mapfish geotools</name>
+            <url>http://dev.mapfish.org/maven/repository/org/geotools//</url>
+        </repository>
+        <repository>
+            <id>osgeo</id>
+            <name>Open Source Geospatial Foundation Repository</name>
+            <url>http://download.osgeo.org/webdav/geotools/</url>
+        </repository>
+        <repository>
+            <id>oss-jfrog-artifactory</id>
+            <name>oss-jfrog-artifactory-releases</name>
+            <url>http://oss.jfrog.org/artifactory/oss-release-local</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${org.springframework-version}</version>
+            <exclusions>
+                <!-- Exclude org.apache.maven.plugins Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework-version}</version>
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${org.springframework.security-version}</version>
+
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>${org.springframework.security-version}</version>
+
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${org.springframework.security-version}</version>
+        </dependency>
+
+        <!-- JPA / Hibernate -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>${org.springframework.data.jpa-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>4.3.9.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>4.3.2.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <!-- Replace with the version of the MySQL driver you want to use -->
+            <version>5.1.29</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-api</artifactId>
+            <version>2.7.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <!-- Servlet -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <!-- GUI -->
+        <dependency>
+            <groupId>displaytag</groupId>
+            <artifactId>displaytag</artifactId>
+            <version>1.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl104-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>2.4.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.synyx</groupId>
+            <artifactId>spring-helper-sitemesh</artifactId>
+            <version>0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>net.contargo</groupId>
+            <artifactId>big-decimal-validator</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+
+        <!--    LOGGING    -->
+        <!-- SLF4J - logging api -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j-version}</version>
+        </dependency>
+        <!--  Interceptor for Commons-logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j-version}</version>
+        </dependency>
+        <!--  Interceptor for java.util.logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jul-to-slf4j</artifactId>
+            <version>${org.slf4j-version}</version>
+        </dependency>
+        <!-- Logback - logging impl -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.logback-extensions</groupId>
+            <artifactId>logback-ext-spring</artifactId>
+            <version>0.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework-version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.unitils</groupId>
+            <artifactId>unitils-core</artifactId>
+            <version>3.4.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>0.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+            <version>0.9.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.hateoas</groupId>
+            <artifactId>spring-hateoas</artifactId>
+            <version>0.9.0.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mangofactory</groupId>
+            <artifactId>swagger-springmvc</artifactId>
+            <version>0.9.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ajar</groupId>
+            <artifactId>swagger-spring-mvc-ui</artifactId>
+            <version>0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>16.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.interceptor</groupId>
+            <artifactId>javax.interceptor-api</artifactId>
+            <version>1.2</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>${srcDir}</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.json</include>
+                </includes>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>../iris/src/test/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.properties</include>
+                    <include>**/*.json</include>
+                </includes>
+            </testResource>
+        </testResources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <releaseProfiles>release</releaseProfiles>
+                    <goals>deploy</goals>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.4.201502262128</version>
+                <configuration>
+                    <includes>
+                        <include>net.contargo.*</include>
+                    </includes>
+                    <destFile>${project.basedir}/target/jacoco.exec</destFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.3.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-stuff</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>commons-logging</exclude>
+                                    </excludes>
+                                    <searchTransitive>true</searchTransitive>
+                                </bannedDependencies>
+                                <requireMavenVersion>
+                                    <version>[3.0.4,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[1.6.0,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>unittests</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*UnitTest.java</include>
+                            </includes>
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>integrationtests</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                                <include>**/*WebTest.java</include>
+                            </includes>
+                            <skip>false</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.github.klieber</groupId>
+                <artifactId>phantomjs-maven-plugin</artifactId>
+                <version>0.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>install</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <version>1.9.2</version>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.github.searls</groupId>
+                <artifactId>jasmine-maven-plugin</artifactId>
+                <version>1.3.1.1</version>
+
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jsSrcDir>src/main/webapp/client/js</jsSrcDir>
+
+                    <keepServerAlive>true</keepServerAlive>
+
+                    <webDriverClassName>org.openqa.selenium.phantomjs.PhantomJSDriver</webDriverClassName>
+
+                    <webDriverCapabilities>
+                        <phantomjs.binary.path>${phantomjs.binary}</phantomjs.binary.path>
+                    </webDriverCapabilities>
+
+                    <specIncludes>
+                        <include>jasmine-jquery-1.3.1.js</include>
+                        <include>globalsetup.js</include>
+                        <include>**Test.js</include>
+                        <include>models/**Test.js</include>
+                        <include>views/**Test.js</include>
+                    </specIncludes>
+                    <sourceIncludes>
+                        <include>lib/jquery*.js</include>
+                        <include>lib/select2.js</include>
+                        <include>lib/underscore.js</include>
+                        <include>lib/backbone.js</include>
+                        <include>lib/bootstrap.min.js</include>
+                        <include>lib/bootstrap-notify.js</include>
+                        <include>lib/handlebars-1.3.0.js</include>
+
+                        <!-- These first models need to be included first for inheritance reasons -->
+                        <include>routing/SelectableAwareCollection.js</include>
+                        <include>routing/models/*.js</include>
+                        <include>routing/views/*.js</include>
+                        <include>routing/*.js</include>
+                    </sourceIncludes>
+
+                </configuration>
+
+            </plugin>
+
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.version}</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                            <port>8082</port>
+                        </connector>
+                    </connectors>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
+                <configuration>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <finalName>IRIS</finalName>
+    </build>
+
+    <!--      Profiles      -->
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>2.4</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.10.2</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>jsSonar</id>
+            <properties>
+                <srcDir>src/main/webapp/client/js/routing</srcDir>
+                <sonar.language>js</sonar.language>
+                <sonar.branch>js</sonar.branch>
+            </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.timurstrekalov</groupId>
+                        <artifactId>saga-maven-plugin</artifactId>
+                        <version>1.4.0</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>coverage</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <baseDir>http://localhost:${jasmine.serverPort}</baseDir>
+                            <outputDir>${project.build.directory}/saga-coverage</outputDir>
+                            <noInstrumentPatterns>
+                                <pattern>.*/spec/.*</pattern>
+                                <!-- Don't instrument specs -->
+                            </noInstrumentPatterns>
+                        </configuration>
+
+                    </plugin>
+
+                    <plugin>
+                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                        <artifactId>replacer</artifactId>
+                        <version>1.5.2</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <file>${project.build.directory}/saga-coverage/total-coverage.dat</file>
+                            <outputFile>${project.build.directory}/jasmine/total-coverage.dat</outputFile>
+                            <regex>true</regex>
+                            <replacements>
+                                <replacement>
+                                    <token>SF:http://localhost:\d+/src/routing/</token>
+                                    <value>SF:${project.build.sourceDirectory}/</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/net/contargo/iris/BoundingBox.java b/src/main/java/net/contargo/iris/BoundingBox.java
new file mode 100644
index 00000000..6c65e0a6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/BoundingBox.java
@@ -0,0 +1,94 @@
+package net.contargo.iris;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ */
+public class BoundingBox {
+
+    private static final Double EARTH_RADIUS = 6371.01d;
+    private static final Double MIN_LAT = Math.toRadians(-90d);
+    private static final Double MIN_LON = Math.toRadians(90d);
+    private static final Double MAX_LON = Math.toRadians(-180);
+    private static final Double MAX_LAT = Math.toRadians(180d);
+
+    private final GeoLocation lowerLeft;
+    private final GeoLocation upperRight;
+
+    /**
+     * Calculates the Bounding-Box with the given geolocation as center and a "radius" of given distance in kilometers.
+     *
+     * <pre>
+     +-------------------------X   upperRight
+     |                         |
+     |            X            |
+     |                         |
+     X-------------------------+   lowerLeft
+
+     * </pre>
+     *
+     * @param  distanceInKm  distance in km
+     *
+     * @return
+     */
+
+    public BoundingBox(GeoLocation location, Double distanceInKm) {
+
+        Double angularDistance = distanceInKm / EARTH_RADIUS;
+
+        double lat = fromDegree(location.getLatitude());
+        double lon = fromDegree(location.getLongitude());
+
+        Double minLatitude = lat - angularDistance;
+        Double maxLatitude = lat + angularDistance;
+
+        Double minLongitude;
+        Double maxLongitude;
+
+        if (minLatitude > MIN_LAT && maxLatitude < MAX_LAT) {
+            Double deltaLongitude = Math.asin(Math.sin(angularDistance) / Math.cos(lat));
+
+            minLongitude = lon - deltaLongitude;
+
+            if (minLongitude < MIN_LON) {
+                minLongitude += 2d * Math.PI;
+            }
+
+            maxLongitude = lon + deltaLongitude;
+
+            if (maxLongitude > MAX_LON) {
+                maxLongitude -= 2d * Math.PI;
+            }
+        } else {
+            minLatitude = Math.max(minLatitude, MIN_LAT);
+
+            maxLatitude = Math.min(maxLatitude, MAX_LAT);
+
+            minLongitude = MIN_LON;
+
+            maxLongitude = MAX_LON;
+        }
+
+        this.lowerLeft = new GeoLocation(Math.toDegrees(minLatitude), Math.toDegrees(minLongitude));
+        this.upperRight = new GeoLocation(Math.toDegrees(maxLatitude), Math.toDegrees(maxLongitude));
+    }
+
+    private double fromDegree(BigDecimal value) {
+
+        return Math.toRadians(value.doubleValue());
+    }
+
+
+    public GeoLocation getLowerLeft() {
+
+        return lowerLeft;
+    }
+
+
+    public GeoLocation getUpperRight() {
+
+        return upperRight;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/GeoLocation.java b/src/main/java/net/contargo/iris/GeoLocation.java
new file mode 100644
index 00000000..128a43e6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/GeoLocation.java
@@ -0,0 +1,197 @@
+package net.contargo.iris;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import net.contargo.iris.util.BigDecimalComparator;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.hibernate.validator.constraints.Range;
+
+import org.springframework.format.number.NumberFormatter;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import java.text.NumberFormat;
+
+import java.util.Locale;
+
+import javax.persistence.MappedSuperclass;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * This class represents a Geolocation.
+ *
+ * <p>The equal method tests if the gps coordinates are the same.</p>
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@MappedSuperclass
+public class GeoLocation {
+
+    private static final int SCALE = 10;
+    private static final int MAX_VALUE_COORD = 180;
+    private static final int MIN_VALUE_COORD = -180;
+
+    @JsonProperty("lat")
+    @NotNull
+    @Range(min = MIN_VALUE_COORD, max = MAX_VALUE_COORD)
+    private BigDecimal latitude;
+
+    @JsonProperty("lon")
+    @NotNull
+    @Range(min = MIN_VALUE_COORD, max = MAX_VALUE_COORD)
+    private BigDecimal longitude;
+
+    public GeoLocation() {
+
+        // default constructor to call from subclasses
+    }
+
+
+    public GeoLocation(BigDecimal latitude, BigDecimal longitude) {
+
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+
+    public GeoLocation(double plat, double plon) {
+
+        double lat = plat;
+        double lon = plon;
+
+        while (lon > MAX_VALUE_COORD) {
+            lon = lon - MAX_VALUE_COORD;
+        }
+
+        while (lat > MAX_VALUE_COORD) {
+            lat = lat - MAX_VALUE_COORD;
+        }
+
+        while (lon < 0) {
+            lon = lon + MAX_VALUE_COORD;
+        }
+
+        while (lat < 0) {
+            lat = lat + MAX_VALUE_COORD;
+        }
+
+        this.latitude = new BigDecimal(lat);
+        this.longitude = new BigDecimal(lon);
+    }
+
+    public BigDecimal getLatitude() {
+
+        if (latitude == null) {
+            return null;
+        }
+
+        return latitude.setScale(SCALE, RoundingMode.HALF_EVEN);
+    }
+
+
+    public void setLatitude(BigDecimal latitude) {
+
+        this.latitude = latitude;
+    }
+
+
+    public BigDecimal getLongitude() {
+
+        if (longitude == null) {
+            return null;
+        }
+
+        return longitude.setScale(SCALE, RoundingMode.HALF_EVEN);
+    }
+
+
+    public void setLongitude(BigDecimal longitude) {
+
+        this.longitude = longitude;
+    }
+
+
+    public String getNiceName() {
+
+        NumberFormatter nf = new NumberFormatter("#0.0#####");
+        NumberFormat numberFormat = nf.getNumberFormat(Locale.getDefault());
+
+        return numberFormat.format(getLatitude()) + ":" + numberFormat.format(getLongitude());
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        HashCodeBuilder builder = new HashCodeBuilder();
+
+        if (latitude != null) {
+            builder.append(latitude.doubleValue());
+        }
+
+        if (longitude != null) {
+            builder.append(longitude.doubleValue());
+        }
+
+        return builder.toHashCode();
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof GeoLocation)) {
+            return false;
+        }
+
+        GeoLocation other = (GeoLocation) obj;
+
+        BigDecimalComparator comparator = new BigDecimalComparator();
+
+        return !(comparator.compare(this.getLatitude(), other.getLatitude()) != 0
+                || comparator.compare(this.getLongitude(), other.getLongitude()) != 0);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "GeoLocationImpl [latitude=" + latitude + ", longitude=" + longitude + "]";
+    }
+
+
+    /**
+     * Calculates the Bounding-Box with this as center and a "radius" of given distance in kilometers.
+     *
+     * <p>This returns two GeoLocations as BoundingBox that wraps the lower left and upper right of the box</p>
+     *
+     * <pre>
+     +-------------------------X   result[1]
+     |                         |
+     |            X            |
+     |                         |
+     X-------------------------+   result[0]
+
+     * </pre>
+     *
+     * @param  distanceInKm  distance in km
+     *
+     * @return  BoundingBox of the given distanceInKm
+     */
+    public BoundingBox getBoundingBox(Double distanceInKm) {
+
+        return new BoundingBox(this, distanceInKm);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/Message.java b/src/main/java/net/contargo/iris/Message.java
new file mode 100644
index 00000000..b66430cd
--- /dev/null
+++ b/src/main/java/net/contargo/iris/Message.java
@@ -0,0 +1,66 @@
+package net.contargo.iris;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+
+/**
+ * Bean representing a Message.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public final class Message {
+
+    public static enum MessageType {
+
+        SUCCESS,
+        ERROR,
+        WARNING
+    }
+
+    private final String message;
+    private final MessageType type;
+
+    public Message(String message, MessageType type) {
+
+        this.message = message;
+        this.type = type;
+    }
+
+    public MessageType getType() {
+
+        return type;
+    }
+
+
+    public String getMessage() {
+
+        return message;
+    }
+
+
+    public static Message error(String message) {
+
+        return new Message(message, MessageType.ERROR);
+    }
+
+
+    public static Message success(String message) {
+
+        return new Message(message, MessageType.SUCCESS);
+    }
+
+
+    public static Message warning(String message) {
+
+        return new Message(message, MessageType.WARNING);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return new ToStringBuilder(this).append("type", type).append("message", message).toString();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/Address.java b/src/main/java/net/contargo/iris/address/Address.java
new file mode 100644
index 00000000..60bd281b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/Address.java
@@ -0,0 +1,206 @@
+package net.contargo.iris.address;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import net.contargo.iris.GeoLocation;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Represents an address, which is delivered by an address resolution provider (nominatim).
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Address extends GeoLocation {
+
+    public static final String COUNTRY_CODE = "country_code";
+    private static final String DISPLAY_NAME = "display_name";
+    private static final String PLACE_ID = "place_id";
+    private static final String OSM_ID = "osm_id";
+    private static final String SHORT_NAME = "short_name";
+    private static final String SUBURB = "suburb";
+    private static final String CITY = "city";
+
+    @JsonProperty(DISPLAY_NAME)
+    private String displayName;
+
+    @JsonProperty(OSM_ID)
+    private long osmId;
+
+    @JsonProperty(PLACE_ID)
+    private long placeId;
+
+    @JsonProperty(SHORT_NAME)
+    private String shortName;
+
+    private Map<String, String> address = new HashMap<>();
+
+    public Address(String displayName) {
+
+        super();
+        this.displayName = displayName;
+    }
+
+
+    public Address() {
+
+        // needed in test.
+    }
+
+
+    public Address(BigDecimal latitude, BigDecimal longitude) {
+
+        super(latitude, longitude);
+    }
+
+    public String getDisplayName() {
+
+        return displayName;
+    }
+
+
+    public void setDisplayName(String displayName) {
+
+        this.displayName = displayName;
+    }
+
+
+    public String getShortName() {
+
+        return shortName;
+    }
+
+
+    public void setShortName(String shortName) {
+
+        this.shortName = shortName;
+    }
+
+
+    public Map<String, String> getAddress() {
+
+        return address;
+    }
+
+
+    public void setAddress(Map<String, String> address) {
+
+        this.address = address;
+    }
+
+
+    public long getOsmId() {
+
+        return osmId;
+    }
+
+
+    public void setOsmId(long osmId) {
+
+        this.osmId = osmId;
+    }
+
+
+    public long getPlaceId() {
+
+        return placeId;
+    }
+
+
+    public void setPlaceId(long placeId) {
+
+        this.placeId = placeId;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+
+        if (this == o) {
+            return true;
+        }
+
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        final Address oth = (Address) o;
+
+        return new EqualsBuilder().append(displayName, oth.displayName).append(osmId, oth.osmId).append(placeId,
+                oth.placeId).append(shortName, oth.shortName).appendSuper(super.equals(o)).isEquals();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().append(displayName).append(osmId).append(placeId).append(shortName).appendSuper(
+                super.hashCode()).toHashCode();
+    }
+
+
+    public String getCountryCode() {
+
+        return this.address.get(COUNTRY_CODE);
+    }
+
+
+    @Override
+    public String getNiceName() {
+
+        String addressText = getAddressText();
+
+        if (StringUtils.hasLength(addressText)) {
+            return addressText;
+        }
+
+        String name = getShortName();
+
+        if (StringUtils.hasLength(name)) {
+            return name;
+        }
+
+        return getDisplayName();
+    }
+
+
+    private String getAddressText() {
+
+        String postalCode = address.get("postcode");
+
+        if (postalCode == null) {
+            postalCode = address.get("boundary");
+        }
+
+        if (address.containsKey(CITY) && postalCode != null) {
+            if (StringUtils.hasText(address.get(SUBURB))) {
+                return String.format("%s %s (%s)", postalCode, address.get(CITY), address.get(SUBURB));
+            } else {
+                return String.format("%s %s", postalCode, address.get(CITY));
+            }
+        }
+
+        return null;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "Address [displayName=" + displayName + ", osmId=" + osmId
+            + ", placeId=" + placeId + ", shortName=" + shortName
+            + ", address=" + address + "]";
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/AddressList.java b/src/main/java/net/contargo/iris/address/AddressList.java
new file mode 100644
index 00000000..feb845b8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/AddressList.java
@@ -0,0 +1,78 @@
+package net.contargo.iris.address;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import java.util.List;
+
+
+/**
+ * Represents a list of addresses. Contains a list of {@link Address}es and a parent Address.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class AddressList {
+
+    private final List<Address> addresses;
+
+    private Address parentAddress;
+
+    public AddressList(Address root, List<Address> addresses) {
+
+        this.parentAddress = root;
+        this.addresses = addresses;
+    }
+
+
+    public AddressList(String name, List<Address> addresses) {
+
+        Address address = new Address();
+        address.setDisplayName(name);
+
+        this.parentAddress = address;
+        this.addresses = addresses;
+    }
+
+    public List<Address> getAddresses() {
+
+        return addresses;
+    }
+
+
+    public Address getParentAddress() {
+
+        return parentAddress;
+    }
+
+
+    public void setParentAddress(Address parentAddress) {
+
+        this.parentAddress = parentAddress;
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().append(addresses).append(parentAddress).toHashCode();
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (!(obj instanceof AddressList)) {
+            return false;
+        }
+
+        if (this == obj) {
+            return true;
+        }
+
+        final AddressList other = (AddressList) obj;
+
+        return new EqualsBuilder().append(this.hashCode(), other.hashCode()).append(this.addresses, other.addresses)
+            .append(this.parentAddress, other.parentAddress).isEquals();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/api/AddressApiController.java b/src/main/java/net/contargo/iris/address/api/AddressApiController.java
new file mode 100644
index 00000000..0e2aecf8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/api/AddressApiController.java
@@ -0,0 +1,202 @@
+package net.contargo.iris.address.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.AddressDtoService;
+import net.contargo.iris.api.AbstractController;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+
+import java.math.BigDecimal;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.*;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+
+/**
+ * Controller for {@link net.contargo.iris.address.dto.AddressDto}s.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Controller
+@Api(description = "API for querying addresses.", value = "")
+public class AddressApiController extends AbstractController {
+
+    public static final String METHOD_ADDRESS_BY_GEOLOCATION = "addressByGeolocation";
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final AddressDtoService addressDtoService;
+
+    @Autowired
+    public AddressApiController(AddressDtoService addressDtoService) {
+
+        this.addressDtoService = addressDtoService;
+    }
+
+    @ApiOperation(
+        value = "Get addresses for a given OpenStreetMap-ID.", notes = "Get addresses for a given OpenStreetMap-ID."
+    )
+    @ModelAttribute("geoCodeResponse")
+    @RequestMapping(value = OSM_ADDRESSES + SLASH + ID_PARAM, method = RequestMethod.GET)
+    public ListOfAddressListsResponse addressByOsmId(
+        @ApiParam(value = "ID identifying a single osm-address.", required = true)
+        @PathVariable(ID)
+        long osmId) {
+
+        AddressDto address = addressDtoService.getAddressByOsmId(osmId);
+
+        ListOfAddressListsResponse response = new ListOfAddressListsResponse(addressDtoService.wrapInListOfAddressLists(
+                    address));
+
+        LOG.info("API: Responding to geocode-request for OSM ID {}  with {} Blocks", osmId,
+            response.getAddresses().size());
+
+        return response;
+    }
+
+
+    // do not remove the last slash of the url, or the longitude decimals will be cut off
+    @ApiOperation(value = "Get address for the given geolocation.", notes = "Get address for the given geolocation.")
+    @ModelAttribute("reverseGeocodeResponse")
+    @RequestMapping(
+        value = REVERSE_GEOCODE + SLASH + PARAM_LATITUDE + COLON + PARAM_LONGITUDE + SLASH, method = RequestMethod.GET
+    )
+    public AddressResponse addressByGeolocation(@PathVariable("lat") BigDecimal latitude,
+        @PathVariable("lon") BigDecimal longitude) throws NoSuchMethodException {
+
+        AddressDto address = addressDtoService.getAddressForGeoLocation(new GeoLocation(latitude, longitude));
+        AddressResponse response = new AddressResponse(address);
+
+        Method method = AddressApiController.class.getMethod(METHOD_ADDRESS_BY_GEOLOCATION, BigDecimal.class,
+                BigDecimal.class);
+
+        response.add(linkTo(method, latitude, longitude).slash(".").withSelfRel());
+
+        LOG.info("API: Responding to request for address by geolocation with latitude {} and longitude {}", latitude,
+            longitude);
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Search list of addresses by address details.", notes = "Search list of addresses by address details."
+    )
+    @ModelAttribute("geoCodeResponse")
+    @RequestMapping(value = GEOCODES, method = RequestMethod.GET)
+    public ListOfAddressListsResponse addressesByAddressDetails(@RequestParam(required = false) String street,
+        @RequestParam(required = false) String postalCode,
+        @RequestParam(required = false) String city,
+        @RequestParam(required = false) String country,
+        @RequestParam(required = false) String name, HttpServletRequest request) {
+
+        Map<String, String> addressDetails = putRequestParamsToMap(street, postalCode, city, country, name);
+
+        ListOfAddressListsResponse response = new ListOfAddressListsResponse(addressDtoService.getAddressesByDetails(
+                    addressDetails));
+
+        response.add(linkTo(getClass()).slash(GEOCODES + "?" + request.getQueryString()).withSelfRel());
+
+        LOG.info("API: Responding to request for address by address details: {}", addressDetails.toString());
+
+        return response;
+    }
+
+
+    @ApiOperation(value = "Search addresses by address details.", notes = "Search addresses by address details.")
+    @ModelAttribute("simpleGeoCodeResponse")
+    @RequestMapping(value = SIMPLE_GEOCODES, method = RequestMethod.GET)
+    public AddressListResponse addressesByAddressDetailsPlain(@RequestParam(required = false) String street,
+        @RequestParam(required = false) String postalCode,
+        @RequestParam(required = false) String city,
+        @RequestParam(required = false) String country,
+        @RequestParam(required = false) String name, HttpServletRequest request) {
+
+        Map<String, String> addressDetails = putRequestParamsToMap(street, postalCode, city, country, name);
+
+        List<AddressDto> addressList = addressDtoService.getAddressesByDetailsPlain(addressDetails);
+
+        AddressListResponse response = new AddressListResponse(addressList);
+
+        response.add(linkTo(getClass()).slash(SIMPLE_GEOCODES + "?" + request.getQueryString()).withSelfRel());
+
+        LOG.info("API: Responding with " + addressList.size() + " addresses to request " + addressDetails.toString());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Get all addresses belonging to the given OpenStreetMap-Place-ID.",
+        notes = "Get all addresses belonging to the given OpenStreetMap-Place-ID."
+    )
+    @ModelAttribute("addresses")
+    @RequestMapping(value = PLACES + SLASH + ID_PARAM + SLASH + ADDRESSES, method = RequestMethod.GET)
+    public List<AddressDto> addressesWherePlaceIsIn(
+        @ApiParam(value = "ID identifying a osm-place-id.", required = true)
+        @PathVariable(ID)
+        long placeId) {
+
+        LOG.info("API: Responding to request for addresses by place id {}", placeId);
+
+        return addressDtoService.getAddressesWherePlaceIsIn(placeId);
+    }
+
+
+    private Map<String, String> putRequestParamsToMap(String street, String postalCode, String city, String country,
+        String name) {
+
+        Map<String, String> addressDetails = new HashMap<>();
+
+        if (city != null) {
+            addressDetails.put(CITY.getKey(), city);
+        }
+
+        if (country != null) {
+            addressDetails.put(COUNTRY.getKey(), country);
+        }
+
+        if (postalCode != null) {
+            addressDetails.put(POSTAL_CODE.getKey(), postalCode);
+        }
+
+        if (street != null) {
+            addressDetails.put(STREET.getKey(), street);
+        }
+
+        if (name != null) {
+            addressDetails.put(NAME.getKey(), name);
+        }
+
+        return addressDetails;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/api/AddressListResponse.java b/src/main/java/net/contargo/iris/address/api/AddressListResponse.java
new file mode 100644
index 00000000..7b9a0127
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/api/AddressListResponse.java
@@ -0,0 +1,33 @@
+package net.contargo.iris.address.api;
+
+import net.contargo.iris.address.dto.AddressDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class AddressListResponse extends ResourceSupport {
+
+    private final List<AddressDto> addresses;
+
+    public AddressListResponse(List<AddressDto> addresses) {
+
+        this.addresses = addresses;
+    }
+
+
+    public AddressListResponse() {
+
+        addresses = new ArrayList<>();
+    }
+
+    public List<AddressDto> getAddresses() {
+
+        return addresses;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/api/AddressResponse.java b/src/main/java/net/contargo/iris/address/api/AddressResponse.java
new file mode 100644
index 00000000..6d4aa1d9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/api/AddressResponse.java
@@ -0,0 +1,30 @@
+package net.contargo.iris.address.api;
+
+import net.contargo.iris.address.dto.AddressDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class AddressResponse extends ResourceSupport {
+
+    private AddressDto address;
+
+    public AddressResponse(AddressDto address) {
+
+        this.address = address;
+    }
+
+
+    public AddressResponse() {
+
+        // Needed for Jackson Mapping
+    }
+
+    public AddressDto getAddress() {
+
+        return address;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/api/ListOfAddressListsResponse.java b/src/main/java/net/contargo/iris/address/api/ListOfAddressListsResponse.java
new file mode 100644
index 00000000..43e0bbf8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/api/ListOfAddressListsResponse.java
@@ -0,0 +1,34 @@
+package net.contargo.iris.address.api;
+
+import net.contargo.iris.address.dto.AddressListDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class ListOfAddressListsResponse extends ResourceSupport {
+
+    private final List<AddressListDto> addresses;
+
+    public ListOfAddressListsResponse(List<AddressListDto> addresses) {
+
+        this.addresses = addresses;
+    }
+
+
+    public ListOfAddressListsResponse() {
+
+        addresses = new ArrayList<>();
+    }
+
+    public List<AddressListDto> getAddresses() {
+
+        return addresses;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/dto/AddressDto.java b/src/main/java/net/contargo/iris/address/dto/AddressDto.java
new file mode 100644
index 00000000..1d72c4e3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/dto/AddressDto.java
@@ -0,0 +1,105 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.address.Address;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import java.util.Map;
+
+import static java.util.Collections.unmodifiableMap;
+
+
+/**
+ * Data Transfer Object for {@link Address}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public final class AddressDto extends GeoLocationDto {
+
+    private static final String TYPE = "ADDRESS";
+
+    private final String displayName;
+    private final String shortName;
+    private final String niceName;
+    private final String countryCode;
+    private final long osmId;
+    private final long placeId;
+    private final Map<String, String> address;
+    private final String type;
+
+    public AddressDto(Address address) {
+
+        super(address);
+        this.countryCode = address.getCountryCode();
+        this.niceName = address.getNiceName();
+        this.displayName = address.getDisplayName();
+        this.osmId = address.getOsmId();
+        this.placeId = address.getPlaceId();
+        this.shortName = address.getShortName();
+        this.address = unmodifiableMap(address.getAddress());
+        this.type = TYPE;
+    }
+
+    public String getShortName() {
+
+        return shortName;
+    }
+
+
+    public String getNiceName() {
+
+        return niceName;
+    }
+
+
+    public Map<String, String> getAddress() {
+
+        return address;
+    }
+
+
+    public String getDisplayName() {
+
+        return displayName;
+    }
+
+
+    public long getOsmId() {
+
+        return osmId;
+    }
+
+
+    public long getPlaceId() {
+
+        return placeId;
+    }
+
+
+    public String getCountryCode() {
+
+        return countryCode;
+    }
+
+
+    @Override
+    public String getType() {
+
+        return type;
+    }
+
+
+    @Override
+    public boolean equals(Object obj) { // NOSONAR We don't want to change the behaviour of base class equals
+
+        return super.equals(obj); // NOSONAR We don't want to change the behaviour of base class equals
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().append(super.hashCode()).toHashCode();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/dto/AddressDtoService.java b/src/main/java/net/contargo/iris/address/dto/AddressDtoService.java
new file mode 100644
index 00000000..62d2e546
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/dto/AddressDtoService.java
@@ -0,0 +1,77 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.GeoLocation;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Delegates to AddressService and converts Address Beans into Address DTOs.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface AddressDtoService {
+
+    /**
+     * @param  osmId
+     *
+     * @return  The address for a certain osmId
+     */
+    AddressDto getAddressByOsmId(long osmId);
+
+
+    /**
+     * Wraps the given AddressDto as first element of an {@link AddressListDto} This is needed to provide a consistent
+     * format of returned Addresses for API-Clients.
+     *
+     * @param  addressDto
+     *
+     * @return
+     */
+    List<AddressListDto> wrapInListOfAddressLists(AddressDto addressDto);
+
+
+    /**
+     * Returns the corresponding {@link AddressDto} object from a given {@link GeoLocation}.
+     *
+     * @param  location  keeps the basis information for the {@link AddressDto} search.
+     *
+     * @return  The address for the given {@link GeoLocation}.
+     */
+    AddressDto getAddressForGeoLocation(GeoLocation location);
+
+
+    /**
+     * Resolves an address (described by the given parameters) to a {@link java.util.List} of
+     * {@link net.contargo.iris.address.Address} objects with the attributes name, latitude and longitude. Uses multiple
+     * fallback strategies to find addresses if not all parameters are provided
+     *
+     * @param  addressDetails  The parameters describing the addresses we are looking for
+     *
+     * @return  A List of Address Lists
+     */
+    List<AddressListDto> getAddressesByDetails(Map<String, String> addressDetails);
+
+
+    /**
+     * Resolves an address (described by the given parameters) to a {@link java.util.List} of
+     * {@link net.contargo.iris.address.Address} objects with the attributes name, latitude and longitude. Uses multiple
+     * fallback strategies to find addresses if not all parameters are provided
+     *
+     * @param  addressDetails  The parameters describing the addresses we are looking for
+     *
+     * @return  A List of Addresses
+     */
+    List<AddressDto> getAddressesByDetailsPlain(Map<String, String> addressDetails);
+
+
+    /**
+     * Returns all Addresses where the given place is in.
+     *
+     * @param  placeId  the OSM Place ID
+     *
+     * @return  All addresses belonging to the OSM-Place defined by the OSM Place ID
+     */
+    List<AddressDto> getAddressesWherePlaceIsIn(Long placeId);
+}
diff --git a/src/main/java/net/contargo/iris/address/dto/AddressDtoServiceImpl.java b/src/main/java/net/contargo/iris/address/dto/AddressDtoServiceImpl.java
new file mode 100644
index 00000000..aa21422e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/dto/AddressDtoServiceImpl.java
@@ -0,0 +1,102 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.nominatim.service.AddressService;
+import net.contargo.iris.address.service.AddressServiceWrapper;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class AddressDtoServiceImpl implements AddressDtoService {
+
+    private final AddressService addressService;
+    private final AddressServiceWrapper addressServiceWrapper;
+
+    public AddressDtoServiceImpl(AddressService addressService, AddressServiceWrapper addressServiceWrapper) {
+
+        this.addressService = addressService;
+        this.addressServiceWrapper = addressServiceWrapper;
+    }
+
+    @Override
+    public AddressDto getAddressByOsmId(long osmId) {
+
+        Address address = addressService.getAddressByOsmId(osmId);
+
+        return address == null ? null : new AddressDto(address);
+    }
+
+
+    @Override
+    public List<AddressListDto> wrapInListOfAddressLists(AddressDto addressDto) {
+
+        List<AddressListDto> listOfLists;
+
+        AddressListDto osmList = new AddressListDto("Result", Arrays.asList(addressDto));
+
+        listOfLists = Arrays.asList(osmList);
+
+        return listOfLists;
+    }
+
+
+    @Override
+    public AddressDto getAddressForGeoLocation(GeoLocation location) {
+
+        Address address = addressServiceWrapper.getAddressForGeoLocation(location);
+
+        return address == null ? null : new AddressDto(address);
+    }
+
+
+    @Override
+    public List<AddressListDto> getAddressesByDetails(Map<String, String> addressDetails) {
+
+        List<AddressList> addressListList = addressServiceWrapper.getAddressesByDetails(addressDetails);
+
+        List<AddressListDto> addressListDtoList = new ArrayList<>();
+
+        for (AddressList addressList : addressListList) {
+            addressListDtoList.add(new AddressListDto(addressList));
+        }
+
+        return addressListDtoList;
+    }
+
+
+    @Override
+    public List<AddressDto> getAddressesByDetailsPlain(Map<String, String> addressDetails) {
+
+        List<AddressListDto> addressListList = getAddressesByDetails(addressDetails);
+        List<AddressDto> addressDtoList = new ArrayList<>();
+
+        for (AddressListDto addressListDto : addressListList) {
+            addressDtoList.addAll(addressListDto.getAddresses());
+        }
+
+        return addressDtoList;
+    }
+
+
+    @Override
+    public List<AddressDto> getAddressesWherePlaceIsIn(Long placeId) {
+
+        List<Address> addressList = addressService.getAdressesWherePlaceIsIn(placeId);
+
+        List<AddressDto> addressDtoList = new ArrayList<>();
+
+        for (Address address : addressList) {
+            addressDtoList.add(new AddressDto(address)); // NOSONAR Instantiating object is necessary
+        }
+
+        return addressDtoList;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/dto/AddressListDto.java b/src/main/java/net/contargo/iris/address/dto/AddressListDto.java
new file mode 100644
index 00000000..00b27446
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/dto/AddressListDto.java
@@ -0,0 +1,56 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Represents a list of addresses to the API as List of {@link AddressDto} with parent Address.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class AddressListDto {
+
+    private final List<AddressDto> addresses;
+    private AddressDto parentAddress;
+
+    public AddressListDto(String name, List<AddressDto> addresses) {
+
+        Address address = new Address(name);
+        this.parentAddress = new AddressDto(address);
+        this.addresses = addresses;
+    }
+
+
+    public AddressListDto() {
+
+        addresses = new ArrayList<>();
+    }
+
+
+    public AddressListDto(AddressList addressList) {
+
+        this.parentAddress = new AddressDto(addressList.getParentAddress());
+
+        this.addresses = new ArrayList<>();
+
+        for (Address adr : addressList.getAddresses()) {
+            this.addresses.add(new AddressDto(adr));
+        }
+    }
+
+    public AddressDto getParentAddress() {
+
+        return parentAddress;
+    }
+
+
+    public List<AddressDto> getAddresses() {
+
+        return addresses;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/dto/GeoLocationDto.java b/src/main/java/net/contargo/iris/address/dto/GeoLocationDto.java
new file mode 100644
index 00000000..29e9813b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/dto/GeoLocationDto.java
@@ -0,0 +1,80 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.GeoLocation;
+
+import org.hibernate.validator.constraints.Range;
+
+import java.math.BigDecimal;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * Data Transfer Object for {@link GeoLocation}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class GeoLocationDto {
+
+    private static final int MAX_VALUE_COORD = 180;
+    private static final int MIN_VALUE_COORD = -180;
+    private static final String TYPE = "GEOLOCATION";
+
+    @NotNull
+    @Range(min = -MAX_VALUE_COORD, max = MAX_VALUE_COORD)
+    private BigDecimal latitude;
+
+    @NotNull
+    @Range(min = MIN_VALUE_COORD, max = MAX_VALUE_COORD)
+    private BigDecimal longitude;
+
+    public GeoLocationDto(GeoLocation geoLocation) {
+
+        if (geoLocation != null) {
+            this.latitude = geoLocation.getLatitude();
+            this.longitude = geoLocation.getLongitude();
+        }
+    }
+
+
+    public GeoLocationDto() {
+
+        // Needed for Jackson Mapping
+    }
+
+    public GeoLocation toEntity() {
+
+        return new GeoLocation(this.latitude, this.longitude);
+    }
+
+
+    // Setters are needed so this DTO can be used as @ModelAttribute in Spring MVC
+    public void setLatitude(BigDecimal latitude) {
+
+        this.latitude = latitude;
+    }
+
+
+    public void setLongitude(BigDecimal longitude) {
+
+        this.longitude = longitude;
+    }
+
+
+    public BigDecimal getLatitude() {
+
+        return latitude;
+    }
+
+
+    public BigDecimal getLongitude() {
+
+        return longitude;
+    }
+
+
+    public String getType() {
+
+        return TYPE;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressDetailKey.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressDetailKey.java
new file mode 100644
index 00000000..24fff3ea
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressDetailKey.java
@@ -0,0 +1,25 @@
+package net.contargo.iris.address.nominatim.service;
+
+/**
+ * @author  Arnold Franke - franke@synyx.de *
+ */
+public enum AddressDetailKey {
+
+    STREET("street"),
+    POSTAL_CODE("postalcode"),
+    CITY("city"),
+    COUNTRY("country"),
+    NAME("name");
+
+    private String key;
+
+    private AddressDetailKey(String key) {
+
+        this.key = key;
+    }
+
+    public String getKey() {
+
+        return key;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressResolutionException.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressResolutionException.java
new file mode 100644
index 00000000..4b75c979
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressResolutionException.java
@@ -0,0 +1,12 @@
+package net.contargo.iris.address.nominatim.service;
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class AddressResolutionException extends RuntimeException {
+
+    public AddressResolutionException(String msg, Throwable t) {
+
+        super(msg, t);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressService.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressService.java
new file mode 100644
index 00000000..7f829352
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressService.java
@@ -0,0 +1,54 @@
+
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * This service is used for address resolution purposes.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface AddressService {
+
+    /**
+     * Resolves an address (described by the given parameters) to a {@link java.util.List} of
+     * {@link net.contargo.iris.address.Address} objects with the attributes name, latitude and longitude. Uses multiple
+     * fallback strategies to find addresses if not all parameters are provided
+     *
+     * @param  addressDetails  @return
+     */
+    List<Address> getAddressesByDetails(Map<String, String> addressDetails);
+
+
+    /**
+     * Returns all Addresses where the given place is in.
+     *
+     * @param  placeId  the OSM Place ID
+     *
+     * @return  All addresses belonging to the OSM-Place defined by the OSM Place ID
+     */
+    List<Address> getAdressesWherePlaceIsIn(Long placeId);
+
+
+    /**
+     * @param  osmId
+     *
+     * @return  The address for a certain osmId
+     */
+    Address getAddressByOsmId(long osmId);
+
+
+    /**
+     * @param  location
+     *
+     * @return  The address for the given geolocation.
+     */
+    Address getAddressByGeolocation(GeoLocation location);
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressServiceHelper.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressServiceHelper.java
new file mode 100644
index 00000000..967e3d42
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressServiceHelper.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.address.Address;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * Supporting class for AddressService.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class AddressServiceHelper {
+
+    List<Address> mergeSearchResultsWithoutDuplications(List<Address> one, List<Address> two) {
+
+        Set<Address> resultSet = new HashSet<>();
+        resultSet.addAll(one);
+        resultSet.addAll(two);
+
+        return new ArrayList<>(resultSet);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressSorter.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressSorter.java
new file mode 100644
index 00000000..1c3620e3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressSorter.java
@@ -0,0 +1,34 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.gis.service.GisService;
+
+import java.math.BigDecimal;
+
+import java.util.Comparator;
+
+
+/**
+ * Comparator to sort Addresses by distance from the Center of EU to sort the ones outside of the EU to the end.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class AddressSorter implements Comparator<Address> {
+
+    private final GisService gisService;
+
+    public AddressSorter(GisService gisService) {
+
+        this.gisService = gisService;
+    }
+
+    @Override
+    public int compare(Address o1, Address o2) {
+
+        BigDecimal distanceOfO1 = gisService.calcAirLineDistInMeters(o1, GisService.CENTER_OF_THE_EUROPEAN_UNION);
+        BigDecimal distanceOfO2 = gisService.calcAirLineDistInMeters(o2, GisService.CENTER_OF_THE_EUROPEAN_UNION);
+
+        return distanceOfO1.compareTo(distanceOfO2);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/AddressValidator.java b/src/main/java/net/contargo/iris/address/nominatim/service/AddressValidator.java
new file mode 100644
index 00000000..4e068214
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/AddressValidator.java
@@ -0,0 +1,25 @@
+package net.contargo.iris.address.nominatim.service;
+
+import org.slf4j.Logger;
+
+import java.lang.invoke.MethodHandles;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+class AddressValidator {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final int MIN_STREET_LENGTH = 3;
+
+    String validateStreet(String street) {
+
+        if (street != null && street.length() < MIN_STREET_LENGTH) {
+            LOG.info("street='" + street + "' seems to be inaccurate, so it will be ignored during geocoding process.");
+
+            return "";
+        }
+
+        return street;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/NominatimAddressService.java b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimAddressService.java
new file mode 100644
index 00000000..55a13952
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimAddressService.java
@@ -0,0 +1,196 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.util.HttpUtilException;
+
+import org.slf4j.Logger;
+
+import org.springframework.util.StringUtils;
+
+import java.lang.invoke.MethodHandles;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * An implementation of the {@link AddressService} interface using Nominatim to resolveWithNominatim an address to
+ * geocoordinates and jackson to generate Java objects from Json. Nominatim: http://nominatim.openstreetmap.org
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class NominatimAddressService implements AddressService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final int ARGUMENT_4 = 4;
+    private static final int ARGUMENT_3 = 3;
+    private static final int ARGUMENT_2 = 2;
+    private static final int ARGUMENT_1 = 1;
+    private static final int ARGUMENT_0 = 0;
+
+    private final NominatimUrlBuilder nominatimUrlBuilder;
+    private final NominatimJsonResponseParser nominatimResponder;
+
+    private final AddressSorter addressSorter;
+    private final AddressServiceHelper addressHelper;
+    private final AddressValidator addressValidator;
+
+    public NominatimAddressService(NominatimUrlBuilder nominatimUrlBuilder,
+        NominatimJsonResponseParser nominatimResponder, AddressSorter addressSorter, AddressServiceHelper addressHelper,
+        AddressValidator addressValidator) {
+
+        this.nominatimUrlBuilder = nominatimUrlBuilder;
+        this.nominatimResponder = nominatimResponder;
+        this.addressSorter = addressSorter;
+        this.addressHelper = addressHelper;
+        this.addressValidator = addressValidator;
+    }
+
+    List<Address> resolveWithNominatim(String street, String postalCode, String city, String country, String name) {
+
+        /*
+         * Please notice that Nominatim has no search results if query contains name and street.
+         * If name should be a search parameter street and streetNumber have to be ignored.
+         */
+
+        if (StringUtils.hasText(name) && StringUtils.hasText(street)) {
+            return geocodeByName(street, postalCode, city, country, name);
+        } else {
+            String url = nominatimUrlBuilder.buildUrl(street, postalCode, city, country, name);
+
+            List<Address> addresses = nominatimResponder.getAddressesForUrl(url);
+
+            Collections.sort(addresses, addressSorter);
+
+            return addresses;
+        }
+    }
+
+
+    @Override
+    public List<Address> getAdressesWherePlaceIsIn(Long placeId) {
+
+        return searchSuburbsViaNominatimsDetailPage(placeId, SuburbType.ADDRESSES, new HashSet<String>());
+    }
+
+
+    @Override
+    public Address getAddressByOsmId(long osmId) {
+
+        String suburbUrl = nominatimUrlBuilder.buildOsmUrl(osmId);
+        List<Address> foundAddresses = nominatimResponder.getAddressesForUrlForOsmId(suburbUrl);
+
+        return foundAddresses.get(0);
+    }
+
+
+    @Override
+    public Address getAddressByGeolocation(GeoLocation geoLocation) {
+
+        try {
+            String url = nominatimUrlBuilder.buildUrl(geoLocation);
+
+            return nominatimResponder.getAddressForUrl(url);
+        } catch (IllegalArgumentException | HttpUtilException e) {
+            throw new AddressResolutionException("Failed to resolve address for " + geoLocation, e);
+        }
+    }
+
+
+    private List<Address> searchSuburbsViaNominatimsDetailPage(Long osmPlaceId, SuburbType suburbType,
+        Set<String> suburbGlobalDisplayNames) {
+
+        List<Address> suburbs = new ArrayList<>();
+
+        String suburbUrl = nominatimUrlBuilder.buildSuburbUrl(osmPlaceId, suburbType.getType());
+        List<Address> foundSuburbs = nominatimResponder.getAddressesForUrl(suburbUrl);
+
+        if (!foundSuburbs.isEmpty()) {
+            // check for possible redundant address display names
+            for (Address foundSuburb : foundSuburbs) {
+                if (!foundSuburb.getDisplayName().contains("No Name")
+                        && !suburbGlobalDisplayNames.contains(foundSuburb.getDisplayName())) {
+                    // add to suburbs list
+                    suburbs.add(foundSuburb);
+
+                    // add to golbal display names, for next iteration
+                    suburbGlobalDisplayNames.add(foundSuburb.getDisplayName());
+                }
+            }
+        }
+
+        return suburbs;
+    }
+
+
+    private List<Address> geocodeByName(String street, String postalCode, String city, String country, String name) {
+
+        // make 2 querys: 1 query for search by name, 1 query for search by street
+        String url1 = nominatimUrlBuilder.buildUrl(null, postalCode, city, country, name);
+        String url2 = nominatimUrlBuilder.buildUrl(street, postalCode, city, country, null);
+
+        List<Address> one = nominatimResponder.getAddressesForUrl(url1);
+        List<Address> two = nominatimResponder.getAddressesForUrl(url2);
+
+        // avoid duplication of places by osm_id
+        List<Address> mergedList = addressHelper.mergeSearchResultsWithoutDuplications(one, two);
+
+        // sort list so that unplausible results (e.g., not in europe) appear last
+        Collections.sort(mergedList, addressSorter);
+
+        return mergedList;
+    }
+
+
+    @Override
+    public List<Address> getAddressesByDetails(Map<String, String> addressDetails) {
+
+        String[][] resolvingStrategies = createResolvingStrategies(addressDetails.get(POSTAL_CODE.getKey()),
+                addressDetails.get(CITY.getKey()), addressDetails.get(COUNTRY.getKey()),
+                addressDetails.get(NAME.getKey()),
+                addressValidator.validateStreet(addressDetails.get(STREET.getKey())));
+
+        for (String[] args : resolvingStrategies) {
+            List<Address> addresses = resolveWithNominatim(args[ARGUMENT_0], args[ARGUMENT_1], args[ARGUMENT_2],
+                    args[ARGUMENT_3], args[ARGUMENT_4]);
+
+            if (!addresses.isEmpty()) {
+                return addresses;
+            }
+        }
+
+        LOG.info("No results for city " + addressDetails.get(CITY.getKey()) + " and country "
+            + addressDetails.get(COUNTRY.getKey())
+            + ". Returning empty result.");
+
+        return Collections.emptyList();
+    }
+
+
+    private String[][] createResolvingStrategies(String postalCode, String city, String country, String name,
+        String internStreet) {
+
+        return new String[][] {
+                { internStreet, postalCode, city, country, name },
+                { internStreet, null, city, country, null },
+                { null, postalCode, city, country, null },
+                { null, null, city, country, null }
+            };
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParser.java b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParser.java
new file mode 100644
index 00000000..f269f49b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParser.java
@@ -0,0 +1,97 @@
+package net.contargo.iris.address.nominatim.service;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.util.HttpUtil;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+import java.lang.invoke.MethodHandles;
+
+import java.util.List;
+
+
+/**
+ * The {@link NominatimJsonResponseParser} sends requests to Nominatim and converts the responses to {@link Address}
+ * objects.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class NominatimJsonResponseParser {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    private final HttpUtil httpUtil;
+    private final ObjectMapper objectMapper;
+
+    public NominatimJsonResponseParser(HttpUtil httpUtil, ObjectMapper objectMapper) {
+
+        this.httpUtil = httpUtil;
+        this.objectMapper = objectMapper;
+    }
+
+    /**
+     * Returns {@link java.util.List} of {@link Address}es for the given URL. Returns an empty {@link java.util.List} if
+     * there are no search results.
+     *
+     * @param  url  String
+     */
+    List<Address> getAddressesForUrl(String url) {
+
+        return convertContentToAddresses(url, httpUtil.getResponseContent(url));
+    }
+
+
+    /**
+     * Extracts the addresses from the URL.
+     *
+     * @param  url  to extract the address
+     *
+     * @return  the extracted addresses
+     */
+    List<Address> getAddressesForUrlForOsmId(String url) {
+
+        return convertContentToAddresses(url, "[" + httpUtil.getResponseContent(url) + "]");
+    }
+
+
+    Address getAddressForUrl(String reverseGeoCodingLookupURL) {
+
+        String content = httpUtil.getResponseContent(reverseGeoCodingLookupURL);
+        LOG.debug("Got result for reverse Geo coding lookup: {}", content);
+
+        Address address;
+
+        try {
+            address = objectMapper.readValue(content, Address.class);
+        } catch (IOException | NullPointerException e) {
+            address = null;
+        }
+
+        return address;
+    }
+
+
+    private List<Address> convertContentToAddresses(String url, String content) {
+
+        List<Address> addresses = null;
+
+        if (content != null) {
+            try {
+                addresses = objectMapper.readValue(content, new TypeReference<List<Address>>() {
+                        });
+                LOG.debug("{} search result(s) found for URL {}", addresses.size(), url);
+            } catch (IOException e) {
+                addresses = null;
+            }
+        }
+
+        return addresses;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilder.java b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilder.java
new file mode 100644
index 00000000..85afa773
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilder.java
@@ -0,0 +1,245 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.countries.service.CountryService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+
+import java.lang.invoke.MethodHandles;
+
+import java.net.URLEncoder;
+
+import java.util.Map;
+
+
+/**
+ * To geocode an address {@link NominatimAddressService} needs a URL containing the base URL, different parameters and
+ * the search query. In the application context the variable parameter are defined (like email and base url), the
+ * requested format is always json since the {@link NominatimJsonResponseParser} creates Java objects by json.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Vincent Potucek - potucek@synyx.de
+ */
+class NominatimUrlBuilder {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final String SEARCH_URL = "search.php?q=";
+    private static final String SUBURB_URL = "suburb.php?place_id=";
+    private static final String SUBURB_TYPE = "&suburb_type=";
+    private static final String ACCEPT_LANGUAGE = "&accept-language=";
+    private static final String FORMAT = "&format=json";
+    private static final String ADDRESS_DETAILS = "&addressdetails=1";
+    private static final String COUNTRY = "&countrycodes=";
+    private static final String WHITESPACE = " ";
+    private static final String OSMTYPE_W = "&osm_type=W";
+    private static final String OSMID = "osm_id=";
+    private static final String REVERSE_URL = "reverse?";
+    private static final String LOG_TWO_PLACEHOLDERS = "{}{}";
+    private static final String LOG_BUILT_URL = "Built URL: ";
+
+    private final String baseUrl;
+    private final String language;
+    private final CountryService countryService;
+
+    NominatimUrlBuilder(String baseUrl, String language, CountryService countryService) {
+
+        this.countryService = countryService;
+
+        Assert.hasText(baseUrl);
+        Assert.hasText(language);
+
+        this.baseUrl = baseUrl;
+        this.language = language;
+    }
+
+    /**
+     * Builds Nominatim's search url appending the query to the base URL.
+     *
+     * @param  street  + streetNumber
+     * @param  postalCode
+     * @param  city
+     * @param  country
+     * @param  name
+     *
+     * @return  ready URL to send a GET request to Nominatim
+     */
+    String buildUrl(String street, String postalCode, String city, String country, String name) {
+
+        String url = baseUrl + SEARCH_URL + buildQuery(street, postalCode, city, name) + COUNTRY
+            + encodeUrl(buildCountryCodeList(country)) + FORMAT + ADDRESS_DETAILS + ACCEPT_LANGUAGE + language;
+
+        LOG.debug(LOG_TWO_PLACEHOLDERS, LOG_BUILT_URL, url);
+
+        return url;
+    }
+
+
+    private String buildCountryCodeList(String country) {
+
+        if (StringUtils.hasText(country)) {
+            return country;
+        } else {
+            Map<String, String> cc = countryService.getCountries();
+
+            return String.join(",", cc.values());
+        }
+    }
+
+
+    /**
+     * Builds Nominatim's suburb url (modified details page) using the given place ID and suburb type.
+     *
+     * @param  placeId  long
+     * @param  suburbType  String
+     *
+     * @return  ready URL to send a GET request to Nominatim
+     */
+    String buildSuburbUrl(long placeId, String suburbType) {
+
+        String suburbUrl = baseUrl + SUBURB_URL + placeId + FORMAT + ADDRESS_DETAILS + SUBURB_TYPE + suburbType;
+        LOG.debug(LOG_TWO_PLACEHOLDERS, LOG_BUILT_URL, suburbUrl);
+
+        return suburbUrl;
+    }
+
+
+    /**
+     * Appends the query to the base URL using Nominatim's special phrases like 'suburb' for specific searching.
+     *
+     * @param  city  the city
+     * @param  specialPhrase  'suburb' or 'village' or any other specific place type
+     *
+     * @return  ready URL to send a GET request to Nominatim
+     */
+    String buildSpecialPhrasesUrl(String city, String specialPhrase) {
+
+        String specialPhrasesUrl = baseUrl + SEARCH_URL + buildSpecialPhraseQuery(city, specialPhrase) + "&limit=100"
+            + FORMAT + ACCEPT_LANGUAGE + language + ADDRESS_DETAILS;
+        LOG.debug(LOG_TWO_PLACEHOLDERS, LOG_BUILT_URL, specialPhrasesUrl);
+
+        return specialPhrasesUrl;
+    }
+
+
+    /**
+     * Build the osm url within the osm id.
+     *
+     * @param  osmId  to build osm url
+     *
+     * @return  The URL for requesting ONE Address by osmId. The osm Type used is "N" for Node by default.
+     */
+    String buildOsmUrl(long osmId) {
+
+        String osmUrl = baseUrl + REVERSE_URL + OSMID + osmId + OSMTYPE_W + FORMAT;
+        LOG.debug(LOG_TWO_PLACEHOLDERS, LOG_BUILT_URL, osmUrl);
+
+        return osmUrl;
+    }
+
+
+    /**
+     * Builds the query and converts it to URL encoded format with {@link java.net.URLEncoder} (e.g. replaces
+     * whitespaces by plus and commas by %2C).
+     *
+     * @param  street:  street name + house number
+     * @param  postalCode
+     * @param  city
+     * @param  name
+     *
+     * @return  search query String
+     */
+    String buildQuery(String street, String postalCode, String city, String name) {
+
+        StringBuilder queryBuilder = new StringBuilder();
+        appendStringWithSeparatorIfHasText(queryBuilder, street, ",");
+        appendStringWithSeparatorIfHasText(queryBuilder, postalCode, WHITESPACE);
+        appendStringWithSeparatorIfHasText(queryBuilder, city, WHITESPACE);
+        appendStringWithSeparatorIfHasText(queryBuilder, name, WHITESPACE);
+
+        String query = queryBuilder.toString();
+        String encodedUrl = encodeUrl(query);
+
+        return encodedUrl == null ? query : encodedUrl;
+    }
+
+
+    /**
+     * Builds the query with special phrase and city and converts it to URL encoded format with
+     * {@link java.net.URLEncoder}.
+     *
+     * @param  city
+     * @param  specialPhrase
+     *
+     * @return  special phrases query
+     */
+    String buildSpecialPhraseQuery(String city, String specialPhrase) {
+
+        StringBuilder queryBuilder = new StringBuilder();
+
+        appendStringWithSeparatorIfHasText(queryBuilder, specialPhrase, WHITESPACE);
+        appendStringWithSeparatorIfHasText(queryBuilder, city, "");
+
+        String query = queryBuilder.toString();
+        String encodedUrl = encodeUrl(query);
+
+        return encodedUrl == null ? query : encodedUrl;
+    }
+
+
+    /**
+     * Encodes an URL with {@link java.net.URLEncoder}.
+     *
+     * @param  url  String
+     *
+     * @return  encoded URL String
+     */
+    private String encodeUrl(String url) {
+
+        String result = null;
+
+        try {
+            result = URLEncoder.encode(url, "UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            LOG.warn("Could not encode this String to URL: {} ", url);
+        }
+
+        return result;
+    }
+
+
+    /**
+     * If the given String has text, append it with the given separator to the StringBuilder.
+     *
+     * @param  builder
+     * @param  string
+     * @param  separator
+     */
+    void appendStringWithSeparatorIfHasText(StringBuilder builder, String string, String separator) {
+
+        if (StringUtils.hasText(string)) {
+            builder.append(string).append(separator);
+        }
+    }
+
+
+    String buildUrl(GeoLocation geoLocation) {
+
+        if (geoLocation.getLatitude() == null || geoLocation.getLongitude() == null) {
+            throw new IllegalArgumentException("Invalid Geo location: " + geoLocation);
+        }
+
+        String url = baseUrl + "reverse/" + "?format=json" + "&lat=" + geoLocation.getLatitude().toString() + "&lon="
+            + geoLocation.getLongitude().toString();
+
+        LOG.debug("Built request URL: {}", url);
+
+        return url;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/nominatim/service/SuburbType.java b/src/main/java/net/contargo/iris/address/nominatim/service/SuburbType.java
new file mode 100644
index 00000000..d3079000
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/nominatim/service/SuburbType.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.address.nominatim.service;
+
+/**
+ * Enum for suburb types [suburb|administrative|village].
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ */
+enum SuburbType {
+
+    ADDRESSES("addresses"),
+    SUBURB("suburb"),
+    ADMINISTRATIVE("administrative"),
+    VILLAGE("village");
+
+    private String type;
+
+    private SuburbType(String type) {
+
+        this.type = type;
+    }
+
+    public String getType() {
+
+        return this.type;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/service/AddressCache.java b/src/main/java/net/contargo/iris/address/service/AddressCache.java
new file mode 100644
index 00000000..a31f7123
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/service/AddressCache.java
@@ -0,0 +1,78 @@
+package net.contargo.iris.address.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+
+import org.springframework.cache.Cache;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+
+
+/**
+ * Wraps a Cache to save resolved Address instances.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ */
+class AddressCache {
+
+    private final Cache cache;
+
+    public AddressCache(Cache cache) {
+
+        this.cache = cache;
+    }
+
+    /**
+     * Caches all the Addresses.
+     *
+     * @param  addressListList
+     */
+    public void cache(List<AddressList> addressListList) {
+
+        for (AddressList list : addressListList) {
+            for (Address address : list.getAddresses()) {
+                cache.put(getAddressLocationBasedHash(address), address);
+            }
+        }
+    }
+
+
+    /**
+     * Returns the Address-Instance for the given GeoLocation IF it exists in the cache - null otherwise.
+     *
+     * @param  loc
+     *
+     * @return
+     */
+    public Address getForLocation(GeoLocation loc) {
+
+        Cache.ValueWrapper valWrapper = cache.get(getAddressLocationBasedHash(loc));
+
+        if (valWrapper == null) {
+            return null;
+        } else {
+            return (Address) valWrapper.get();
+        }
+    }
+
+
+    private String getAddressLocationBasedHash(GeoLocation address) {
+
+        BigDecimal latitude = new BigDecimal(-1);
+
+        if (address.getLatitude() != null) {
+            latitude = address.getLatitude();
+        }
+
+        BigDecimal longitude = new BigDecimal(-1);
+
+        if (address.getLongitude() != null) {
+            longitude = address.getLongitude();
+        }
+
+        return latitude + ":" + longitude;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/service/AddressServiceWrapper.java b/src/main/java/net/contargo/iris/address/service/AddressServiceWrapper.java
new file mode 100644
index 00000000..b6bbf2a0
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/service/AddressServiceWrapper.java
@@ -0,0 +1,161 @@
+package net.contargo.iris.address.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.nominatim.service.AddressService;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+import net.contargo.iris.normalizer.NormalizerService;
+
+import org.apache.commons.lang.StringUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+
+/**
+ * Wrapper class to have better control about the resolving methods of {@link AddressService}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class AddressServiceWrapper {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AddressServiceWrapper.class);
+
+    private final AddressService addressService;
+    private final StaticAddressService staticAddressService;
+    private final AddressCache addressCache;
+    private final NormalizerService normalizerService;
+
+    public AddressServiceWrapper(AddressService addressService, StaticAddressService staticAddressService,
+        AddressCache cache, NormalizerService normalizerService) {
+
+        this.addressService = addressService;
+        this.staticAddressService = staticAddressService;
+        this.addressCache = cache;
+        this.normalizerService = normalizerService;
+    }
+
+    /**
+     * Searches an {@link Address} by the given parameters of the {@link GeoLocation} and returns it.
+     *
+     * @param  geoLocation  basis for the search of the {@link Address}
+     *
+     * @return  The address for the given {@link GeoLocation}.
+     */
+    public Address getAddressForGeoLocation(GeoLocation geoLocation) {
+
+        Address address = addressCache.getForLocation(geoLocation);
+
+        if (address != null) {
+            return address;
+        }
+
+        StaticAddress staticAddress = staticAddressService.getForLocation(geoLocation);
+
+        if (staticAddress != null) {
+            return staticAddress.toAddress();
+        }
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Cache miss: {}", geoLocation);
+        }
+
+        address = addressService.getAddressByGeolocation(geoLocation);
+
+        if (address != null) {
+            // the geo coordinates in the returned 'address' object differ from
+            // the geo coordinates in the 'loc' object
+            address.setLatitude(geoLocation.getLatitude());
+            address.setLongitude(geoLocation.getLongitude());
+            addressCache.cache(getSimpleAddressList(Arrays.asList(address)));
+        }
+
+        return address;
+    }
+
+
+    /**
+     * Searches with the given parameters from the addressDetails map like street, postalcode and city the
+     * geocoordinates and returns a list of {@link AddressList} with their geocoordinates. To improve the result quality
+     * of geocoding services, it's sometimes better to make the search not with all the given parameters. (e.g. try to
+     * get address using only street and city)
+     *
+     * @param  addressDetails  keeps the search information
+     *
+     * @return  list of {@link AddressList}
+     */
+    public List<AddressList> getAddressesByDetails(Map<String, String> addressDetails) {
+
+        List<AddressList> result = new ArrayList<>();
+
+        String cityNormalized = normalizerService.normalize(addressDetails.get(CITY.getKey()));
+        String postalCode = addressDetails.get(POSTAL_CODE.getKey());
+        String country = addressDetails.get(COUNTRY.getKey());
+        String street = addressDetails.get(STREET.getKey());
+
+        if (StringUtils.isNotEmpty(postalCode) || StringUtils.isNotEmpty(cityNormalized)) {
+            result.add(resolveByStaticAddressService(postalCode, cityNormalized, country));
+        }
+
+        if (street != null && !"".equals(street)) {
+            result.addAll(resolveByNominatim(addressDetails));
+        }
+
+        addressCache.cache(result);
+
+        return result;
+    }
+
+
+    private AddressList resolveByStaticAddressService(String postalCode, String city, String country) {
+
+        return staticAddressService.findAddresses(postalCode, city, country);
+    }
+
+
+    private List<AddressList> resolveByNominatim(Map<String, String> addressDetails) {
+
+        List<Address> addresses = addressService.getAddressesByDetails(addressDetails);
+
+        if (addresses == null || addresses.isEmpty()) {
+            LOG.info("No results for city " + addressDetails.get(CITY.getKey()) + " and country "
+                + addressDetails.get(COUNTRY.getKey())
+                + ". Returning empty result.");
+
+            return Collections.emptyList();
+        }
+
+        return getSimpleAddressList(addresses);
+    }
+
+
+    private List<AddressList> getSimpleAddressList(List<Address> addresses) {
+
+        List<AddressList> addressListList = new ArrayList<>();
+
+        for (Address address : addresses) {
+            List<Address> result = new ArrayList<>();
+            result.add(address);
+
+            AddressList addressesList = new AddressList(address, result);
+            addressListList.add(addressesList);
+        }
+
+        return addressListList;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/StaticAddress.java b/src/main/java/net/contargo/iris/address/staticsearch/StaticAddress.java
new file mode 100644
index 00000000..f3be2a0d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/StaticAddress.java
@@ -0,0 +1,372 @@
+package net.contargo.iris.address.staticsearch;
+
+import com.google.common.base.Strings;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+import org.hibernate.validator.constraints.NotBlank;
+
+import org.springframework.util.StringUtils;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import javax.validation.constraints.Size;
+
+
+/**
+ * Entity for static addresses (csv list).
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@Entity(name = "StaticAddress")
+// NOSONAR Don't want to override equals
+public class StaticAddress extends GeoLocation {
+
+    public static final String STATIC_ID = "static_id";
+
+    private static final int POSTAL_CODE_MAX_SIZE = 10;
+    private static final int COUNTRY_MAX_SIZE = 5;
+    private static final int HASHKEY_MAX_SIZE = 5;
+    private static final int CITY_MAX_SIZE = 255;
+    private static final int SUBURB_MAX_SIZE = 255;
+    private static final int HASH_KEY_SIZE = 5;
+    private static final int BASE_36 = 36;
+    private static final int BASE_10 = 10;
+    private static final int BEGIN_INDEX_0 = 0;
+    private static final int END_INDEX_4 = 4;
+    private static final int SHIFT_20 = 20;
+    private static final int LENGTH_AUTOINCREMENTED_PART = 12;
+    private static final int BINARY_111111 = 63;
+    private static final int SIZE_TO_THE_PAD = 16;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Size(max = COUNTRY_MAX_SIZE)
+    private String country;
+
+    @NotBlank
+    @Size(max = POSTAL_CODE_MAX_SIZE)
+    private String postalcode;
+
+    @NotBlank
+    @Size(max = CITY_MAX_SIZE)
+    private String city;
+
+    @NotBlank
+    @Size(max = CITY_MAX_SIZE)
+    private String cityNormalized;
+
+    @Size(max = SUBURB_MAX_SIZE)
+    private String suburb;
+
+    @Size(max = SUBURB_MAX_SIZE)
+    private String suburbNormalized;
+
+    @Size(max = HASHKEY_MAX_SIZE)
+    private String hashKey;
+
+    private BigInteger uniqueId;
+
+    public Address toAddress() {
+
+        Address address = new Address();
+
+        injectDisplayName(address);
+        address.getAddress().put(Address.COUNTRY_CODE, getCountry());
+
+        if (postalcode != null) {
+            address.getAddress().put("postcode", postalcode);
+        }
+
+        if (city != null) {
+            address.getAddress().put("city", city);
+        }
+
+        if (suburb != null) {
+            address.getAddress().put("suburb", suburb);
+        }
+
+        address.getAddress().put("hashkey", getHashKey());
+        address.getAddress().put(STATIC_ID, uniqueId == null ? null : uniqueId.toString());
+        address.setLongitude(getLongitude());
+        address.setLatitude(getLatitude());
+
+        return address;
+    }
+
+
+    private void injectDisplayName(Address address) {
+
+        if (StringUtils.hasText(suburb)) {
+            address.setDisplayName(String.format("%s %s (%s)", extractString(postalcode), extractString(city),
+                    extractString(suburb)));
+        } else {
+            address.setDisplayName(String.format("%s %s", extractString(postalcode), extractString(city)));
+        }
+    }
+
+
+    private String extractString(String value) {
+
+        return value == null || value.isEmpty() ? "" : value;
+    }
+
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public void setId(Long id) {
+
+        this.id = id;
+    }
+
+
+    public String getCountry() {
+
+        return country;
+    }
+
+
+    public void setCountry(String country) {
+
+        this.country = country;
+    }
+
+
+    public String getPostalcode() {
+
+        return postalcode;
+    }
+
+
+    public void setPostalcode(String postalcode) {
+
+        this.postalcode = postalcode;
+    }
+
+
+    public String getCity() {
+
+        return city;
+    }
+
+
+    public void setCity(String city) {
+
+        this.city = city;
+    }
+
+
+    public String getCityNormalized() {
+
+        return cityNormalized;
+    }
+
+
+    public void setCityNormalized(String cityNormalized) {
+
+        this.cityNormalized = cityNormalized;
+    }
+
+
+    public String getSuburb() {
+
+        return suburb;
+    }
+
+
+    public void setSuburb(String suburb) {
+
+        this.suburb = suburb;
+    }
+
+
+    public String getSuburbNormalized() {
+
+        return suburbNormalized;
+    }
+
+
+    public void setSuburbNormalized(String suburbNormalized) {
+
+        this.suburbNormalized = suburbNormalized;
+    }
+
+
+    public String getHashKey() {
+
+        if (hashKey == null || "".equals(hashKey)) {
+            hashKey = generateHashKey();
+        }
+
+        return hashKey;
+    }
+
+
+    /**
+     * Generates a quasi unique "hashKey" from this {@link StaticAddress}'s uniqueId. The Hash Key is no real hash but a
+     * mapping. The Hash Key consists of a 5 digit Base36 number. 5 digit Base36 fits into 26 bit binary. The Hash Key
+     * is assembled in binary by Java bitwise operators and then converted to Base36.
+     *
+     * <p>Assembly of the 26 bit binary HashKey:</p>
+     *
+     * <p>The first 6 bits are the first 4 digits of the uniqueId ( representing the systemId) mapped to a 6 digit
+     * binary number. This is only duplicate-free for a small number of possible systemIds.</p>
+     *
+     * <p>The last 20 bits are the autoincremented last 12 digits of the uniqueId. This works up to 1048575 (2^20)</p>
+     *
+     * @return  the uniqueId mapped to a Base36 "hashKey"
+     */
+    private String generateHashKey() {
+
+        if (this.uniqueId == null) {
+            return "";
+        }
+
+        String uniqueIdString = this.uniqueId.toString();
+        uniqueIdString = org.apache.commons.lang.StringUtils.leftPad(uniqueIdString, SIZE_TO_THE_PAD, '0');
+
+        long systemId = Long.valueOf(uniqueIdString.substring(BEGIN_INDEX_0, END_INDEX_4));
+        long systemIdInBinary = mapToSixBits(systemId);
+        long uniqueIdAutoIncrementedPartInBinary = getAutoIncrementedPart(uniqueIdString);
+
+        long hashKeyInBinary = joinBinaryNumbers(systemIdInBinary, uniqueIdAutoIncrementedPartInBinary);
+
+        return convertToBase36(hashKeyInBinary);
+    }
+
+
+    private String convertToBase36(long hashkeyInBinary) {
+
+        String hashKeyInBase36 = conv(String.valueOf(hashkeyInBinary), BASE_10, BASE_36);
+        hashKeyInBase36 = Strings.padStart(hashKeyInBase36, HASH_KEY_SIZE, '0');
+
+        return hashKeyInBase36.toUpperCase();
+    }
+
+
+    private long getAutoIncrementedPart(String uniqueIdString) {
+
+        return Long.valueOf(uniqueIdString.substring(uniqueIdString.length() - LENGTH_AUTOINCREMENTED_PART + 1,
+                    uniqueIdString.length()));
+    }
+
+
+    private long joinBinaryNumbers(long systemIdInBit, long uniqueIdAutoIncrementedPart) {
+
+        // Append 20 0-bits to the systemId so there is room for adding a larger number (up to 20 bits)
+        long finalNumberOfBitsWithSystemId = systemIdInBit << SHIFT_20;
+
+        // fill the 0-bits with the AutoIncremented part of the uniqueId. Works for every number not larger than 2^20
+        return finalNumberOfBitsWithSystemId | uniqueIdAutoIncrementedPart;
+    }
+
+
+    private long mapToSixBits(long systemId) {
+
+        // Has to map the systemId to exactly 6 bits without duplication
+        // Get the last 6 bits of the systemId by applying a binary AND with 111111. We need the 6 last bits because
+        // the currently known systemIds have conflicts in the last 5 bits.
+        return systemId & BINARY_111111;
+    }
+
+
+    public BigInteger getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(BigInteger uniqueId) {
+
+        this.uniqueId = uniqueId;
+        hashKey = generateHashKey();
+    }
+
+
+    String conv(String input, int fromBase, int toBase) {
+
+        try {
+            int inputInFromBase = Integer.parseInt(input, fromBase);
+
+            return Integer.toString(inputInFromBase, toBase);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        return new EqualsBuilder().appendSuper(super.equals(obj)).isEquals();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().appendSuper(super.hashCode()).toHashCode();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "StaticAddress [id=" + id + ", country=" + country
+            + ", postalCode=" + postalcode + ", city=" + city
+            + ", cityNormalized=" + cityNormalized + ", suburb=" + suburb
+            + ", suburbNormalized=" + suburbNormalized + ", latitude=" + getLatitude() + ", longitude=" + getLongitude()
+            + "]";
+    }
+
+
+    /**
+     * Check for changed address parameters (suburb, city, postalcode).
+     *
+     * @param  staticAddress  to check
+     *
+     * @return  true, if address parameters are different
+     */
+    public boolean areAddressParametersDifferent(StaticAddress staticAddress) {
+
+        EqualsBuilder builder = new EqualsBuilder();
+        builder.append(this.suburb, staticAddress.getSuburb());
+        builder.append(this.city, staticAddress.getCity());
+        builder.append(this.postalcode, staticAddress.getPostalcode());
+
+        return !builder.isEquals();
+    }
+
+
+    /**
+     * Check for changed parameters longitude and latitude.
+     *
+     * @param  staticAddress  to check
+     *
+     * @return  true, if parameters are different
+     */
+    public boolean areLatitudeAndLongitudeDifferent(StaticAddress staticAddress) {
+
+        boolean latitudeEqual = this.getLatitude().compareTo(staticAddress.getLatitude()) == 0;
+        boolean longitudeEqual = this.getLongitude().compareTo(staticAddress.getLongitude()) == 0;
+
+        return !(latitudeEqual && longitudeEqual);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiController.java b/src/main/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiController.java
new file mode 100644
index 00000000..179d8335
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiController.java
@@ -0,0 +1,136 @@
+package net.contargo.iris.address.staticsearch.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.api.ListOfAddressListsResponse;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.staticsearch.dto.StaticAddressDtoService;
+import net.contargo.iris.address.staticsearch.dto.StaticAddressesResponse;
+import net.contargo.iris.address.staticsearch.dto.StaticAddressesUidResponse;
+import net.contargo.iris.api.AbstractController;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigDecimal;
+
+import java.util.Collection;
+
+import static net.contargo.iris.api.AbstractController.SLASH;
+import static net.contargo.iris.api.AbstractController.STATIC_ADDRESSES;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+
+/**
+ * Controller for the public API of {@link net.contargo.iris.address.dto.AddressDto}s that belong to static addresses.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Api(value = SLASH + STATIC_ADDRESSES, description = "API for interaction with static addresses.")
+@Controller
+@RequestMapping(SLASH + STATIC_ADDRESSES)
+public class StaticAddressApiController extends AbstractController {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final String LAT = "lat";
+    private static final String LON = "lon";
+
+    private final StaticAddressDtoService staticAddressDtoService;
+
+    @Autowired
+    public StaticAddressApiController(StaticAddressDtoService staticAddressDtoService) {
+
+        this.staticAddressDtoService = staticAddressDtoService;
+    }
+
+    @ApiOperation(value = "Returns all static addresses.", notes = "Returns all static addresses.")
+    @RequestMapping(method = RequestMethod.GET)
+    public StaticAddressesResponse getAll() {
+
+        StaticAddressesResponse response = new StaticAddressesResponse();
+        response.setAddressDtoList(staticAddressDtoService.getAll());
+
+        response.add(linkTo(getClass()).withSelfRel());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Returns all static addresses filtered by postalcode, city and country.",
+        notes = "Returns all static addresses filtered by postalcode, city and country.", response = AddressDto.class,
+        responseContainer = "List"
+    )
+    @RequestMapping(method = RequestMethod.GET, params = { "postalCode", "city", "country" })
+    @ResponseBody
+    public Collection<AddressDto> getByPostalCodeAndCityAndCountry(
+        @RequestParam(value = "postalCode") String postalCode,
+        @RequestParam(value = "city") String city,
+        @RequestParam(value = "country") String country) {
+
+        return staticAddressDtoService.getAddressesByDetails(postalCode, city, country);
+    }
+
+
+    @ApiOperation(
+        value = "Returns all static addresses filtered by the given geolocation.",
+        notes = "Returns all static addresses filtered by the given geolocation."
+    )
+    @ModelAttribute("geoCodeResponse")
+    @RequestMapping(method = RequestMethod.GET, params = { LAT, LON })
+    public ListOfAddressListsResponse getStaticAddressByGeolocation(@RequestParam(LAT) BigDecimal latitude,
+        @RequestParam(LON) BigDecimal longitude) {
+
+        GeoLocation location = new GeoLocation(latitude, longitude);
+        ListOfAddressListsResponse response = new ListOfAddressListsResponse(
+                staticAddressDtoService.getStaticAddressByGeolocation(location));
+
+        LOG.info("API: Responding to geocode-request for geolocation {} with {} Blocks", location.toString(),
+            response.getAddresses().size());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Returns a list of static address uids that are located in a bounding box with a given radius.",
+        notes = "Returns a list of static address uids that are located in a bounding box with a given radius."
+    )
+    @RequestMapping(method = RequestMethod.GET, params = { LAT, LON, "distance" })
+    @ResponseBody
+    public StaticAddressesUidResponse staticAddressesByBoundingBox(@RequestParam(LAT) BigDecimal latitude,
+        @RequestParam(LON) BigDecimal longitude,
+        @RequestParam("distance") Double distance) {
+
+        GeoLocation location = new GeoLocation(latitude, longitude);
+
+        StaticAddressesUidResponse response = new StaticAddressesUidResponse(
+                staticAddressDtoService.getStaticAddressByBoundingBox(location, distance));
+
+        LOG.info("API: Responding with {} items to boundingbox-request for geolocation {} with {} distance",
+            response.getUids().size(), location.toString(), distance);
+
+        response.add(linkTo(methodOn(getClass()).staticAddressesByBoundingBox(latitude, longitude, distance))
+            .withSelfRel());
+
+        return response;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoService.java b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoService.java
new file mode 100644
index 00000000..60c07c90
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoService.java
@@ -0,0 +1,59 @@
+package net.contargo.iris.address.staticsearch.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.AddressListDto;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface StaticAddressDtoService {
+
+    /**
+     * Finds all {@link AddressDto} of static addresses by the given parameters postalCode, city and country.
+     *
+     * @param  postalCode  String
+     * @param  city  String
+     * @param  country  String
+     *
+     * @return  List of {@link AddressDto}s.
+     */
+    List<AddressDto> getAddressesByDetails(String postalCode, String city, String country);
+
+
+    /**
+     * Finds all {@link AddressDto} of static addresses.
+     *
+     * @return  a list of all {@link AddressDto} of static addresses.
+     */
+    List<AddressDto> getAll();
+
+
+    /**
+     * Returns one {@link net.contargo.iris.address.staticsearch.StaticAddress} wrapped in a list of lists for
+     * compatibility with the client and consistency to the other interfaces, that deliver actual lists of address
+     * lists. The static address is the one matching to the given Geolocation.
+     *
+     * @param  location
+     *
+     * @return  static address wrapped in a list of lists.
+     */
+    List<AddressListDto> getStaticAddressByGeolocation(GeoLocation location);
+
+
+    /**
+     * Retrieves a list of static address uids that are located in a bounding box with radius {@code km} around
+     * {@code geoLocation}.
+     *
+     * @param  location  the geolocation at the bounding box's center
+     * @param  distance  the bounding box's radius
+     *
+     * @return  a list of static address uids
+     */
+    List<BigInteger> getStaticAddressByBoundingBox(GeoLocation location, Double distance);
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImpl.java b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImpl.java
new file mode 100644
index 00000000..e018f85e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImpl.java
@@ -0,0 +1,86 @@
+package net.contargo.iris.address.staticsearch.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.AddressListDto;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class StaticAddressDtoServiceImpl implements StaticAddressDtoService {
+
+    private final StaticAddressService staticAddressService;
+
+    public StaticAddressDtoServiceImpl(StaticAddressService staticAddressService) {
+
+        this.staticAddressService = staticAddressService;
+    }
+
+    @Override
+    public List<AddressDto> getAddressesByDetails(String postalCode, String city, String country) {
+
+        List<StaticAddress> addressList = staticAddressService.getAddressesByDetails(postalCode, city, country);
+
+        return convertStaticAddressListToDTOList(addressList);
+    }
+
+
+    @Override
+    public List<AddressDto> getAll() {
+
+        List<StaticAddress> staticAddresses = staticAddressService.getAll();
+
+        return convertStaticAddressListToDTOList(staticAddresses);
+    }
+
+
+    private List<AddressDto> convertStaticAddressListToDTOList(List<StaticAddress> addressList) {
+
+        List<AddressDto> addressDtoList = new ArrayList<>();
+
+        for (StaticAddress staticAddress : addressList) {
+            addressDtoList.add(new AddressDto(staticAddress.toAddress()));
+        }
+
+        return addressDtoList;
+    }
+
+
+    @Override
+    public List<AddressListDto> getStaticAddressByGeolocation(GeoLocation location) {
+
+        List<AddressList> addressListList = staticAddressService.getAddressListListForGeolocation(location);
+
+        List<AddressListDto> addressListDtoList = new ArrayList<>();
+
+        for (AddressList addressList : addressListList) {
+            addressListDtoList.add(new AddressListDto(addressList)); // NOSONAR
+        }
+
+        return addressListDtoList;
+    }
+
+
+    @Override
+    public List<BigInteger> getStaticAddressByBoundingBox(GeoLocation location, Double distance) {
+
+        List<StaticAddress> staticAddresses = staticAddressService.getAddressesInBoundingBox(location, distance);
+
+        List<BigInteger> result = new ArrayList<>();
+
+        for (StaticAddress staticAddress : staticAddresses) {
+            result.add(staticAddress.getUniqueId());
+        }
+
+        return result;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesResponse.java b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesResponse.java
new file mode 100644
index 00000000..7a1b3fc9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesResponse.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.address.staticsearch.dto;
+
+import net.contargo.iris.address.dto.AddressDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class StaticAddressesResponse extends ResourceSupport {
+
+    private List<AddressDto> addressDtoList;
+
+    public List<AddressDto> getAddressDtoList() {
+
+        return addressDtoList;
+    }
+
+
+    public void setAddressDtoList(List<AddressDto> addressDtoList) {
+
+        this.addressDtoList = addressDtoList;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesUidResponse.java b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesUidResponse.java
new file mode 100644
index 00000000..f2efe4e5
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/dto/StaticAddressesUidResponse.java
@@ -0,0 +1,32 @@
+package net.contargo.iris.address.staticsearch.dto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class StaticAddressesUidResponse extends ResourceSupport {
+
+    private List<BigInteger> uids;
+
+    public StaticAddressesUidResponse(List<BigInteger> staticAddressByBoundingBox) {
+
+        uids = staticAddressByBoundingBox;
+    }
+
+    public List<BigInteger> getUids() {
+
+        return uids;
+    }
+
+
+    public void setUids(List<BigInteger> uids) {
+
+        this.uids = uids;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/persistence/StaticAddressRepository.java b/src/main/java/net/contargo/iris/address/staticsearch/persistence/StaticAddressRepository.java
new file mode 100644
index 00000000..5de00242
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/persistence/StaticAddressRepository.java
@@ -0,0 +1,90 @@
+package net.contargo.iris.address.staticsearch.persistence;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Repository that provides access to data of {@link StaticAddress}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public interface StaticAddressRepository extends JpaRepository<StaticAddress, Long> {
+
+    String SELECT_FROM_STATICADDRESS_A = "SELECT a FROM StaticAddress a ";
+    String ORDER_BY_CITY_SUBURB_POSTALCODE = "ORDER BY a.cityNormalized, a.suburbNormalized, a.postalcode";
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE a.postalcode = ?1 "
+        + "AND (a.cityNormalized LIKE ?2 OR a.suburbNormalized LIKE ?2) " + ORDER_BY_CITY_SUBURB_POSTALCODE
+    )
+    List<StaticAddress> findByPostalCodeAndCity(String postalCode, String city);
+
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE a.postalcode = ?1 "
+        + "OR a.cityNormalized LIKE ?2 "
+        + "OR a.suburbNormalized LIKE ?2 " + ORDER_BY_CITY_SUBURB_POSTALCODE
+    )
+    List<StaticAddress> findByPostalCodeOrCity(String postalCode, String city);
+
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE a.country = ?3 "
+        + "AND a.postalcode = ?1 "
+        + "AND (a.cityNormalized LIKE CONCAT('%', ?2, '%') OR a.suburbNormalized LIKE CONCAT('%', ?2, '%')) "
+        + ORDER_BY_CITY_SUBURB_POSTALCODE
+    )
+    List<StaticAddress> findByCountryAndPostalCodeAndCity(String postalCode, String city, String country);
+
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE a.country = ?3 "
+        + "AND ((a.postalcode = ?1 AND a.postalcode <> '') "
+        + "OR (a.cityNormalized LIKE ?2 AND a.cityNormalized <> '') "
+        + "OR (a.suburbNormalized LIKE ?2 AND a.suburbNormalized <> '')) " + ORDER_BY_CITY_SUBURB_POSTALCODE
+    )
+    List<StaticAddress> findByCountryAndPostalCodeOrCity(String postalCode, String city, String country);
+
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE (a.latitude between ?1 AND ?2) "
+        + "AND (a.longitude between ?3 AND ?4) " + ORDER_BY_CITY_SUBURB_POSTALCODE
+    )
+    List<StaticAddress> findByBoundingBox(BigDecimal fromLatitude, BigDecimal toLatitude, BigDecimal fromLongitude,
+        BigDecimal toLongitude);
+
+
+    @Query(
+        SELECT_FROM_STATICADDRESS_A
+        + "WHERE (a.hashKey is null OR a.hashKey = '') "
+    )
+    Page<StaticAddress> findMissingHashKeys(Pageable pageable);
+
+
+    List<StaticAddress> findByCityNormalizedAndSuburbNormalizedAndPostalcode(String city, String suburb,
+        String postalcode);
+
+
+    StaticAddress findByLatitudeAndLongitude(BigDecimal latitude, BigDecimal longitude);
+
+
+    StaticAddress findByUniqueId(BigInteger uniqueId);
+
+
+    List<StaticAddress> findByPostalcode(String postalCode);
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressCoordinatesDuplicationException.java b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressCoordinatesDuplicationException.java
new file mode 100644
index 00000000..8da91efd
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressCoordinatesDuplicationException.java
@@ -0,0 +1,10 @@
+package net.contargo.iris.address.staticsearch.service;
+
+/**
+ * Is thrown when new StaticAddresses are putted in the db which, are duplicates (coordinates) to others.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ */
+
+public class StaticAddressCoordinatesDuplicationException extends RuntimeException {
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressDuplicationException.java b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressDuplicationException.java
new file mode 100644
index 00000000..7f04019d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressDuplicationException.java
@@ -0,0 +1,10 @@
+package net.contargo.iris.address.staticsearch.service;
+
+/**
+ * Is thrown when new StaticAddresses are putted in the db which, are duplicates to others.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ */
+
+public class StaticAddressDuplicationException extends RuntimeException {
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressService.java b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressService.java
new file mode 100644
index 00000000..ffa09f4e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressService.java
@@ -0,0 +1,123 @@
+package net.contargo.iris.address.staticsearch.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+
+import java.util.List;
+
+
+/**
+ * Provides service methods for {@link StaticAddress} entities.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public interface StaticAddressService {
+
+    /**
+     * Finds all {@link net.contargo.iris.address.Address}es by the given parameters postalCode, city and country.
+     *
+     * @param  postalCode  String
+     * @param  city  String
+     * @param  country  String
+     *
+     * @return  {@link AddressList}
+     */
+    AddressList findAddresses(String postalCode, String city, String country);
+
+
+    /**
+     * Finds all {@link StaticAddress} by the given parameters postalCode, city and country. The procedure of this
+     * method is following (step to next procedure if result list is empty): 1. Execute an AND search, i.e. find
+     * addresses by postal code AND city 2. Execute an OR search, i.e. find addresses by postal code OR city 3. Execute
+     * a split search, i.e. if the city string is "Neustadt an der Weinstrasse" and nothing is found for that then
+     * execute search for "Neustadt"
+     *
+     * @param  postalCode  String
+     * @param  city  String
+     * @param  country  String
+     *
+     * @return  List of {@link StaticAddress}es.
+     */
+    List<StaticAddress> getAddressesByDetailsWithFallbacks(String postalCode, String city, String country);
+
+
+    List<StaticAddress> getAddressesByDetails(String postalCode, String city, String country);
+
+
+    /**
+     * Finds an Address at the exact given location or null.
+     *
+     * @param  loc
+     *
+     * @return
+     */
+    StaticAddress getForLocation(GeoLocation loc);
+
+
+    /**
+     * @param  staticAddressId
+     *
+     * @return
+     */
+    StaticAddress findbyId(Long staticAddressId);
+
+
+    /**
+     * saves the staticAddress in the Database.
+     *
+     * @param  staticAddress  the staticAddress to save in the database
+     *
+     * @return  staticAddress which was saved in the database
+     *
+     * @throws  StaticAddressDuplicationException  if duplicate was found.
+     */
+    StaticAddress saveStaticAddress(StaticAddress staticAddress);
+
+
+    /**
+     * Finds all {@link StaticAddress}.
+     *
+     * @return  a list of all {@link StaticAddress}.
+     */
+    List<StaticAddress> getAll();
+
+
+    /**
+     * @param  staticAddressId
+     *
+     * @return  The _one_ Address for the given static address ID. For consistent processing on client side it is
+     *          wrapped in a list of AddressLists.
+     */
+    List<AddressList> getAddressListListForStaticAddressId(Long staticAddressId);
+
+
+    /**
+     * @param  location
+     *
+     * @return  The _one_ Address for the given geoLocation. For consistent processing on client side it is wrapped in a
+     *          list of AddressLists.
+     */
+    List<AddressList> getAddressListListForGeolocation(GeoLocation location);
+
+
+    void normalizeFields(StaticAddress staticAddress);
+
+
+    /**
+     * looks for database entries with missing hashkeys. generates and saves the hashkeys.
+     */
+    void fillMissingHashKeys();
+
+
+    /**
+     * Retrieves a list of static addresses that are located in a bounding box with radius {@code km} around
+     * {@code geoLocation}.
+     *
+     * @param  geoLocation  the geolocation at the bounding box's center
+     * @param  km  the bounding box's radius
+     *
+     * @return  a list of static addresses
+     */
+    List<StaticAddress> getAddressesInBoundingBox(GeoLocation geoLocation, Double km);
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImpl.java b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImpl.java
new file mode 100644
index 00000000..932fcb71
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImpl.java
@@ -0,0 +1,497 @@
+package net.contargo.iris.address.staticsearch.service;
+
+import net.contargo.iris.BoundingBox;
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+import net.contargo.iris.normalizer.NormalizerServiceImpl;
+import net.contargo.iris.sequence.service.SequenceService;
+
+import org.slf4j.Logger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.persistence.Entity;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Implementation of {@link StaticAddressService}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+@Transactional
+public class StaticAddressServiceImpl implements StaticAddressService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final String WILDCARD = "%";
+    private static final int PAGE_SIZE = 50;
+
+    private final StaticAddressRepository repository;
+
+    private final SequenceService uniqueIdSequenceService;
+
+    private final NormalizerServiceImpl normalizerService;
+
+    public StaticAddressServiceImpl(StaticAddressRepository repository, SequenceService uniqueIdSequenceService,
+        NormalizerServiceImpl normalizerService) {
+
+        this.repository = repository;
+        this.uniqueIdSequenceService = uniqueIdSequenceService;
+        this.normalizerService = normalizerService;
+    }
+
+    /**
+     * Finds all {@link Address}es by the given parameters postalCode, city and country. The procedure of this method is
+     * following (step to next procedure if result list is empty): 1. Execute an AND search, i.e. find addresses by
+     * postal code AND city 2. Execute an OR search, i.e. find addresses by postal code OR city 3. Execute a split
+     * search, i.e. if the city string is "Neustadt an der Weinstrasse" and nothing is found for that then execute
+     * search for "Neustadt"
+     *
+     * @param  postalCode  String
+     * @param  city  String
+     * @param  country  String
+     *
+     * @return  {@link AddressList}
+     */
+    @Override
+    public AddressList findAddresses(String postalCode, String city, String country) {
+
+        List<StaticAddress> staticAddresses = getAddressesByDetailsWithFallbacks(postalCode, city, country);
+
+        List<Address> addresses = staticAddresses.stream().map(StaticAddress::toAddress).collect(Collectors.toList());
+
+        return new AddressList("City and Suburb Results", addresses);
+    }
+
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<StaticAddress> getAddressesByDetailsWithFallbacks(String postalCode, String city, String country) {
+
+        String normalizedCity = normalizerService.normalize(city);
+
+        List<StaticAddress> staticAddresses = executeANDSearch(postalCode, normalizedCity, country);
+
+        if (staticAddresses.isEmpty()) {
+            // fallback to OR search
+            staticAddresses = executeORSearch(postalCode, normalizedCity, country);
+        }
+
+        if (staticAddresses.isEmpty() && city != null) {
+            // fallback to split search
+            staticAddresses = executeSplitSearch(postalCode, city, country);
+        }
+
+        return staticAddresses;
+    }
+
+
+    @Override
+    public List<StaticAddress> getAddressesByDetails(String postalCode, String city, String country) {
+
+        String normalizedCity = normalizerService.normalize(city);
+
+        return repository.findByCountryAndPostalCodeAndCity(postalCode, normalizedCity, country);
+    }
+
+
+    @Override
+    @Transactional(readOnly = true)
+    public StaticAddress getForLocation(GeoLocation loc) {
+
+        return repository.findByLatitudeAndLongitude(loc.getLatitude(), loc.getLongitude());
+    }
+
+
+    @Override
+    @Transactional(readOnly = true)
+    public StaticAddress findbyId(Long staticAddressId) {
+
+        return repository.findOne(staticAddressId);
+    }
+
+
+    @Override
+    public synchronized StaticAddress saveStaticAddress(StaticAddress staticAddress) {
+
+        setEmptyValues(staticAddress);
+
+        normalizeFields(staticAddress);
+
+        if (staticAddress.getId() == null) {
+            return saveNewStaticAddress(staticAddress);
+        } else {
+            return updateStaticAddress(staticAddress);
+        }
+    }
+
+
+    @Override
+    public List<StaticAddress> getAll() {
+
+        return repository.findAll();
+    }
+
+
+    /**
+     * @param  staticAddressId
+     *
+     * @return  The _one_ Address for the given static address ID. For consistent processing on client side it is
+     *          wrapped in a list of AddressLists.
+     */
+    @Override
+    public List<AddressList> getAddressListListForStaticAddressId(Long staticAddressId) {
+
+        StaticAddress staticAddress = findbyId(staticAddressId);
+
+        if (staticAddress == null) {
+            return Collections.emptyList();
+        }
+
+        AddressList staticAddressList = new AddressList("Result ", Arrays.asList(staticAddress.toAddress()));
+
+        return Arrays.asList(staticAddressList);
+    }
+
+
+    /**
+     * @param  location
+     *
+     * @return  The _one_ Address for the given geoLocation. For consistent processing on client side it is wrapped in a
+     *          list of AddressLists.
+     */
+    @Override
+    public List<AddressList> getAddressListListForGeolocation(GeoLocation location) {
+
+        StaticAddress staticAddress = getForLocation(location);
+
+        if (staticAddress == null) {
+            return Collections.emptyList();
+        }
+
+        AddressList staticAddressList = new AddressList("Result ", Arrays.asList(staticAddress.toAddress()));
+
+        return Arrays.asList(staticAddressList);
+    }
+
+
+    private void setEmptyValues(StaticAddress staticAddress) {
+
+        if (staticAddress.getCity() == null) {
+            staticAddress.setCity("");
+        }
+
+        if (staticAddress.getPostalcode() == null) {
+            staticAddress.setPostalcode("");
+        }
+
+        if (staticAddress.getSuburb() == null) {
+            staticAddress.setSuburb("");
+        }
+    }
+
+
+    @Override
+    public void normalizeFields(StaticAddress staticAddress) {
+
+        if (staticAddress.getCity() != null) {
+            staticAddress.setCityNormalized(normalizerService.normalize(staticAddress.getCity()));
+        }
+
+        if (staticAddress.getSuburb() != null) {
+            staticAddress.setSuburbNormalized(normalizerService.normalize(staticAddress.getSuburb()));
+        }
+    }
+
+
+    @Override
+    public void fillMissingHashKeys() {
+
+        LOG.info("Starting to fill the static address hashkeys with " + PAGE_SIZE + " items per page");
+
+        int currentPage = 0;
+        int totalPages = getTotalPages(currentPage, PAGE_SIZE);
+
+        boolean hasElements = true;
+
+        while (hasElements) {
+            List<StaticAddress> addressesOfCurrentPage = getAddresses(0, PAGE_SIZE);
+
+            // change state
+            hasElements = !addressesOfCurrentPage.isEmpty();
+
+            if (hasElements) {
+                LOG.info(String.format("Processing page %d of %d", currentPage + 1, totalPages));
+
+                for (StaticAddress staticAddress : addressesOfCurrentPage) {
+                    staticAddress.setUniqueId(staticAddress.getUniqueId());
+                    repository.save(staticAddress);
+                }
+
+                currentPage = currentPage + 1;
+            }
+        }
+
+        LOG.info("Finished filling the hashkeys");
+    }
+
+
+    @Override
+    public List<StaticAddress> getAddressesInBoundingBox(GeoLocation geoLocation, Double km) {
+
+        Assert.notNull(geoLocation);
+        Assert.notNull(km);
+
+        BoundingBox box = geoLocation.getBoundingBox(km);
+        GeoLocation lowerLeft = box.getLowerLeft();
+        GeoLocation upperRight = box.getUpperRight();
+
+        return repository.findByBoundingBox(lowerLeft.getLatitude(), upperRight.getLatitude(), lowerLeft.getLongitude(),
+                upperRight.getLongitude());
+    }
+
+
+    private StaticAddress updateStaticAddress(StaticAddress staticAddress) {
+
+        StaticAddress staticAddressFromDb = repository.findOne(staticAddress.getId());
+
+        boolean addressParametersDifferent = staticAddressFromDb.areAddressParametersDifferent(staticAddress);
+
+        boolean coordinatesDifferent = staticAddressFromDb.areLatitudeAndLongitudeDifferent(staticAddress);
+
+        if (addressParametersDifferent && checkDuplicateAddressParameters(staticAddress)) {
+            throw new StaticAddressDuplicationException();
+        }
+
+        if (coordinatesDifferent && checkOnDuplicateCoordinates(staticAddressFromDb, staticAddress)) {
+            throw new StaticAddressCoordinatesDuplicationException();
+        }
+
+        return repository.save(staticAddress);
+    }
+
+
+    private StaticAddress saveNewStaticAddress(StaticAddress staticAddress) {
+
+        if (staticAddress.getUniqueId() == null) {
+            staticAddress.setUniqueId(determineUniqueId());
+        }
+
+        if (checkDuplicateAddressParameters(staticAddress)) {
+            throw new StaticAddressDuplicationException();
+        }
+
+        if (checkOnDuplicateCoordinates(staticAddress)) {
+            throw new StaticAddressCoordinatesDuplicationException();
+        }
+
+        return repository.save(staticAddress);
+    }
+
+
+    BigInteger determineUniqueId() {
+
+        String entityName = StaticAddress.class.getAnnotation(Entity.class).name();
+        BigInteger nextUniqueId = uniqueIdSequenceService.getNextId(entityName);
+        boolean isUniqueIdAlreadyAssigned = isUniqueIdAlreadyAssigned(nextUniqueId);
+
+        while (isUniqueIdAlreadyAssigned) {
+            // In this loop we increment the ID by ourselves to avoid write-accesses to the DB for performance
+            LOG.warn("StaticAddress uniqueId {} already assigned - trying next uniqueId", nextUniqueId);
+            nextUniqueId = nextUniqueId.add(BigInteger.ONE);
+
+            if (!isUniqueIdAlreadyAssigned(nextUniqueId)) {
+                isUniqueIdAlreadyAssigned = false;
+                uniqueIdSequenceService.setNextId(entityName, nextUniqueId);
+            }
+        }
+
+        return nextUniqueId;
+    }
+
+
+    private boolean isUniqueIdAlreadyAssigned(BigInteger uniqueId) {
+
+        return repository.findByUniqueId(uniqueId) != null;
+    }
+
+
+    private boolean checkOnDuplicateCoordinates(StaticAddress staticAddressFromDb, StaticAddress staticAddress) {
+
+        // compare coordinates
+        if (null != staticAddressFromDb && staticAddressFromDb.equals(staticAddress)) {
+            return false;
+        }
+
+        StaticAddress addressFromDb = repository.findByLatitudeAndLongitude(staticAddress.getLatitude(),
+                staticAddress.getLongitude());
+
+        return null != addressFromDb;
+    }
+
+
+    private boolean checkOnDuplicateCoordinates(StaticAddress staticAddress) {
+
+        return this.checkOnDuplicateCoordinates(null, staticAddress);
+    }
+
+
+    private boolean checkDuplicateAddressParameters(StaticAddress staticAddress) {
+
+        List<StaticAddress> staticAddresses = repository.findByCityNormalizedAndSuburbNormalizedAndPostalcode(
+                staticAddress.getCityNormalized(), staticAddress.getSuburbNormalized(), staticAddress.getPostalcode());
+
+        return !staticAddresses.isEmpty();
+    }
+
+
+    /**
+     * Similar to method executeORSearch, only using other repository methods.
+     */
+    private List<StaticAddress> executeANDSearch(String postalCode, String city, String country) {
+
+        List<StaticAddress> addresses = new ArrayList<>();
+
+        if (StringUtils.hasText(country)) {
+            addresses = repository.findByCountryAndPostalCodeAndCity(postalCode, getParameterWithWildcard(city),
+                    country);
+        } else if (StringUtils.hasText(city)) {
+            addresses = repository.findByPostalCodeAndCity(postalCode, getParameterWithWildcard(city));
+        } else {
+            repository.findByPostalcode(postalCode);
+        }
+
+        return addresses;
+    }
+
+
+    /**
+     * Similar to method executeANDSearch, only using other repository methods.
+     */
+    private List<StaticAddress> executeORSearch(String postalCode, String city, String country) {
+
+        List<StaticAddress> addresses;
+
+        if (StringUtils.hasText(country)) {
+            addresses = repository.findByCountryAndPostalCodeOrCity(postalCode, getParameterWithWildcard(city),
+                    country);
+        } else if (StringUtils.hasText(city)) {
+            addresses = repository.findByPostalCodeOrCity(postalCode, getParameterWithWildcard(city));
+        } else {
+            addresses = repository.findByPostalcode(postalCode);
+        }
+
+        return addresses;
+    }
+
+
+    /**
+     * Adds wildcard to String if it is not empty and returns the new String.
+     *
+     * @param  param
+     *
+     * @return  new String with wildcard
+     */
+    private String getParameterWithWildcard(String param) {
+
+        // rule for wildcard city: "city%"
+        if (StringUtils.hasText(param)) {
+            return param + WILDCARD;
+        }
+
+        return param;
+    }
+
+
+    /**
+     * This is a fallback method if neither executeANDSearch nor executeORSearch have a result. The city string is split
+     * on whitespaces. The current implementation executes the search only for first element of the split string.
+     *
+     * @param  postalCode
+     * @param  city
+     * @param  country
+     *
+     * @return  {@link java.util.List} of {@link StaticAddress} matching the given search parameters
+     */
+    private List<StaticAddress> executeSplitSearch(String postalCode, String city, String country) {
+
+        Assert.notNull(city);
+
+        String[] singleSearchParameters = city.split(" ");
+
+        String firstString = normalizerService.normalize(singleSearchParameters[0]);
+        List<StaticAddress> addresses = executeANDSearch(postalCode, firstString, country);
+
+        if (addresses.isEmpty()) {
+            addresses = executeORSearch(postalCode, firstString, country);
+        }
+
+        return addresses;
+    }
+
+
+    /**
+     * Retrieves total amount of pages, according to pagesize.
+     *
+     * @param  currentPage
+     * @param  pageSize
+     *
+     * @return
+     */
+    private int getTotalPages(int currentPage, int pageSize) {
+
+        Pageable pageable = new PageRequest(currentPage, pageSize);
+
+        return getAllPagesForEmptyItems(pageable).getTotalPages();
+    }
+
+
+    /**
+     * Retreive only empty pages from repository..
+     *
+     * @param  pageable
+     *
+     * @return
+     */
+    private Page<StaticAddress> getAllPagesForEmptyItems(Pageable pageable) {
+
+        return repository.findMissingHashKeys(pageable);
+    }
+
+
+    /**
+     * Get pageable addresses according to the given page size.
+     *
+     * @param  startPage
+     * @param  pageSize
+     *
+     * @return
+     */
+    private List<StaticAddress> getAddresses(int startPage, int pageSize) {
+
+        Pageable pageable = new PageRequest(startPage, pageSize);
+
+        return getAllPagesForEmptyItems(pageable).getContent();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressController.java b/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressController.java
new file mode 100644
index 00000000..26b143aa
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressController.java
@@ -0,0 +1,161 @@
+package net.contargo.iris.address.staticsearch.web;
+
+import net.contargo.iris.Message;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressCoordinatesDuplicationException;
+import net.contargo.iris.address.staticsearch.service.StaticAddressDuplicationException;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceException;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.validation.BindingResult;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.lang.invoke.MethodHandles;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+import static net.contargo.iris.Message.error;
+import static net.contargo.iris.Message.success;
+import static net.contargo.iris.api.AbstractController.SLASH;
+import static net.contargo.iris.api.AbstractController.STATIC_ADDRESSES;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Controller for the web API of {@link net.contargo.iris.address.staticsearch.StaticAddress}s.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+@Controller
+@RequestMapping(SLASH + STATIC_ADDRESSES)
+public class StaticAddressController extends AbstractController {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final String CONTROLLER_CONTEXT = "staticAddressManagement" + SLASH;
+
+    private static final String STATIC_ADDRESS_REQUEST_BEAN = "request";
+    private static final String ENTITY_ATTRIBUTE = "staticAddress";
+    private static final String ENTITYS_ATTRIBUTE = "staticAddresses";
+
+    private static final String ENTITY_VIEW = "staticaddresses";
+    private static final String ENTITY_FORM_VIEW = "staticaddressForm";
+
+    private static final Message SAVE_SUCCESS_MESSAGE = success("staticaddress.save.success");
+    private static final Message UPDATE_SUCCESS_MESSAGE = success("staticaddress.update.success");
+    private static final Message DUPLICATION_ERROR_MESSAGE = error("staticaddress.error.duplicate");
+    private static final Message DUPLICATION_GEOCOORDINATES_ERROR_MESSAGE = error(
+            "staticaddress.error.coordinates.duplicate");
+
+    private final StaticAddressService staticAddressService;
+
+    @Autowired
+    public StaticAddressController(StaticAddressService staticAddressService) {
+
+        this.staticAddressService = staticAddressService;
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public String getByDetails(Model model, @ModelAttribute StaticAddressRequest staticAddressRequest) {
+
+        if (!staticAddressRequest.isEmpty()) {
+            List<StaticAddress> staticAddressList = staticAddressService.getAddressesByDetailsWithFallbacks(
+                    staticAddressRequest.getPostalcode(), staticAddressRequest.getCity(), null);
+
+            model.addAttribute(ENTITYS_ATTRIBUTE, staticAddressList);
+        }
+
+        model.addAttribute(STATIC_ADDRESS_REQUEST_BEAN, staticAddressRequest);
+
+        return CONTROLLER_CONTEXT + ENTITY_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.GET)
+    public String getStaticAddress(Model model, @PathVariable Long id) {
+
+        model.addAttribute(ENTITY_ATTRIBUTE, staticAddressService.findbyId(id));
+
+        return CONTROLLER_CONTEXT + ENTITY_FORM_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + "new", method = RequestMethod.GET)
+    public String prepareForCreate(Model model) {
+
+        model.addAttribute(ENTITY_ATTRIBUTE, new StaticAddress());
+
+        return CONTROLLER_CONTEXT + ENTITY_FORM_VIEW;
+    }
+
+
+    @ModelAttribute("staticAddress")
+    public void prepareSaveStaticAddress(StaticAddress staticAddress) {
+
+        staticAddressService.normalizeFields(staticAddress);
+    }
+
+
+    @RequestMapping(value = SLASH, method = RequestMethod.POST)
+    public String saveStaticAddress(@Valid @ModelAttribute StaticAddress staticAddress, BindingResult result,
+        Model model) {
+
+        return saveOrUpdateStaticAddress(staticAddress, result, model, SAVE_SUCCESS_MESSAGE);
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.PUT)
+    public String updateStaticAddress(@Valid @ModelAttribute StaticAddress staticAddress, BindingResult result,
+        Model model) {
+
+        return saveOrUpdateStaticAddress(staticAddress, result, model, UPDATE_SUCCESS_MESSAGE);
+    }
+
+
+    private String saveOrUpdateStaticAddress(StaticAddress staticAddress, BindingResult result, Model model,
+        Message message) {
+
+        if (result.hasErrors()) {
+            model.addAttribute(ENTITY_ATTRIBUTE, staticAddress);
+
+            return CONTROLLER_CONTEXT + ENTITY_FORM_VIEW;
+        }
+
+        try {
+            StaticAddress savedStaticAddress = staticAddressService.saveStaticAddress(staticAddress);
+
+            model.addAttribute(ENTITY_ATTRIBUTE, savedStaticAddress);
+            model.addAttribute(AbstractController.MESSAGE, message);
+        } catch (StaticAddressDuplicationException e) {
+            model.addAttribute(ENTITY_ATTRIBUTE, staticAddress);
+            model.addAttribute(AbstractController.MESSAGE, DUPLICATION_ERROR_MESSAGE);
+        } catch (StaticAddressCoordinatesDuplicationException e) {
+            model.addAttribute(ENTITY_ATTRIBUTE, staticAddress);
+            model.addAttribute(AbstractController.MESSAGE, DUPLICATION_GEOCOORDINATES_ERROR_MESSAGE);
+        } catch (UniqueIdSequenceServiceException e) {
+            model.addAttribute(ENTITY_ATTRIBUTE, staticAddress);
+            model.addAttribute(AbstractController.MESSAGE, UNIQUEID_ERROR_MESSAGE);
+            LOG.error(e.getMessage());
+        }
+
+        return CONTROLLER_CONTEXT + ENTITY_FORM_VIEW;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequest.java b/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequest.java
new file mode 100644
index 00000000..ddefb072
--- /dev/null
+++ b/src/main/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequest.java
@@ -0,0 +1,52 @@
+package net.contargo.iris.address.staticsearch.web;
+
+import org.springframework.util.StringUtils;
+
+
+/**
+ * View bean to encapsulate search parameter for a static address.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ */
+class StaticAddressRequest {
+
+    private String postalcode = null;
+    private String city = null;
+
+    public String getPostalcode() {
+
+        if (null != postalcode && postalcode.isEmpty()) {
+            postalcode = null;
+        }
+
+        return postalcode;
+    }
+
+
+    public void setPostalcode(String postalcode) {
+
+        this.postalcode = postalcode;
+    }
+
+
+    public String getCity() {
+
+        if (null != city && city.isEmpty()) {
+            city = null;
+        }
+
+        return city;
+    }
+
+
+    public void setCity(String city) {
+
+        this.city = city;
+    }
+
+
+    public boolean isEmpty() {
+
+        return StringUtils.isEmpty(postalcode) && StringUtils.isEmpty(city);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/AbstractController.java b/src/main/java/net/contargo/iris/api/AbstractController.java
new file mode 100644
index 00000000..589fa6ca
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/AbstractController.java
@@ -0,0 +1,54 @@
+package net.contargo.iris.api;
+
+import net.contargo.iris.Message;
+
+import static net.contargo.iris.Message.error;
+
+
+/**
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public abstract class AbstractController {
+
+    public static final Message UNIQUEID_ERROR_MESSAGE = error("uniqueid.error.message");
+
+    // Domain specific constants
+    public static final String TERMINALS = "terminals";
+    public static final String SEAPORTS = "seaports";
+    public static final String ROUTE_TYPES = "routetypes";
+    public static final String STATIC_ADDRESSES = "staticaddresses";
+    public static final String CONNECTIONS = "connections";
+    public static final String LOGIN = "login";
+    public static final String ROUTE_DETAILS = "routedetails";
+    public static final String OSM_ADDRESSES = "osmaddresses";
+    public static final String COUNTRIES = "countries";
+    public static final String REVERSE_GEOCODE = "reversegeocode";
+    public static final String ADDRESSES = "addresses";
+    public static final String PLACES = "places";
+    public static final String GEOCODES = "geocodes";
+    public static final String SIMPLE_GEOCODES = "simplegeocodes";
+    public static final String TRIANGLE = "triangle";
+    public static final String TRIANGLE_VIEW = "routing/triangle";
+
+    // parameter constants
+    public static final String ID_PARAM = "{id}";
+    public static final String ID = "id";
+    public static final String PARAM_LATITUDE = "{lat}";
+    public static final String PARAM_LONGITUDE = "{lon}";
+
+    // character constants
+    public static final String SLASH = "/";
+    public static final String COLON = ":";
+    public static final String STAR = "*";
+
+    // navigation constants
+    public static final String FORM = "form";
+    public static final String MESSAGE = "message";
+    public static final String REDIRECT = "redirect:";
+    public static final String RESPONSE = "response";
+    public static final String WEB = "web";
+    public static final String LINK_REF_ROOT = "root";
+    public static final String INDEX = "index";
+    public static final String WEBAPI_ROOT_URL = SLASH + WEB + SLASH;
+}
diff --git a/src/main/java/net/contargo/iris/api/NotFoundException.java b/src/main/java/net/contargo/iris/api/NotFoundException.java
new file mode 100644
index 00000000..429d96a1
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/NotFoundException.java
@@ -0,0 +1,14 @@
+package net.contargo.iris.api;
+
+/**
+ * Should be thrown when an entity cannot be found. Will be mapped to an HTTP 404 error.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+
+        super(message);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/PublicAPIExceptionHandler.java b/src/main/java/net/contargo/iris/api/PublicAPIExceptionHandler.java
new file mode 100644
index 00000000..6ab89315
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/PublicAPIExceptionHandler.java
@@ -0,0 +1,98 @@
+package net.contargo.iris.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * This ExceptionHandler handles thrown Exceptions of our public API and responds with Exception specific HTTP status
+ * codes.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class PublicAPIExceptionHandler implements HandlerExceptionResolver {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PublicAPIExceptionHandler.class);
+
+    @Override
+    public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
+        Exception ex) {
+
+        ModelAndView modelAndView = new ModelAndView();
+
+        LOG.error("REST-API Exception: " + ex.getMessage(), ex);
+
+        try {
+            if (ex instanceof IllegalArgumentException) {
+                modelAndView = handleIllegalArgumentException(response, (IllegalArgumentException) ex);
+            } else if (ex instanceof IllegalStateException) {
+                modelAndView = handleIllegalStateException(response, (IllegalStateException) ex);
+            } else if (ex instanceof HttpClientErrorException) {
+                modelAndView = handleHttpClientErrorException(response, (HttpClientErrorException) ex);
+            } else if (ex instanceof NotFoundException) {
+                modelAndView = handleNotFoundException(response, (NotFoundException) ex);
+            } else {
+                modelAndView = handleGenericException(response, ex);
+            }
+        } catch (IOException handlerException) {
+            LOG.warn("Handling of [" + ex.getClass().getName() + "] resulted in Exception", handlerException);
+        }
+
+        return modelAndView;
+    }
+
+
+    private ModelAndView handleIllegalArgumentException(HttpServletResponse response, IllegalArgumentException ex)
+        throws IOException {
+
+        response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad Request. " + ex.getMessage());
+
+        return new ModelAndView();
+    }
+
+
+    private ModelAndView handleIllegalStateException(HttpServletResponse response, IllegalStateException ex)
+        throws IOException {
+
+        response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad request. " + ex.getMessage());
+
+        return new ModelAndView();
+    }
+
+
+    private ModelAndView handleHttpClientErrorException(HttpServletResponse response, HttpClientErrorException ex)
+        throws IOException {
+
+        response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+            "Service is temporary not available, please try again later. " + ex.getMessage());
+
+        return new ModelAndView();
+    }
+
+
+    private ModelAndView handleGenericException(HttpServletResponse response, Exception ex) throws IOException {
+
+        response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Internal Server Error. " + ex.getMessage());
+
+        return new ModelAndView();
+    }
+
+
+    private ModelAndView handleNotFoundException(HttpServletResponse response, NotFoundException ex)
+        throws IOException {
+
+        response.sendError(HttpServletResponse.SC_NOT_FOUND, "Not found. " + ex.getMessage());
+
+        return new ModelAndView();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/WebExceptionHandler.java b/src/main/java/net/contargo/iris/api/WebExceptionHandler.java
new file mode 100644
index 00000000..bc5656c3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/WebExceptionHandler.java
@@ -0,0 +1,120 @@
+package net.contargo.iris.api;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.joda.time.DateTime;
+
+import org.slf4j.Logger;
+
+import org.springframework.security.core.Authentication;
+
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+
+import java.lang.invoke.MethodHandles;
+
+import java.util.Random;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * This ExceptionHandler generates detailed error reports if an unexpected error resp. Exception occurs.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class WebExceptionHandler extends SimpleMappingExceptionResolver implements HandlerExceptionResolver {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final int MAX_RANDOM_NUMBER = 9999;
+
+    private final File basePath;
+    private final Random random = new Random();
+    private final UserAuthenticationService userAuthenticationService;
+
+    public WebExceptionHandler(File basePath, UserAuthenticationService userAuthenticationService) {
+
+        this.basePath = basePath;
+        this.userAuthenticationService = userAuthenticationService;
+
+        createDirectoryIfNotExists(basePath);
+    }
+
+    String textualRepresentationOfCurrentUser() {
+
+        Authentication currentUser = userAuthenticationService.getCurrentUser();
+
+        return currentUser == null ? "?" : String.format("user: %s%n", currentUser.getName());
+    }
+
+
+    @Override
+    public ModelAndView doResolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
+        Exception e) {
+
+        // generate unique id for exception
+        DateTime now = new DateTime();
+        String id = String.format("%s-%4d", now.toString("yyyy-MM-dd_HH-mm-ss"), random.nextInt(MAX_RANDOM_NUMBER));
+
+        request.setAttribute("exception_id", id);
+
+        String user = textualRepresentationOfCurrentUser();
+
+        addExceptionStackTraceToRequest(request, e);
+
+        File file = new File(basePath, id + "-report.txt");
+
+        try {
+            PrintWriter writer = new PrintWriter(file, "UTF-8");
+            writer.append(String.format(
+                    "id: %s%ndate: %s%n%s%n" + "requesturl: %s%ncontroller: %s%n%n%n"
+                    + "stacktrace:%n", id, now.toString("dd.mm.yyyy HH:mm:ss"), user,
+                    request.getRequestURL().toString(), handler.getClass().getName()));
+
+            e.printStackTrace(writer);
+            writer.append("\n\n");
+
+            writer.close();
+        } catch (FileNotFoundException fileNotFoundException) {
+            LOG.warn("File not found.", fileNotFoundException);
+        } catch (UnsupportedEncodingException unsupportedEncodingException) {
+            LOG.warn("Encoding not supported.", unsupportedEncodingException);
+        }
+
+        LOG.error("A new error report was generated due to an exception. See " + file.getPath()
+            + " for further information.", e);
+
+        return super.doResolveException(request, response, handler, e);
+    }
+
+
+    private void addExceptionStackTraceToRequest(HttpServletRequest request, Exception exception) {
+
+        StringWriter writer = new StringWriter();
+        exception.printStackTrace(new PrintWriter(writer));
+        request.setAttribute("exception_trace", writer.toString());
+    }
+
+
+    private void createDirectoryIfNotExists(File dir) {
+
+        if (dir.exists() && !dir.isDirectory()) {
+            throw new IllegalStateException("Directory " + dir.getAbsolutePath()
+                + " exists and is a file (needed a directory)");
+        } else if (!dir.exists() && !dir.mkdirs()) {
+            throw new IllegalStateException("Directory " + dir.getAbsolutePath()
+                + " can not be created");
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/discover/DiscoverPublicApiController.java b/src/main/java/net/contargo/iris/api/discover/DiscoverPublicApiController.java
new file mode 100644
index 00000000..33fefc88
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/discover/DiscoverPublicApiController.java
@@ -0,0 +1,135 @@
+package net.contargo.iris.api.discover;
+
+import com.mangofactory.swagger.annotations.ApiIgnore;
+
+import net.contargo.iris.address.api.AddressApiController;
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.connection.api.MainRunConnectionApiController;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.countries.api.CountriesApiController;
+import net.contargo.iris.enricher.api.RouteEnricherApiController;
+import net.contargo.iris.route.RouteCombo;
+import net.contargo.iris.seaport.api.SeaportApiController;
+import net.contargo.iris.terminal.api.TerminalApiController;
+
+import org.springframework.beans.factory.annotation.Value;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.lang.reflect.Method;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+
+/**
+ * Controller which presents all public API's as link so they can be used to move through the API.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Controller
+@RequestMapping
+@ApiIgnore
+public class DiscoverPublicApiController extends AbstractController {
+
+    static final String REL_COUNTRIES = COUNTRIES;
+    static final String REL_REVERSE_GEOCODE = REVERSE_GEOCODE;
+    static final String REL_GEOCODE = "geocode";
+    static final String REL_TERMINALS = TERMINALS;
+    static final String REL_TERMINAL_EXAMPLE = "terminal (by uid)";
+    static final String REL_SEAPORTS_OF_CONNECTIONS = "seaports (as part of connections)";
+    static final String REL_SEAPORTS_OF_CONNECTIONS_FILTERED = "seaports (as part of connections, filtered)";
+    static final String REL_SEAPORT_EXAMPLE = "seaport (by uid)";
+    static final String REL_CONNECTIONS = "connections_url";
+    static final String REL_SIMPLE_GEOCODES_EXAMPLE = "simplegeocodes_example";
+    static final String REL_ROUTE_DETAILS_EXAMPLE = "route_details_example";
+    static final String REL_OSM_ADDRESSES = OSM_ADDRESSES;
+
+    private static final String ROOT_URL = SLASH;
+    private static final Double SEAPORTS_LAT = 49.0;
+    private static final Double SEAPORTS_LON = 8.41;
+
+    private static final BigInteger SEAPORT_UID = new BigInteger("1301000000000001");
+    private static final BigInteger TERMINAL_UID = new BigInteger("1301000000000001");
+
+    @Value(value = "${application.version}")
+    private String applicationVersion;
+
+    @RequestMapping(value = ROOT_URL, method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public DiscoverResponse discover() throws NoSuchMethodException {
+
+        DiscoverResponse discoverResponse = new DiscoverResponse(applicationVersion);
+
+        // connections_url
+        discoverResponse.add(linkTo(
+                methodOn(MainRunConnectionApiController.class).getSeaportRoutes(SEAPORT_UID, SEAPORTS_LAT, SEAPORTS_LON,
+                    true, ContainerType.TWENTY_LIGHT, false, RouteCombo.WATERWAY)).withRel(REL_CONNECTIONS));
+
+        // countries
+        discoverResponse.add(linkTo(CountriesApiController.class).withRel(REL_COUNTRIES));
+
+        // osmaddresses
+        discoverResponse.add(linkTo(AddressApiController.class).slash(OSM_ADDRESSES).slash(
+                "134631686?_=1381911583029").withRel(REL_OSM_ADDRESSES));
+
+        // reverse_geocode
+        Method method = AddressApiController.class.getMethod(AddressApiController.METHOD_ADDRESS_BY_GEOLOCATION,
+                BigDecimal.class, BigDecimal.class);
+        discoverResponse.add(linkTo(method, new BigDecimal("49.123"), new BigDecimal("8.12")).slash(".").withRel(
+                REL_REVERSE_GEOCODE));
+
+        // geocode
+        discoverResponse.add(linkTo(AddressApiController.class).slash(GEOCODES + "?city=Karlsruhe&postalcode=76137")
+            .withRel(REL_GEOCODE));
+
+        // seaport
+        discoverResponse.add(linkTo(methodOn(SeaportApiController.class).getSeaportById(SEAPORT_UID)).withRel(
+                REL_SEAPORT_EXAMPLE));
+        discoverResponse.add(linkTo(
+                methodOn(MainRunConnectionApiController.class).getSeaportsInConnections(RouteCombo.ALL)).withRel(
+                REL_SEAPORTS_OF_CONNECTIONS));
+        discoverResponse.add(linkTo(
+                methodOn(MainRunConnectionApiController.class).getSeaportsInConnections(RouteCombo.RAILWAY)).withRel(
+                REL_SEAPORTS_OF_CONNECTIONS_FILTERED));
+
+        // terminal (by uid)
+        discoverResponse.add(linkTo(methodOn(TerminalApiController.class).getTerminalByUid(TERMINAL_UID)).withRel(
+                REL_TERMINAL_EXAMPLE));
+
+        // terminals
+        discoverResponse.add(linkTo(methodOn(TerminalApiController.class).getTerminals()).withRel(REL_TERMINALS));
+
+        discoverResponse.add(linkTo(AddressApiController.class).slash(
+                "simplegeocodes?city=Karlsruhe&postalcode=76137").withRel(REL_SIMPLE_GEOCODES_EXAMPLE));
+
+        discoverResponse.add(linkTo(RouteEnricherApiController.class).slash(
+                "?data.parts[0].origin.longitude=4.3&data.parts[0].origin.latitude=51.36833"
+                + "&data.parts[0].destination.longitude=8.2852700000&data.parts[0].destination.latitude=49.0690300000"
+                + "&data.parts[0].routeType=BARGE&data.parts[0].containerType=TWENTY_LIGHT"
+                + "&data.parts[0].containerState=FULL"
+                + "&data.parts[1].origin.longitude=8.2852700000&data.parts[1].origin.latitude=49.0690300000"
+                + "&data.parts[1].destination.longitude=8.41&data.parts[1].destination.latitude=49.0"
+                + "&data.parts[1].routeType=TRUCK&data.parts[1].containerType=TWENTY_LIGHT"
+                + "&data.parts[1].containerState=FULL"
+                + "&data.parts[2].origin.longitude=8.41&data.parts[2].origin.latitude=49.0"
+                + "&data.parts[2].destination.longitude=8.2852700000&data.parts[2].destination.latitude=49.0690300000"
+                + "&data.parts[2].routeType=TRUCK&data.parts[2].containerType=TWENTY_LIGHT"
+                + "&data.parts[2].containerState=EMPTY"
+                + "&data.parts[3].origin.longitude=8.2852700000&data.parts[3].origin.latitude=49.0690300000"
+                + "&data.parts[3].destination.longitude=4.3&data.parts[3].destination.latitude=51.36833"
+                + "&data.parts[3].routeType=BARGE"
+                + "&data.parts[3].containerType=TWENTY_LIGHT&data.parts[3].containerState=EMPTY").withRel(
+                REL_ROUTE_DETAILS_EXAMPLE));
+
+        return discoverResponse;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/discover/DiscoverResponse.java b/src/main/java/net/contargo/iris/api/discover/DiscoverResponse.java
new file mode 100644
index 00000000..b4c942d5
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/discover/DiscoverResponse.java
@@ -0,0 +1,38 @@
+package net.contargo.iris.api.discover;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * Response Object which is used in the {@link DiscoverPublicApiController} to return the current version of the
+ * application.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+class DiscoverResponse extends ResourceSupport {
+
+    private String version;
+
+    public DiscoverResponse(String applicationVersion) {
+
+        this.version = applicationVersion;
+    }
+
+
+    public DiscoverResponse() {
+
+        // Needed for Jackson Mapping
+    }
+
+    public String getVersion() {
+
+        return version;
+    }
+
+
+    public void setVersion(String version) {
+
+        this.version = version;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/api/discover/TestExplainView.java b/src/main/java/net/contargo/iris/api/discover/TestExplainView.java
new file mode 100644
index 00000000..92255197
--- /dev/null
+++ b/src/main/java/net/contargo/iris/api/discover/TestExplainView.java
@@ -0,0 +1,173 @@
+package net.contargo.iris.api.discover;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import org.springframework.context.ApplicationContextAware;
+
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.ResourceSupport;
+
+import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import java.net.URLDecoder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.apache.commons.lang.CharEncoding.UTF_8;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+public class TestExplainView extends MappingJackson2JsonView implements ApplicationContextAware {
+
+    private final ObjectMapper objectMapper;
+
+    @Value(value = "${application.version}")
+    private String applicationVersion;
+
+    private final UserAuthenticationService userAuthenticationService;
+
+    @Autowired
+    public TestExplainView(UserAuthenticationService userAuthenticationService, ObjectMapper objectMapper) {
+
+        setContentType("text/html");
+        this.userAuthenticationService = userAuthenticationService;
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
+        HttpServletResponse response) throws IOException {
+
+        @SuppressWarnings("unchecked")
+        Map<String, Object> value = (Map<String, Object>) filterModel(model);
+
+        StringBuilder builder = new StringBuilder();
+
+        addGreetingSection(builder, request);
+
+        addFormatsSection(request, builder);
+
+        addLinkSection(builder, value);
+
+        addJSONPrettyPrintSection(response, value, builder);
+
+        response.getOutputStream().write(("<hr>" + applicationVersion).getBytes(UTF_8));
+    }
+
+
+    void addGreetingSection(StringBuilder builder, HttpServletRequest request) {
+
+        String username = userAuthenticationService.getCurrentUser().getName();
+        builder.append("<h1>Hello ").append(username).append(" from ").append(request.getRemoteHost()).append("</h1>");
+        builder.append("This is a <i>RESTful</i> webservice. <br/>");
+    }
+
+
+    void addJSONPrettyPrintSection(HttpServletResponse response, Map<String, Object> value, StringBuilder builder)
+        throws IOException {
+
+        builder.append("<h2>JSON</h2><pre>");
+
+        response.getOutputStream().write(builder.toString().getBytes(UTF_8));
+
+        ObjectWriter writer = objectMapper.writerWithDefaultPrettyPrinter();
+        response.getOutputStream().write(writer.writeValueAsBytes(value));
+        response.getOutputStream().write("</pre>".getBytes(UTF_8));
+    }
+
+
+    void addFormatsSection(HttpServletRequest request, StringBuilder builder) {
+
+        String accept = request.getHeader("Accept");
+        StringBuffer urlB = request.getRequestURL();
+        String q = request.getQueryString();
+
+        if (q != null) {
+            urlB.append('?').append(q);
+        }
+
+        builder.append("<h2>Request and Formats</h2>");
+
+        String url = urlB.toString();
+
+        builder.append("You requested this page using url <b>").append(url).append("</b> and Accept-Header <b>").append(
+            accept).append("</b>  <br/><br/>");
+
+        builder.append("You requested this page as HTML (Probably because your client has text/html "
+            + "prior to application/json or application/xml in the Accept-Header.");
+        builder.append("If you are intersted in another format please adjust your Accept-Header "
+            + "or append .json or .xml at the url:<ul>");
+
+        for (String type : Arrays.asList("json")) {
+            String typeUrl = url + "." + type;
+
+            if (q != null) {
+                typeUrl = request.getRequestURL().append(".").append(type).append("?").append(q).toString();
+            }
+
+            builder.append("<li><a href='").append(typeUrl).append("'>Show as ").append(type).append("</a>  (").append(
+                typeUrl).append(")</li>");
+        }
+
+        builder.append("</ul>");
+    }
+
+
+    void addLinkSection(StringBuilder builder, Map<String, Object> value) {
+
+        List<Link> links = new ArrayList<>();
+
+        for (Map.Entry<String, Object> entry : value.entrySet()) {
+            Object v = entry.getValue();
+
+            if (v instanceof ResourceSupport) {
+                links = ((ResourceSupport) v).getLinks();
+            }
+        }
+
+        builder.append("<h2>Links</h2>");
+
+        builder.append("You can navigate to the following other resources from here:<ul>");
+
+        String link;
+        String decodedLink;
+
+        for (Link singleLink : links) {
+            link = singleLink.getHref();
+
+            try {
+                decodedLink = URLDecoder.decode(link, UTF_8);
+            } catch (UnsupportedEncodingException e) {
+                decodedLink = link;
+            }
+
+            if (decodedLink.contains("{")) {
+                builder.append("<li>").append(singleLink.getRel()).append(": ").append(decodedLink).append(
+                    " (url contains placeholders)</li>");
+            } else {
+                builder.append("<li><a href='").append(decodedLink).append("'>").append(singleLink.getRel()).append(
+                    "</a> (").append(decodedLink).append(")</li>");
+            }
+        }
+
+        builder.append("</ul>");
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2BargeRegionMap.java b/src/main/java/net/contargo/iris/co2/advice/Co2BargeRegionMap.java
new file mode 100644
index 00000000..7c38cf9c
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2BargeRegionMap.java
@@ -0,0 +1,92 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.terminal.Region;
+
+import java.math.BigDecimal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static net.contargo.iris.container.ContainerState.FULL;
+import static net.contargo.iris.route.RoutePart.Direction.DOWNSTREAM;
+
+import static java.util.Collections.unmodifiableMap;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2BargeRegionMap {
+
+    static final String FULL_UPSTREAM = "FullUpstream";
+    static final String FULL_DOWNSTREAM = "FullDownstream";
+    static final String EMPTY_UPSTREAM = "EmptyUpstream";
+    static final String EMPTY_DOWNSTREAM = "EmptyDownstream";
+
+    static final Map<String, BigDecimal> NIEDERRHEIN_CO2_MAP;
+
+    static {
+        Map<String, BigDecimal> map = new HashMap<>();
+        map.put(FULL_UPSTREAM, new BigDecimal("0.31"));
+        map.put(EMPTY_UPSTREAM, new BigDecimal("0.27"));
+        map.put(FULL_DOWNSTREAM, new BigDecimal("0.17"));
+        map.put(EMPTY_DOWNSTREAM, new BigDecimal("0.14"));
+        NIEDERRHEIN_CO2_MAP = unmodifiableMap(map);
+    }
+
+    static final Map<String, BigDecimal> OBERRHEIN_CO2_MAP;
+
+    static {
+        Map<String, BigDecimal> map = new HashMap<>();
+        map.put(FULL_UPSTREAM, new BigDecimal("0.43"));
+        map.put(EMPTY_UPSTREAM, new BigDecimal("0.4"));
+        map.put(FULL_DOWNSTREAM, new BigDecimal("0.23"));
+        map.put(EMPTY_DOWNSTREAM, new BigDecimal("0.21"));
+        OBERRHEIN_CO2_MAP = unmodifiableMap(map);
+    }
+
+    static final Map<String, BigDecimal> SCHELDE_CO2_MAP;
+
+    static {
+        Map<String, BigDecimal> map = new HashMap<>();
+        map.put(FULL_UPSTREAM, new BigDecimal("0.427"));
+        map.put(FULL_DOWNSTREAM, new BigDecimal("0.427"));
+        map.put(EMPTY_UPSTREAM, new BigDecimal("0.375"));
+        map.put(EMPTY_DOWNSTREAM, new BigDecimal("0.375"));
+        SCHELDE_CO2_MAP = unmodifiableMap(map);
+    }
+
+    BigDecimal getCo2Factor(Region region, RoutePart routePart) {
+
+        return getCo2Map(region).get(getCo2FactorsKey(routePart));
+    }
+
+
+    String getCo2FactorsKey(RoutePart routePart) {
+
+        if (routePart.getContainerState() == FULL) {
+            return routePart.getDirection() == DOWNSTREAM ? FULL_DOWNSTREAM : FULL_UPSTREAM;
+        } else {
+            return routePart.getDirection() == DOWNSTREAM ? EMPTY_DOWNSTREAM : EMPTY_UPSTREAM;
+        }
+    }
+
+
+    private Map<String, BigDecimal> getCo2Map(Region region) {
+
+        if (region == Region.NIEDERRHEIN || region == Region.NOT_SET) {
+            return NIEDERRHEIN_CO2_MAP;
+        }
+
+        if (region == Region.OBERRHEIN) {
+            return OBERRHEIN_CO2_MAP;
+        }
+
+        if (region == Region.SCHELDE) {
+            return SCHELDE_CO2_MAP;
+        }
+
+        throw new IllegalStateException("There is no Co2 Map for region: " + region);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2PartBargeStrategy.java b/src/main/java/net/contargo/iris/co2/advice/Co2PartBargeStrategy.java
new file mode 100644
index 00000000..4090b164
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2PartBargeStrategy.java
@@ -0,0 +1,37 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+import net.contargo.iris.terminal.Terminal;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Co2 strategy for the main run connection with route type barge.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class Co2PartBargeStrategy implements Co2PartStrategy {
+
+    private final Co2BargeRegionMap co2BargeRegionMap;
+
+    public Co2PartBargeStrategy(Co2BargeRegionMap co2BargeRegionMap) {
+
+        this.co2BargeRegionMap = co2BargeRegionMap;
+    }
+
+    @Override
+    public BigDecimal getEmissionForRoutePart(RoutePart routePart) {
+
+        RoutePartData routePartData = routePart.getData();
+        Terminal terminal = routePart.findTerminal();
+
+        BigDecimal distance1 = routePartData.getDieselDistance();
+
+        BigDecimal co2Factor = co2BargeRegionMap.getCo2Factor(terminal.getRegion(), routePart);
+
+        return distance1.multiply(co2Factor);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2PartRailStrategy.java b/src/main/java/net/contargo/iris/co2/advice/Co2PartRailStrategy.java
new file mode 100644
index 00000000..d5dbe570
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2PartRailStrategy.java
@@ -0,0 +1,46 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2PartRailStrategy implements Co2PartStrategy {
+
+    private static final BigDecimal CO2_RAIL_FULL_DIESEL = BigDecimal.valueOf(0.5);
+    private static final BigDecimal CO2_RAIL_EMPTY_DIESEL = BigDecimal.valueOf(0.4);
+    private static final BigDecimal CO2_RAIL_FULL_ELEKTRO = BigDecimal.valueOf(0.34);
+    private static final BigDecimal CO2_RAIL_EMPTY_ELEKTRO = BigDecimal.valueOf(0.27);
+
+    @Override
+    public BigDecimal getEmissionForRoutePart(RoutePart routePart) {
+
+        BigDecimal co2 = BigDecimal.ZERO;
+
+        RoutePartData routePartData = routePart.getData();
+
+        BigDecimal distance1 = routePartData.getDieselDistance();
+        BigDecimal distance2 = routePartData.getElectricDistance();
+
+        BigDecimal co2DieselFactor;
+        BigDecimal co2ElektroFactor;
+
+        if (ContainerState.FULL == routePart.getContainerState()) {
+            co2DieselFactor = CO2_RAIL_FULL_DIESEL;
+            co2ElektroFactor = CO2_RAIL_FULL_ELEKTRO;
+        } else {
+            co2DieselFactor = CO2_RAIL_EMPTY_DIESEL;
+            co2ElektroFactor = CO2_RAIL_EMPTY_ELEKTRO;
+        }
+
+        co2 = co2.add(distance1.multiply(co2DieselFactor));
+        co2 = co2.add(distance2.multiply(co2ElektroFactor));
+
+        return co2;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategy.java b/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategy.java
new file mode 100644
index 00000000..7fa7a2ce
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategy.java
@@ -0,0 +1,21 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface Co2PartStrategy {
+
+    /**
+     * Calculates the co2 emission of a specific {@link RoutePart}.
+     *
+     * @param  routePart  to calculate co2 emission for
+     *
+     * @return  co2 emission
+     */
+    BigDecimal getEmissionForRoutePart(RoutePart routePart);
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisor.java b/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisor.java
new file mode 100644
index 00000000..390f3430
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisor.java
@@ -0,0 +1,63 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RouteType;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class Co2PartStrategyAdvisor {
+
+    private Co2PartStrategy bargeStrategy;
+    private Co2PartStrategy railStrategy;
+    private Co2PartStrategy truckStrategy;
+
+    Co2PartStrategyAdvisor() {
+
+        // no-arg constructor used for unit testing
+    }
+
+
+    public Co2PartStrategyAdvisor(Co2PartStrategy bargeStrategy, Co2PartStrategy railStrategy,
+        Co2PartStrategy truckStrategy) {
+
+        this.bargeStrategy = bargeStrategy;
+        this.railStrategy = railStrategy;
+        this.truckStrategy = truckStrategy;
+    }
+
+    void setBargeStrategy(Co2PartStrategy bargeStrategy) {
+
+        this.bargeStrategy = bargeStrategy;
+    }
+
+
+    void setRailStrategy(Co2PartStrategy railStrategy) {
+
+        this.railStrategy = railStrategy;
+    }
+
+
+    void setTruckStrategy(Co2PartStrategy truckStrategy) {
+
+        this.truckStrategy = truckStrategy;
+    }
+
+
+    public Co2PartStrategy advice(RouteType routeType) {
+
+        if (routeType == RouteType.BARGE) {
+            return bargeStrategy;
+        }
+
+        if (routeType == RouteType.RAIL) {
+            return railStrategy;
+        }
+
+        if (routeType == RouteType.TRUCK) {
+            return truckStrategy;
+        }
+
+        throw new IllegalStateException("Cannot determine co2 for route part of type " + routeType);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/advice/Co2PartTruckStrategy.java b/src/main/java/net/contargo/iris/co2/advice/Co2PartTruckStrategy.java
new file mode 100644
index 00000000..de05d685
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/advice/Co2PartTruckStrategy.java
@@ -0,0 +1,35 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2PartTruckStrategy implements Co2PartStrategy {
+
+    private static final BigDecimal CO2_TRUCK_FULL = BigDecimal.valueOf(0.88);
+    private static final BigDecimal CO2_TRUCK_EMPTY = BigDecimal.valueOf(0.73);
+
+    @Override
+    public BigDecimal getEmissionForRoutePart(RoutePart routePart) {
+
+        RoutePartData routePartData = routePart.getData();
+
+        BigDecimal co2Factor;
+
+        if (ContainerState.FULL == routePart.getContainerState()) {
+            co2Factor = CO2_TRUCK_FULL;
+        } else {
+            co2Factor = CO2_TRUCK_EMPTY;
+        }
+
+        BigDecimal distance = routePartData.getDistance();
+
+        return distance.multiply(co2Factor);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/co2/service/Co2Service.java b/src/main/java/net/contargo/iris/co2/service/Co2Service.java
new file mode 100644
index 00000000..5f8011eb
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/service/Co2Service.java
@@ -0,0 +1,32 @@
+package net.contargo.iris.co2.service;
+
+import net.contargo.iris.route.Route;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface Co2Service {
+
+    /**
+     * Get Co2 emission for the given route.
+     *
+     * @param  route  to extract co2 emission
+     *
+     * @return  Co2 in kg
+     */
+    BigDecimal getEmission(Route route);
+
+
+    /**
+     * Get Co2 emission for the given route if it would be a direct truck route.
+     *
+     * @param  route  to extract truck co2 emission
+     *
+     * @return  Co2 in kg
+     */
+    BigDecimal getEmissionDirectTruck(Route route);
+}
diff --git a/src/main/java/net/contargo/iris/co2/service/Co2ServiceImpl.java b/src/main/java/net/contargo/iris/co2/service/Co2ServiceImpl.java
new file mode 100644
index 00000000..008b4432
--- /dev/null
+++ b/src/main/java/net/contargo/iris/co2/service/Co2ServiceImpl.java
@@ -0,0 +1,114 @@
+package net.contargo.iris.co2.service;
+
+import net.contargo.iris.co2.advice.Co2PartStrategy;
+import net.contargo.iris.co2.advice.Co2PartStrategyAdvisor;
+import net.contargo.iris.route.DirectTruckRouteBuilder;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+import org.slf4j.Logger;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2ServiceImpl implements Co2Service {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    // Umschlag "CO2 Handling"
+    private static final BigDecimal CO2_HANDLING = BigDecimal.valueOf(8);
+
+    // Umschlag "Direkttruck Oneway"
+    private static final BigDecimal CO2_TRUCK_ONE_WAY = BigDecimal.valueOf(4);
+
+    private final DirectTruckRouteBuilder directTruckRouteBuilder;
+    private final Co2PartStrategyAdvisor co2PartStrategyAdvisor;
+
+    Co2ServiceImpl(DirectTruckRouteBuilder directTruckRouteBuilder, Co2PartStrategyAdvisor co2PartStrategyAdvisor) {
+
+        this.directTruckRouteBuilder = directTruckRouteBuilder;
+        this.co2PartStrategyAdvisor = co2PartStrategyAdvisor;
+    }
+
+    @Override
+    public BigDecimal getEmission(Route route) {
+
+        BigDecimal co2 = BigDecimal.ZERO;
+
+        List<RoutePart> parts = route.getData().getParts();
+
+        for (int i = 0; i < parts.size(); i++) {
+            RoutePart part = parts.get(i);
+            RouteType type = part.getRouteType();
+
+            Co2PartStrategy strategy = co2PartStrategyAdvisor.advice(type);
+            co2 = co2.add(strategy.getEmissionForRoutePart(part));
+
+            if (co2HandlingRequired(parts, i)) {
+                co2 = co2.add(CO2_HANDLING);
+            }
+        }
+
+        if (!route.isRoundTrip()) {
+            co2 = co2.add(CO2_TRUCK_ONE_WAY);
+        }
+
+        LOG.debug("Setting CO2 for route {}: {} kg", route.getName(), co2);
+
+        return co2;
+    }
+
+
+    @Override
+    public BigDecimal getEmissionDirectTruck(Route route) {
+
+        Route truckRoute = directTruckRouteBuilder.getCorrespondingDirectTruckRoute(route);
+
+        BigDecimal co2 = BigDecimal.ZERO;
+        List<RoutePart> parts = truckRoute.getData().getParts();
+
+        for (RoutePart part : parts) {
+            Co2PartStrategy strategy = co2PartStrategyAdvisor.advice(RouteType.TRUCK);
+            co2 = co2.add(strategy.getEmissionForRoutePart(part));
+        }
+
+        if (!truckRoute.isRoundTrip()) {
+            co2 = co2.add(CO2_TRUCK_ONE_WAY);
+        }
+
+        LOG.debug("Setting CO2 Direct Truck for route {}: {} kg", route.getName(), co2);
+
+        return co2;
+    }
+
+
+    /**
+     * If there a is a change in transport, you have to consider Co2-Handling in emission calculation. (e.g. from truck
+     * route to rail route). Please notice that there are two different Co2-Handling values: one for direct truck and
+     * one for transport with main run (barge or rail)
+     *
+     * @param  routeParts
+     * @param  indexOfRoutePart
+     *
+     * @return  true if Co2 Handling is to be considered in emission calculation, false if not
+     */
+    private boolean co2HandlingRequired(List<RoutePart> routeParts, int indexOfRoutePart) {
+
+        RoutePart part = routeParts.get(indexOfRoutePart);
+
+        // if this part is not the last route part AND the next part is not of the same route type, then return true
+        return (indexOfRoutePart < (routeParts.size() - 1))
+            && (!part.isOfType(routeParts.get(indexOfRoutePart + 1).getRouteType()));
+    }
+}
diff --git a/src/main/java/net/contargo/iris/config/SwaggerConfig.java b/src/main/java/net/contargo/iris/config/SwaggerConfig.java
new file mode 100644
index 00000000..212b0ab8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/config/SwaggerConfig.java
@@ -0,0 +1,46 @@
+package net.contargo.iris.config;
+
+import com.mangofactory.swagger.configuration.SpringSwaggerConfig;
+import com.mangofactory.swagger.models.dto.ApiInfo;
+import com.mangofactory.swagger.plugin.EnableSwagger;
+import com.mangofactory.swagger.plugin.SwaggerSpringMvcPlugin;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import org.springframework.ui.Model;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Configuration
+@EnableSwagger
+public class SwaggerConfig {
+
+    private SpringSwaggerConfig springSwaggerConfig;
+
+    @Autowired
+    public void setSpringSwaggerConfig(SpringSwaggerConfig springSwaggerConfig) {
+
+        this.springSwaggerConfig = springSwaggerConfig;
+    }
+
+
+    @Bean
+    public SwaggerSpringMvcPlugin customImplementation() {
+
+        this.springSwaggerConfig.defaultSwaggerPathProvider().setApiResourcePrefix("api");
+
+        return new SwaggerSpringMvcPlugin(this.springSwaggerConfig).apiInfo(apiInfo()).ignoredParameterTypes(
+                Model.class);
+    }
+
+
+    private ApiInfo apiInfo() {
+
+        return new ApiInfo("IRIS Backend Api", null, null, null, null, null);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/MainRunConnection.java b/src/main/java/net/contargo/iris/connection/MainRunConnection.java
new file mode 100644
index 00000000..1dbd61d5
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/MainRunConnection.java
@@ -0,0 +1,212 @@
+package net.contargo.iris.connection;
+
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import net.contargo.validation.bigdecimal.BigDecimalValidate;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * Represents a connection between a {@link Terminal} and a {@link Seaport}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Entity
+@Table(
+    name = "Connection",
+    uniqueConstraints = @UniqueConstraint(columnNames = { "seaport_id", "terminal_id", "routeType" })
+)
+public class MainRunConnection {
+
+    private static final long TEN = 10L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    @ManyToOne
+    private Seaport seaport;
+
+    @NotNull
+    @ManyToOne
+    private Terminal terminal;
+
+    @NotNull
+    @BigDecimalValidate(minValue = 0, minDecimalPlaces = 1L, maxDecimalPlaces = TEN, maxFractionalPlaces = TEN)
+    private BigDecimal dieselDistance;
+
+    @NotNull
+    @BigDecimalValidate(minValue = 0, minDecimalPlaces = 1L, maxDecimalPlaces = TEN, maxFractionalPlaces = TEN)
+    private BigDecimal electricDistance;
+
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    private RouteType routeType;
+
+    @NotNull
+    private Boolean enabled = Boolean.TRUE;
+
+    public MainRunConnection() {
+
+        // JPA needs no-arg constructor
+    }
+
+
+    public MainRunConnection(Seaport seaport) {
+
+        super();
+        this.seaport = seaport;
+    }
+
+    /**
+     * Computes the total distance of this {@link MainRunConnection} as the sum of its diesel distance and its
+     * electrical distance.
+     *
+     * @return  total distance
+     */
+    public BigDecimal getTotalDistance() {
+
+        return getDieselDistance().add(getElectricDistance());
+    }
+
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public void setId(Long id) {
+
+        this.id = id;
+    }
+
+
+    public Seaport getSeaport() {
+
+        return seaport;
+    }
+
+
+    public void setSeaport(Seaport seaport) {
+
+        this.seaport = seaport;
+    }
+
+
+    public Terminal getTerminal() {
+
+        return terminal;
+    }
+
+
+    public void setTerminal(Terminal terminal) {
+
+        this.terminal = terminal;
+    }
+
+
+    public BigDecimal getDieselDistance() {
+
+        return dieselDistance;
+    }
+
+
+    public void setDieselDistance(BigDecimal dieselDistance) {
+
+        this.dieselDistance = dieselDistance;
+    }
+
+
+    public BigDecimal getElectricDistance() {
+
+        return electricDistance;
+    }
+
+
+    public void setElectricDistance(BigDecimal electricDistance) {
+
+        this.electricDistance = electricDistance;
+    }
+
+
+    public RouteType getRouteType() {
+
+        return routeType;
+    }
+
+
+    public void setRouteType(RouteType routeType) {
+
+        this.routeType = routeType;
+    }
+
+
+    public Boolean getEnabled() {
+
+        return enabled;
+    }
+
+
+    public void setEnabled(Boolean enabled) {
+
+        this.enabled = enabled;
+    }
+
+
+    /**
+     * Checks whether this {@link MainRunConnection} along with both its {@link Seaport} and {@link Terminal}.
+     *
+     * @return  true if each of them is enabled, false otherwise
+     */
+    public Boolean getEverythingEnabled() {
+
+        if (!enabled) {
+            return false;
+        }
+
+        if (seaport == null) {
+            return false;
+        }
+
+        if (!seaport.isEnabled()) {
+            return false;
+        }
+
+        if (null == terminal) {
+            return false;
+        }
+
+        if (!terminal.isEnabled()) {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "MainRunConnection [id=" + id + ", seaport=" + seaport
+            + ", location=" + terminal + ", dieselDistance=" + dieselDistance + ", electricDistance=" + electricDistance
+            + ", routeType=" + routeType + "]";
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunAdvisor.java b/src/main/java/net/contargo/iris/connection/advice/MainRunAdvisor.java
new file mode 100644
index 00000000..ffc317ad
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunAdvisor.java
@@ -0,0 +1,80 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteProduct;
+
+import static net.contargo.iris.route.RouteDirection.IMPORT;
+import static net.contargo.iris.route.RouteProduct.ROUNDTRIP;
+
+
+/**
+ * Determines {@link MainRunStrategy} strategy for building routes based on {@link RouteProduct} and
+ * {@link RouteDirection}.
+ *
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+public class MainRunAdvisor {
+
+    private MainRunStrategy mainRunRoundTripImportAdvice;
+    private MainRunStrategy mainRunRoundTripExportAdvice;
+    private MainRunStrategy mainRunOneWayImportAdvice;
+    private MainRunStrategy mainRunOneWayExportAdvice;
+
+    MainRunAdvisor(MainRunStrategy mainRunRoundTripImportAdvice, MainRunStrategy mainRunRoundTripExportAdvice,
+        MainRunStrategy mainRunOneWayImportAdvice, MainRunStrategy mainRunOneWayExportAdvice) {
+
+        this.mainRunRoundTripImportAdvice = mainRunRoundTripImportAdvice;
+        this.mainRunRoundTripExportAdvice = mainRunRoundTripExportAdvice;
+        this.mainRunOneWayImportAdvice = mainRunOneWayImportAdvice;
+        this.mainRunOneWayExportAdvice = mainRunOneWayExportAdvice;
+    }
+
+    void setMainRunRoundTripImportAdvice(MainRunStrategy mainRunRoundTripImportAdvice) {
+
+        this.mainRunRoundTripImportAdvice = mainRunRoundTripImportAdvice;
+    }
+
+
+    void setMainRunRoundTripExportAdvice(MainRunStrategy mainRunRoundTripExportAdvice) {
+
+        this.mainRunRoundTripExportAdvice = mainRunRoundTripExportAdvice;
+    }
+
+
+    void setMainRunOneWayImportAdvice(MainRunStrategy mainRunOneWayImportAdvice) {
+
+        this.mainRunOneWayImportAdvice = mainRunOneWayImportAdvice;
+    }
+
+
+    void setMainRunOneWayExportAdvice(MainRunStrategy mainRunOneWayExportAdvice) {
+
+        this.mainRunOneWayExportAdvice = mainRunOneWayExportAdvice;
+    }
+
+
+    /**
+     * Determines concrete MainRunStrategy strategy based on given routeProduct and routeDirection.
+     *
+     * @param  routeProduct
+     * @param  routeDirection
+     *
+     * @return
+     */
+    public MainRunStrategy advice(RouteProduct routeProduct, RouteDirection routeDirection) {
+
+        if (ROUNDTRIP.equals(routeProduct)) {
+            if (IMPORT.equals(routeDirection)) {
+                return mainRunRoundTripImportAdvice;
+            } else {
+                return mainRunRoundTripExportAdvice;
+            }
+        } else {
+            if (IMPORT.equals(routeDirection)) {
+                return mainRunOneWayImportAdvice;
+            } else {
+                return mainRunOneWayExportAdvice;
+            }
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategy.java b/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategy.java
new file mode 100644
index 00000000..3ab1cfc8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategy.java
@@ -0,0 +1,36 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteBuilder;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @see  MainRunStrategy
+ * @see  MainRunAdvisor
+ */
+class MainRunOneWayExportStrategy implements MainRunStrategy {
+
+    /**
+     * @see  MainRunStrategy#getRoute(Seaport, GeoLocation, Terminal, ContainerType, RouteType)
+     */
+    @Override
+    public Route getRoute(Seaport seaPort, GeoLocation destination, Terminal terminal, ContainerType containerType,
+        RouteType mainRunRouteType) {
+
+        RouteBuilder routeBuilder = new RouteBuilder(terminal, containerType, ContainerState.EMPTY);
+        routeBuilder.goTo(destination, RouteType.TRUCK);
+        routeBuilder.loadContainer();
+        routeBuilder.goTo(terminal, RouteType.TRUCK);
+        routeBuilder.goTo(seaPort, mainRunRouteType);
+        routeBuilder.responsibleTerminal(terminal);
+
+        return routeBuilder.getRoute();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategy.java b/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategy.java
new file mode 100644
index 00000000..c8b2ed41
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategy.java
@@ -0,0 +1,36 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteBuilder;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @see  MainRunStrategy
+ * @see  MainRunAdvisor
+ */
+class MainRunOneWayImportStrategy implements MainRunStrategy {
+
+    /**
+     * @see  MainRunStrategy#getRoute(Seaport, GeoLocation, Terminal, ContainerType, RouteType)
+     */
+    @Override
+    public Route getRoute(Seaport seaPort, GeoLocation destination, Terminal terminal, ContainerType containerType,
+        RouteType mainRunRouteType) {
+
+        RouteBuilder routeBuilder = new RouteBuilder(seaPort, containerType, ContainerState.FULL);
+        routeBuilder.goTo(terminal, mainRunRouteType);
+        routeBuilder.goTo(destination, RouteType.TRUCK);
+        routeBuilder.unloadContainer();
+        routeBuilder.goTo(terminal, RouteType.TRUCK);
+        routeBuilder.responsibleTerminal(terminal);
+
+        return routeBuilder.getRoute();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategy.java b/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategy.java
new file mode 100644
index 00000000..4f997524
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategy.java
@@ -0,0 +1,37 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteBuilder;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @see  MainRunStrategy
+ * @see  MainRunAdvisor
+ */
+class MainRunRoundTripExportStrategy implements MainRunStrategy {
+
+    /**
+     * @see  MainRunStrategy#getRoute(Seaport, GeoLocation, Terminal, ContainerType, RouteType)
+     */
+    @Override
+    public Route getRoute(Seaport seaPort, GeoLocation destination, Terminal terminal, ContainerType containerType,
+        RouteType mainRunRouteType) {
+
+        RouteBuilder routeBuilder = new RouteBuilder(seaPort, containerType, ContainerState.EMPTY);
+        routeBuilder.goTo(terminal, mainRunRouteType);
+        routeBuilder.goTo(destination, RouteType.TRUCK);
+        routeBuilder.loadContainer();
+        routeBuilder.goTo(terminal, RouteType.TRUCK);
+        routeBuilder.goTo(seaPort, mainRunRouteType);
+        routeBuilder.responsibleTerminal(terminal);
+
+        return routeBuilder.getRoute();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategy.java b/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategy.java
new file mode 100644
index 00000000..29aa6c55
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategy.java
@@ -0,0 +1,37 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteBuilder;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @see  MainRunStrategy
+ * @see  MainRunAdvisor
+ */
+class MainRunRoundTripImportStrategy implements MainRunStrategy {
+
+    /**
+     * @see  MainRunStrategy#getRoute(Seaport, GeoLocation, Terminal, ContainerType, RouteType)
+     */
+    @Override
+    public Route getRoute(Seaport seaPort, GeoLocation destination, Terminal terminal, ContainerType containerType,
+        RouteType mainRunRouteType) {
+
+        RouteBuilder routeBuilder = new RouteBuilder(seaPort, containerType, ContainerState.FULL);
+        routeBuilder.goTo(terminal, mainRunRouteType);
+        routeBuilder.goTo(destination, RouteType.TRUCK);
+        routeBuilder.unloadContainer();
+        routeBuilder.goTo(terminal, RouteType.TRUCK);
+        routeBuilder.goTo(seaPort, mainRunRouteType);
+        routeBuilder.responsibleTerminal(terminal);
+
+        return routeBuilder.getRoute();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/advice/MainRunStrategy.java b/src/main/java/net/contargo/iris/connection/advice/MainRunStrategy.java
new file mode 100644
index 00000000..bbcec7db
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/advice/MainRunStrategy.java
@@ -0,0 +1,32 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * Strategy component for building a concrete route.
+ *
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @see  MainRunAdvisor
+ */
+public interface MainRunStrategy {
+
+    /**
+     * Builds a {@link Route} based on given parameters.
+     *
+     * @param  seaport  the {@link Route}'s {@link Seaport}
+     * @param  destination  the {@link Route}'s destination
+     * @param  terminal  the {@link Route}'s {@link Terminal}
+     * @param  containerType  the {@link Route}'s {@link ContainerType}
+     * @param  routeType  the {@link Route}'s {@link RouteType}
+     *
+     * @return
+     */
+    Route getRoute(Seaport seaport, GeoLocation destination, Terminal terminal, ContainerType containerType,
+        RouteType routeType);
+}
diff --git a/src/main/java/net/contargo/iris/connection/api/MainRunConnectionApiController.java b/src/main/java/net/contargo/iris/connection/api/MainRunConnectionApiController.java
new file mode 100644
index 00000000..6e1c5599
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/api/MainRunConnectionApiController.java
@@ -0,0 +1,165 @@
+package net.contargo.iris.connection.api;
+
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.connection.dto.MainRunConnectionDto;
+import net.contargo.iris.connection.dto.MainRunConnectionDtoService;
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.connection.dto.SeaportConnectionRoutesDtoService;
+import net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.RouteCombo;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigInteger;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+
+/**
+ * Public API controller that responds to request for {@link net.contargo.iris.connection.MainRunConnection}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Controller
+@RequestMapping(value = "/connections")
+public class MainRunConnectionApiController extends AbstractController {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final String ROUTE_DETAILS_URL = "/routedetails";
+    private static final String ROUTE_PART_DETAILS_URL = "/routepartdetails";
+
+    private final SeaportDtoService seaportDtoService;
+    private final SeaportConnectionRoutesDtoService seaportConnectionRoutesDtoService;
+    private final RouteUrlSerializationService routeUrlSerializationService;
+    private final MainRunConnectionDtoService connectionApiDtoService;
+    private final SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService;
+
+    @Autowired
+    public MainRunConnectionApiController(SeaportDtoService seaportDtoService,
+        SeaportConnectionRoutesDtoService seaportConnectionRoutesDtoService,
+        RouteUrlSerializationService routeUrlSerializationService, MainRunConnectionDtoService connectionApiDtoService,
+        SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService) {
+
+        this.seaportDtoService = seaportDtoService;
+        this.seaportConnectionRoutesDtoService = seaportConnectionRoutesDtoService;
+        this.routeUrlSerializationService = routeUrlSerializationService;
+        this.connectionApiDtoService = connectionApiDtoService;
+        this.seaportTerminalConnectionDtoService = seaportTerminalConnectionDtoService;
+    }
+
+    @ApiOperation(
+        value = "Returns a list of all possible connection routes between a seaport and a destination address.",
+        notes = "Returns a list of all possible connection routes between a seaport and a destination address."
+    )
+    @RequestMapping(value = SLASH + "{seaportuid}" + SLASH + "{lat}:{lon}" + SLASH + "{isroundtrip}", method = GET)
+    @ModelAttribute(RESPONSE)
+    public RoutesResponse getSeaportRoutes(@PathVariable("seaportuid") BigInteger seaportUid,
+        @PathVariable("lat") double latitude,
+        @PathVariable("lon") double longitude,
+        @PathVariable("isroundtrip") boolean isRoundTrip,
+        @RequestParam(value = "containerType", required = false) ContainerType containerType,
+        @RequestParam(value = "isImport", defaultValue = "true") boolean isImport,
+        @RequestParam(value = "combo", defaultValue = "ALL") RouteCombo routeCombo) {
+
+        RouteInformation routeInformation = new RouteInformation(containerType, routeCombo, latitude, longitude,
+                isRoundTrip, isImport);
+
+        SeaportDto seaport = seaportDtoService.getByUid(seaportUid);
+
+        List<RouteDto> routes = seaportConnectionRoutesDtoService.getAvailableSeaportConnectionRoutes(seaport,
+                routeInformation);
+
+        for (RouteDto route : routes) {
+            routeUrlSerializationService.serializeUrl(route, ROUTE_DETAILS_URL, ROUTE_PART_DETAILS_URL);
+        }
+
+        RoutesResponse response = new RoutesResponse();
+
+        response.add(linkTo(
+                methodOn(getClass()).getSeaportRoutes(seaportUid, latitude, longitude, isRoundTrip, containerType,
+                    isImport, routeCombo)).withSelfRel());
+
+        response.setRoutes(routes);
+
+        LOG.info("API: Responding with {} connections for seaportsconnections-request: seaport {} to {}:{}"
+            + " with isRoundtrip {} containerType {} and isimport {} ", routes.size(), seaportUid, latitude, longitude,
+            isRoundTrip, containerType, isImport);
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Returns all seaports that have a connection of a given route-combo.",
+        notes = "Returns all seaports that have a connection of a given route-combo."
+    )
+    @RequestMapping(value = SLASH + "seaports", method = GET)
+    @ResponseBody
+    public SeaportsResponse getSeaportsInConnections(
+        @RequestParam(value = "combo", defaultValue = "ALL") RouteCombo routeCombo) {
+
+        SeaportsResponse response = new SeaportsResponse();
+
+        response.add(linkTo(methodOn(getClass()).getSeaportsInConnections(routeCombo)).withSelfRel());
+
+        Set<SeaportDto> ports = new HashSet<>();
+
+        for (RouteType t : routeCombo.getRouteTypes()) {
+            ports.addAll(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(t));
+        }
+
+        response.setSeaports(ports);
+
+        LOG.info("API: Returning {} active seaports in connections with combo {}", ports.size(), routeCombo);
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Returns all Connections containing the given terminal",
+        notes = "Returns all Connections containing the given terminal", response = MainRunConnectionDto.class,
+        responseContainer = "List"
+    )
+    @RequestMapping(method = GET, params = "terminalUid", produces = "application/json")
+    @ResponseBody
+    public Collection<MainRunConnectionDto> getConnectionsForTerminal(
+        @RequestParam("terminalUid") BigInteger terminalUid) {
+
+        LOG.info("API: client requests connections for terminal UID: " + terminalUid);
+
+        return connectionApiDtoService.getConnectionsForTerminal(terminalUid);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationService.java b/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationService.java
new file mode 100644
index 00000000..f9a4162f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationService.java
@@ -0,0 +1,21 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.connection.dto.RouteDto;
+
+
+/**
+ * Service that serializes urls for routes.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface RouteUrlSerializationService {
+
+    /**
+     * Constructs a link with the given {@link net.contargo.iris.connection.dto.RouteDto}'s detail information.
+     *
+     * @param  route
+     * @param  baseUrlRoute
+     * @param  baseUrlRoutePart
+     */
+    void serializeUrl(RouteDto route, String baseUrlRoute, String baseUrlRoutePart);
+}
diff --git a/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImpl.java b/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImpl.java
new file mode 100644
index 00000000..84d3f7f8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImpl.java
@@ -0,0 +1,52 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.connection.dto.RouteDto;
+
+
+/**
+ * Default implementation of {@link RouteUrlSerializationService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RouteUrlSerializationServiceImpl implements RouteUrlSerializationService {
+
+    public static final String DATA_PARTS = "&data.parts[";
+
+    @Override
+    public void serializeUrl(RouteDto route, String baseUrlRoute, String baseUrlRoutePart) {
+
+        StringBuilder url = new StringBuilder(baseUrlRoute);
+
+        url.append('?');
+        url.append("terminal=").append(route.getResponsibleTerminal().getUniqueId()).append('&');
+
+        for (int i = 0; i < route.getData().getParts().size(); i++) {
+            if (i > 0) {
+                url.append('&');
+            }
+
+            url.append("data.parts[").append(i).append("].origin.longitude=");
+            url.append(route.getData().getParts().get(i).getOrigin().getLongitude().doubleValue());
+
+            url.append(DATA_PARTS).append(i).append("].origin.latitude=");
+            url.append(route.getData().getParts().get(i).getOrigin().getLatitude().doubleValue());
+
+            url.append(DATA_PARTS).append(i).append("].destination.longitude=");
+            url.append(route.getData().getParts().get(i).getDestination().getLongitude().doubleValue());
+
+            url.append(DATA_PARTS).append(i).append("].destination.latitude=");
+            url.append(route.getData().getParts().get(i).getDestination().getLatitude().doubleValue());
+
+            url.append(DATA_PARTS).append(i).append("].routeType=");
+            url.append(route.getData().getParts().get(i).getRouteType());
+
+            url.append(DATA_PARTS).append(i).append("].containerType=");
+            url.append(route.getData().getParts().get(i).getContainerType());
+
+            url.append(DATA_PARTS).append(i).append("].containerState=");
+            url.append(route.getData().getParts().get(i).getContainerState());
+        }
+
+        route.setUrl(url.toString());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/api/RoutesResponse.java b/src/main/java/net/contargo/iris/connection/api/RoutesResponse.java
new file mode 100644
index 00000000..d9aca288
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/api/RoutesResponse.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.connection.dto.RouteDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.List;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+class RoutesResponse extends ResourceSupport {
+
+    private List<RouteDto> routes;
+
+    public List<RouteDto> getRoutes() {
+
+        return routes;
+    }
+
+
+    public void setRoutes(List<RouteDto> routes) {
+
+        this.routes = routes;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/api/SeaportsResponse.java b/src/main/java/net/contargo/iris/connection/api/SeaportsResponse.java
new file mode 100644
index 00000000..88cec72c
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/api/SeaportsResponse.java
@@ -0,0 +1,30 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.Set;
+
+
+/**
+ * HATEOAS supporting response object for a list of {@link net.contargo.iris.seaport.dto.SeaportDto}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class SeaportsResponse extends ResourceSupport {
+
+    private Set<SeaportDto> seaports;
+
+    public Set<SeaportDto> getSeaports() {
+
+        return seaports;
+    }
+
+
+    public void setSeaports(Set<SeaportDto> seaports) {
+
+        this.seaports = seaports;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/GeolocationDtoFactory.java b/src/main/java/net/contargo/iris/connection/dto/GeolocationDtoFactory.java
new file mode 100644
index 00000000..e73c48c5
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/GeolocationDtoFactory.java
@@ -0,0 +1,49 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+
+/**
+ * Factory that creates {@link GeoLocationDto}s from {@link GeoLocation}s, {@link Terminal}s or {@link Seaport}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+final class GeolocationDtoFactory {
+
+    private GeolocationDtoFactory() {
+
+        // utility classes should not have a public or default constructor
+    }
+
+    /**
+     * Transforms a {@link GeoLocation} instance into its corresponing dto of type {@link GeoLocationDto},
+     * {@link TerminalDto} or {@link SeaportDto}.
+     *
+     * @param  geolocation
+     *
+     * @return
+     */
+    static GeoLocationDto createGeolocationDto(GeoLocation geolocation) {
+
+        GeoLocationDto dto;
+
+        if (geolocation instanceof Terminal) {
+            dto = new TerminalDto((Terminal) geolocation);
+        } else if (geolocation instanceof Seaport) {
+            dto = new SeaportDto((Seaport) geolocation);
+        } else if (geolocation instanceof Address) {
+            dto = new AddressDto((Address) geolocation);
+        } else {
+            dto = new GeoLocationDto(geolocation);
+        }
+
+        return dto;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDto.java b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDto.java
new file mode 100644
index 00000000..a4cdf3d6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDto.java
@@ -0,0 +1,43 @@
+package net.contargo.iris.connection.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import net.contargo.iris.route.RouteType;
+
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class MainRunConnectionDto {
+
+    private final String seaportUid;
+    private final String terminalUid;
+    private final RouteType routeType;
+
+    public MainRunConnectionDto(String seaportUid, String terminalUid, RouteType routeType) {
+
+        this.seaportUid = seaportUid;
+        this.terminalUid = terminalUid;
+        this.routeType = routeType;
+    }
+
+    @JsonProperty("seaportUid")
+    public String getSeaportUid() {
+
+        return seaportUid;
+    }
+
+
+    @JsonProperty("terminalUid")
+    public String getTerminalUid() {
+
+        return terminalUid;
+    }
+
+
+    @JsonProperty("routeType")
+    public RouteType getRouteType() {
+
+        return routeType;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoService.java b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoService.java
new file mode 100644
index 00000000..91eb269b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoService.java
@@ -0,0 +1,14 @@
+package net.contargo.iris.connection.dto;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface MainRunConnectionDtoService {
+
+    List<MainRunConnectionDto> getConnectionsForTerminal(BigInteger terminalUID);
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImpl.java b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImpl.java
new file mode 100644
index 00000000..8838cba7
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImpl.java
@@ -0,0 +1,44 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class MainRunConnectionDtoServiceImpl implements MainRunConnectionDtoService {
+
+    private final MainRunConnectionService mainRunConnectionService;
+
+    public MainRunConnectionDtoServiceImpl(MainRunConnectionService mainRunConnectionService) {
+
+        this.mainRunConnectionService = mainRunConnectionService;
+    }
+
+    @Override
+    public List<MainRunConnectionDto> getConnectionsForTerminal(BigInteger terminalUID) {
+
+        List<MainRunConnectionDto> connectionDtos = new ArrayList<>();
+
+        for (MainRunConnection connection : mainRunConnectionService.getConnectionsForTerminal(terminalUID)) {
+            connectionDtos.add(newDto(connection));
+        }
+
+        return connectionDtos;
+    }
+
+
+    private MainRunConnectionDto newDto(MainRunConnection connection) {
+
+        String seaportUid = connection.getSeaport().getUniqueId().toString();
+        String terminalUid = connection.getTerminal().getUniqueId().toString();
+
+        return new MainRunConnectionDto(seaportUid, terminalUid, connection.getRouteType());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/RouteDataDto.java b/src/main/java/net/contargo/iris/connection/dto/RouteDataDto.java
new file mode 100644
index 00000000..ebf78a57
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/RouteDataDto.java
@@ -0,0 +1,170 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Dto layer for {@link RouteData}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RouteDataDto {
+
+    private BigDecimal co2;
+    private BigDecimal co2DirectTruck;
+    private BigDecimal totalDistance;
+    private BigDecimal totalOnewayTruckDistance;
+    private BigDecimal totalRealTollDistance;
+    private BigDecimal totalTollDistance;
+    private BigDecimal totalDuration;
+    private List<RoutePartDto> parts;
+
+    public RouteDataDto() {
+
+        // needed for Spring MVC instantiation of Controller parameter
+    }
+
+
+    public RouteDataDto(RouteData data) {
+
+        parts = new ArrayList<>();
+
+        if (data != null) {
+            this.co2 = data.getCo2();
+            this.co2DirectTruck = data.getCo2DirectTruck();
+            this.totalDistance = data.getTotalDistance();
+            this.totalDuration = data.getTotalDuration();
+            this.totalOnewayTruckDistance = data.getTotalOnewayTruckDistance();
+            this.totalRealTollDistance = data.getTotalRealTollDistance();
+            this.totalTollDistance = data.getTotalTollDistance();
+
+            for (RoutePart part : data.getParts()) {
+                parts.add(new RoutePartDto(part));
+            }
+        }
+    }
+
+    public RouteData toRouteData() {
+
+        RouteData routeData = new RouteData();
+        routeData.setCo2(co2);
+        routeData.setCo2DirectTruck(co2DirectTruck);
+        routeData.setTotalDistance(totalDistance);
+        routeData.setTotalOnewayTruckDistance(totalOnewayTruckDistance);
+        routeData.setTotalRealTollDistance(totalRealTollDistance);
+        routeData.setTotalTollDistance(totalTollDistance);
+        routeData.setTotalDuration(totalDuration);
+
+        List<RoutePart> routeParts = new ArrayList<>();
+
+        for (RoutePartDto part : parts) {
+            routeParts.add(part.toRoutePart());
+        }
+
+        routeData.setParts(routeParts);
+
+        return routeData;
+    }
+
+
+    public void setCo2(BigDecimal co2) {
+
+        this.co2 = co2;
+    }
+
+
+    public void setCo2DirectTruck(BigDecimal co2DirectTruck) {
+
+        this.co2DirectTruck = co2DirectTruck;
+    }
+
+
+    public void setTotalDistance(BigDecimal totalDistance) {
+
+        this.totalDistance = totalDistance;
+    }
+
+
+    public void setTotalOnewayTruckDistance(BigDecimal totalOnewayTruckDistance) {
+
+        this.totalOnewayTruckDistance = totalOnewayTruckDistance;
+    }
+
+
+    public void setTotalRealTollDistance(BigDecimal totalRealTollDistance) {
+
+        this.totalRealTollDistance = totalRealTollDistance;
+    }
+
+
+    public void setTotalTollDistance(BigDecimal totalTollDistance) {
+
+        this.totalTollDistance = totalTollDistance;
+    }
+
+
+    public void setTotalDuration(BigDecimal totalDuration) {
+
+        this.totalDuration = totalDuration;
+    }
+
+
+    public void setParts(List<RoutePartDto> parts) {
+
+        this.parts = parts;
+    }
+
+
+    public BigDecimal getCo2() {
+
+        return co2;
+    }
+
+
+    public BigDecimal getCo2DirectTruck() {
+
+        return co2DirectTruck;
+    }
+
+
+    public List<RoutePartDto> getParts() {
+
+        return parts;
+    }
+
+
+    public BigDecimal getTotalDistance() {
+
+        return totalDistance;
+    }
+
+
+    public BigDecimal getTotalOnewayTruckDistance() {
+
+        return totalOnewayTruckDistance;
+    }
+
+
+    public BigDecimal getTotalRealTollDistance() {
+
+        return totalRealTollDistance;
+    }
+
+
+    public BigDecimal getTotalTollDistance() {
+
+        return totalTollDistance;
+    }
+
+
+    public BigDecimal getTotalDuration() {
+
+        return totalDuration;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/RouteDto.java b/src/main/java/net/contargo/iris/connection/dto/RouteDto.java
new file mode 100644
index 00000000..79a83b39
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/RouteDto.java
@@ -0,0 +1,181 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteProduct;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Dto layer for {@link Route}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class RouteDto {
+
+    private TerminalDto responsibleTerminal;
+    private boolean roundTrip;
+    private RouteProduct product;
+    private String shortName;
+    private String name;
+    private RouteDataDto data;
+    private Map<String, String> errors;
+    private RouteDirection direction;
+    private String url;
+
+    public RouteDto(Route route) {
+
+        if (route != null) {
+            this.name = route.getName();
+            this.data = route.getData() == null ? null : new RouteDataDto(route.getData());
+            this.shortName = route.getShortName();
+            this.roundTrip = route.isRoundTrip();
+            this.direction = route.getDirection();
+            this.product = route.getProduct();
+            this.errors = route.getErrors();
+            this.responsibleTerminal = route.getResponsibleTerminal() == null
+                ? null : new TerminalDto(route.getResponsibleTerminal());
+        }
+    }
+
+
+    public RouteDto() {
+
+        // needed for Spring MVC instantiation of Controller parameter
+        this.errors = new HashMap<>();
+    }
+
+    public Route toRoute() {
+
+        Route route = new Route();
+
+        if (this.getData() != null) {
+            route.setData(this.getData().toRouteData());
+        }
+
+        if (responsibleTerminal != null) {
+            route.setResponsibleTerminal(this.responsibleTerminal.toEntity());
+        }
+
+        return route;
+    }
+
+
+    public TerminalDto getResponsibleTerminal() {
+
+        return responsibleTerminal;
+    }
+
+
+    public void setResponsibleTerminal(TerminalDto responsibleTerminal) {
+
+        this.responsibleTerminal = responsibleTerminal;
+    }
+
+
+    public int size() {
+
+        return data.getParts().size();
+    }
+
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    public void setRoundTrip(boolean roundTrip) {
+
+        this.roundTrip = roundTrip;
+    }
+
+
+    public void setProduct(RouteProduct product) {
+
+        this.product = product;
+    }
+
+
+    public void setShortName(String shortName) {
+
+        this.shortName = shortName;
+    }
+
+
+    public void setData(RouteDataDto data) {
+
+        this.data = data;
+    }
+
+
+    public void setErrors(Map<String, String> errors) {
+
+        this.errors = errors;
+    }
+
+
+    public void setDirection(RouteDirection direction) {
+
+        this.direction = direction;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public String getShortName() {
+
+        return shortName;
+    }
+
+
+    public RouteDataDto getData() {
+
+        return data;
+    }
+
+
+    public boolean isRoundTrip() {
+
+        return roundTrip;
+    }
+
+
+    public String getUrl() {
+
+        return url;
+    }
+
+
+    public void setUrl(String url) {
+
+        this.url = url;
+    }
+
+
+    public Map<String, String> getErrors() {
+
+        return Collections.unmodifiableMap(errors);
+    }
+
+
+    public RouteDirection getDirection() {
+
+        return direction;
+    }
+
+
+    public RouteProduct getProduct() {
+
+        return product;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/RoutePartDataDto.java b/src/main/java/net/contargo/iris/connection/dto/RoutePartDataDto.java
new file mode 100644
index 00000000..569c7e45
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/RoutePartDataDto.java
@@ -0,0 +1,97 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.route.RoutePartData;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Dto for {@link RoutePartData}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RoutePartDataDto {
+
+    private BigDecimal airlineDistance;
+    private BigDecimal distance;
+    private BigDecimal dieselDistance;
+    private BigDecimal electricDistance;
+    private BigDecimal tollDistance;
+    private BigDecimal duration;
+    private BigDecimal co2;
+
+    public RoutePartDataDto() {
+
+        // needed for Spring MVC instantiation of Controller parameter
+    }
+
+
+    public RoutePartDataDto(RoutePartData data) {
+
+        if (data != null) {
+            this.airlineDistance = data.getAirLineDistance();
+            this.distance = data.getDistance();
+            this.dieselDistance = data.getDieselDistance();
+            this.electricDistance = data.getElectricDistance();
+            this.tollDistance = data.getTollDistance();
+            this.duration = data.getDuration();
+            this.co2 = data.getCo2();
+        }
+    }
+
+    public RoutePartData toRoutePartData() {
+
+        RoutePartData routePartData = new RoutePartData();
+        routePartData.setAirLineDistance(airlineDistance);
+        routePartData.setDistance(distance);
+        routePartData.setDieselDistance(dieselDistance);
+        routePartData.setElectricDistance(electricDistance);
+        routePartData.setTollDistance(tollDistance);
+        routePartData.setDuration(duration);
+        routePartData.setCo2(co2);
+
+        return routePartData;
+    }
+
+
+    public BigDecimal getAirlineDistance() {
+
+        return airlineDistance;
+    }
+
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public BigDecimal getDieselDistance() {
+
+        return dieselDistance;
+    }
+
+
+    public BigDecimal getElectricDistance() {
+
+        return electricDistance;
+    }
+
+
+    public BigDecimal getTollDistance() {
+
+        return tollDistance;
+    }
+
+
+    public BigDecimal getDuration() {
+
+        return duration;
+    }
+
+
+    public BigDecimal getCo2() {
+
+        return co2;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/RoutePartDto.java b/src/main/java/net/contargo/iris/connection/dto/RoutePartDto.java
new file mode 100644
index 00000000..27f8c6d4
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/RoutePartDto.java
@@ -0,0 +1,157 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+
+/**
+ * Dto layer for {@link RoutePart}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RoutePartDto {
+
+    private String name;
+    private RoutePartDataDto data;
+    private GeoLocationDto origin;
+    private ContainerState containerState;
+    private ContainerType containerType;
+    private RoutePart.Direction direction;
+    private RouteType routeType;
+    private GeoLocationDto destination;
+
+    public RoutePartDto() {
+
+        // needed for Spring MVC instantiation of Controller parameter
+    }
+
+
+    public RoutePartDto(RoutePart part) {
+
+        if (part != null) {
+            this.name = part.getName();
+            this.containerState = part.getContainerState();
+            this.containerType = part.getContainerType();
+            this.direction = part.getDirection();
+            this.routeType = part.getRouteType();
+            this.data = part.getData() == null ? null : new RoutePartDataDto(part.getData());
+            this.origin = GeolocationDtoFactory.createGeolocationDto(part.getOrigin());
+            this.destination = GeolocationDtoFactory.createGeolocationDto(part.getDestination());
+        }
+    }
+
+    public RoutePart toRoutePart() {
+
+        RoutePart routePart = new RoutePart();
+
+        if (this.origin != null && this.destination != null) {
+            routePart.setDestination(this.destination.toEntity());
+            routePart.setOrigin(this.origin.toEntity());
+        }
+
+        routePart.setRouteType(this.routeType);
+        routePart.setContainerState(this.containerState);
+        routePart.setContainerType(this.containerType);
+
+        return routePart;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public RoutePartDataDto getData() {
+
+        return data;
+    }
+
+
+    public GeoLocationDto getOrigin() {
+
+        return origin;
+    }
+
+
+    public ContainerState getContainerState() {
+
+        return containerState;
+    }
+
+
+    public ContainerType getContainerType() {
+
+        return containerType;
+    }
+
+
+    public RoutePart.Direction getDirection() {
+
+        return direction;
+    }
+
+
+    public RouteType getRouteType() {
+
+        return routeType;
+    }
+
+
+    public GeoLocationDto getDestination() {
+
+        return destination;
+    }
+
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    public void setData(RoutePartDataDto data) {
+
+        this.data = data;
+    }
+
+
+    public void setOrigin(GeoLocationDto origin) {
+
+        this.origin = origin;
+    }
+
+
+    public void setContainerState(ContainerState containerState) {
+
+        this.containerState = containerState;
+    }
+
+
+    public void setContainerType(ContainerType containerType) {
+
+        this.containerType = containerType;
+    }
+
+
+    public void setDirection(RoutePart.Direction direction) {
+
+        this.direction = direction;
+    }
+
+
+    public void setRouteType(RouteType routeType) {
+
+        this.routeType = routeType;
+    }
+
+
+    public void setDestination(GeoLocationDto destination) {
+
+        this.destination = destination;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoService.java b/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoService.java
new file mode 100644
index 00000000..8a2dc9e2
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoService.java
@@ -0,0 +1,17 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import java.util.List;
+
+
+/**
+ * Dto interfact for {@link net.contargo.iris.connection.service.SeaportConnectionRoutesService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface SeaportConnectionRoutesDtoService {
+
+    List<RouteDto> getAvailableSeaportConnectionRoutes(SeaportDto seaport, RouteInformation routeInformation);
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImpl.java b/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImpl.java
new file mode 100644
index 00000000..f3496e93
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImpl.java
@@ -0,0 +1,45 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.connection.service.SeaportConnectionRoutesService;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Default implementation of {@link SeaportConnectionRoutesDtoService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class SeaportConnectionRoutesDtoServiceImpl implements SeaportConnectionRoutesDtoService {
+
+    private final SeaportConnectionRoutesService seaportConnectionRoutesService;
+
+    public SeaportConnectionRoutesDtoServiceImpl(SeaportConnectionRoutesService seaportConnectionRoutesService) {
+
+        this.seaportConnectionRoutesService = seaportConnectionRoutesService;
+    }
+
+    @Override
+    public List<RouteDto> getAvailableSeaportConnectionRoutes(SeaportDto seaportDto,
+        RouteInformation routeInformation) {
+
+        List<RouteDto> routeDtos = new ArrayList<>();
+
+        if (seaportDto == null) {
+            return routeDtos;
+        }
+
+        List<Route> routes = seaportConnectionRoutesService.getAvailableSeaportConnectionRoutes(seaportDto.toEntity(),
+                routeInformation);
+
+        for (Route route : routes) {
+            routeDtos.add(new RouteDto(route));
+        }
+
+        return routeDtos;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoService.java b/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoService.java
new file mode 100644
index 00000000..9fa2642f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoService.java
@@ -0,0 +1,41 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import java.util.List;
+
+
+/**
+ * Dto service layer for {@link net.contargo.iris.connection.service.SeaportTerminalConnectionService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface SeaportTerminalConnectionDtoService {
+
+    /**
+     * Finds all {@link net.contargo.iris.seaport.Seaport}s that have a
+     * {@link net.contargo.iris.connection.MainRunConnection} of type {@code type}.
+     *
+     * @param  type  the {@link net.contargo.iris.connection.MainRunConnection}'s
+     *               {@link net.contargo.iris.route.RouteType}
+     *
+     * @return  all matching {@link net.contargo.iris.seaport.Seaport}s as {@link SeaportDto}s
+     */
+    List<SeaportDto> findSeaportsConnectedByRouteType(RouteType type);
+
+
+    /**
+     * Finds all {@link net.contargo.iris.terminal.Terminal}s that are part of a
+     * {@link net.contargo.iris.connection.MainRunConnection} with the given {@link RouteType} and the specified
+     * {@link net.contargo.iris.seaport.Seaport} property.
+     *
+     * @param  seaport  the {@link net.contargo.iris.connection.MainRunConnection}'s
+     *                  {@link net.contargo.iris.seaport.Seaport}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  all matching {@link net.contargo.iris.terminal.Terminal}s as {@link TerminalDto}s
+     */
+    List<TerminalDto> findTerminalsConnectedToSeaPortByRouteType(SeaportDto seaport, RouteType routeType);
+}
diff --git a/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImpl.java b/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImpl.java
new file mode 100644
index 00000000..d21144b1
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImpl.java
@@ -0,0 +1,59 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.connection.service.SeaportTerminalConnectionService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Implementation of {@link SeaportTerminalConnectionDtoService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class SeaportTerminalConnectionDtoServiceImpl implements SeaportTerminalConnectionDtoService {
+
+    private final SeaportTerminalConnectionService seaportTerminalConnectionService;
+
+    public SeaportTerminalConnectionDtoServiceImpl(SeaportTerminalConnectionService seaportTerminalConnectionService) {
+
+        this.seaportTerminalConnectionService = seaportTerminalConnectionService;
+    }
+
+    @Override
+    public List<SeaportDto> findSeaportsConnectedByRouteType(RouteType type) {
+
+        List<Seaport> seaports = seaportTerminalConnectionService.findSeaPortsConnectedByRouteType(type);
+
+        List<SeaportDto> dtos = new ArrayList<>();
+
+        for (Seaport seaport : seaports) {
+            dtos.add(new SeaportDto(seaport));
+        }
+
+        return dtos;
+    }
+
+
+    @Override
+    public List<TerminalDto> findTerminalsConnectedToSeaPortByRouteType(SeaportDto seaportDto, RouteType routeType) {
+
+        Seaport seaport = seaportDto.toEntity();
+
+        List<Terminal> terminals = seaportTerminalConnectionService.getTerminalsConnectedToSeaPortByRouteType(seaport,
+                routeType);
+
+        List<TerminalDto> dtos = new ArrayList<>();
+
+        for (Terminal terminal : terminals) {
+            dtos.add(new TerminalDto(terminal));
+        }
+
+        return dtos;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/persistence/MainRunConnectionRepository.java b/src/main/java/net/contargo/iris/connection/persistence/MainRunConnectionRepository.java
new file mode 100644
index 00000000..0dec7b54
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/persistence/MainRunConnectionRepository.java
@@ -0,0 +1,110 @@
+package net.contargo.iris.connection.persistence;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Repository interface for {@link net.contargo.iris.connection.MainRunConnection}s that grants access to the database.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface MainRunConnectionRepository extends JpaRepository<MainRunConnection, Long> {
+
+    /**
+     * Finds all {@link net.contargo.iris.connection.MainRunConnection}s with the specified {@code enabled} value.
+     *
+     * @param  enabled  indicates whether enabled or non-enabled {@link net.contargo.iris.connection.MainRunConnection}s
+     *                  should be returned
+     *
+     * @return  a list of {@link net.contargo.iris.connection.MainRunConnection}s
+     */
+    List<MainRunConnection> findByEnabled(boolean enabled);
+
+
+    /**
+     * Finds the specified {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  terminal  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Terminal}
+     * @param  seaport  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     * @param  enabled  indicates whether the connection should be enabled or not
+     *
+     * @return  a {@link net.contargo.iris.connection.MainRunConnection} with the specified properties
+     */
+    MainRunConnection findByTerminalAndSeaportAndRouteTypeAndEnabled(Terminal terminal, Seaport seaport,
+        RouteType routeType, boolean enabled);
+
+
+    /**
+     * Finds all {@link Seaport}s that are part of a {@link net.contargo.iris.connection.MainRunConnection} with the
+     * given {@link RouteType}.
+     *
+     * @param  type  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  a list of {@link Seaport}s
+     */
+    @Query(
+        "SELECT DISTINCT p FROM MainRunConnection c JOIN c.seaport p WHERE c.routeType = ?1 and p.enabled = true "
+        + "and c.enabled = true"
+    )
+    List<Seaport> findSeaportsConnectedByRouteType(RouteType type);
+
+
+    /**
+     * Finds all {@link Terminal}s that are part of a {@link net.contargo.iris.connection.MainRunConnection} with the
+     * given {@link RouteType} and the specified {@link Seaport} property.
+     *
+     * @param  seaportUid  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}'s unique id
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  a list of {@link Terminal}s
+     */
+    @Query(
+        "SELECT t FROM MainRunConnection c JOIN c.terminal t JOIN c.seaport s WHERE c.seaport.uniqueId = ?1 "
+        + "AND c.routeType = ?2 and t.enabled = true and s.enabled = true and c.enabled = true"
+    )
+    List<Terminal> getTerminalsConnectedToSeaPortByRouteType(BigInteger seaportUid, RouteType routeType);
+
+
+    /**
+     * Checks if a {@link net.contargo.iris.connection.MainRunConnection} by {@link Seaport}, {@link Terminal} and
+     * {@link RouteType} without the own id is already applied.
+     *
+     * @param  seaport  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}
+     * @param  terminal  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Terminal}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     * @param  id  the id of the own {@link net.contargo.iris.connection.MainRunConnection}
+     *
+     * @return  <code>true</code>, if a connection is not found or is found but with the given id
+     */
+    MainRunConnection findBySeaportAndTerminalAndRouteTypeAndIdNot(Seaport seaport, Terminal terminal,
+        RouteType routeType, Long id);
+
+
+    /**
+     * Checks if a {@link net.contargo.iris.connection.MainRunConnection} by {@link Seaport}, {@link Terminal} and
+     * {@link RouteType}is already applied.
+     *
+     * @param  seaport  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}
+     * @param  terminal  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Terminal}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  <code>true</code>, if no connection with this attributes are found
+     */
+    MainRunConnection findBySeaportAndTerminalAndRouteType(Seaport seaport, Terminal terminal, RouteType routeType);
+
+
+    @Query("SELECT c FROM MainRunConnection c WHERE c.terminal.uniqueId = ?1")
+    List<MainRunConnection> findConnectionsByTerminalUniqueId(BigInteger terminalUID);
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/MainRunConnectionService.java b/src/main/java/net/contargo/iris/connection/service/MainRunConnectionService.java
new file mode 100644
index 00000000..60be3e29
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/MainRunConnectionService.java
@@ -0,0 +1,97 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Services that provides handling of {@link net.contargo.iris.connection.MainRunConnection}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface MainRunConnectionService {
+
+    /**
+     * Finds all {@link net.contargo.iris.connection.MainRunConnection}s.
+     *
+     * @return  a list of {@link net.contargo.iris.connection.MainRunConnection}s
+     */
+    List<MainRunConnection> getAll();
+
+
+    /**
+     * Finds all active, i.e. enabled {@link net.contargo.iris.connection.MainRunConnection}s
+     *
+     * @return  a list of {@link net.contargo.iris.connection.MainRunConnection}s
+     */
+    List<MainRunConnection> getAllActive();
+
+
+    /**
+     * Finds a {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  id  the {@link net.contargo.iris.connection.MainRunConnection}'s id
+     *
+     * @return  the {@link net.contargo.iris.connection.MainRunConnection} with the specified {@code id}
+     */
+    MainRunConnection getById(Long id);
+
+
+    /**
+     * Saves a {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  mainrunConnection  the {@link net.contargo.iris.connection.MainRunConnection} to be saved
+     *
+     * @return  the saved {MainRunConnection} that does not have a null id property
+     */
+    MainRunConnection save(MainRunConnection mainrunConnection);
+
+
+    /**
+     * Finds a {@link net.contargo.iris.connection.MainRunConnection} with the specified attributes.
+     *
+     * @param  terminal  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Terminal}
+     * @param  seaport  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  a {@link net.contargo.iris.connection.MainRunConnection}
+     */
+    MainRunConnection findRoutingConnectionBetweenTerminalAndSeaportByType(Terminal terminal, Seaport seaport,
+        RouteType routeType);
+
+
+    /**
+     * Checks if a connection between a {@link Seaport}, {@link Terminal} and {@link RouteType} is already applied.
+     *
+     * @param  mainrunConnection  Keeps the information of the {@link net.contargo.iris.seaport.Seaport},
+     *                            {@link net.contargo.iris.terminal.Terminal}, and
+     *                            {@link net.contargo.iris.route.RouteType}
+     *
+     * @return  <code>true</code>, if the connection is already applied
+     */
+    Boolean isAlreadyApplied(MainRunConnection mainrunConnection);
+
+
+    /**
+     * Checks if a connection, and not the given connection, between a {@link Seaport}, {@link Terminal} and
+     * {@link RouteType} is already applied.
+     *
+     * @param  mainrunConnection  Keeps the information of the {@link net.contargo.iris.seaport.Seaport},
+     *                            {@link net.contargo.iris.terminal.Terminal}, and
+     *                            {@link net.contargo.iris.route.RouteType}
+     *
+     * @return  <code>true</code>, if the connection is already applied but is not the own connection
+     */
+    Boolean isAlreadyAppliedAndNotThis(MainRunConnection mainrunConnection);
+
+
+    List<MainRunConnection> getConnectionsForTerminal(BigInteger terminalUID);
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/MainRunConnectionServiceImpl.java b/src/main/java/net/contargo/iris/connection/service/MainRunConnectionServiceImpl.java
new file mode 100644
index 00000000..21d21755
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/MainRunConnectionServiceImpl.java
@@ -0,0 +1,125 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.persistence.MainRunConnectionRepository;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import org.springframework.util.Assert;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Service for operations with the {@link net.contargo.iris.connection.MainRunConnection}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Transactional
+public class MainRunConnectionServiceImpl implements MainRunConnectionService {
+
+    private final MainRunConnectionRepository mainRunConnectionRepository;
+
+    public MainRunConnectionServiceImpl(MainRunConnectionRepository mainRunConnectionRepository) {
+
+        this.mainRunConnectionRepository = mainRunConnectionRepository;
+    }
+
+    /**
+     * @see  MainRunConnectionService#getAll()
+     */
+    @Override
+    public List<MainRunConnection> getAll() {
+
+        return mainRunConnectionRepository.findAll();
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#getAllActive()
+     */
+    @Override
+    public List<MainRunConnection> getAllActive() {
+
+        return mainRunConnectionRepository.findByEnabled(true);
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#getById(Long)
+     */
+    @Override
+    public MainRunConnection getById(Long id) {
+
+        return mainRunConnectionRepository.findOne(id);
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#save(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public MainRunConnection save(MainRunConnection mainrunConnection) {
+
+        return mainRunConnectionRepository.save(mainrunConnection);
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#findRoutingConnectionBetweenTerminalAndSeaportByType(
+     *       net.contargo.iris.terminal.Terminal, net.contargo.iris.seaport.Seaport, net.contargo.iris.route.RouteType)
+     */
+    @Override
+    public MainRunConnection findRoutingConnectionBetweenTerminalAndSeaportByType(Terminal terminal, Seaport seaport,
+        RouteType routeType) {
+
+        Assert.notNull(terminal);
+        Assert.notNull(seaport);
+        Assert.notNull(routeType);
+
+        return mainRunConnectionRepository.findByTerminalAndSeaportAndRouteTypeAndEnabled(terminal, seaport, routeType,
+                true);
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#isAlreadyApplied(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public Boolean isAlreadyApplied(MainRunConnection mainrunConnection) {
+
+        MainRunConnection dbMainrunConnection = mainRunConnectionRepository.findBySeaportAndTerminalAndRouteType(
+                mainrunConnection.getSeaport(), mainrunConnection.getTerminal(), mainrunConnection.getRouteType());
+
+        return null != dbMainrunConnection;
+    }
+
+
+    /**
+     * @see  MainRunConnectionService#isAlreadyAppliedAndNotThis(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public Boolean isAlreadyAppliedAndNotThis(MainRunConnection mainrunConnection) {
+
+        MainRunConnection dbMainrunConnection =
+            mainRunConnectionRepository.findBySeaportAndTerminalAndRouteTypeAndIdNot(mainrunConnection.getSeaport(),
+                mainrunConnection.getTerminal(), mainrunConnection.getRouteType(), mainrunConnection.getId());
+
+        return null != dbMainrunConnection;
+    }
+
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<MainRunConnection> getConnectionsForTerminal(BigInteger terminalUID) {
+
+        return mainRunConnectionRepository.findConnectionsByTerminalUniqueId(terminalUID);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesService.java b/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesService.java
new file mode 100644
index 00000000..5245d6a9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesService.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.seaport.Seaport;
+
+import java.util.List;
+
+
+/**
+ * Service that calculates {@link Route}s between {@link Seaport}s and some destination.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface SeaportConnectionRoutesService {
+
+    /**
+     * Returns a list of all possible connection routes between a seaport and a destination address.
+     *
+     * @param  origin  The origin seaport
+     * @param  routeInformation
+     *
+     * @return  List of possible connections (empty if none found)
+     */
+    List<Route> getAvailableSeaportConnectionRoutes(Seaport origin, RouteInformation routeInformation);
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImpl.java b/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImpl.java
new file mode 100644
index 00000000..083aa01e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImpl.java
@@ -0,0 +1,63 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.advice.MainRunAdvisor;
+import net.contargo.iris.connection.advice.MainRunStrategy;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class SeaportConnectionRoutesServiceImpl implements SeaportConnectionRoutesService {
+
+    private final SeaportTerminalConnectionService seaportTerminalConnectionService;
+    private final MainRunAdvisor mainRunAdvisor;
+
+    public SeaportConnectionRoutesServiceImpl(SeaportTerminalConnectionService seaportTerminalConnectionService,
+        MainRunAdvisor mainRunAdvisor) {
+
+        this.seaportTerminalConnectionService = seaportTerminalConnectionService;
+        this.mainRunAdvisor = mainRunAdvisor;
+    }
+
+    Route getMainRunRoute(Seaport seaPort, Terminal terminal, RouteInformation routeInformation, RouteType routeType) {
+
+        if (routeType != RouteType.BARGE && routeType != RouteType.RAIL) {
+            throw new IllegalArgumentException();
+        }
+
+        MainRunStrategy mainRunStrategy = mainRunAdvisor.advice(routeInformation.getProduct(),
+                routeInformation.getRouteDirection());
+
+        return mainRunStrategy.getRoute(seaPort, routeInformation.getDestination(), terminal,
+                routeInformation.getContainerType(), routeType);
+    }
+
+
+    @Override
+    public List<Route> getAvailableSeaportConnectionRoutes(Seaport origin, RouteInformation routeInformation) {
+
+        List<Route> routes = new ArrayList<>();
+
+        // a RouteCombo has one ore more (in case RouteCombo.ALL) RouteTypes
+        for (RouteType routeType : routeInformation.getRouteCombo().getRouteTypes()) {
+            // get all terminals that have routes with the given route type to the given seaport
+            List<Terminal> terminals = seaportTerminalConnectionService.getTerminalsConnectedToSeaPortByRouteType(
+                    origin, routeType);
+
+            // get route for each location and add it to route list
+            for (Terminal terminal : terminals) {
+                routes.add(getMainRunRoute(origin, terminal, routeInformation, routeType));
+            }
+        }
+
+        return routes;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionService.java b/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionService.java
new file mode 100644
index 00000000..3291acb7
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionService.java
@@ -0,0 +1,38 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import java.util.List;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface SeaportTerminalConnectionService {
+
+    /**
+     * Finds all {@link net.contargo.iris.seaport.Seaport}s that have a
+     * {@link net.contargo.iris.connection.MainRunConnection} of type {@code type}.
+     *
+     * @param  type  the {@link net.contargo.iris.connection.MainRunConnection}'s
+     *               {@link net.contargo.iris.route.RouteType}
+     *
+     * @return  all matching {@link net.contargo.iris.seaport.Seaport}s
+     */
+    List<Seaport> findSeaPortsConnectedByRouteType(RouteType type);
+
+
+    /**
+     * Finds all {@link net.contargo.iris.terminal.Terminal}s that are part of a
+     * {@link net.contargo.iris.connection.MainRunConnection} with the given {@link RouteType} and the specified
+     * {@link Seaport} property.
+     *
+     * @param  seaPort  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link Seaport}
+     * @param  routeType  the {@link net.contargo.iris.connection.MainRunConnection}'s {@link RouteType}
+     *
+     * @return  all matching {@link net.contargo.iris.terminal.Terminal}s
+     */
+    List<Terminal> getTerminalsConnectedToSeaPortByRouteType(Seaport seaPort, RouteType routeType);
+}
diff --git a/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImpl.java b/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImpl.java
new file mode 100644
index 00000000..1caa1132
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImpl.java
@@ -0,0 +1,56 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.persistence.MainRunConnectionRepository;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import java.util.List;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class SeaportTerminalConnectionServiceImpl implements SeaportTerminalConnectionService {
+
+    private final MainRunConnectionRepository mainRunConnectionRepository;
+    private final SeaportService seaportService;
+    private final TerminalService terminalService;
+
+    public SeaportTerminalConnectionServiceImpl(MainRunConnectionRepository mainRunConnectionRepository,
+        SeaportService seaportService, TerminalService terminalService) {
+
+        this.mainRunConnectionRepository = mainRunConnectionRepository;
+        this.seaportService = seaportService;
+        this.terminalService = terminalService;
+    }
+
+    /**
+     * @see  SeaportTerminalConnectionService#findSeaPortsConnectedByRouteType(net.contargo.iris.route.RouteType)
+     */
+    @Override
+    public List<Seaport> findSeaPortsConnectedByRouteType(RouteType type) {
+
+        if (type.equals(RouteType.TRUCK)) {
+            return seaportService.getAllActive();
+        }
+
+        return mainRunConnectionRepository.findSeaportsConnectedByRouteType(type);
+    }
+
+
+    /**
+     * @see  SeaportTerminalConnectionService#getTerminalsConnectedToSeaPortByRouteType(Seaport, RouteType)
+     */
+    @Override
+    public List<Terminal> getTerminalsConnectedToSeaPortByRouteType(Seaport seaPort, RouteType routeType) {
+
+        if (routeType.equals(RouteType.TRUCK)) {
+            return terminalService.getAllActive();
+        }
+
+        return mainRunConnectionRepository.getTerminalsConnectedToSeaPortByRouteType(seaPort.getUniqueId(), routeType);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/connection/web/MainRunConnectionController.java b/src/main/java/net/contargo/iris/connection/web/MainRunConnectionController.java
new file mode 100644
index 00000000..bf705286
--- /dev/null
+++ b/src/main/java/net/contargo/iris/connection/web/MainRunConnectionController.java
@@ -0,0 +1,163 @@
+package net.contargo.iris.connection.web;
+
+import net.contargo.iris.Message;
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.validation.BindingResult;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.util.Arrays;
+
+import javax.validation.Valid;
+
+import static net.contargo.iris.api.AbstractController.CONNECTIONS;
+import static net.contargo.iris.api.AbstractController.SLASH;
+
+
+/**
+ * Controller to handle {@link net.contargo.iris.connection.MainRunConnection}'s.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Controller
+@RequestMapping(SLASH + CONNECTIONS)
+public class MainRunConnectionController extends AbstractController {
+
+    private static final String CONTROLLER_CONTEXT = "connectionManagement" + SLASH;
+
+    private static final String SEAPORTS_ATTRIBUTE = SEAPORTS;
+    private static final String TERMINALS_ATTRIBUTE = TERMINALS;
+    private static final String ROUTE_TYPES_ATTRIBUTE = ROUTE_TYPES;
+
+    private static final String MAINRUN_CONNECTIONS_ATTRIBUTE = "mainRunConnections";
+    private static final String MAINRUN_CONNECTION_ATTRIBUTE = "mainRunConnection";
+
+    private static final String MAINRUN_CONNECTIONS_VIEW = "mainrunconnections";
+    private static final String MAINRUN_CONNECTION_VIEW = "mainrunconnection";
+
+    private static final Message SAVE_SUCCESS_MESSAGE = Message.success("mainrunconnection.success.save.message");
+    private static final Message EDIT_SUCCESS_MESSAGE = Message.success("mainrunconnection.success.edit.message");
+
+    private final MainRunConnectionService mainRunConnectionService;
+    private final TerminalService terminalService;
+    private final SeaportService seaportService;
+
+    @Autowired
+    public MainRunConnectionController(MainRunConnectionService mainRunConnectionService,
+        TerminalService terminalService, SeaportService seaportService) {
+
+        this.mainRunConnectionService = mainRunConnectionService;
+        this.terminalService = terminalService;
+        this.seaportService = seaportService;
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public String getAllConnections(Model model) {
+
+        model.addAttribute(MAINRUN_CONNECTIONS_ATTRIBUTE, mainRunConnectionService.getAll());
+
+        return CONTROLLER_CONTEXT + MAINRUN_CONNECTIONS_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + "new", method = RequestMethod.GET)
+    public String prepareForCreate(Model model) {
+
+        model.addAttribute(MAINRUN_CONNECTION_ATTRIBUTE, new MainRunConnection());
+        addCollectionsForDropdowns(model);
+
+        return CONTROLLER_CONTEXT + MAINRUN_CONNECTION_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH, method = RequestMethod.POST)
+    public String createConnection(@Valid @ModelAttribute MainRunConnection mainRunConnection, BindingResult result,
+        Model model, RedirectAttributes redirectAttributes) {
+
+        if (mainRunConnectionService.isAlreadyApplied(mainRunConnection)) {
+            model.addAttribute(MAINRUN_CONNECTION_ATTRIBUTE, mainRunConnection);
+            addCollectionsForDropdowns(model);
+
+            result.rejectValue("seaport.id", "mainrunconnection.duplicate.connection.seaport");
+            result.rejectValue("terminal.id", "mainrunconnection.duplicate.connection.terminal");
+            result.rejectValue("routeType", "mainrunconnection.duplicate.connection.routetype");
+
+            return CONTROLLER_CONTEXT + MAINRUN_CONNECTION_VIEW;
+        }
+
+        return createOrUpdate(model, result, mainRunConnection, redirectAttributes, SAVE_SUCCESS_MESSAGE);
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.GET)
+    public String prepareForUpdate(@PathVariable Long id, Model model) {
+
+        model.addAttribute(MAINRUN_CONNECTION_ATTRIBUTE, mainRunConnectionService.getById(id));
+        addCollectionsForDropdowns(model);
+
+        return CONTROLLER_CONTEXT + MAINRUN_CONNECTION_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.PUT)
+    public String updateConnection(@Valid @ModelAttribute MainRunConnection mainRunConnection, BindingResult result,
+        @PathVariable Long id, Model model, RedirectAttributes redirectAttributes) {
+
+        mainRunConnection.setId(mainRunConnectionService.getById(id).getId());
+
+        if (mainRunConnectionService.isAlreadyAppliedAndNotThis(mainRunConnection)) {
+            model.addAttribute(MAINRUN_CONNECTION_ATTRIBUTE, mainRunConnection);
+            addCollectionsForDropdowns(model);
+
+            result.rejectValue("seaport.id", "mainrunconnection.duplicate.connection.seaport");
+            result.rejectValue("terminal.id", "mainrunconnection.duplicate.connection.terminal");
+            result.rejectValue("routeType", "mainrunconnection.duplicate.connection.routetype");
+
+            return CONTROLLER_CONTEXT + MAINRUN_CONNECTION_VIEW;
+        }
+
+        return createOrUpdate(model, result, mainRunConnection, redirectAttributes, EDIT_SUCCESS_MESSAGE);
+    }
+
+
+    private String createOrUpdate(Model model, BindingResult result, MainRunConnection mainRunConnection,
+        RedirectAttributes redirectAttributes, Message successMessage) {
+
+        if (result.hasErrors()) {
+            addCollectionsForDropdowns(model);
+
+            return CONTROLLER_CONTEXT + MAINRUN_CONNECTION_VIEW;
+        }
+
+        Long id = mainRunConnectionService.save(mainRunConnection).getId();
+
+        redirectAttributes.addFlashAttribute(MESSAGE, successMessage);
+
+        return REDIRECT + WEBAPI_ROOT_URL + CONNECTIONS + SLASH + id;
+    }
+
+
+    private void addCollectionsForDropdowns(Model model) {
+
+        model.addAttribute(SEAPORTS_ATTRIBUTE, seaportService.getAll());
+        model.addAttribute(TERMINALS_ATTRIBUTE, terminalService.getAll());
+        model.addAttribute(ROUTE_TYPES_ATTRIBUTE, Arrays.asList(RouteType.BARGE, RouteType.RAIL));
+    }
+}
diff --git a/src/main/java/net/contargo/iris/container/ContainerState.java b/src/main/java/net/contargo/iris/container/ContainerState.java
new file mode 100644
index 00000000..c3e42ca3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/container/ContainerState.java
@@ -0,0 +1,11 @@
+package net.contargo.iris.container;
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public enum ContainerState {
+
+    FULL,
+    EMPTY
+}
diff --git a/src/main/java/net/contargo/iris/container/ContainerType.java b/src/main/java/net/contargo/iris/container/ContainerType.java
new file mode 100644
index 00000000..fdb8f0a3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/container/ContainerType.java
@@ -0,0 +1,35 @@
+package net.contargo.iris.container;
+
+/**
+ * Enum for type of containers.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+
+public enum ContainerType {
+
+    NOT_SET(""),
+    TWENTY_LIGHT("twenty_light"),
+    TWENTY_HEAVY("twenty_heavy"),
+    THIRTY(""),
+    FORTY("forty"),
+    FORTYFIVE("");
+
+    private String csvString;
+
+    private ContainerType(String csvString) {
+
+        this.csvString = csvString;
+    }
+
+    public boolean isUnknown() {
+
+        return this.equals(NOT_SET);
+    }
+
+
+    public String getCsvString() {
+
+        return this.csvString;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/api/CountriesApiController.java b/src/main/java/net/contargo/iris/countries/api/CountriesApiController.java
new file mode 100644
index 00000000..deaffe5b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/api/CountriesApiController.java
@@ -0,0 +1,52 @@
+package net.contargo.iris.countries.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.countries.dto.CountryDtoService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+
+/**
+ * API Controller for Information about countries.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Controller
+@RequestMapping(value = CountriesApiController.COUNTRIES)
+@Api(value = CountriesApiController.COUNTRIES, description = "API for Information about countries.")
+public class CountriesApiController extends AbstractController {
+
+    private final CountryDtoService countryDtoService;
+
+    @Autowired
+    public CountriesApiController(CountryDtoService countryDtoService) {
+
+        this.countryDtoService = countryDtoService;
+    }
+
+    @ApiOperation(value = "Get all countries.", notes = "Get all countries.")
+    @ModelAttribute("countriesResponse")
+    @RequestMapping(method = RequestMethod.GET)
+    public CountriesResponse countries() {
+
+        CountriesResponse response = new CountriesResponse();
+        response.setCountries(countryDtoService.getCountries());
+
+        response.add(linkTo(getClass()).withSelfRel());
+
+        return response;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/api/CountriesResponse.java b/src/main/java/net/contargo/iris/countries/api/CountriesResponse.java
new file mode 100644
index 00000000..0cf648c3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/api/CountriesResponse.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.countries.api;
+
+import net.contargo.iris.countries.dto.CountryDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.List;
+
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+class CountriesResponse extends ResourceSupport {
+
+    private List<CountryDto> countries;
+
+    public List<CountryDto> getCountries() {
+
+        return countries;
+    }
+
+
+    public void setCountries(List<CountryDto> countries) {
+
+        this.countries = countries;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/dto/CountryCodeCountryDtoService.java b/src/main/java/net/contargo/iris/countries/dto/CountryCodeCountryDtoService.java
new file mode 100644
index 00000000..6364cefb
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/dto/CountryCodeCountryDtoService.java
@@ -0,0 +1,35 @@
+package net.contargo.iris.countries.dto;
+
+import net.contargo.iris.countries.service.CountryService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ *
+ *          <p>Created: Date: 8/23/13 Time: 8:57 AM</p>
+ */
+public class CountryCodeCountryDtoService implements CountryDtoService {
+
+    private final CountryService service;
+
+    public CountryCodeCountryDtoService(CountryService service) {
+
+        this.service = service;
+    }
+
+    @Override
+    public List<CountryDto> getCountries() {
+
+        List<CountryDto> countryDtoList = new ArrayList<>();
+
+        for (Map.Entry<String, String> entry : service.getCountries().entrySet()) {
+            countryDtoList.add(new CountryDto(entry.getKey(), entry.getValue()));
+        }
+
+        return countryDtoList;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/dto/CountryDto.java b/src/main/java/net/contargo/iris/countries/dto/CountryDto.java
new file mode 100644
index 00000000..b171c51f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/dto/CountryDto.java
@@ -0,0 +1,64 @@
+package net.contargo.iris.countries.dto;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+
+/**
+ * View Bean for exposing countries over the API.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class CountryDto {
+
+    private String name;
+    private String value;
+
+    public CountryDto(String name, String value) {
+
+        this.name = name;
+        this.value = value;
+    }
+
+
+    public CountryDto() {
+
+        // Needed for Jackson Mapping
+    }
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public String getValue() {
+
+        return value;
+    }
+
+
+    @Override
+    public boolean equals(Object obj) {
+
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof CountryDto)) {
+            return false;
+        }
+
+        CountryDto other = (CountryDto) obj;
+
+        return new EqualsBuilder().append(this.hashCode(), other.hashCode()).append(this.name, other.name).append(
+                this.value, other.value).isEquals();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().append(this.name).append(this.value).toHashCode();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/dto/CountryDtoService.java b/src/main/java/net/contargo/iris/countries/dto/CountryDtoService.java
new file mode 100644
index 00000000..96786273
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/dto/CountryDtoService.java
@@ -0,0 +1,14 @@
+package net.contargo.iris.countries.dto;
+
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ *
+ *          <p>Created: Date: 8/23/13 Time: 8:55 AM</p>
+ */
+public interface CountryDtoService {
+
+    List<CountryDto> getCountries();
+}
diff --git a/src/main/java/net/contargo/iris/countries/service/CountryCode.java b/src/main/java/net/contargo/iris/countries/service/CountryCode.java
new file mode 100644
index 00000000..1bb33877
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/service/CountryCode.java
@@ -0,0 +1,43 @@
+package net.contargo.iris.countries.service;
+
+/**
+ * Enum representing country codes (ISO 3166-1 alpha2 code), e.g. de for Germany.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+enum CountryCode {
+
+    OPTIONAL("Country (optional)", ""),
+    GERMANY("Germany", "DE"),
+    NETHERLANDS("Netherlands", "NL"),
+    BELGIUM("Belgium", "BE"),
+    LUXEMBOURG("Luxembourg", "LU"),
+    FRANCE("France", "FR"),
+    SWITZERLAND("Switzerland", "CH"),
+    LIECHTENSTEIN("Liechtenstein", "LI"),
+    AUSTRIA("Austria", "AT"),
+    CZECH_REPUBLIC("Czech Republic", "CZ"),
+    POLAND("Poland", "PL"),
+    DENMARK("Denmark", "DK");
+
+    private String name;
+    private String value;
+
+    private CountryCode(String name, String value) {
+
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getValue() {
+
+        return value;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/service/CountryCodeCountryService.java b/src/main/java/net/contargo/iris/countries/service/CountryCodeCountryService.java
new file mode 100644
index 00000000..85cc8f52
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/service/CountryCodeCountryService.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.countries.service;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class CountryCodeCountryService implements CountryService {
+
+    @Override
+    public Map<String, String> getCountries() {
+
+        Map<String, String> countryMap = new LinkedHashMap<>();
+
+        for (CountryCode countryCode : CountryCode.values()) {
+            countryMap.put(countryCode.getName(), countryCode.getValue());
+        }
+
+        return countryMap;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/countries/service/CountryService.java b/src/main/java/net/contargo/iris/countries/service/CountryService.java
new file mode 100644
index 00000000..d95dd95d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/countries/service/CountryService.java
@@ -0,0 +1,12 @@
+package net.contargo.iris.countries.service;
+
+import java.util.Map;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface CountryService {
+
+    Map<String, String> getCountries();
+}
diff --git a/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceService.java b/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceService.java
new file mode 100644
index 00000000..f889ad81
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceService.java
@@ -0,0 +1,41 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface ConnectionDistanceService {
+
+    /**
+     * Extracts the distance of a {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  mainrunConnection
+     *
+     * @return  BigDecimal
+     */
+    BigDecimal getDistance(MainRunConnection mainrunConnection);
+
+
+    /**
+     * Extracts the dieselDistance of a {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  mainrunConnection
+     *
+     * @return  BigDecimal
+     */
+    BigDecimal getDieselDistance(MainRunConnection mainrunConnection);
+
+
+    /**
+     * Extracts the electricDistance of a {@link net.contargo.iris.connection.MainRunConnection}.
+     *
+     * @param  mainrunConnection
+     *
+     * @return  BigDecimal
+     */
+    BigDecimal getElectricDistance(MainRunConnection mainrunConnection);
+}
diff --git a/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImpl.java b/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImpl.java
new file mode 100644
index 00000000..275463f6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImpl.java
@@ -0,0 +1,51 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.rounding.RoundingService;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Default implementation of {@link ConnectionDistanceService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class ConnectionDistanceServiceImpl implements ConnectionDistanceService {
+
+    private final RoundingService roundingService;
+
+    public ConnectionDistanceServiceImpl(RoundingService roundingService) {
+
+        this.roundingService = roundingService;
+    }
+
+    /**
+     * @see  ConnectionDistanceService#getDistance(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public BigDecimal getDistance(MainRunConnection mainrunConnection) {
+
+        return roundingService.roundDistance(mainrunConnection.getTotalDistance());
+    }
+
+
+    /**
+     * @see  ConnectionDistanceService#getDieselDistance(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public BigDecimal getDieselDistance(MainRunConnection mainrunConnection) {
+
+        return roundingService.roundDistance(mainrunConnection.getDieselDistance());
+    }
+
+
+    /**
+     * @see  ConnectionDistanceService#getElectricDistance(net.contargo.iris.connection.MainRunConnection)
+     */
+    @Override
+    public BigDecimal getElectricDistance(MainRunConnection mainrunConnection) {
+
+        return roundingService.roundDistance(mainrunConnection.getElectricDistance());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distance/service/DistanceService.java b/src/main/java/net/contargo/iris/distance/service/DistanceService.java
new file mode 100644
index 00000000..89ed611f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distance/service/DistanceService.java
@@ -0,0 +1,33 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.truck.TruckRoute;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Extracts specific properties and calculates the correct value with or without rounding.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface DistanceService {
+
+    /**
+     * Extracts the distance of a {@link TruckRoute}.
+     *
+     * @param  truckRoute  to get distance of
+     *
+     * @return  BigDecimal
+     */
+    BigDecimal getDistance(TruckRoute truckRoute);
+
+
+    /**
+     * Extracts the toll distance of a {@link TruckRoute}.
+     *
+     * @param  truckRoute  to get toll of
+     *
+     * @return  BigDecimal
+     */
+    BigDecimal getTollDistance(TruckRoute truckRoute);
+}
diff --git a/src/main/java/net/contargo/iris/distance/service/DistanceServiceImpl.java b/src/main/java/net/contargo/iris/distance/service/DistanceServiceImpl.java
new file mode 100644
index 00000000..cda41d5b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distance/service/DistanceServiceImpl.java
@@ -0,0 +1,35 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.truck.TruckRoute;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Handles the extraction and calculation of the distances.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class DistanceServiceImpl implements DistanceService {
+
+    private final RoundingService roundingService;
+
+    public DistanceServiceImpl(RoundingService roundingService) {
+
+        this.roundingService = roundingService;
+    }
+
+    @Override
+    public BigDecimal getDistance(TruckRoute truckRoute) {
+
+        return roundingService.roundDistance(truckRoute.getDistance());
+    }
+
+
+    @Override
+    public BigDecimal getTollDistance(TruckRoute truckRoute) {
+
+        return roundingService.roundDistance(truckRoute.getTollDistance());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/DistanceCloudAddress.java b/src/main/java/net/contargo/iris/distancecloud/DistanceCloudAddress.java
new file mode 100644
index 00000000..ca1a42be
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/DistanceCloudAddress.java
@@ -0,0 +1,156 @@
+package net.contargo.iris.distancecloud;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+
+/**
+ * Container for addresses, which are used to describe Addresses within a cloud around a certain GeoLocation.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class DistanceCloudAddress {
+
+    private String city;
+    private String postalcode;
+    private String suburb;
+    private BigDecimal distance;
+    private BigDecimal tollDistance;
+    private BigDecimal airLineDistanceMeter;
+    private String country;
+    private String errorMessage = "";
+    private String hashKey;
+    private BigInteger uniqueId;
+
+    public DistanceCloudAddress(StaticAddress staticAddress) {
+
+        this.city = staticAddress.getCity();
+        this.suburb = staticAddress.getSuburb();
+        this.postalcode = staticAddress.getPostalcode();
+        this.country = staticAddress.getCountry();
+        this.hashKey = staticAddress.getHashKey();
+        this.uniqueId = staticAddress.getUniqueId();
+    }
+
+    public String getErrorMessage() {
+
+        return errorMessage;
+    }
+
+
+    public void setErrorMessage(String errorMessage) {
+
+        this.errorMessage = errorMessage;
+    }
+
+
+    public String getCity() {
+
+        return city;
+    }
+
+
+    public void setCity(String city) {
+
+        this.city = city;
+    }
+
+
+    public String getPostalcode() {
+
+        return postalcode;
+    }
+
+
+    public void setPostalcode(String postalcode) {
+
+        this.postalcode = postalcode;
+    }
+
+
+    public String getSuburb() {
+
+        return suburb;
+    }
+
+
+    public void setSuburb(String suburb) {
+
+        this.suburb = suburb;
+    }
+
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public void setDistance(BigDecimal distance) {
+
+        this.distance = distance;
+    }
+
+
+    public BigDecimal getTollDistance() {
+
+        return tollDistance;
+    }
+
+
+    public void setTollDistance(BigDecimal tollDistance) {
+
+        this.tollDistance = tollDistance;
+    }
+
+
+    public BigDecimal getAirLineDistanceMeter() {
+
+        return airLineDistanceMeter;
+    }
+
+
+    public void setAirLineDistanceMeter(BigDecimal airLineDistanceMeter) {
+
+        this.airLineDistanceMeter = airLineDistanceMeter;
+    }
+
+
+    public String getCountry() {
+
+        return country;
+    }
+
+
+    public void setCountry(String country) {
+
+        this.country = country;
+    }
+
+
+    public String getHashKey() {
+
+        return hashKey;
+    }
+
+
+    public void setHashKey(String hashKey) {
+
+        this.hashKey = hashKey;
+    }
+
+
+    public BigInteger getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(BigInteger uniqueId) {
+
+        this.uniqueId = uniqueId;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudAddressResponse.java b/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudAddressResponse.java
new file mode 100644
index 00000000..96115a99
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudAddressResponse.java
@@ -0,0 +1,30 @@
+package net.contargo.iris.distancecloud.api;
+
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class DistanceCloudAddressResponse extends ResourceSupport {
+
+    private DistanceCloudAddressDto address;
+
+    public DistanceCloudAddressResponse(DistanceCloudAddressDto address) {
+
+        this.address = address;
+    }
+
+    public DistanceCloudAddressDto getAddress() {
+
+        return address;
+    }
+
+
+    public void setAddress(DistanceCloudAddressDto address) {
+
+        this.address = address;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudApiController.java b/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudApiController.java
new file mode 100644
index 00000000..73637637
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/api/DistanceCloudApiController.java
@@ -0,0 +1,60 @@
+package net.contargo.iris.distancecloud.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDto;
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDtoService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.math.BigInteger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Api(value = "", description = "API for calculating cloud-distances.")
+@Controller
+public class DistanceCloudApiController extends AbstractController {
+
+    private final DistanceCloudAddressDtoService distanceCloudAddressDtoService;
+
+    @Autowired
+    public DistanceCloudApiController(DistanceCloudAddressDtoService distanceCloudAddressDtoService) {
+
+        this.distanceCloudAddressDtoService = distanceCloudAddressDtoService;
+    }
+
+    @ApiOperation(
+        notes = "Calculates the cloud-distance between the given terminal and static address.",
+        value = "Calculates the cloud-distance between the given terminal and static address."
+    )
+    @RequestMapping(value = "distancecloudaddress", method = RequestMethod.GET)
+    @ResponseBody
+    public DistanceCloudAddressResponse cloudAddress(@RequestParam("terminal") BigInteger terminalUid,
+        @RequestParam("address") BigInteger staticAddressUid) {
+
+        DistanceCloudAddressDto address = distanceCloudAddressDtoService.getAddressInCloud(terminalUid,
+                staticAddressUid);
+
+        DistanceCloudAddressResponse distanceCloudAddressResponse = new DistanceCloudAddressResponse(address);
+
+        distanceCloudAddressResponse.add(linkTo(methodOn(getClass()).cloudAddress(terminalUid, staticAddressUid))
+            .withSelfRel());
+
+        return distanceCloudAddressResponse;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDto.java b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDto.java
new file mode 100644
index 00000000..887e6bf2
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDto.java
@@ -0,0 +1,99 @@
+package net.contargo.iris.distancecloud.dto;
+
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Container for addresses, which are used to describe Addresses within a cloud around a certain GeoLocation.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public final class DistanceCloudAddressDto {
+
+    private final String city;
+    private final String postalcode;
+    private final String suburb;
+    private final BigDecimal distance;
+    private final BigDecimal tollDistance;
+    private final BigDecimal airLineDistanceMeter;
+    private final String country;
+    private final String errorMessage;
+    private final String hashKey;
+    private final String uniqueId;
+
+    public DistanceCloudAddressDto(DistanceCloudAddress address) {
+
+        this.city = address.getCity();
+        this.suburb = address.getSuburb();
+        this.postalcode = address.getPostalcode();
+        this.country = address.getCountry();
+        this.hashKey = address.getHashKey();
+        this.distance = address.getDistance();
+        this.tollDistance = address.getTollDistance();
+        this.airLineDistanceMeter = address.getAirLineDistanceMeter();
+        this.errorMessage = address.getErrorMessage();
+        this.uniqueId = String.valueOf(address.getUniqueId());
+    }
+
+    public String getErrorMessage() {
+
+        return errorMessage;
+    }
+
+
+    public String getCity() {
+
+        return city;
+    }
+
+
+    public String getPostalcode() {
+
+        return postalcode;
+    }
+
+
+    public String getSuburb() {
+
+        return suburb;
+    }
+
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public BigDecimal getTollDistance() {
+
+        return tollDistance;
+    }
+
+
+    public BigDecimal getAirLineDistanceMeter() {
+
+        return airLineDistanceMeter;
+    }
+
+
+    public String getCountry() {
+
+        return country;
+    }
+
+
+    public String getHashKey() {
+
+        return hashKey;
+    }
+
+
+    public String getUniqueId() {
+
+        return uniqueId;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoService.java b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoService.java
new file mode 100644
index 00000000..636e5820
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoService.java
@@ -0,0 +1,13 @@
+package net.contargo.iris.distancecloud.dto;
+
+import java.math.BigInteger;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface DistanceCloudAddressDtoService {
+
+    DistanceCloudAddressDto getAddressInCloud(BigInteger terminalUid, BigInteger staticAddressUid);
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImpl.java b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImpl.java
new file mode 100644
index 00000000..54e911ea
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImpl.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.distancecloud.dto;
+
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+import net.contargo.iris.distancecloud.service.DistanceCloudAddressService;
+
+import java.math.BigInteger;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class DistanceCloudAddressDtoServiceImpl implements DistanceCloudAddressDtoService {
+
+    private final DistanceCloudAddressService service;
+
+    public DistanceCloudAddressDtoServiceImpl(DistanceCloudAddressService service) {
+
+        this.service = service;
+    }
+
+    @Override
+    public DistanceCloudAddressDto getAddressInCloud(BigInteger terminalUid, BigInteger staticAddressUid) {
+
+        DistanceCloudAddress address = service.getAddressInCloud(terminalUid, staticAddressUid);
+
+        return new DistanceCloudAddressDto(address);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressService.java b/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressService.java
new file mode 100644
index 00000000..aa952122
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressService.java
@@ -0,0 +1,15 @@
+package net.contargo.iris.distancecloud.service;
+
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+
+import java.math.BigInteger;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface DistanceCloudAddressService {
+
+    DistanceCloudAddress getAddressInCloud(BigInteger terminalUid, BigInteger staticAddressUid);
+}
diff --git a/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImpl.java b/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImpl.java
new file mode 100644
index 00000000..55274643
--- /dev/null
+++ b/src/main/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImpl.java
@@ -0,0 +1,94 @@
+package net.contargo.iris.distancecloud.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+import net.contargo.iris.gis.service.GisService;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.OSRMNonRoutableRouteException;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class DistanceCloudAddressServiceImpl implements DistanceCloudAddressService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final BigDecimal MULTIPLIER = new BigDecimal(2);
+
+    private final RoundingService roundingService;
+
+    private final TruckRouteService truckRouteService;
+    private final StaticAddressRepository repository;
+    private final GisService gisService;
+    private final TerminalService terminalService;
+
+    public DistanceCloudAddressServiceImpl(TruckRouteService truckRouteService, StaticAddressRepository repository,
+        RoundingService roundingService, GisService gisService, TerminalService terminalService) {
+
+        this.truckRouteService = truckRouteService;
+        this.repository = repository;
+        this.roundingService = roundingService;
+        this.gisService = gisService;
+        this.terminalService = terminalService;
+    }
+
+    @Override
+    public DistanceCloudAddress getAddressInCloud(BigInteger terminalUid, BigInteger staticAddressUid) {
+
+        Terminal terminal = terminalService.getByUniqueId(terminalUid);
+        StaticAddress staticAddress = repository.findByUniqueId(staticAddressUid);
+
+        try {
+            return createDistanceCloudAddress(terminal, staticAddress);
+        } catch (OSRMNonRoutableRouteException e) {
+            LOG.error("Cold not determine route, adding information to distance cloud address bean", e);
+
+            DistanceCloudAddress distanceCloudAddress = new DistanceCloudAddress(staticAddress);
+            distanceCloudAddress.setErrorMessage("Routing not possible");
+
+            return distanceCloudAddress;
+        }
+    }
+
+
+    public DistanceCloudAddress createDistanceCloudAddress(GeoLocation geoLocation, StaticAddress staticAddress) {
+
+        LOG.debug("Creating distance-cloud-address item for {} and {}", geoLocation, staticAddress);
+
+        TruckRoute terminalToAddressRoute = truckRouteService.route(geoLocation, staticAddress);
+        DistanceCloudAddress cloudAddress = new DistanceCloudAddress(staticAddress);
+
+        // distance from geoLocation -> address
+        BigDecimal distanceRounded = terminalToAddressRoute.getDistance();
+        distanceRounded = roundingService.roundDistance(distanceRounded);
+        cloudAddress.setDistance(distanceRounded);
+
+        // toll distance from geoLocation -> address
+        BigDecimal tollDistanceRounded = terminalToAddressRoute.getTollDistance();
+        tollDistanceRounded = roundingService.roundDistance(tollDistanceRounded);
+        cloudAddress.setTollDistance(tollDistanceRounded.multiply(MULTIPLIER));
+
+        // air-line distance
+        BigDecimal airLineDistanceInMeters = gisService.calcAirLineDistInMeters(geoLocation, staticAddress);
+        cloudAddress.setAirLineDistanceMeter(roundingService.roundDistance(airLineDistanceInMeters));
+
+        return cloudAddress;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/duration/service/DurationService.java b/src/main/java/net/contargo/iris/duration/service/DurationService.java
new file mode 100644
index 00000000..789b41ce
--- /dev/null
+++ b/src/main/java/net/contargo/iris/duration/service/DurationService.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.duration.service;
+
+import net.contargo.iris.truck.TruckRoute;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Interface for implementation of duration services..
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface DurationService {
+
+    /**
+     * Returns the duration.
+     *
+     * @param  truckRoute  to extract the duration
+     *
+     * @return  the rounded duration of a {@link TruckRoute}
+     */
+    BigDecimal getDuration(TruckRoute truckRoute);
+}
diff --git a/src/main/java/net/contargo/iris/duration/service/DurationServiceImpl.java b/src/main/java/net/contargo/iris/duration/service/DurationServiceImpl.java
new file mode 100644
index 00000000..2eb98f38
--- /dev/null
+++ b/src/main/java/net/contargo/iris/duration/service/DurationServiceImpl.java
@@ -0,0 +1,28 @@
+package net.contargo.iris.duration.service;
+
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.truck.TruckRoute;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Service implementation of {@link DurationService} to receive (rounded) duration information from entities.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class DurationServiceImpl implements DurationService {
+
+    private final RoundingService roundingService;
+
+    public DurationServiceImpl(RoundingService roundingService) {
+
+        this.roundingService = roundingService;
+    }
+
+    @Override
+    public BigDecimal getDuration(TruckRoute truckRoute) {
+
+        return roundingService.roundDuration(truckRoute.getDuration());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/api/RouteEnricherApiController.java b/src/main/java/net/contargo/iris/enricher/api/RouteEnricherApiController.java
new file mode 100644
index 00000000..6dda79e6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/api/RouteEnricherApiController.java
@@ -0,0 +1,97 @@
+package net.contargo.iris.enricher.api;
+
+import com.mangofactory.swagger.annotations.ApiIgnore;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.enricher.dto.EnricherDtoService;
+import net.contargo.iris.terminal.dto.TerminalDto;
+import net.contargo.iris.terminal.dto.TerminalDtoService;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigInteger;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Api(
+    value = AbstractController.SLASH + RouteEnricherApiController.ROUTE_DETAILS_URL,
+    description = "Api to get eiriched routes"
+)
+@Controller
+@RequestMapping(AbstractController.SLASH + RouteEnricherApiController.ROUTE_DETAILS_URL)
+public class RouteEnricherApiController extends AbstractController {
+
+    public static final String ROUTE_DETAILS_URL = ROUTE_DETAILS;
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final EnricherDtoService enricherDtoService;
+    private final TerminalDtoService terminalDtoService;
+
+    @Autowired
+    RouteEnricherApiController(EnricherDtoService enricherDtoService, TerminalDtoService terminalDtoService) {
+
+        this.enricherDtoService = enricherDtoService;
+        this.terminalDtoService = terminalDtoService;
+    }
+
+    @ApiOperation(
+        value = "Takes a route and returns it enriched with additional information.",
+        notes = "Takes a route and returns it enriched with additional information. The route consists of an arbitrary "
+            + "number of route parts which are passed as request params.\n\n"
+            + "Example usage:\n\n"
+            + "/api/routedetails?data.parts[0].origin.latitude=51.39119&data.parts[0].origin.longitude=6.72873&\n"
+            + "data.parts[0].destination.latitude=51.36833&data.parts[0].destination.longitude=4.3&\n"
+            + "data.parts[0].containerType=TWENTY_LIGHT&data.parts[0].containerState=FULL&\n"
+            + "data.parts[0].routeType=TRUCK&data.parts[1].origin.latitude=51.36833&\n"
+            + "data.parts[1].origin.longitude=4.3&data.parts[1].destination.latitude=51.39119&\n"
+            + "data.parts[1].destination.longitude=6.72873&data.parts[1].containerType=TWENTY_LIGHT&\n"
+            + "data.parts[1].containerState=FULL&data.parts[1].routeType=TRUCK"
+    )
+    @RequestMapping(method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public RouteResponse getEnrichedRoute(@ApiIgnore RouteDto route,
+        @RequestParam(value = "terminal", required = false)
+        @ApiIgnore String terminalUid, Model model) {
+
+        model.asMap().remove("routeDto");
+
+        if (terminalUid != null) {
+            TerminalDto terminal = terminalDtoService.getByUid(new BigInteger(terminalUid));
+            route.setResponsibleTerminal(terminal);
+        }
+
+        RouteResponse response = new RouteResponse();
+        response.setRoute(enricherDtoService.enrich(route));
+        response.add(linkTo(getClass()).withSelfRel());
+
+        LOG.info("API: Responding routedetails with a route with {} parts. Route name is {}",
+            response.getRoute().size(), response.getRoute().getName());
+
+        return response;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/api/RouteResponse.java b/src/main/java/net/contargo/iris/enricher/api/RouteResponse.java
new file mode 100644
index 00000000..a0654bf0
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/api/RouteResponse.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.enricher.api;
+
+import net.contargo.iris.connection.dto.RouteDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneid0r - schneider@synyx.de
+ */
+class RouteResponse extends ResourceSupport {
+
+    private RouteDto route;
+
+    public RouteDto getRoute() {
+
+        return route;
+    }
+
+
+    public void setRoute(RouteDto route) {
+
+        this.route = route;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoService.java b/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoService.java
new file mode 100644
index 00000000..8918319f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoService.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.enricher.dto;
+
+import net.contargo.iris.connection.dto.RouteDto;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface EnricherDtoService {
+
+    /**
+     * Enriches a {@link net.contargo.iris.connection.dto.RouteDto}.
+     *
+     * @param  route  to be enriched
+     *
+     * @return  enriched {@link net.contargo.iris.connection.dto.RouteDto}
+     */
+    RouteDto enrich(RouteDto route);
+}
diff --git a/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImpl.java b/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImpl.java
new file mode 100644
index 00000000..007bbb2c
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImpl.java
@@ -0,0 +1,24 @@
+package net.contargo.iris.enricher.dto;
+
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.enricher.service.EnricherService;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class EnricherDtoServiceImpl implements EnricherDtoService {
+
+    private final EnricherService enricherService;
+
+    public EnricherDtoServiceImpl(EnricherService enricherService) {
+
+        this.enricherService = enricherService;
+    }
+
+    @Override
+    public RouteDto enrich(RouteDto routeDto) {
+
+        return new RouteDto(enricherService.enrich(routeDto.toRoute()));
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricher.java
new file mode 100644
index 00000000..9adfb760
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricher.java
@@ -0,0 +1,39 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.gis.service.GisService;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.route.RoutePart;
+
+import java.math.BigDecimal;
+
+
+/**
+ * RoutePartEnricher for Air-Line-Distance.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class AirLineDistancePartEnricher implements RoutePartEnricher {
+
+    private static final BigDecimal METERS_IN_A_KILOMETER = new BigDecimal(1000);
+
+    private final GisService gisService;
+
+    private final RoundingService roundingService;
+
+    AirLineDistancePartEnricher(GisService gisService, RoundingService roundingService) {
+
+        this.gisService = gisService;
+        this.roundingService = roundingService;
+    }
+
+    @Override
+    public void enrich(RoutePart routePart, EnricherContext context) {
+
+        BigDecimal airLineDistance = gisService.calcAirLineDistInMeters(routePart.getOrigin(),
+                routePart.getDestination());
+        airLineDistance = airLineDistance.divide(METERS_IN_A_KILOMETER);
+        airLineDistance = roundingService.roundDistance(airLineDistance);
+
+        routePart.getData().setAirLineDistance(airLineDistance);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/Co2PartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/Co2PartEnricher.java
new file mode 100644
index 00000000..36330098
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/Co2PartEnricher.java
@@ -0,0 +1,45 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.co2.advice.Co2PartStrategy;
+import net.contargo.iris.co2.advice.Co2PartStrategyAdvisor;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2PartEnricher implements RoutePartEnricher {
+
+    private final Co2PartStrategyAdvisor co2PartStrategyAdvisor;
+
+    @Autowired
+    Co2PartEnricher(Co2PartStrategyAdvisor co2PartStrategyAdvisor) {
+
+        this.co2PartStrategyAdvisor = co2PartStrategyAdvisor;
+    }
+
+    @Override
+    public void enrich(RoutePart routePart, EnricherContext context) throws CriticalEnricherException {
+
+        RouteType routeType = routePart.getRouteType();
+
+        Co2PartStrategy strategy;
+
+        try {
+            strategy = co2PartStrategyAdvisor.advice(routeType);
+        } catch (IllegalStateException e) {
+            throw new CriticalEnricherException("Co2 part enrichment failed", e);
+        }
+
+        BigDecimal emission = strategy.getEmissionForRoutePart(routePart);
+
+        routePart.getData().setCo2(emission);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/Co2TotalEnricher.java b/src/main/java/net/contargo/iris/enricher/service/Co2TotalEnricher.java
new file mode 100644
index 00000000..06d715bc
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/Co2TotalEnricher.java
@@ -0,0 +1,43 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.co2.service.Co2Service;
+import net.contargo.iris.route.Route;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Enricher to set emission information on {@link Route}s.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class Co2TotalEnricher implements RouteTotalEnricher {
+
+    private final Co2Service co2Service;
+
+    @Autowired
+    Co2TotalEnricher(Co2Service co2Service) {
+
+        this.co2Service = co2Service;
+    }
+
+    @Override
+    public void enrich(Route route, EnricherContext context) throws CriticalEnricherException {
+
+        BigDecimal co2;
+        BigDecimal co2DirectTruck;
+
+        try {
+            co2 = co2Service.getEmission(route);
+            co2DirectTruck = co2Service.getEmissionDirectTruck(route);
+        } catch (IllegalStateException e) {
+            throw new CriticalEnricherException("Failed calculating co2 emission", e);
+        }
+
+        route.getData().setCo2(co2);
+        route.getData().setCo2DirectTruck(co2DirectTruck);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/CriticalEnricherException.java b/src/main/java/net/contargo/iris/enricher/service/CriticalEnricherException.java
new file mode 100644
index 00000000..258b0fad
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/CriticalEnricherException.java
@@ -0,0 +1,12 @@
+package net.contargo.iris.enricher.service;
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class CriticalEnricherException extends Exception {
+
+    public CriticalEnricherException(String message, Throwable t) {
+
+        super(message, t);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/Enricher.java b/src/main/java/net/contargo/iris/enricher/service/Enricher.java
new file mode 100644
index 00000000..101dd3f7
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/Enricher.java
@@ -0,0 +1,9 @@
+package net.contargo.iris.enricher.service;
+
+/**
+ * Common interface for all enrichers.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+interface Enricher {
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/EnricherContext.java b/src/main/java/net/contargo/iris/enricher/service/EnricherContext.java
new file mode 100644
index 00000000..9b14dda1
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/EnricherContext.java
@@ -0,0 +1,78 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteType;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+// NOSONAR trailing comment...
+final class EnricherContext { // NOSONAR class can not be instantiated because correct use of builder pattern
+
+    private final RouteDirection routeDirection;
+    private final List<RouteType> routeTypes;
+    private final Map<String, String> errors;
+
+    private EnricherContext(Builder builder) {
+
+        this.routeDirection = builder.routeDirection;
+        this.routeTypes = builder.routeTypes;
+        this.errors = new HashMap<>();
+    }
+
+    public RouteDirection getRouteDirection() {
+
+        return routeDirection;
+    }
+
+
+    public List<RouteType> getRouteTypes() {
+
+        return routeTypes;
+    }
+
+
+    public Map<String, String> getErrors() {
+
+        return errors;
+    }
+
+
+    public void addError(String type, String errorMessage) {
+
+        errors.put(type, errorMessage);
+    }
+
+    public static class Builder {
+
+        private RouteDirection routeDirection;
+        private List<RouteType> routeTypes;
+
+        public Builder routeDirection(RouteDirection value) {
+
+            routeDirection = value;
+
+            return this;
+        }
+
+
+        public Builder routeTypes(List<RouteType> value) {
+
+            routeTypes = value;
+
+            return this;
+        }
+
+
+        public EnricherContext build() {
+
+            return new EnricherContext(this);
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/EnricherService.java b/src/main/java/net/contargo/iris/enricher/service/EnricherService.java
new file mode 100644
index 00000000..331e7d2b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/EnricherService.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+
+
+/**
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface EnricherService {
+
+    /**
+     * Enriches a {@link Route}.
+     *
+     * @param  route  to be enriched
+     *
+     * @return  enriched {@link Route}
+     */
+    Route enrich(Route route);
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/EnricherServiceImpl.java b/src/main/java/net/contargo/iris/enricher/service/EnricherServiceImpl.java
new file mode 100644
index 00000000..23ca8695
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/EnricherServiceImpl.java
@@ -0,0 +1,105 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import org.slf4j.Logger;
+
+import org.springframework.util.Assert;
+
+import java.lang.invoke.MethodHandles;
+
+import java.util.List;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Implementation of interface {@link EnricherService}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class EnricherServiceImpl implements EnricherService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final List<RoutePartEnricher> routePartEnricherList;
+    private final List<RouteTotalEnricher> routeTotalEnricherList;
+
+    public EnricherServiceImpl(List<RoutePartEnricher> routePartEnricherList,
+        List<RouteTotalEnricher> routeTotalEnricherList) {
+
+        Assert.notNull(routePartEnricherList);
+        Assert.notNull(routeTotalEnricherList);
+
+        this.routePartEnricherList = routePartEnricherList;
+        this.routeTotalEnricherList = routeTotalEnricherList;
+    }
+
+    @Override
+    public Route enrich(Route route) {
+
+        EnricherContext enricherContext = new EnricherContext.Builder().routeDirection(route.getDirection()).build();
+
+        try {
+            for (RoutePart routePart : route.getData().getParts()) {
+                enrich(routePart, enricherContext, routePartEnricherList);
+            }
+
+            enrich(route, enricherContext, routeTotalEnricherList);
+        } catch (CriticalEnricherException e) {
+            handleError(route, enricherContext);
+
+            return route;
+        } finally {
+            route.setErrors(enricherContext.getErrors());
+        }
+
+        return route;
+    }
+
+
+    private void enrich(RoutePart routePart, EnricherContext context, List<RoutePartEnricher> routePartEnrichers)
+        throws CriticalEnricherException {
+
+        for (RoutePartEnricher routePartEnricher : routePartEnrichers) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Enriching route using RoutePartEnricher {}", routePartEnricher.getClass().getSimpleName());
+            }
+
+            routePartEnricher.enrich(routePart, context);
+        }
+    }
+
+
+    private void enrich(Route route, EnricherContext context, List<RouteTotalEnricher> routeTotalEnrichers)
+        throws CriticalEnricherException {
+
+        for (RouteTotalEnricher routeTotalEnricher : routeTotalEnrichers) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Enriching route using RouteTotalEnricher {}", routeTotalEnricher.getClass().getSimpleName());
+            }
+
+            routeTotalEnricher.enrich(route, context);
+        }
+    }
+
+
+    private void handleError(Route route, EnricherContext context) {
+
+        List<RoutePart> parts = route.getData().getParts();
+
+        for (RoutePart part : parts) {
+            part.setData(new RoutePartData());
+        }
+
+        RouteData data = new RouteData();
+        data.setParts(parts);
+
+        route.setData(data);
+
+        context.addError("route", "Routing failed");
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/GeoLocationPartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/GeoLocationPartEnricher.java
new file mode 100644
index 00000000..b223c141
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/GeoLocationPartEnricher.java
@@ -0,0 +1,33 @@
+
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.address.nominatim.service.AddressResolutionException;
+import net.contargo.iris.location.GeoLocationService;
+import net.contargo.iris.route.RoutePart;
+
+
+/**
+ * {@link RoutePartEnricher} for {@link net.contargo.iris.GeoLocation}s.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class GeoLocationPartEnricher implements RoutePartEnricher {
+
+    private final GeoLocationService geoLocationService;
+
+    GeoLocationPartEnricher(GeoLocationService geoLocationService) {
+
+        this.geoLocationService = geoLocationService;
+    }
+
+    @Override
+    public void enrich(RoutePart part, EnricherContext context) throws CriticalEnricherException {
+
+        try {
+            part.setOrigin(geoLocationService.getDetailedGeoLocation(part.getOrigin()));
+            part.setDestination(geoLocationService.getDetailedGeoLocation(part.getDestination()));
+        } catch (AddressResolutionException e) {
+            throw new CriticalEnricherException("Not possible to enrich geolocation", e);
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/MainRunPartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/MainRunPartEnricher.java
new file mode 100644
index 00000000..a8d78304
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/MainRunPartEnricher.java
@@ -0,0 +1,62 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+import net.contargo.iris.distance.service.ConnectionDistanceService;
+import net.contargo.iris.mainrun.service.MainRunDurationService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+import net.contargo.iris.route.RouteType;
+
+
+/**
+ * Enricher to set information about distance and duration on a main run {@link RoutePart}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class MainRunPartEnricher implements RoutePartEnricher {
+
+    private final MainRunConnectionService mainRunConnectionService;
+    private final MainRunDurationService mainRunDurationService;
+    private final ConnectionDistanceService connectionDistanceService;
+
+    MainRunPartEnricher(MainRunConnectionService mainRunConnectionService,
+        MainRunDurationService mainRunDurationService, ConnectionDistanceService connectionDistanceService) {
+
+        this.mainRunConnectionService = mainRunConnectionService;
+        this.mainRunDurationService = mainRunDurationService;
+        this.connectionDistanceService = connectionDistanceService;
+    }
+
+    /**
+     * @see  RoutePartEnricher#enrich(net.contargo.iris.route.RoutePart, EnricherContext)
+     */
+    @Override
+    public void enrich(RoutePart routePart, EnricherContext context) throws CriticalEnricherException {
+
+        if (routePart.isOfType(RouteType.BARGE) || routePart.isOfType(RouteType.RAIL)) {
+            RoutePartData routePartData = routePart.getData();
+
+            MainRunConnection mainRunConnection;
+
+            try {
+                mainRunConnection = mainRunConnectionService.findRoutingConnectionBetweenTerminalAndSeaportByType(
+                        routePart.findTerminal(), routePart.findSeaport(), routePart.getRouteType());
+
+                if (mainRunConnection == null) {
+                    throw new IllegalStateException("mainRunConnection may not be null");
+                }
+            } catch (IllegalStateException e) {
+                throw new CriticalEnricherException(
+                    "Enriching not possible: missing terminal or seaport to determine main run connection", e);
+            }
+
+            routePartData.setDistance(connectionDistanceService.getDistance(mainRunConnection));
+            routePartData.setDieselDistance(connectionDistanceService.getDieselDistance(mainRunConnection));
+            routePartData.setElectricDistance(connectionDistanceService.getElectricDistance(mainRunConnection));
+            routePartData.setDuration(mainRunDurationService.getMainRunRoutePartDuration(mainRunConnection, routePart));
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricher.java
new file mode 100644
index 00000000..a35bceec
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricher.java
@@ -0,0 +1,93 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.api.NotFoundException;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.routedatarevision.service.RouteDataRevisionService;
+import net.contargo.iris.terminal.Terminal;
+
+import org.slf4j.Logger;
+
+import java.lang.invoke.MethodHandles;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Enriches a {@link net.contargo.iris.route.RoutePart RoutePart} if the following conditions are met: the route parts
+ * direction is either terminal -> address or address -> terminal and the route parts type is TRUCK
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class RouteDataRevisionPartEnricher implements RoutePartEnricher {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final String MESSAGE = "Route part isn't Address -> Terminal or Terminal -> Address. "
+        + "So not applicable for route data revision.";
+
+    private final RouteDataRevisionService routeDataRevisionService;
+
+    public RouteDataRevisionPartEnricher(RouteDataRevisionService routeDataRevisionService) {
+
+        this.routeDataRevisionService = routeDataRevisionService;
+    }
+
+    @Override
+    public void enrich(RoutePart routePart, EnricherContext context) throws CriticalEnricherException {
+
+        if (routePart.getRouteType() == RouteType.TRUCK) {
+            try {
+                Terminal terminal = extractTerminal(routePart);
+                Address address = extractAddress(routePart);
+
+                RouteDataRevision routeDataRevision = routeDataRevisionService.getRouteDataRevision(terminal, address);
+
+                if (routeDataRevision != null) {
+                    routePart.getData().setDistance(routeDataRevision.getTruckDistanceOneWay());
+                    routePart.getData().setTollDistance(routeDataRevision.getTollDistanceOneWay());
+                    routePart.getData().setAirLineDistance(routeDataRevision.getAirlineDistance());
+                }
+            } catch (NotFoundException e) {
+                LOG.debug(e.getMessage());
+            }
+        }
+    }
+
+
+    private Terminal extractTerminal(RoutePart routePart) {
+
+        Terminal terminal = null;
+
+        if (routePart.getOrigin() instanceof Terminal) {
+            terminal = (Terminal) routePart.getOrigin();
+        } else if (routePart.getDestination() instanceof Terminal) {
+            terminal = (Terminal) routePart.getDestination();
+        }
+
+        if (terminal == null) {
+            throw new NotFoundException(MESSAGE);
+        }
+
+        return terminal;
+    }
+
+
+    private Address extractAddress(RoutePart routePart) {
+
+        Address address = null;
+
+        if (routePart.getOrigin() instanceof Address) {
+            address = (Address) routePart.getOrigin();
+        } else if (routePart.getDestination() instanceof Address) {
+            address = (Address) routePart.getDestination();
+        }
+
+        if (address == null) {
+            throw new NotFoundException(MESSAGE);
+        }
+
+        return address;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/RoutePartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/RoutePartEnricher.java
new file mode 100644
index 00000000..c369f88f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/RoutePartEnricher.java
@@ -0,0 +1,20 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.RoutePart;
+
+
+/**
+ * Interface for instances that can enrich {@link RoutePart} with more data.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+interface RoutePartEnricher extends Enricher {
+
+    /**
+     * Enrich the {@link RoutePart} by any data.
+     *
+     * @param  routePart  the {@link RoutePart} to enrich
+     * @param  context  the {@link EnricherContext}
+     */
+    void enrich(RoutePart routePart, EnricherContext context) throws CriticalEnricherException;
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/RouteTotalEnricher.java b/src/main/java/net/contargo/iris/enricher/service/RouteTotalEnricher.java
new file mode 100644
index 00000000..fe6dc9bf
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/RouteTotalEnricher.java
@@ -0,0 +1,20 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+
+
+/**
+ * Interface for instances that can enrich {@link Route} with more data.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+interface RouteTotalEnricher extends Enricher {
+
+    /**
+     * Enrich the {@link Route} by any data.
+     *
+     * @param  route  to enrich
+     * @param  context  the context
+     */
+    void enrich(Route route, EnricherContext context) throws CriticalEnricherException;
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/TotalEnricher.java b/src/main/java/net/contargo/iris/enricher/service/TotalEnricher.java
new file mode 100644
index 00000000..3421948e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/TotalEnricher.java
@@ -0,0 +1,64 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Enricher that sums up the distances and total distances of a {@link Route} and set it as {@link RouteData}
+ * information.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class TotalEnricher implements RouteTotalEnricher {
+
+    @Override
+    public void enrich(Route route, EnricherContext context) {
+
+        RouteData routeData = route.getData();
+
+        BigDecimal totalDistance = null;
+        BigDecimal totalRealTollDistance = null;
+        BigDecimal totalDuration = null;
+
+        for (RoutePart part : routeData.getParts()) {
+            RoutePartData data = part.getData();
+
+            totalDistance = add(totalDistance, data.getDistance());
+            totalRealTollDistance = add(totalRealTollDistance, data.getTollDistance());
+            totalDuration = add(totalDuration, data.getDuration());
+        }
+
+        routeData.setTotalDistance(totalDistance);
+        routeData.setTotalRealTollDistance(totalRealTollDistance);
+        routeData.setTotalDuration(totalDuration);
+    }
+
+
+    private BigDecimal add(BigDecimal sum, BigDecimal summand) {
+
+        BigDecimal result = sum;
+
+        if (notNull(summand)) {
+            if (sum == null) {
+                result = BigDecimal.ZERO;
+            }
+
+            result = result.add(summand);
+        }
+
+        return result;
+    }
+
+
+    private boolean notNull(BigDecimal subject) {
+
+        return subject != null;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricher.java b/src/main/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricher.java
new file mode 100644
index 00000000..b7159860
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricher.java
@@ -0,0 +1,58 @@
+
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.distance.service.DistanceService;
+import net.contargo.iris.duration.service.DurationService;
+import net.contargo.iris.osrm.service.RoutingException;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Enricher to set information about distance and duration on a Truck {@link RoutePart}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class TruckRoutingPartEnricher implements RoutePartEnricher {
+
+    private final TruckRouteService truckRouteService;
+    private final DistanceService distanceService;
+    private final DurationService durationService;
+
+    TruckRoutingPartEnricher(TruckRouteService truckRouteService, DistanceService distanceService,
+        DurationService durationService) {
+
+        this.truckRouteService = truckRouteService;
+        this.distanceService = distanceService;
+        this.durationService = durationService;
+    }
+
+    @Override
+    public void enrich(RoutePart routePart, EnricherContext context) throws CriticalEnricherException {
+
+        if (routePart.isOfType(RouteType.TRUCK)) {
+            RoutePartData routePartData = routePart.getData();
+
+            TruckRoute truckRoute;
+
+            try {
+                truckRoute = truckRouteService.route(routePart.getOrigin(), routePart.getDestination());
+            } catch (RoutingException e) {
+                throw new CriticalEnricherException("Truck routing failed", e);
+            }
+
+            BigDecimal partDistance = distanceService.getDistance(truckRoute);
+
+            routePartData.setTollDistance(distanceService.getTollDistance(truckRoute));
+            routePartData.setDistance(partDistance);
+            routePartData.setDieselDistance(partDistance);
+            routePartData.setElectricDistance(BigDecimal.ZERO);
+            routePartData.setDuration(durationService.getDuration(truckRoute));
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/enricher/service/TruckingTotalEnricher.java b/src/main/java/net/contargo/iris/enricher/service/TruckingTotalEnricher.java
new file mode 100644
index 00000000..305e5c67
--- /dev/null
+++ b/src/main/java/net/contargo/iris/enricher/service/TruckingTotalEnricher.java
@@ -0,0 +1,59 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+import net.contargo.iris.route.RouteType;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+
+
+/**
+ * Enricher that sums up the totalTollDistance of a {@link Route} and set it as {@link RouteData} information.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+class TruckingTotalEnricher implements RouteTotalEnricher {
+
+    private static final BigDecimal DOUBLING = new BigDecimal("2");
+    private static final BigDecimal DIVISOR = new BigDecimal("2");
+
+    @Override
+    public void enrich(Route route, EnricherContext context) {
+
+        RouteData routeData = route.getData();
+
+        BigDecimal totalTollDistance = BigDecimal.ZERO;
+        BigDecimal totalOnewayTruckDistance = BigDecimal.ZERO;
+
+        for (RoutePart truckPart : getRelevantTruckRouteParts(route)) {
+            RoutePartData truckPartData = truckPart.getData();
+
+            totalTollDistance = totalTollDistance.add(truckPartData.getTollDistance());
+            totalOnewayTruckDistance = totalOnewayTruckDistance.add(truckPartData.getDistance());
+        }
+
+        if (route.isTriangle()) {
+            totalTollDistance = totalTollDistance.divide(DIVISOR);
+            totalOnewayTruckDistance = totalOnewayTruckDistance.divide(DIVISOR);
+        }
+
+        // has to be doubled because above you look only at the oneway
+        routeData.setTotalTollDistance(totalTollDistance.multiply(DOUBLING));
+        routeData.setTotalOnewayTruckDistance(totalOnewayTruckDistance);
+    }
+
+
+    private List<RoutePart> getRelevantTruckRouteParts(Route route) {
+
+        if (route.isTriangle()) {
+            return route.getData().getRoutePartsOfType(RouteType.TRUCK);
+        }
+
+        return route.getData().getOnewayTruckParts().getTruckRoutePartList();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/api/AirlineDistanceApiController.java b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceApiController.java
new file mode 100644
index 00000000..79dde4b1
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceApiController.java
@@ -0,0 +1,108 @@
+package net.contargo.iris.gis.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.gis.dto.AirlineDistanceDto;
+import net.contargo.iris.gis.dto.AirlineDistanceDtoService;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigDecimal;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+
+/**
+ * Implements an RESTful geocode interface.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Api(value = AirlineDistanceApiController.AIRLINE_DISTANCE, description = "API for calculating airline distances.")
+@Controller
+@RequestMapping(AirlineDistanceApiController.AIRLINE_DISTANCE)
+public class AirlineDistanceApiController extends AbstractController {
+
+    static final String AIRLINE_DISTANCE = "airlineDistance";
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+    private static final BigDecimal LAT_MIN = new BigDecimal(-90);
+    private static final BigDecimal LAT_MAX = new BigDecimal(90);
+    private static final BigDecimal LON_MIN = new BigDecimal(-180);
+    private static final BigDecimal LON_MAX = new BigDecimal(180);
+
+    private final AirlineDistanceDtoService airlineDistanceDtoService;
+    private final AirlineDistanceResponseAssembler responseAssembler;
+
+    @Autowired
+    public AirlineDistanceApiController(AirlineDistanceDtoService airlineDistanceDtoService,
+        AirlineDistanceResponseAssembler responseAssembler) {
+
+        this.airlineDistanceDtoService = airlineDistanceDtoService;
+        this.responseAssembler = responseAssembler;
+    }
+
+    @ApiOperation(
+        value = "Calculates the airline distance between two geographical points in meters.",
+        notes = "Calculates the airline distance between two geographical points in meters."
+    )
+    @RequestMapping(method = GET)
+    @ModelAttribute(AIRLINE_DISTANCE)
+    public AirlineDistanceResponse airlineDistance(@RequestParam("alat") String aLatitude,
+        @RequestParam("alon") String aLongitude,
+        @RequestParam("blat") String bLatitude,
+        @RequestParam("blon") String bLongitude) {
+
+        validateGeoCoordinates(aLatitude, aLongitude, bLatitude, bLongitude);
+
+        AirlineDistanceDto airlineDistanceDto = airlineDistanceDtoService.calcAirLineDistInMeters(aLatitude, aLongitude,
+                bLatitude, bLongitude);
+        LOG.info("API: Responding to request for airline distance between geographic locations");
+
+        return responseAssembler.toResource(airlineDistanceDto);
+    }
+
+
+    private void validateGeoCoordinates(String alat, String alon, String blat, String blon) {
+
+        validateLatitude(alat);
+        validateLongitude(alon);
+        validateLatitude(blat);
+        validateLongitude(blon);
+    }
+
+
+    private void validateLatitude(String lat) {
+
+        // may throw a NumberFormatException
+        BigDecimal latitude = new BigDecimal(lat);
+
+        if (latitude.compareTo(LAT_MIN) == -1 || latitude.compareTo(LAT_MAX) == 1) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+
+    private void validateLongitude(String lon) {
+
+        // may throw a NumberFormatException
+        BigDecimal longitude = new BigDecimal(lon);
+
+        if (longitude.compareTo(LON_MIN) == -1 || longitude.compareTo(LON_MAX) == 1) {
+            throw new IllegalArgumentException();
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponse.java b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponse.java
new file mode 100644
index 00000000..7aff0885
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponse.java
@@ -0,0 +1,34 @@
+package net.contargo.iris.gis.api;
+
+import net.contargo.iris.gis.dto.AirlineDistanceDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class AirlineDistanceResponse extends ResourceSupport {
+
+    private final BigDecimal distance;
+    private final String unit;
+
+    public AirlineDistanceResponse(AirlineDistanceDto airlineDistanceDto) {
+
+        this.distance = airlineDistanceDto.getDistance();
+        this.unit = airlineDistanceDto.getUnit().getName();
+    }
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public String getUnit() {
+
+        return unit;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssembler.java b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssembler.java
new file mode 100644
index 00000000..9a584e6e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssembler.java
@@ -0,0 +1,38 @@
+package net.contargo.iris.gis.api;
+
+import net.contargo.iris.gis.dto.AirlineDistanceDto;
+
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.mvc.ResourceAssemblerSupport;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+
+
+/**
+ * {@link ResourceAssemblerSupport} that maps an {@link net.contargo.iris.gis.dto.AirlineDistanceDto} to an object of
+ * type {@link AirlineDistanceResponse}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ */
+class AirlineDistanceResponseAssembler extends ResourceAssemblerSupport<AirlineDistanceDto, AirlineDistanceResponse> {
+
+    public AirlineDistanceResponseAssembler() {
+
+        super(AirlineDistanceApiController.class, AirlineDistanceResponse.class);
+    }
+
+    @Override
+    public AirlineDistanceResponse toResource(AirlineDistanceDto airlineDistanceDto) {
+
+        AirlineDistanceResponse airlineDistanceResponse = new AirlineDistanceResponse(airlineDistanceDto);
+
+        Link linkWithoutParams = linkTo(AirlineDistanceApiController.class).withSelfRel();
+
+        // Did not find a way to attach ?-params properly with ControllerLinkBuilder
+        Link linkWithParams = new Link(linkWithoutParams.getHref().concat(airlineDistanceDto.getScope()),
+                linkWithoutParams.getRel());
+        airlineDistanceResponse.add(linkWithParams);
+
+        return airlineDistanceResponse;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDto.java b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDto.java
new file mode 100644
index 00000000..ec49991d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDto.java
@@ -0,0 +1,42 @@
+package net.contargo.iris.gis.dto;
+
+import java.math.BigDecimal;
+
+
+/**
+ * DTO class that encapsulates information about airline distance and its unit. Also contains the scope information that
+ * may be accessed when this DTO gets mapped to an object of type
+ * {@link net.contargo.iris.gis.api.AirlineDistanceResponse}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class AirlineDistanceDto {
+
+    private final BigDecimal distance;
+    private final AirlineDistanceUnit unit;
+    private final String scope;
+
+    public AirlineDistanceDto(BigDecimal distance, AirlineDistanceUnit unit, String scope) {
+
+        this.distance = distance;
+        this.unit = unit;
+        this.scope = scope;
+    }
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public AirlineDistanceUnit getUnit() {
+
+        return unit;
+    }
+
+
+    public String getScope() {
+
+        return scope;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoService.java b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoService.java
new file mode 100644
index 00000000..fc9b3753
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoService.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.gis.dto;
+
+/**
+ * Delegates service calls to the injected {@link GisService}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface AirlineDistanceDtoService {
+
+    /**
+     * Calculates the airline distance between two geographical points (each represented by latitude and longitude) in
+     * meters.
+     *
+     * @param  alat  latitude of point A
+     * @param  alon  longitude of point A
+     * @param  blat  latitude of point B
+     * @param  blon  longitude of point B
+     *
+     * @return  an object of type {@link AirlineDistanceDto} representing the airline distance
+     */
+    AirlineDistanceDto calcAirLineDistInMeters(String alat, String alon, String blat, String blon);
+}
diff --git a/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImpl.java b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImpl.java
new file mode 100644
index 00000000..737f212a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImpl.java
@@ -0,0 +1,42 @@
+package net.contargo.iris.gis.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.gis.service.GisService;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.gis.dto.AirlineDistanceUnit.METER;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class AirlineDistanceDtoServiceImpl implements AirlineDistanceDtoService {
+
+    private GisService gisService;
+
+    AirlineDistanceDtoServiceImpl() {
+
+        // a nor-arg constructor must be available
+    }
+
+
+    public AirlineDistanceDtoServiceImpl(GisService gisService) {
+
+        this.gisService = gisService;
+    }
+
+    @Override
+    public AirlineDistanceDto calcAirLineDistInMeters(String alat, String alon, String blat, String blon) {
+
+        // the scope identifies the distance that gets calculated
+        StringBuilder scope = new StringBuilder();
+        scope.append("?alat=").append(alat).append("&alon=").append(alon);
+        scope.append("&blat=").append(blat).append("&blon=").append(blon);
+
+        GeoLocation a = new GeoLocation(new BigDecimal(alat), new BigDecimal(alon));
+        GeoLocation b = new GeoLocation(new BigDecimal(blat), new BigDecimal(blon));
+
+        return new AirlineDistanceDto(gisService.calcAirLineDistInMeters(a, b), METER, scope.toString());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceUnit.java b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceUnit.java
new file mode 100644
index 00000000..07c6228f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/dto/AirlineDistanceUnit.java
@@ -0,0 +1,21 @@
+package net.contargo.iris.gis.dto;
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public enum AirlineDistanceUnit {
+
+    METER("meter");
+
+    private final String name;
+
+    private AirlineDistanceUnit(String name) {
+
+        this.name = name;
+    }
+
+    public String getName() {
+
+        return name;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/gis/service/GisService.java b/src/main/java/net/contargo/iris/gis/service/GisService.java
new file mode 100644
index 00000000..a2ae2501
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/service/GisService.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.gis.service;
+
+import net.contargo.iris.GeoLocation;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Provides geocode-related services.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface GisService {
+
+    GeoLocation CENTER_OF_THE_EUROPEAN_UNION = new GeoLocation(new BigDecimal("50.1725"), new BigDecimal("9.15"));
+
+    /**
+     * Calculates the airline distance between two geographical points in meters.
+     *
+     * @param  a  The first geographic location
+     * @param  b  The second geographic location
+     *
+     * @return  The distance between a and b, in meters
+     */
+    BigDecimal calcAirLineDistInMeters(GeoLocation a, GeoLocation b);
+}
diff --git a/src/main/java/net/contargo/iris/gis/service/GisServiceImpl.java b/src/main/java/net/contargo/iris/gis/service/GisServiceImpl.java
new file mode 100644
index 00000000..99687fe5
--- /dev/null
+++ b/src/main/java/net/contargo/iris/gis/service/GisServiceImpl.java
@@ -0,0 +1,24 @@
+package net.contargo.iris.gis.service;
+
+import net.contargo.iris.GeoLocation;
+
+import org.geotools.referencing.GeodeticCalculator;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Sven Mueller - mueller@synyx.de
+ */
+public class GisServiceImpl implements GisService {
+
+    @Override
+    public BigDecimal calcAirLineDistInMeters(GeoLocation a, GeoLocation b) {
+
+        GeodeticCalculator calculator = new GeodeticCalculator();
+        calculator.setStartingGeographicPoint(a.getLongitude().doubleValue(), a.getLatitude().doubleValue());
+        calculator.setDestinationGeographicPoint(b.getLongitude().doubleValue(), b.getLatitude().doubleValue());
+
+        return new BigDecimal(calculator.getOrthodromicDistance());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/location/GeoLocationService.java b/src/main/java/net/contargo/iris/location/GeoLocationService.java
new file mode 100644
index 00000000..ecc90d7b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/location/GeoLocationService.java
@@ -0,0 +1,21 @@
+package net.contargo.iris.location;
+
+import net.contargo.iris.GeoLocation;
+
+
+/**
+ * Provides services related to {@link net.contargo.iris.GeoLocation} entities.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface GeoLocationService {
+
+    /**
+     * Tries to find a detailed geolocation by a geolocation with only the gps data.
+     *
+     * @param  location {@link GeoLocation} with only longitude and latitude
+     *
+     * @return  Full {@link GeoLocation} with all information about this place
+     */
+    GeoLocation getDetailedGeoLocation(GeoLocation location);
+}
diff --git a/src/main/java/net/contargo/iris/location/GeoLocationServiceImpl.java b/src/main/java/net/contargo/iris/location/GeoLocationServiceImpl.java
new file mode 100644
index 00000000..0dcb08a6
--- /dev/null
+++ b/src/main/java/net/contargo/iris/location/GeoLocationServiceImpl.java
@@ -0,0 +1,64 @@
+package net.contargo.iris.location;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.service.AddressServiceWrapper;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.slf4j.Logger;
+
+import java.lang.invoke.MethodHandles;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Provides implementations related to {@link net.contargo.iris.GeoLocation} entities.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class GeoLocationServiceImpl implements GeoLocationService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final TerminalService terminalService;
+    private final SeaportService seaportService;
+    private final AddressServiceWrapper addressServiceWrapper;
+
+    public GeoLocationServiceImpl(TerminalService terminalService, SeaportService seaportService,
+        AddressServiceWrapper addressServiceWrapper) {
+
+        this.terminalService = terminalService;
+        this.seaportService = seaportService;
+        this.addressServiceWrapper = addressServiceWrapper;
+    }
+
+    @Override
+    public GeoLocation getDetailedGeoLocation(GeoLocation location) {
+
+        GeoLocation enrichedLocation = seaportService.getByGeoLocation(location);
+
+        if (enrichedLocation == null) {
+            enrichedLocation = terminalService.getByGeoLocation(location);
+        }
+
+        // try to resolve address from cache
+        if (enrichedLocation == null) {
+            Address address = addressServiceWrapper.getAddressForGeoLocation(location);
+
+            if (null == address) {
+                LOG.warn("Couldn't resolve address for {}", location);
+            } else {
+                enrichedLocation = address;
+            }
+        }
+
+        // if nothing found, set given location to enriched one
+        if (enrichedLocation == null) {
+            enrichedLocation = location;
+        }
+
+        return enrichedLocation;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/login/web/LoginController.java b/src/main/java/net/contargo/iris/login/web/LoginController.java
new file mode 100644
index 00000000..bbc3acc3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/login/web/LoginController.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.login.web;
+
+import net.contargo.iris.api.AbstractController;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import static net.contargo.iris.api.AbstractController.LOGIN;
+import static net.contargo.iris.api.AbstractController.SLASH;
+
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+@Controller
+@RequestMapping(value = SLASH + LOGIN)
+public class LoginController extends AbstractController {
+
+    private static final String CONTROLLER_CONTEXT = "login" + SLASH;
+
+    @RequestMapping(value = "", method = GET)
+    public String getLogin() {
+
+        return CONTROLLER_CONTEXT + LOGIN;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationService.java b/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationService.java
new file mode 100644
index 00000000..752d599a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationService.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.mainrun.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.route.RoutePart;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Sven Mueller - mueller@synyx.de
+ */
+public interface MainRunDurationService {
+
+    /**
+     * Computes the duration of a {@link RoutePart}.
+     *
+     * @param  routePart  a {@link RoutePart}
+     * @param  mainrunConnection
+     *
+     * @return  the duration of {@code routePart} if it's a main run, 0 if it's not
+     */
+    BigDecimal getMainRunRoutePartDuration(MainRunConnection mainrunConnection, RoutePart routePart);
+}
diff --git a/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImpl.java b/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImpl.java
new file mode 100644
index 00000000..477ee517
--- /dev/null
+++ b/src/main/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImpl.java
@@ -0,0 +1,65 @@
+package net.contargo.iris.mainrun.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+
+/**
+ * Computes duration of main runs and rounds results.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class MainRunDurationServiceImpl implements MainRunDurationService {
+
+    // average speeds in km/h
+    private static final BigDecimal AVERAGE_SPEED_BARGE_UPSTREAM = new BigDecimal("10.0");
+    private static final BigDecimal AVERAGE_SPEED_BARGE_DOWNSTREAM = new BigDecimal("18.0");
+    private static final BigDecimal AVERAGE_SPEED_RAIL = new BigDecimal("45.0");
+    private static final BigDecimal SECONDS_IN_AN_HOUR = new BigDecimal("60.0");
+    private static final int SCALE = 5;
+
+    private final RoundingService roundingService;
+
+    public MainRunDurationServiceImpl(RoundingService roundingService) {
+
+        this.roundingService = roundingService;
+    }
+
+    /**
+     * @see  MainRunDurationService#getMainRunRoutePartDuration(net.contargo.iris.connection.MainRunConnection,
+     *       net.contargo.iris.route.RoutePart)
+     */
+    @Override
+    public BigDecimal getMainRunRoutePartDuration(MainRunConnection mainrunConnection, RoutePart routePart) {
+
+        RoutePart.Direction direction = routePart.getDirection();
+        BigDecimal distance = mainrunConnection.getTotalDistance();
+        BigDecimal divisor;
+
+        if (routePart.isOfType(RouteType.BARGE)) {
+            // electric distance is 0.0 if route part is of type barge, so you don't need to consider it in the
+            // calculation
+            if (direction == RoutePart.Direction.DOWNSTREAM) {
+                divisor = AVERAGE_SPEED_BARGE_DOWNSTREAM;
+            } else {
+                divisor = AVERAGE_SPEED_BARGE_UPSTREAM;
+            }
+        } else if (routePart.isOfType(RouteType.RAIL)) {
+            divisor = AVERAGE_SPEED_RAIL;
+        } else {
+            // not a main run route part, return 0.0
+            return BigDecimal.ZERO;
+        }
+
+        BigDecimal duration = distance.divide(divisor, SCALE, RoundingMode.HALF_UP).multiply(SECONDS_IN_AN_HOUR);
+
+        return roundingService.roundDuration(duration);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/normalizer/NormalizerService.java b/src/main/java/net/contargo/iris/normalizer/NormalizerService.java
new file mode 100644
index 00000000..ef180c24
--- /dev/null
+++ b/src/main/java/net/contargo/iris/normalizer/NormalizerService.java
@@ -0,0 +1,18 @@
+package net.contargo.iris.normalizer;
+
+/**
+ * Provides services to normalize Strings.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface NormalizerService {
+
+    /**
+     * Normalizes a given string by replacing umlaut, whitespaces, ...
+     *
+     * @param  text  to normalize
+     *
+     * @return  normalized string
+     */
+    String normalize(String text);
+}
diff --git a/src/main/java/net/contargo/iris/normalizer/NormalizerServiceImpl.java b/src/main/java/net/contargo/iris/normalizer/NormalizerServiceImpl.java
new file mode 100644
index 00000000..c29f5bdd
--- /dev/null
+++ b/src/main/java/net/contargo/iris/normalizer/NormalizerServiceImpl.java
@@ -0,0 +1,92 @@
+package net.contargo.iris.normalizer;
+
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+/**
+ * Normalizer for iris related normalizations.
+ *
+ * <ul>
+ * <li>ä --> ae, ö --> oe, ü --> ue</li>
+ * <li>ß --> ss</li>
+ * <li>only chars, no numbers, hyphens, etc.</li>
+ * <li>to upper case</li>
+ * </ul>
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class NormalizerServiceImpl implements NormalizerService {
+
+    private final CustomNormalizer normalizerUE = new CustomNormalizer("[üÜ]", "ue");
+    private final CustomNormalizer normalizerOE = new CustomNormalizer("[öÖ]", "oe");
+    private final CustomNormalizer normalizerAE = new CustomNormalizer("[äÄ]", "ae");
+    private final CustomNormalizer normalizerSS = new CustomNormalizer("ß", "ss");
+    private final CustomNormalizer normalizerRemoveNumbers = new CustomNormalizer("\\d", "");
+    private final CustomNormalizer normalizerRemovePunct = new CustomNormalizer("\\p{Punct}", "");
+    private final CustomNormalizer normalizerRemoveWhitespaces = new CustomNormalizer("\\s", "");
+
+    @Override
+    public String normalize(String text) {
+
+        if (text == null || text.isEmpty()) {
+            return text;
+        }
+
+        String normalizedText;
+
+        normalizedText = replace(text, normalizerUE);
+        normalizedText = replace(normalizedText, normalizerOE);
+        normalizedText = replace(normalizedText, normalizerAE);
+        normalizedText = replace(normalizedText, normalizerSS);
+        normalizedText = replace(normalizedText, normalizerRemoveNumbers);
+        normalizedText = replace(normalizedText, normalizerRemovePunct);
+        normalizedText = replace(normalizedText, normalizerRemoveWhitespaces);
+
+        normalizedText = normalizedText.toUpperCase(Locale.getDefault());
+
+        return normalizedText;
+    }
+
+
+    private String replace(String text, CustomNormalizer normalizer) {
+
+        Matcher matcher = Pattern.compile(normalizer.getRegex()).matcher(text);
+
+        StringBuffer stringBuffer = new StringBuffer();
+
+        while (matcher.find()) {
+            matcher.appendReplacement(stringBuffer, normalizer.getReplacement());
+        }
+
+        matcher.appendTail(stringBuffer);
+
+        return stringBuffer.toString();
+    }
+
+    private static final class CustomNormalizer {
+
+        private final String regex;
+
+        private final String replacement;
+
+        private CustomNormalizer(String regex, String replacement) {
+
+            this.regex = regex;
+            this.replacement = replacement;
+        }
+
+        public String getRegex() {
+
+            return regex;
+        }
+
+
+        public String getReplacement() {
+
+            return replacement;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponse.java b/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponse.java
new file mode 100644
index 00000000..c02c0017
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponse.java
@@ -0,0 +1,70 @@
+package net.contargo.iris.osrm.service;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+/**
+ * Response of the osrm server. This response contains two important information. The first are the total kilometers and
+ * time which is provided in the route_summary attribute. And the total toll kilometers which are provided in the
+ * route_instructions.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@JsonIgnoreProperties({ "hint_data", "route_name", "via_indices", "found_alternative", "via_points" })
+class OSRMJsonResponse {
+
+    private int status;
+    private String status_message; // NOSONAR Field is legacy part of public API
+    private OSRMJsonResponseRouteSummary route_summary; // NOSONAR Field is legacy part of public API
+    private String[][] route_instructions; // NOSONAR Field is legacy part of public API
+
+    public String[][] getRoute_instructions() { // NOSONAR Field is part of public API, therefore unchangable legacy
+
+        String[][] routeInstructions = route_instructions;
+
+        return routeInstructions;
+    }
+
+
+    public void setRoute_instructions(String[][] routeInstructions) { // NOSONAR Field is legacy part of public API
+
+        route_instructions = routeInstructions.clone();
+    }
+
+
+    public int getStatus() {
+
+        return status;
+    }
+
+
+    public void setStatus(int status) {
+
+        this.status = status;
+    }
+
+
+    public String getStatus_message() { // NOSONAR Field is legacy part of public API
+
+        return status_message;
+    }
+
+
+    public void setStatus_message(String statusMessage) { // NOSONAR Field is legacy part of public API
+
+        this.status_message = statusMessage;
+    }
+
+
+    public OSRMJsonResponseRouteSummary getRoute_summary() { // NOSONAR Field is legacy part of public API
+
+        return route_summary;
+    }
+
+
+    public void setRoute_summary(OSRMJsonResponseRouteSummary routeSummary) { // NOSONAR Field is part of public API
+
+        this.route_summary = routeSummary;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponseRouteSummary.java b/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponseRouteSummary.java
new file mode 100644
index 00000000..058a3064
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/OSRMJsonResponseRouteSummary.java
@@ -0,0 +1,73 @@
+package net.contargo.iris.osrm.service;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * Reponse Object from the OSRM Route Summary.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+class OSRMJsonResponseRouteSummary {
+
+    private static final String TOTAL_DISTANCE = "total_distance";
+    private static final String TOTAL_TIME = "total_time";
+    private static final String START_POINT = "start_point";
+    private static final String END_POINT = "end_point";
+
+    @JsonProperty(TOTAL_DISTANCE)
+    private double totalDistance;
+    @JsonProperty(TOTAL_TIME)
+    private double totalTime;
+    @JsonProperty(START_POINT)
+    private String startPoint;
+    @JsonProperty(END_POINT)
+    private String endPoint;
+
+    public double getTotal_distance() { // NOSONAR Field is legacy part of public API
+
+        return totalDistance;
+    }
+
+
+    public void setTotalDistance(double totalDistance) {
+
+        this.totalDistance = totalDistance;
+    }
+
+
+    public double getTotalTime() {
+
+        return totalTime;
+    }
+
+
+    public void setTotalTime(double totalTime) {
+
+        this.totalTime = totalTime;
+    }
+
+
+    public String getStart_point() { // NOSONAR Field is legacy part of public API
+
+        return startPoint;
+    }
+
+
+    public void setStartPoint(String startPoint) {
+
+        this.startPoint = startPoint;
+    }
+
+
+    public String getEnd_point() { // NOSONAR Field is legacy part of public API
+
+        return endPoint;
+    }
+
+
+    public void setEndPoint(String endPoint) {
+
+        this.endPoint = endPoint;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/OSRMQueryResult.java b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryResult.java
new file mode 100644
index 00000000..95a7b25a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryResult.java
@@ -0,0 +1,54 @@
+package net.contargo.iris.osrm.service;
+
+import java.util.Arrays;
+
+
+/**
+ * Represents the result of a OSRM Query to the application. So we dont have to use the OSRM Response returned by the
+ * OSRM service
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public final class OSRMQueryResult {
+
+    private final int status;
+    private final double totalDistance;
+    private final double totalTime;
+    private final String[][] routeInstructions;
+
+    public OSRMQueryResult(int status, double totalDistance, double totalTime, String[][] instructions) {
+
+        this.status = status;
+        this.totalDistance = totalDistance;
+        this.totalTime = totalTime;
+
+        if (instructions == null) {
+            this.routeInstructions = new String[0][0];
+        } else {
+            this.routeInstructions = instructions.clone();
+        }
+    }
+
+    public int getStatus() {
+
+        return status;
+    }
+
+
+    public double getTotalDistance() {
+
+        return totalDistance;
+    }
+
+
+    public double getTotalTime() {
+
+        return totalTime;
+    }
+
+
+    public String[][] getRouteInstructions() {
+
+        return Arrays.copyOf(routeInstructions, routeInstructions.length);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/OSRMQueryService.java b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryService.java
new file mode 100644
index 00000000..3b640b61
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryService.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.osrm.service;
+
+import net.contargo.iris.GeoLocation;
+
+
+/**
+ * Interface of the osrm services.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface OSRMQueryService {
+
+    /**
+     * Returns the information from osrm of the route between the start and the destination.
+     *
+     * @param  start {@link GeoLocation }of the start point
+     * @param  destination {@link GeoLocation } of the destination point
+     *
+     * @return  {@link OSRMQueryResult} with all information given by the osrm server
+     */
+    OSRMQueryResult getOSRMXmlRoute(GeoLocation start, GeoLocation destination);
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/OSRMQueryServiceImpl.java b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryServiceImpl.java
new file mode 100644
index 00000000..7f350169
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/OSRMQueryServiceImpl.java
@@ -0,0 +1,86 @@
+package net.contargo.iris.osrm.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.util.HttpUtil;
+import net.contargo.iris.util.HttpUtilException;
+
+import java.io.IOException;
+
+
+/**
+ * Implementation of the osrm query service.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class OSRMQueryServiceImpl implements OSRMQueryService {
+
+    private static final int STATUS_NO_ROUTE = 207;
+
+    private static final String Q_QUESTIONMARK = "?";
+    private static final String Q_EQUALS = "=";
+    private static final String Q_AMPERSAND = "&";
+    private static final String Q_COMMA = ",";
+
+    private static final String Q_LOCATION = "loc";
+    private static final String Q_ZOOM = "z";
+    private static final String Q_GEOMETRY = "geometry";
+    private static final String Q_INSTRUCTIONS = "instructions";
+    private static final String Q_ALTERNATIVE = "alt";
+
+    private final String baseUrl;
+    private final HttpUtil httpUtil;
+    private final ObjectMapper objectMapper;
+
+    public OSRMQueryServiceImpl(HttpUtil httpUtil, String baseUrl, ObjectMapper objectMapper) {
+
+        this.httpUtil = httpUtil;
+        this.baseUrl = baseUrl;
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public OSRMQueryResult getOSRMXmlRoute(GeoLocation start, GeoLocation destination) {
+
+        try {
+            return createOSRMQueryResult(route(start, destination));
+        } catch (HttpUtilException | IOException e) {
+            throw new RoutingException("Error querying OSRM service: ", e);
+        }
+    }
+
+
+    private OSRMJsonResponse route(GeoLocation start, GeoLocation destination) throws IOException {
+
+        String query = createOSRMQueryString(start, destination);
+        String response = httpUtil.getResponseContent(query);
+
+        return objectMapper.readValue(response, OSRMJsonResponse.class);
+    }
+
+
+    private String createOSRMQueryString(GeoLocation start, GeoLocation destination) {
+
+        return baseUrl + Q_QUESTIONMARK + Q_LOCATION + Q_EQUALS + start.getLatitude() + Q_COMMA + start.getLongitude()
+            + Q_AMPERSAND + Q_LOCATION + Q_EQUALS + destination.getLatitude() + Q_COMMA + destination.getLongitude()
+            + Q_AMPERSAND + Q_ZOOM + Q_EQUALS + 0 + Q_AMPERSAND + Q_GEOMETRY + Q_EQUALS + false + Q_AMPERSAND
+            + Q_INSTRUCTIONS + Q_EQUALS + true + Q_AMPERSAND + Q_ALTERNATIVE + Q_EQUALS + false;
+    }
+
+
+    private OSRMQueryResult createOSRMQueryResult(OSRMJsonResponse response) {
+
+        double totalDistance = 0d;
+        double totalTime = 0d;
+        int status = response.getStatus();
+
+        if (status != STATUS_NO_ROUTE) {
+            totalDistance = response.getRoute_summary().getTotal_distance();
+            totalTime = response.getRoute_summary().getTotalTime();
+        }
+
+        return new OSRMQueryResult(status, totalDistance, totalTime, response.getRoute_instructions());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/osrm/service/RoutingException.java b/src/main/java/net/contargo/iris/osrm/service/RoutingException.java
new file mode 100644
index 00000000..a2a9ef39
--- /dev/null
+++ b/src/main/java/net/contargo/iris/osrm/service/RoutingException.java
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package net.contargo.iris.osrm.service;
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RoutingException extends RuntimeException {
+
+    private static final long serialVersionUID = -659534689406599095L;
+
+    public RoutingException(String message, Exception cause) {
+
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/rounding/RoundingService.java b/src/main/java/net/contargo/iris/rounding/RoundingService.java
new file mode 100644
index 00000000..782a6d2b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/rounding/RoundingService.java
@@ -0,0 +1,32 @@
+package net.contargo.iris.rounding;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Interface for instances that helps to round data informations.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public interface RoundingService {
+
+    int DIGITS_TO_CUT_DISTANCE = 3;
+    int DIGITS_TO_CUT_DURATION = 1;
+    int DIGITS_TO_ROUND = 0;
+
+    /**
+     * @param  bigDecimal  BigDecimal to round
+     *
+     * @return  bigDecimal rounded BigDecimal
+     */
+    BigDecimal roundDistance(BigDecimal bigDecimal);
+
+
+    /**
+     * @param  bigDecimal  BigDecimal to round
+     *
+     * @return  bigDecimal rounded BigDecimal
+     */
+    BigDecimal roundDuration(BigDecimal bigDecimal);
+}
diff --git a/src/main/java/net/contargo/iris/rounding/RoundingServiceImpl.java b/src/main/java/net/contargo/iris/rounding/RoundingServiceImpl.java
new file mode 100644
index 00000000..fd1447e3
--- /dev/null
+++ b/src/main/java/net/contargo/iris/rounding/RoundingServiceImpl.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.rounding;
+
+import java.math.BigDecimal;
+
+import static java.math.BigDecimal.ROUND_DOWN;
+import static java.math.BigDecimal.ROUND_UP;
+
+
+/**
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class RoundingServiceImpl implements RoundingService {
+
+    @Override
+    public BigDecimal roundDistance(BigDecimal bigDecimal) {
+
+        return bigDecimal.setScale(DIGITS_TO_CUT_DISTANCE, ROUND_DOWN).setScale(DIGITS_TO_ROUND, ROUND_UP);
+    }
+
+
+    @Override
+    public BigDecimal roundDuration(BigDecimal bigDecimal) {
+
+        return bigDecimal.setScale(DIGITS_TO_CUT_DURATION, ROUND_DOWN).setScale(DIGITS_TO_ROUND, ROUND_UP);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/DirectTruckRouteBuilder.java b/src/main/java/net/contargo/iris/route/DirectTruckRouteBuilder.java
new file mode 100644
index 00000000..098820e9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/DirectTruckRouteBuilder.java
@@ -0,0 +1,98 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Helper class to build a direct truck route from a given route.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class DirectTruckRouteBuilder {
+
+    private final TruckRouteService truckRouteService;
+
+    public DirectTruckRouteBuilder(TruckRouteService truckRouteService) {
+
+        this.truckRouteService = truckRouteService;
+    }
+
+    /**
+     * Builds the corresponding direct truck route to a given {@link Route} that may have mainrun parts.
+     *
+     * @param  route {@link Route}
+     *
+     * @return  corresponding direct truck route to the given {@link Route}
+     */
+    public Route getCorrespondingDirectTruckRoute(Route route) {
+
+        Route newRoute = new Route();
+
+        boolean skipLoop = false;
+
+        for (int i = 0; i < route.getData().getParts().size(); i++) {
+            if (skipLoop) {
+                skipLoop = false;
+
+                continue;
+            }
+
+            RoutePart currentPart = route.getData().getParts().get(i);
+            RoutePart partToAdd = currentPart.copyWithoutData();
+
+            if (!isLastPart(route, i)) {
+                RoutePart nextPart = route.getData().getParts().get(i + 1);
+
+                if (stopsOnTerminal(currentPart, nextPart)) {
+                    partToAdd = currentPart.copyWithoutData();
+                    partToAdd.setDestination(nextPart.getDestination());
+                    partToAdd.setRouteType(RouteType.TRUCK);
+
+                    // skip over the next part
+                    skipLoop = true;
+                }
+            }
+
+            enrichRoutePartWithDistance(partToAdd);
+            newRoute.getData().getParts().add(partToAdd);
+        }
+
+        return newRoute;
+    }
+
+
+    private boolean isLastPart(Route route, int i) {
+
+        return i == route.getData().getParts().size() - 1;
+    }
+
+
+    private void enrichRoutePartWithDistance(RoutePart part) {
+
+        TruckRoute route = truckRouteService.route(part.getOrigin(), part.getDestination());
+        BigDecimal distance = route.getDistance();
+        part.getData().setDistance(distance);
+    }
+
+
+    /**
+     * Checks if {@link Route} has a {@link Terminal} as stopover. (e.g. if {@link Route} has schema: Seaport -->
+     * Terminal --> Destination --> Terminal)
+     *
+     * @param  currentPart {@link RoutePart}
+     * @param  nextPart {@link RoutePart}
+     *
+     * @return  true if {@link Route} has a {@link Terminal} as stopover, false if not (i.e. Terminal is end or start
+     *          point, e.g.: Seaport --> Destination --> Terminal)
+     */
+    private boolean stopsOnTerminal(RoutePart currentPart, RoutePart nextPart) {
+
+        return (currentPart.getDestination() instanceof Terminal)
+            && currentPart.getDestination().equals(nextPart.getOrigin());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/Route.java b/src/main/java/net/contargo/iris/route/Route.java
new file mode 100644
index 00000000..55c21f84
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/Route.java
@@ -0,0 +1,196 @@
+package net.contargo.iris.route;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.terminal.Terminal;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.container.ContainerState.EMPTY;
+import static net.contargo.iris.container.ContainerState.FULL;
+
+
+/**
+ * Represents a combined routing, consisting of multiple RoutePart objects.
+ *
+ * <p>A typical example would be a Route consisting of a BargeRoute, followed by a TruckRoute.</p>
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class Route {
+
+    private RouteData data = new RouteData();
+
+    private Terminal responsibleTerminal;
+
+    private Map<String, String> errors = new HashMap<>();
+
+    public RouteData getData() {
+
+        return data;
+    }
+
+
+    public void setData(RouteData data) {
+
+        this.data = data;
+    }
+
+
+    public Map<String, String> getErrors() {
+
+        return errors;
+    }
+
+
+    public Terminal getResponsibleTerminal() {
+
+        return responsibleTerminal;
+    }
+
+
+    public void setResponsibleTerminal(Terminal responsibleTerminal) {
+
+        this.responsibleTerminal = responsibleTerminal;
+    }
+
+
+    public void setErrors(Map<String, String> errors) {
+
+        this.errors = errors;
+    }
+
+
+    /**
+     * Creates a name for this {@link Route} out of its parts.
+     *
+     * @return  a name representing this {@link Route}
+     */
+    public String getName() {
+
+        StringBuilder routeName = new StringBuilder();
+
+        for (int i = 0; i < getData().getParts().size(); i++) {
+            if (i > 0) {
+                routeName.append(" -> ");
+            }
+
+            routeName.append(getData().getParts().get(i).getOrigin().getNiceName());
+
+            if (i == (getData().getParts().size() - 1)) {
+                routeName.append(" -> ").append(getData().getParts().get(i).getDestination().getNiceName());
+            }
+        }
+
+        return routeName.toString();
+    }
+
+
+    public String getShortName() {
+
+        for (RoutePart routePart : getData().getParts()) {
+            if (routePart.getOrigin() instanceof Terminal) {
+                return "via " + ((Terminal) routePart.getOrigin()).getName();
+            } else if (routePart.getDestination() instanceof Terminal) {
+                return "via " + ((Terminal) routePart.getDestination()).getName();
+            }
+        }
+
+        return getName();
+    }
+
+
+    public RouteProduct getProduct() {
+
+        List<RoutePart> routeParts = getData().getParts();
+
+        if (routeParts.isEmpty()) {
+            return RouteProduct.ONEWAY;
+        }
+
+        // if first part and last part of route are identical, than the route is a round trip
+        GeoLocation start = routeParts.get(0).getOrigin();
+        GeoLocation end = routeParts.get(routeParts.size() - 1).getDestination();
+
+        if (start.equals(end)) {
+            return RouteProduct.ROUNDTRIP;
+        }
+
+        return RouteProduct.ONEWAY;
+    }
+
+
+    public boolean isRoundTrip() {
+
+        return RouteProduct.ROUNDTRIP.equals(getProduct());
+    }
+
+
+    public RouteDirection getDirection() {
+
+        List<RoutePart> parts = getData().getParts();
+
+        if (parts.isEmpty()) {
+            return null;
+        }
+
+        ContainerState currentState = parts.get(0).getContainerState();
+        RouteDirection direction = null;
+
+        for (RoutePart part : parts) {
+            ContainerState newState = part.getContainerState();
+
+            if (null != newState && null != currentState) {
+                if (!currentState.equals(newState)) {
+                    RouteDirection currentDirection = determineRouteDirection(currentState, newState);
+
+                    if (hasDirectionChanged(direction, currentDirection)) {
+                        return null;
+                    } else {
+                        direction = currentDirection;
+                    }
+                }
+
+                currentState = newState;
+            }
+        }
+
+        return direction;
+    }
+
+
+    private boolean hasDirectionChanged(RouteDirection direction, RouteDirection currentDirection) {
+
+        return direction != null && !direction.equals(currentDirection);
+    }
+
+
+    private RouteDirection determineRouteDirection(ContainerState oldState, ContainerState newState) {
+
+        if (EMPTY.equals(oldState) && FULL.equals(newState)) {
+            return RouteDirection.EXPORT;
+        } else if (FULL.equals(oldState) && EMPTY.equals(newState)) {
+            return RouteDirection.IMPORT;
+        } else {
+            return null;
+        }
+    }
+
+
+    /**
+     * Returns true if this route is an triangle routing or false if it is not.
+     *
+     * @return  true if triangle routing, else false
+     */
+    @JsonIgnore
+    public Boolean isTriangle() {
+
+        TruckRouteParts onewayTruckParts = data.getOnewayTruckParts();
+        List<RoutePart> truckParts = data.getRoutePartsOfType(RouteType.TRUCK);
+
+        return onewayTruckParts.getTruckRoutePartList().size() == truckParts.size();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteBuilder.java b/src/main/java/net/contargo/iris/route/RouteBuilder.java
new file mode 100644
index 00000000..7a7a9907
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteBuilder.java
@@ -0,0 +1,83 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * Builder class to create a {@link Route} and enrich its {@link RoutePart}s only with important information like
+ * origin, destination, {@link ContainerType}, etc.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public class RouteBuilder {
+
+    private final Route route;
+    private GeoLocation currentLocation;
+    private ContainerType containerType;
+    private ContainerState containerState;
+
+    public RouteBuilder(GeoLocation startLocation, ContainerType containerType, ContainerState containerState) {
+
+        this.route = new Route();
+
+        this.currentLocation = startLocation;
+        this.containerType = containerType;
+        this.containerState = containerState;
+    }
+
+    public void unloadContainer() {
+
+        containerState = ContainerState.EMPTY;
+    }
+
+
+    public void loadContainer() {
+
+        containerState = ContainerState.FULL;
+    }
+
+
+    /**
+     * Adds a {@link RoutePart} to {@link Route} setting information about origin, destination, route type, container
+     * type, container state (full or empty) and direction (if barge route).
+     *
+     * @param  destination  as next destination
+     * @param  routeType  type of the next part with destination
+     */
+    public RouteBuilder goTo(GeoLocation destination, RouteType routeType) {
+
+        RoutePart part = new RoutePart(currentLocation, destination, routeType);
+
+        part.setContainerType(containerType);
+        part.setContainerState(containerState);
+
+        route.getData().getParts().add(part);
+
+        part.setData(null);
+
+        currentLocation = destination;
+
+        return this;
+    }
+
+
+    public void responsibleTerminal(Terminal terminal) {
+
+        route.setResponsibleTerminal(terminal);
+    }
+
+
+    public Route getRoute() {
+
+        return route;
+    }
+
+
+    public void changeContainerType(ContainerType type) {
+
+        this.containerType = type;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteCombo.java b/src/main/java/net/contargo/iris/route/RouteCombo.java
new file mode 100644
index 00000000..9a09bb77
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteCombo.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.route;
+
+/**
+ * Enum describing which combo mode a Route has. Each combo has one or more route types.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public enum RouteCombo {
+
+    WATERWAY(new RouteType[] { RouteType.BARGE }),
+    RAILWAY(new RouteType[] { RouteType.RAIL }),
+    DIRECT_TRUCK(new RouteType[] { RouteType.TRUCK }),
+    ALL(new RouteType[] { RouteType.BARGE, RouteType.RAIL });
+    // DIRECT_TRUCK is at the moment not in ALL included. #3194
+
+    private RouteType[] routeTypes;
+
+    private RouteCombo(RouteType[] routeTypes) {
+
+        this.routeTypes = routeTypes.clone();
+    }
+
+    public RouteType[] getRouteTypes() {
+
+        RouteType[] thisRouteTypes = routeTypes;
+
+        return thisRouteTypes;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteData.java b/src/main/java/net/contargo/iris/route/RouteData.java
new file mode 100644
index 00000000..a3ca3764
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteData.java
@@ -0,0 +1,144 @@
+package net.contargo.iris.route;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * This class represents a collection of attributes associated with a {@link Route}. Any of these attributes might be
+ * set by one or more enricher object(s). Route data doesn't only consist of distance and duration related information,
+ * but also encompasses a list of {@link RoutePart} objects.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @see  Route
+ * @see  RoutePart
+ * @see  RouteBuilder
+ */
+public class RouteData {
+
+    private BigDecimal totalDistance;
+    private BigDecimal totalTollDistance;
+    private BigDecimal totalRealTollDistance;
+    private BigDecimal totalOnewayTruckDistance;
+    private BigDecimal totalDuration;
+    private BigDecimal co2;
+    private BigDecimal co2DirectTruck;
+    private List<RoutePart> parts = new ArrayList<>();
+
+    public BigDecimal getTotalDistance() {
+
+        return totalDistance;
+    }
+
+
+    public void setTotalDistance(BigDecimal totalDistance) {
+
+        this.totalDistance = totalDistance;
+    }
+
+
+    public BigDecimal getTotalTollDistance() {
+
+        return totalTollDistance;
+    }
+
+
+    public void setTotalTollDistance(BigDecimal totalTollDistance) {
+
+        this.totalTollDistance = totalTollDistance;
+    }
+
+
+    public BigDecimal getTotalRealTollDistance() {
+
+        return totalRealTollDistance;
+    }
+
+
+    public void setTotalRealTollDistance(BigDecimal totalRealTollDistance) {
+
+        this.totalRealTollDistance = totalRealTollDistance;
+    }
+
+
+    public BigDecimal getTotalOnewayTruckDistance() {
+
+        return totalOnewayTruckDistance;
+    }
+
+
+    public void setTotalOnewayTruckDistance(BigDecimal totalOnewayTruckDistance) {
+
+        this.totalOnewayTruckDistance = totalOnewayTruckDistance;
+    }
+
+
+    public BigDecimal getTotalDuration() {
+
+        return totalDuration;
+    }
+
+
+    public void setTotalDuration(BigDecimal totalDuration) {
+
+        this.totalDuration = totalDuration;
+    }
+
+
+    public BigDecimal getCo2() {
+
+        return co2;
+    }
+
+
+    public void setCo2(BigDecimal co2) {
+
+        this.co2 = co2;
+    }
+
+
+    public BigDecimal getCo2DirectTruck() {
+
+        return co2DirectTruck;
+    }
+
+
+    public void setCo2DirectTruck(BigDecimal co2DirectTruck) {
+
+        this.co2DirectTruck = co2DirectTruck;
+    }
+
+
+    public List<RoutePart> getParts() {
+
+        return parts;
+    }
+
+
+    public void setParts(List<RoutePart> parts) {
+
+        this.parts = parts;
+    }
+
+
+    @JsonIgnore
+    public TruckRouteParts getOnewayTruckParts() {
+
+        TruckRouteParts truckParts = new TruckRouteParts(getRoutePartsOfType(RouteType.TRUCK));
+
+        truckParts.reduceToOneway();
+
+        return truckParts;
+    }
+
+
+    public List<RoutePart> getRoutePartsOfType(final RouteType routeType) {
+
+        return parts.stream().filter(part -> part.isOfType(routeType)).collect(Collectors.toList());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteDirection.java b/src/main/java/net/contargo/iris/route/RouteDirection.java
new file mode 100644
index 00000000..4c373835
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteDirection.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.route;
+
+/**
+ * Direction of a Routing (is stuff exported or imported).
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public enum RouteDirection {
+
+    IMPORT,
+    EXPORT;
+
+    /**
+     * @param  isImport  boolean that indicates if it is an IMPORT
+     *
+     * @return  IMPORT if isImport is true, EXPORT otherwise
+     */
+    public static RouteDirection fromIsImport(boolean isImport) {
+
+        if (isImport) {
+            return IMPORT;
+        } else {
+            return EXPORT;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteInformation.java b/src/main/java/net/contargo/iris/route/RouteInformation.java
new file mode 100644
index 00000000..c93ac985
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteInformation.java
@@ -0,0 +1,99 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+
+
+/**
+ * Encapsulates detail information that are needed to compute a {@link net.contargo.iris.route.Route}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RouteInformation {
+
+    private GeoLocation destination;
+    private RouteProduct product;
+    private ContainerType containerType;
+    private RouteDirection routeDirection;
+    private RouteCombo routeCombo;
+
+    public RouteInformation(ContainerType containerType, RouteCombo combo, double lat, double lon, boolean isRoundTrip,
+        boolean isImport) {
+
+        this.destination = new GeoLocation(lat, lon);
+        this.containerType = containerType;
+        this.routeCombo = combo;
+        this.product = RouteProduct.fromIsRoundtrip(isRoundTrip);
+        this.routeDirection = RouteDirection.fromIsImport(isImport);
+    }
+
+
+    public RouteInformation(GeoLocation destination, RouteProduct product, ContainerType containerType,
+        RouteDirection routeDirection, RouteCombo combo) {
+
+        this.destination = destination;
+        this.product = product;
+        this.containerType = containerType;
+        this.routeDirection = routeDirection;
+        this.routeCombo = combo;
+    }
+
+    public GeoLocation getDestination() {
+
+        return destination;
+    }
+
+
+    public void setDestination(GeoLocation destination) {
+
+        this.destination = destination;
+    }
+
+
+    public RouteProduct getProduct() {
+
+        return product;
+    }
+
+
+    public void setProduct(RouteProduct product) {
+
+        this.product = product;
+    }
+
+
+    public ContainerType getContainerType() {
+
+        return containerType;
+    }
+
+
+    public void setContainerType(ContainerType containerType) {
+
+        this.containerType = containerType;
+    }
+
+
+    public RouteDirection getRouteDirection() {
+
+        return routeDirection;
+    }
+
+
+    public void setRouteDirection(RouteDirection routeDirection) {
+
+        this.routeDirection = routeDirection;
+    }
+
+
+    public RouteCombo getRouteCombo() {
+
+        return routeCombo;
+    }
+
+
+    public void setRouteCombo(RouteCombo routeCombo) {
+
+        this.routeCombo = routeCombo;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RoutePart.java b/src/main/java/net/contargo/iris/route/RoutePart.java
new file mode 100644
index 00000000..9757a7ef
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RoutePart.java
@@ -0,0 +1,236 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * This class represents a route part having two associated {@link GeoLocation}s, each denoting an origin or a
+ * destination respectively. Note that the associated {@link GeoLocation}s may be any subtype of {@link GeoLocation}.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @see  GeoLocation
+ */
+public class RoutePart {
+
+    public enum Direction {
+
+        NOT_SET,
+        DOWNSTREAM,
+        UPSTREAM
+    }
+
+    private GeoLocation origin;
+    private GeoLocation destination;
+    private RouteType routeType;
+    private ContainerType containerType;
+    private ContainerState containerState;
+    private RoutePartData data = new RoutePartData();
+
+    public RoutePart() {
+
+        // Needed for Spring MVC JSON mapping
+    }
+
+
+    public RoutePart(GeoLocation origin, GeoLocation destination, RouteType routeType) {
+
+        this.origin = origin;
+        this.destination = destination;
+        this.routeType = routeType;
+    }
+
+
+    public RoutePart(RouteType routeType, GeoLocation origin, GeoLocation destination, ContainerType containerType,
+        ContainerState containerState) {
+
+        this.routeType = routeType;
+        this.origin = origin;
+        this.destination = destination;
+        this.containerType = containerType;
+        this.containerState = containerState;
+    }
+
+    /**
+     * Computes this {@link RoutePart}'s direction.
+     *
+     * @return  <ul>
+     *          <li>UPSTREAM if it's a {@link RoutePart} from {@link Seaport} to {@link Terminal}</li>
+     *          <li>DOWNSTREAM if it's a {@link RoutePart} from {@link Terminal} to {@link Seaport}</li>
+     *          <li>NOT_SET otherwise, or if it's not a main run part</li>
+     *          </ul>
+     */
+    public Direction getDirection() {
+
+        if (!isOfType(RouteType.BARGE)) {
+            return Direction.NOT_SET;
+        }
+
+        if (origin instanceof Seaport && destination instanceof Terminal) {
+            return RoutePart.Direction.UPSTREAM;
+        } else if (origin instanceof Terminal && destination instanceof Seaport) {
+            return Direction.DOWNSTREAM;
+        } else {
+            return Direction.NOT_SET;
+        }
+    }
+
+
+    public boolean isOfType(RouteType type) {
+
+        return this.routeType == type && type != null;
+    }
+
+
+    public String getName() {
+
+        return getOrigin().getNiceName() + " -> " + getDestination().getNiceName();
+    }
+
+
+    public GeoLocation getOrigin() {
+
+        return origin;
+    }
+
+
+    public void setOrigin(GeoLocation origin) {
+
+        this.origin = origin;
+    }
+
+
+    public GeoLocation getDestination() {
+
+        return destination;
+    }
+
+
+    public void setDestination(GeoLocation destination) {
+
+        this.destination = destination;
+    }
+
+
+    public RouteType getRouteType() {
+
+        return routeType;
+    }
+
+
+    public void setRouteType(RouteType routeType) {
+
+        this.routeType = routeType;
+    }
+
+
+    public ContainerType getContainerType() {
+
+        return containerType;
+    }
+
+
+    public void setContainerType(ContainerType containerType) {
+
+        this.containerType = containerType;
+    }
+
+
+    public ContainerState getContainerState() {
+
+        return containerState;
+    }
+
+
+    public void setContainerState(ContainerState containerState) {
+
+        this.containerState = containerState;
+    }
+
+
+    public RoutePartData getData() {
+
+        return data;
+    }
+
+
+    public void setData(RoutePartData data) {
+
+        this.data = data;
+    }
+
+
+    /**
+     * Checks whether this {@link RoutePart} has a {@link Terminal}.
+     *
+     * @return  true if origin or destination are a {@link Terminal}, false otherwise
+     */
+    public boolean hasTerminal() {
+
+        return getOrigin() instanceof Terminal || getDestination() instanceof Terminal;
+    }
+
+
+    /**
+     * Checks whether this {@link RoutePart} has a {@link Seaport}.
+     *
+     * @return  true if origin or destination are a {@link Seaport}, false otherwise
+     */
+    public boolean hasSeaport() {
+
+        return getOrigin() instanceof Seaport || getDestination() instanceof Seaport;
+    }
+
+
+    /**
+     * Finds this {@link RoutePart}'s {@link Terminal}.
+     *
+     * @return  the associated {@link Terminal}
+     *
+     * @throws  IllegalStateException  if neither origin nor destination are a {@link Terminal}
+     */
+    public Terminal findTerminal() {
+
+        if (getOrigin() instanceof Terminal) {
+            return (Terminal) getOrigin();
+        } else if (getDestination() instanceof Terminal) {
+            return (Terminal) getDestination();
+        }
+
+        throw new IllegalStateException("Neither origin nor destination is a Teminal");
+    }
+
+
+    /**
+     * Finds this {@link RoutePart}'s {@link Seaport}.
+     *
+     * @return  the associated {@link Seaport}
+     *
+     * @throws  IllegalStateException  if neither origin nor destination are a {@link Seaport}
+     */
+    public Seaport findSeaport() {
+
+        if (getOrigin() instanceof Seaport) {
+            return (Seaport) getOrigin();
+        } else if (getDestination() instanceof Seaport) {
+            return (Seaport) getDestination();
+        }
+
+        throw new IllegalStateException("Neither origin nor destination is a SeaPort");
+    }
+
+
+    /**
+     * Returns a copy of the {@link RoutePart} without {@link RouteData}.
+     *
+     * @return  {@link net.contargo.iris.route.RoutePart} without {@link net.contargo.iris.route.RouteData}
+     */
+    public RoutePart copyWithoutData() {
+
+        return new RoutePart(routeType, origin, destination, containerType, containerState);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RoutePartData.java b/src/main/java/net/contargo/iris/route/RoutePartData.java
new file mode 100644
index 00000000..5ea8cc21
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RoutePartData.java
@@ -0,0 +1,107 @@
+package net.contargo.iris.route;
+
+import java.math.BigDecimal;
+
+
+/**
+ * This class represents a collection of attributes associated with a {@link RoutePart}. Any of these attributes might
+ * be set by (one or more) enricher object(s).
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ * @see  RoutePart
+ */
+public class RoutePartData {
+
+    private BigDecimal airLineDistance;
+    private BigDecimal distance;
+    private BigDecimal dieselDistance;
+    private BigDecimal electricDistance;
+    private BigDecimal tollDistance;
+    private BigDecimal duration;
+
+    private BigDecimal co2;
+
+    public BigDecimal getAirLineDistance() {
+
+        return airLineDistance;
+    }
+
+
+    public void setAirLineDistance(BigDecimal airLineDistance) {
+
+        this.airLineDistance = airLineDistance;
+    }
+
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public void setDistance(BigDecimal distance) {
+
+        this.distance = distance;
+    }
+
+
+    public BigDecimal getDieselDistance() {
+
+        return dieselDistance;
+    }
+
+
+    public void setDieselDistance(BigDecimal dieselDistance) {
+
+        this.dieselDistance = dieselDistance;
+    }
+
+
+    public BigDecimal getElectricDistance() {
+
+        return electricDistance;
+    }
+
+
+    public void setElectricDistance(BigDecimal electricDistance) {
+
+        this.electricDistance = electricDistance;
+    }
+
+
+    public BigDecimal getTollDistance() {
+
+        return tollDistance;
+    }
+
+
+    public void setTollDistance(BigDecimal tollDistance) {
+
+        this.tollDistance = tollDistance;
+    }
+
+
+    public BigDecimal getDuration() {
+
+        return duration;
+    }
+
+
+    public void setDuration(BigDecimal duration) {
+
+        this.duration = duration;
+    }
+
+
+    public BigDecimal getCo2() {
+
+        return co2;
+    }
+
+
+    public void setCo2(BigDecimal co2) {
+
+        this.co2 = co2;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteProduct.java b/src/main/java/net/contargo/iris/route/RouteProduct.java
new file mode 100644
index 00000000..510e927b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteProduct.java
@@ -0,0 +1,21 @@
+package net.contargo.iris.route;
+
+/**
+ * Represents a type of transport. It's either a oneway transport or a roundtrip transport.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public enum RouteProduct {
+
+    ONEWAY,
+    ROUNDTRIP;
+
+    public static RouteProduct fromIsRoundtrip(boolean isRoundtrip) {
+
+        if (isRoundtrip) {
+            return ROUNDTRIP;
+        } else {
+            return ONEWAY;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/RouteType.java b/src/main/java/net/contargo/iris/route/RouteType.java
new file mode 100644
index 00000000..c3a4c939
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/RouteType.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.route;
+
+/**
+ * Enum to mark a {@Route}.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public enum RouteType {
+
+    BARGE("route.type.barge"),
+    RAIL("route.type.rail"),
+    TRUCK("route.type.truck");
+
+    private String messageKey;
+
+    private RouteType(String messageKey) {
+
+        this.messageKey = messageKey;
+    }
+
+    public String getMessageKey() {
+
+        return messageKey;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/route/TruckRouteParts.java b/src/main/java/net/contargo/iris/route/TruckRouteParts.java
new file mode 100644
index 00000000..ba64c86e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/route/TruckRouteParts.java
@@ -0,0 +1,89 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.address.Address;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+/**
+ * Container Class for Routepartlist, containing only Truck-RouteParts.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class TruckRouteParts {
+
+    private List<RoutePart> truckRoutePartList = new ArrayList<>();
+
+    public TruckRouteParts(List<RoutePart> truckRoutePartList) {
+
+        for (RoutePart truckRoutePart : truckRoutePartList) {
+            if (!truckRoutePart.isOfType(RouteType.TRUCK)) {
+                throw new IllegalArgumentException("Can't add non-Truck Routepart to TruckRoutParts");
+            }
+        }
+
+        this.truckRoutePartList = truckRoutePartList;
+    }
+
+    public List<RoutePart> getTruckRoutePartList() {
+
+        return Collections.unmodifiableList(truckRoutePartList);
+    }
+
+
+    public void setTruckRoutePartList(List<RoutePart> truckRoutePartList) {
+
+        this.truckRoutePartList = truckRoutePartList;
+    }
+
+
+    public void addTruckRoutePart(RoutePart truckRoutePart) {
+
+        if (truckRoutePart.isOfType(RouteType.TRUCK)) {
+            truckRoutePartList.add(truckRoutePart);
+        } else {
+            throw new IllegalArgumentException("Can't add non-Truck Routepart to TruckRoutParts");
+        }
+    }
+
+
+    public Address extractDestinationAddress() {
+
+        for (RoutePart routePart : truckRoutePartList) {
+            if (routePart.getDestination() instanceof Address) {
+                return (Address) routePart.getDestination();
+            }
+        }
+
+        return null;
+    }
+
+
+    boolean isEqualRoundTrip() {
+
+        if (truckRoutePartList.size() % 2 != 0) {
+            return false;
+        }
+
+        for (int i = 0; i < truckRoutePartList.size(); i++) {
+            RoutePart routePart = truckRoutePartList.get(i);
+            RoutePart contraRoutePart = truckRoutePartList.get(truckRoutePartList.size() - 1 - i);
+
+            if (!routePart.getOrigin().equals(contraRoutePart.getDestination())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    public void reduceToOneway() {
+
+        if (isEqualRoundTrip()) {
+            truckRoutePartList.subList(truckRoutePartList.size() / 2, truckRoutePartList.size()).clear();
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/routedatarevision/RouteDataRevision.java b/src/main/java/net/contargo/iris/routedatarevision/RouteDataRevision.java
new file mode 100644
index 00000000..f23dcad2
--- /dev/null
+++ b/src/main/java/net/contargo/iris/routedatarevision/RouteDataRevision.java
@@ -0,0 +1,163 @@
+package net.contargo.iris.routedatarevision;
+
+import net.contargo.iris.terminal.Terminal;
+
+import net.contargo.validation.bigdecimal.BigDecimalValidate;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * Entity holding the information of route data revisions.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Entity
+public class RouteDataRevision {
+
+    private static final int DEG_180 = 180;
+
+    private static final int MAX_DEC_15 = 15;
+    private static final int MAX_FRAC_2 = 2;
+    private static final int MAX_FRAC_10 = 10;
+    private static final int MAX_DEC_3 = 3;
+    private static final int MIN_0 = 0;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    @ManyToOne
+    private Terminal terminal;
+
+    @NotNull
+    @BigDecimalValidate(maxFractionalPlaces = MAX_FRAC_2, maxDecimalPlaces = MAX_DEC_15)
+    private BigDecimal truckDistanceOneWay;
+
+    @NotNull
+    @BigDecimalValidate(maxFractionalPlaces = MAX_FRAC_2, maxDecimalPlaces = MAX_DEC_15)
+    private BigDecimal tollDistanceOneWay;
+
+    @NotNull
+    @BigDecimalValidate(maxFractionalPlaces = MAX_FRAC_2, maxDecimalPlaces = MAX_DEC_15)
+    private BigDecimal airlineDistance;
+
+    @NotNull
+    @BigDecimalValidate(
+        minValue = -DEG_180, maxValue = DEG_180, maxFractionalPlaces = MAX_FRAC_10, maxDecimalPlaces = MAX_DEC_3
+    )
+    private BigDecimal latitude;
+
+    @NotNull
+    @BigDecimalValidate(
+        minValue = -DEG_180, maxValue = DEG_180, maxFractionalPlaces = MAX_FRAC_10, maxDecimalPlaces = MAX_DEC_3
+    )
+    private BigDecimal longitude;
+
+    @NotNull
+    @BigDecimalValidate(minValue = MIN_0, maxFractionalPlaces = MAX_FRAC_2, maxDecimalPlaces = MAX_DEC_15)
+    private BigDecimal radius;
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public void setId(Long id) {
+
+        this.id = id;
+    }
+
+
+    public Terminal getTerminal() {
+
+        return terminal;
+    }
+
+
+    public void setTerminal(Terminal terminal) {
+
+        this.terminal = terminal;
+    }
+
+
+    public BigDecimal getTruckDistanceOneWay() {
+
+        return truckDistanceOneWay;
+    }
+
+
+    public void setTruckDistanceOneWay(BigDecimal truckDistanceOneWay) {
+
+        this.truckDistanceOneWay = truckDistanceOneWay;
+    }
+
+
+    public BigDecimal getTollDistanceOneWay() {
+
+        return tollDistanceOneWay;
+    }
+
+
+    public void setTollDistanceOneWay(BigDecimal tollDistanceOneWay) {
+
+        this.tollDistanceOneWay = tollDistanceOneWay;
+    }
+
+
+    public BigDecimal getAirlineDistance() {
+
+        return airlineDistance;
+    }
+
+
+    public void setAirlineDistance(BigDecimal airlineDistance) {
+
+        this.airlineDistance = airlineDistance;
+    }
+
+
+    public BigDecimal getLatitude() {
+
+        return latitude;
+    }
+
+
+    public void setLatitude(BigDecimal latitude) {
+
+        this.latitude = latitude;
+    }
+
+
+    public BigDecimal getLongitude() {
+
+        return longitude;
+    }
+
+
+    public void setLongitude(BigDecimal longitude) {
+
+        this.longitude = longitude;
+    }
+
+
+    public BigDecimal getRadius() {
+
+        return radius;
+    }
+
+
+    public void setRadius(BigDecimal radius) {
+
+        this.radius = radius;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepository.java b/src/main/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepository.java
new file mode 100644
index 00000000..fccaf25c
--- /dev/null
+++ b/src/main/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepository.java
@@ -0,0 +1,38 @@
+package net.contargo.iris.routedatarevision.persistence;
+
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.terminal.Terminal;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+
+import java.math.BigDecimal;
+
+
+/**
+ * Repository for {@link net.contargo.iris.routedatarevision.RouteDataRevision RouteDataRevision} instances.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface RouteDataRevisionRepository extends Repository<RouteDataRevision, Long> {
+
+    @Query(
+        value = "SELECT * "
+            + "FROM "
+            + "    ("
+            + "        SELECT *, "
+            + "               (6371 * acos(cos(radians(:latitude)) * cos(radians(latitude)) "
+            + "               * cos(radians(longitude) - radians(:longitude)) + sin(radians(:latitude)) "
+            + "               * sin(radians(latitude)))) AS distance "
+            + "        FROM RouteDataRevision "
+            + "        WHERE terminal_id = :terminal "
+            + "    ) as dis "
+            + "WHERE dis.distance <= dis.radius "
+            + "ORDER BY dis.distance ASC "
+            + "LIMIT 0, 1", nativeQuery = true
+    )
+    RouteDataRevision findNearest(@Param("terminal") Terminal terminal,
+        @Param("latitude") BigDecimal latitude,
+        @Param("longitude") BigDecimal longitude);
+}
diff --git a/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionService.java b/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionService.java
new file mode 100644
index 00000000..7facbfb1
--- /dev/null
+++ b/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionService.java
@@ -0,0 +1,28 @@
+package net.contargo.iris.routedatarevision.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.terminal.Terminal;
+
+
+/**
+ * Service to a revision of the received information from a routing service.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface RouteDataRevisionService {
+
+    /**
+     * Method to receive the correct {@link net.contargo.iris.routedatarevision.RouteDataRevision RouteDataRevision}
+     * with the shortest distance between the requested {@link Address} and the
+     * {@link net.contargo.iris.routedatarevision.RouteDataRevision RouteDataRevision} saved in the database.
+     *
+     * @param  terminal  on which the {@link net.contargo.iris.routedatarevision.RouteDataRevision RouteDataRevision}
+     *                   information are based on
+     * @param  destination  describes the destination {@link Address} on which the {@link RouteDataRevision} information
+     *                      are provided for
+     *
+     * @return  the {@link RouteDataRevision} with the best fit for the given {@link Terminal} and {@link Address}
+     */
+    RouteDataRevision getRouteDataRevision(Terminal terminal, Address destination);
+}
diff --git a/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImpl.java b/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImpl.java
new file mode 100644
index 00000000..0def9f85
--- /dev/null
+++ b/src/main/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImpl.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.routedatarevision.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.routedatarevision.persistence.RouteDataRevisionRepository;
+import net.contargo.iris.terminal.Terminal;
+
+import org.springframework.transaction.annotation.Transactional;
+
+
+public class RouteDataRevisionServiceImpl implements RouteDataRevisionService {
+
+    private final RouteDataRevisionRepository routeDataRevisionRepository;
+
+    public RouteDataRevisionServiceImpl(RouteDataRevisionRepository routeDataRevisionRepository) {
+
+        this.routeDataRevisionRepository = routeDataRevisionRepository;
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public RouteDataRevision getRouteDataRevision(Terminal terminal, Address destination) {
+
+        return routeDataRevisionRepository.findNearest(terminal, destination.getLatitude(), destination.getLongitude());
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/Seaport.java b/src/main/java/net/contargo/iris/seaport/Seaport.java
new file mode 100644
index 00000000..3dd4ad75
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/Seaport.java
@@ -0,0 +1,126 @@
+package net.contargo.iris.seaport;
+
+import net.contargo.iris.GeoLocation;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import javax.validation.constraints.Size;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Entity(name = "Seaport")
+public class Seaport extends GeoLocation {
+
+    private static final int MAX_NAME_SIZE = 254;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotEmpty
+    @Size(max = MAX_NAME_SIZE)
+    private String name;
+
+    private boolean enabled = false;
+
+    private BigInteger uniqueId;
+
+    public Seaport() {
+
+        // JPA entity classes must have a no-arg constructor
+    }
+
+
+    public Seaport(GeoLocation geoLocation) {
+
+        this.setLatitude(geoLocation.getLatitude());
+        this.setLongitude(geoLocation.getLongitude());
+    }
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public void setId(Long id) {
+
+        this.id = id;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    public boolean isEnabled() {
+
+        return enabled;
+    }
+
+
+    public BigInteger getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(BigInteger uniqueId) {
+
+        this.uniqueId = uniqueId;
+    }
+
+
+    @Override
+    public String getNiceName() {
+
+        return getName();
+    }
+
+
+    public void setEnabled(boolean enabled) {
+
+        this.enabled = enabled;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+
+        return new EqualsBuilder().appendSuper(super.equals(o)).isEquals();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().appendSuper(super.hashCode()).toHashCode();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return new ToStringBuilder(this).append("id", id).append("name", name).append("enabled", enabled).toString();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/api/SeaportApiController.java b/src/main/java/net/contargo/iris/seaport/api/SeaportApiController.java
new file mode 100644
index 00000000..7173e63d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/api/SeaportApiController.java
@@ -0,0 +1,131 @@
+package net.contargo.iris.seaport.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.api.NotFoundException;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.math.BigInteger;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.validation.Valid;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+
+/**
+ * Public API controller that responds to seaport or terminal requests.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Api(value = "/seaports", description = "API endpoint to manage seaports.")
+@Controller
+@RequestMapping(value = "/seaports")
+public class SeaportApiController extends AbstractController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SeaportApiController.class);
+
+    private final SeaportDtoService seaportDtoService;
+
+    @Autowired
+    public SeaportApiController(SeaportDtoService seaportDtoService) {
+
+        this.seaportDtoService = seaportDtoService;
+    }
+
+    @ApiOperation(value = "Returns all active seaports.", notes = "Returns all active seaports.")
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public SeaportsResponse getSeaports() {
+
+        SeaportsResponse response = new SeaportsResponse();
+
+        response.add(linkTo(methodOn(getClass()).getSeaports()).withSelfRel());
+
+        Set<SeaportDto> ports = new HashSet<>();
+        ports.addAll(seaportDtoService.getAllActive());
+
+        response.setSeaports(ports);
+
+        LOG.info("API: Returning {} active seaports ", ports.size());
+
+        return response;
+    }
+
+
+    @ApiOperation(value = "Returns the seaport for the given UID.", notes = "Returns the seaport for the given UID.")
+    @RequestMapping(value = SLASH + "{seaportuid}", method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public SeaportResponse getSeaportById(@PathVariable("seaportuid") BigInteger seaportUID) {
+
+        SeaportResponse response = new SeaportResponse();
+
+        response.add(linkTo(methodOn(getClass()).getSeaportById(seaportUID)).withSelfRel());
+        response.add(linkTo(methodOn(getClass()).getSeaports()).withRel("seaports"));
+
+        SeaportDto port = seaportDtoService.getByUid(seaportUID);
+
+        if (port == null) {
+            throw new NotFoundException("Cannot find Seaport for UID " + seaportUID);
+        }
+
+        response.setSeaport(port);
+
+        LOG.info("API: Returning seaport {}", port.getName());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Saves the given seaport with the specified UID.",
+        notes = "Saves the given seaport with the specified UID.", response = Void.class
+    )
+    @RequestMapping(value = SLASH + "{seaportUid}", method = RequestMethod.PUT)
+    public ResponseEntity syncSeaport(@PathVariable("seaportUid") BigInteger seaportUID,
+        @Valid @RequestBody SeaportDto seaport) {
+
+        boolean update = seaportDtoService.existsByUniqueId(seaportUID);
+
+        if (update) {
+            seaportDtoService.updateSeaport(seaportUID, seaport);
+
+            LOG.info("API: Updating seaport with unique id {}", seaportUID);
+
+            return new ResponseEntity(HttpStatus.NO_CONTENT);
+        } else {
+            seaport.setUniqueId(seaportUID.toString());
+
+            seaportDtoService.save(seaport);
+
+            LOG.info("API: Creating seaport with unique id {}", seaportUID);
+
+            return new ResponseEntity(HttpStatus.CREATED);
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/api/SeaportResponse.java b/src/main/java/net/contargo/iris/seaport/api/SeaportResponse.java
new file mode 100644
index 00000000..a8896bdc
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/api/SeaportResponse.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.seaport.api;
+
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * HATEOAS supporting response object for a single {@link net.contargo.iris.seaport.dto.SeaportDto}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+class SeaportResponse extends ResourceSupport {
+
+    private SeaportDto seaport;
+
+    public SeaportDto getSeaport() {
+
+        return seaport;
+    }
+
+
+    public void setSeaport(SeaportDto seaport) {
+
+        this.seaport = seaport;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/api/SeaportsResponse.java b/src/main/java/net/contargo/iris/seaport/api/SeaportsResponse.java
new file mode 100644
index 00000000..c4b9da4d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/api/SeaportsResponse.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.seaport.api;
+
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.Set;
+
+
+/**
+ * HATEOAS supporting response object for a list of {@link net.contargo.iris.seaport.dto.SeaportDto}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+class SeaportsResponse extends ResourceSupport {
+
+    private Set<SeaportDto> seaports;
+
+    public Set<SeaportDto> getSeaports() {
+
+        return seaports;
+    }
+
+
+    public void setSeaports(Set<SeaportDto> seaports) {
+
+        this.seaports = seaports;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/dto/SeaportDto.java b/src/main/java/net/contargo/iris/seaport/dto/SeaportDto.java
new file mode 100644
index 00000000..14ee651a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/dto/SeaportDto.java
@@ -0,0 +1,103 @@
+package net.contargo.iris.seaport.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.seaport.Seaport;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Size;
+import java.math.BigInteger;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class SeaportDto extends GeoLocationDto {
+
+    private static final int MAX_NAME_SIZE = 254;
+    private static final String SEAPORT = "SEAPORT";
+
+    @NotEmpty
+    @Size(max = MAX_NAME_SIZE)
+    private String name;
+
+    private boolean enabled;
+    private String type;
+
+    private String uniqueId;
+
+    public SeaportDto() {
+
+        // Used to create JSON Objects
+    }
+
+
+    public SeaportDto(Seaport seaport) {
+
+        super(seaport);
+
+        if (seaport != null) {
+            this.name = seaport.getName();
+            this.enabled = seaport.isEnabled();
+            this.uniqueId = seaport.getUniqueId() == null ? null : seaport.getUniqueId().toString();
+            this.type = SEAPORT;
+        }
+    }
+
+    public boolean isEnabled() {
+
+        return enabled;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public void setEnabled(boolean enabled) {
+
+        this.enabled = enabled;
+    }
+
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    @Override
+    public Seaport toEntity() {
+
+        Seaport seaport = new Seaport(super.toEntity());
+        seaport.setEnabled(this.enabled);
+        seaport.setName(this.name);
+        seaport.setUniqueId(this.uniqueId == null ? null : new BigInteger(this.uniqueId));
+
+        return seaport;
+    }
+
+
+    @Override
+    public String getType() {
+
+        return type;
+    }
+
+
+    @JsonProperty("uniqueId")
+    public String getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(String uniqueId) {
+
+        this.uniqueId = uniqueId;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoService.java b/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoService.java
new file mode 100644
index 00000000..2c339b79
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoService.java
@@ -0,0 +1,37 @@
+package net.contargo.iris.seaport.dto;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * View Bean Service for mapping of {@link net.contargo.iris.seaport.Seaport}s to {@link SeaportDto}s, Maps all return
+ * values of the methods of @link SeaportService} to View Beans. For detailed Javadoc see interface
+ * {@link net.contargo.iris.seaport.service.SeaportService}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface SeaportDtoService {
+
+    List<SeaportDto> getAll();
+
+
+    List<SeaportDto> getAllActive();
+
+
+    SeaportDto getById(Long id);
+
+
+    SeaportDto save(SeaportDto seaPortDto);
+
+
+    boolean existsByUniqueId(BigInteger seaportUid);
+
+
+    SeaportDto updateSeaport(BigInteger seaportUid, SeaportDto seaportDto);
+
+
+    SeaportDto getByUid(BigInteger uid);
+}
diff --git a/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImpl.java b/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImpl.java
new file mode 100644
index 00000000..bbde8659
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImpl.java
@@ -0,0 +1,95 @@
+package net.contargo.iris.seaport.dto;
+
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class SeaportDtoServiceImpl implements SeaportDtoService {
+
+    private final SeaportService seaportService;
+
+    public SeaportDtoServiceImpl(SeaportService seaportService) {
+
+        this.seaportService = seaportService;
+    }
+
+    @Override
+    public List<SeaportDto> getAll() {
+
+        List<SeaportDto> seaportDtos = new ArrayList<>();
+        List<Seaport> seaports = seaportService.getAll();
+
+        for (Seaport seaport : seaports) {
+            seaportDtos.add(new SeaportDto(seaport));
+        }
+
+        return seaportDtos;
+    }
+
+
+    @Override
+    public List<SeaportDto> getAllActive() {
+
+        List<SeaportDto> seaportDtos = new ArrayList<>();
+        List<Seaport> seaports = seaportService.getAllActive();
+
+        for (Seaport seaport : seaports) {
+            seaportDtos.add(new SeaportDto(seaport));
+        }
+
+        return seaportDtos;
+    }
+
+
+    @Override
+    public SeaportDto getById(Long id) {
+
+        Seaport seaport = seaportService.getById(id);
+
+        return seaport == null ? null : new SeaportDto(seaport);
+    }
+
+
+    @Override
+    public SeaportDto save(SeaportDto seaPortDto) {
+
+        Seaport seaportToSave = seaPortDto.toEntity();
+        Seaport savedSeaport = seaportService.save(seaportToSave);
+
+        return new SeaportDto(savedSeaport);
+    }
+
+
+    @Override
+    public boolean existsByUniqueId(BigInteger seaportUid) {
+
+        return seaportService.existsByUniqueId(seaportUid);
+    }
+
+
+    @Override
+    public SeaportDto updateSeaport(BigInteger seaportUid, SeaportDto seaportDto) {
+
+        Seaport seaport = seaportService.updateSeaport(seaportUid, seaportDto.toEntity());
+
+        return new SeaportDto(seaport);
+    }
+
+
+    @Override
+    public SeaportDto getByUid(BigInteger uid) {
+
+        Seaport seaport = seaportService.getByUniqueId(uid);
+
+        return seaport == null ? null : new SeaportDto(seaport);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/persistence/SeaportRepository.java b/src/main/java/net/contargo/iris/seaport/persistence/SeaportRepository.java
new file mode 100644
index 00000000..ad968f57
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/persistence/SeaportRepository.java
@@ -0,0 +1,37 @@
+package net.contargo.iris.seaport.persistence;
+
+import net.contargo.iris.seaport.Seaport;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Repository interface for {@link Seaport}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface SeaportRepository extends JpaRepository<Seaport, Long> {
+
+    List<Seaport> findByEnabled(boolean enabled);
+
+
+    Seaport findByLatitudeAndLongitude(BigDecimal latitude, BigDecimal longitude);
+
+
+    Seaport findByUniqueId(BigInteger uniqueId);
+
+
+    Seaport findByName(String name);
+
+
+    Seaport findByLatitudeAndLongitudeAndIdNot(BigDecimal latitude, BigDecimal longitude, Long terminalId);
+
+
+    Seaport findByNameAndIdNot(String name, Long terminalId);
+}
diff --git a/src/main/java/net/contargo/iris/seaport/service/NonUniqueSeaportException.java b/src/main/java/net/contargo/iris/seaport/service/NonUniqueSeaportException.java
new file mode 100644
index 00000000..5b9e499d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/service/NonUniqueSeaportException.java
@@ -0,0 +1,25 @@
+package net.contargo.iris.seaport.service;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class NonUniqueSeaportException extends IllegalArgumentException {
+
+    private final List<String> badFields;
+
+    public NonUniqueSeaportException(String... badFields) {
+
+        super("Seaport name and coordinates have to be unique.");
+        this.badFields = asList(badFields);
+    }
+
+    public List<String> getBadFields() {
+
+        return badFields;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/service/SeaportService.java b/src/main/java/net/contargo/iris/seaport/service/SeaportService.java
new file mode 100644
index 00000000..032a358d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/service/SeaportService.java
@@ -0,0 +1,72 @@
+package net.contargo.iris.seaport.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.seaport.Seaport;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Provides services related to {@link Seaport} entities.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface SeaportService {
+
+    /**
+     * Returns all (active/inactive) {@link Seaport}s of the System.
+     *
+     * @return  a List of all {@link Seaport}s
+     */
+    List<Seaport> getAll();
+
+
+    /**
+     * Returns all active {@link Seaport}s of the System.
+     *
+     * @return  a List of active {@link Seaport}s
+     */
+    List<Seaport> getAllActive();
+
+
+    /**
+     * Returns the {@link Seaport} based on the given ID or null if not found.
+     *
+     * @param  id  the id to return a {@link Seaport} for
+     *
+     * @return  the {@link Seaport} found or null
+     */
+    Seaport getById(Long id);
+
+
+    Seaport getByUniqueId(BigInteger uniqueId);
+
+
+    /**
+     * Saves a {@link Seaport} to database..
+     *
+     * @param  seaport  to save
+     *
+     * @return  the persisted {@link Seaport}
+     */
+    Seaport save(Seaport seaport);
+
+
+    /**
+     * Returns a {@link Seaport} by its latitude and longitude.
+     *
+     * @param  location  credentials to find {@link Seaport} with
+     *
+     * @return  {@link Seaport} with given {@link GeoLocation}
+     */
+    Seaport getByGeoLocation(GeoLocation location);
+
+
+    boolean existsByUniqueId(BigInteger seaportUid);
+
+
+    Seaport updateSeaport(BigInteger seaportUid, Seaport seaport);
+}
diff --git a/src/main/java/net/contargo/iris/seaport/service/SeaportServiceImpl.java b/src/main/java/net/contargo/iris/seaport/service/SeaportServiceImpl.java
new file mode 100644
index 00000000..2e8d2c56
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/service/SeaportServiceImpl.java
@@ -0,0 +1,163 @@
+package net.contargo.iris.seaport.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.persistence.SeaportRepository;
+import net.contargo.iris.sequence.service.SequenceService;
+
+import org.slf4j.Logger;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Provides implementations related to {@link Seaport} entities.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Transactional
+public class SeaportServiceImpl implements SeaportService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final SeaportRepository seaportRepository;
+    private final SequenceService uniqueIdSequenceService;
+
+    public SeaportServiceImpl(SeaportRepository seaportRepository, SequenceService uniqueIdSequenceService) {
+
+        this.seaportRepository = seaportRepository;
+        this.uniqueIdSequenceService = uniqueIdSequenceService;
+    }
+
+    @Override
+    public List<Seaport> getAll() {
+
+        return seaportRepository.findAll();
+    }
+
+
+    @Override
+    public List<Seaport> getAllActive() {
+
+        return seaportRepository.findByEnabled(true);
+    }
+
+
+    @Override
+    public Seaport getById(Long id) {
+
+        return seaportRepository.findOne(id);
+    }
+
+
+    @Override
+    public Seaport getByUniqueId(BigInteger uniqueId) {
+
+        return seaportRepository.findByUniqueId(uniqueId);
+    }
+
+
+    @Override
+    public synchronized Seaport save(Seaport seaport) {
+
+        if (seaport.getUniqueId() == null) {
+            seaport.setUniqueId(determineUniqueId());
+        }
+
+        checkUniqueConstraints(seaport);
+
+        return seaportRepository.save(seaport);
+    }
+
+
+    @Override
+    public Seaport getByGeoLocation(GeoLocation location) {
+
+        return seaportRepository.findByLatitudeAndLongitude(location.getLatitude(), location.getLongitude());
+    }
+
+
+    @Override
+    public boolean existsByUniqueId(BigInteger seaportUid) {
+
+        return getByUniqueId(seaportUid) != null;
+    }
+
+
+    @Override
+    public Seaport updateSeaport(BigInteger seaportUid, Seaport seaport) {
+
+        Seaport savedSeaport = getByUniqueId(seaportUid);
+        savedSeaport.setEnabled(seaport.isEnabled());
+        savedSeaport.setName(seaport.getName());
+        savedSeaport.setLatitude(seaport.getLatitude());
+        savedSeaport.setLongitude(seaport.getLongitude());
+
+        return save(savedSeaport);
+    }
+
+
+    @Transactional(readOnly = true)
+    void checkUniqueConstraints(Seaport seaport) {
+
+        boolean uniqueCoordinates;
+        boolean uniqueName;
+
+        if (seaport.getId() == null) {
+            // create
+            uniqueCoordinates =
+                seaportRepository.findByLatitudeAndLongitude(seaport.getLatitude(), seaport.getLongitude()) == null;
+
+            uniqueName = seaportRepository.findByName(seaport.getName()) == null;
+        } else {
+            // update
+            Long seaportId = seaport.getId();
+
+            uniqueCoordinates = seaportRepository.findByLatitudeAndLongitudeAndIdNot(seaport.getLatitude(),
+                    seaport.getLongitude(), seaportId) == null;
+
+            uniqueName = seaportRepository.findByNameAndIdNot(seaport.getName(), seaportId) == null;
+        }
+
+        if (!uniqueCoordinates) {
+            throw new NonUniqueSeaportException("latitude", "longitude");
+        }
+
+        if (!uniqueName) {
+            throw new NonUniqueSeaportException("name");
+        }
+    }
+
+
+    BigInteger determineUniqueId() {
+
+        String entityName = Seaport.class.getAnnotation(Entity.class).name();
+        BigInteger nextUniqueId = uniqueIdSequenceService.getNextId(entityName);
+
+        boolean isUniqueIdAlreadyAssigned = seaportRepository.findByUniqueId(nextUniqueId) != null;
+
+        while (isUniqueIdAlreadyAssigned) {
+            // In this loop we increment the ID by ourselves to avoid write-accesses to the DB for performance.
+            LOG.warn("Terminal uniqueId {} already assigned - trying next uniqueId", nextUniqueId);
+            nextUniqueId = nextUniqueId.add(BigInteger.ONE);
+
+            if (!(seaportRepository.findByUniqueId(nextUniqueId) != null)) {
+                isUniqueIdAlreadyAssigned = false;
+                uniqueIdSequenceService.setNextId(entityName, nextUniqueId);
+            }
+        }
+
+        return nextUniqueId;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/seaport/web/SeaportController.java b/src/main/java/net/contargo/iris/seaport/web/SeaportController.java
new file mode 100644
index 00000000..4f49feaf
--- /dev/null
+++ b/src/main/java/net/contargo/iris/seaport/web/SeaportController.java
@@ -0,0 +1,143 @@
+package net.contargo.iris.seaport.web;
+
+import net.contargo.iris.Message;
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.NonUniqueSeaportException;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceException;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.validation.BindingResult;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.lang.invoke.MethodHandles;
+
+import javax.validation.Valid;
+
+import static net.contargo.iris.api.AbstractController.SEAPORTS;
+import static net.contargo.iris.api.AbstractController.SLASH;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Controller Class for all operations with {@link Seaport}s.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Controller
+@RequestMapping(SLASH + SEAPORTS)
+public class SeaportController extends AbstractController {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final String CONTROLLER_CONTEXT = "seaportManagement" + SLASH;
+
+    private static final String SEAPORTS_ATTRIBUTE = SEAPORTS;
+    private static final String SEAPORT_ATTRIBUTE = "seaport";
+
+    private static final String SEAPORTS_VIEW = SEAPORTS;
+    private static final String SEAPORT_VIEW = "seaport";
+
+    private static final Message SAVE_SUCCESS_MESSAGE = Message.success("seaport.success.save.message");
+    private static final Message UPDATE_SUCCESS_MESSAGE = Message.success("seaport.success.update.message");
+
+    private final SeaportService seaportService;
+
+    @Autowired
+    public SeaportController(SeaportService seaportService) {
+
+        this.seaportService = seaportService;
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public String getAllSeaports(Model model) {
+
+        model.addAttribute(SEAPORTS_ATTRIBUTE, seaportService.getAll());
+
+        return CONTROLLER_CONTEXT + SEAPORTS_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + "new", method = RequestMethod.GET)
+    public String prepareForCreate(Model model) {
+
+        model.addAttribute(SEAPORT_ATTRIBUTE, new Seaport());
+
+        return CONTROLLER_CONTEXT + SEAPORT_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH, method = RequestMethod.POST)
+    public String saveSeaport(@Valid @ModelAttribute Seaport seaport, BindingResult result, Model model,
+        RedirectAttributes redirectAttributes) {
+
+        return saveOrUpdateSeaport(model, result, seaport, redirectAttributes, SAVE_SUCCESS_MESSAGE);
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.GET)
+    public String getSeaport(@PathVariable Long id, Model model) {
+
+        model.addAttribute(SEAPORT_ATTRIBUTE, seaportService.getById(id));
+
+        return CONTROLLER_CONTEXT + SEAPORT_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.PUT)
+    public String updateSeaport(@Valid @ModelAttribute Seaport seaport, BindingResult result, @PathVariable Long id,
+        Model model, RedirectAttributes redirectAttributes) {
+
+        seaport.setId(seaportService.getById(id).getId());
+
+        return saveOrUpdateSeaport(model, result, seaport, redirectAttributes, UPDATE_SUCCESS_MESSAGE);
+    }
+
+
+    private String saveOrUpdateSeaport(Model model, BindingResult result, Seaport seaport,
+        RedirectAttributes redirectAttributes, Message successMessage) {
+
+        if (result.hasErrors()) {
+            model.addAttribute(SEAPORT_ATTRIBUTE, seaport);
+
+            return CONTROLLER_CONTEXT + SEAPORT_VIEW;
+        }
+
+        try {
+            Long id = seaportService.save(seaport).getId();
+
+            redirectAttributes.addFlashAttribute(MESSAGE, successMessage);
+
+            return REDIRECT + WEBAPI_ROOT_URL + SEAPORTS + SLASH + id;
+        } catch (NonUniqueSeaportException e) {
+            for (String fieldName : e.getBadFields()) {
+                result.rejectValue(fieldName, "seaport.nonunique." + fieldName);
+            }
+
+            model.addAttribute(SEAPORT_ATTRIBUTE, seaport);
+
+            return CONTROLLER_CONTEXT + SEAPORT_VIEW;
+        } catch (UniqueIdSequenceServiceException e) {
+            model.addAttribute(SEAPORT_ATTRIBUTE, seaport);
+            model.addAttribute(AbstractController.MESSAGE, UNIQUEID_ERROR_MESSAGE);
+            LOG.error(e.getMessage());
+
+            return CONTROLLER_CONTEXT + SEAPORT_VIEW;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/security/SpringUserAuthenticationService.java b/src/main/java/net/contargo/iris/security/SpringUserAuthenticationService.java
new file mode 100644
index 00000000..2a66fcd8
--- /dev/null
+++ b/src/main/java/net/contargo/iris/security/SpringUserAuthenticationService.java
@@ -0,0 +1,26 @@
+package net.contargo.iris.security;
+
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+
+/**
+ * Implementation of {@link UserAuthenticationService} which access {@link SecurityContextHolder}.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ */
+public class SpringUserAuthenticationService implements UserAuthenticationService {
+
+    @Override
+    public Authentication getCurrentUser() {
+
+        SecurityContext context = SecurityContextHolder.getContext();
+
+        if (context == null) {
+            return null;
+        }
+
+        return context.getAuthentication();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/security/UserAuthenticationService.java b/src/main/java/net/contargo/iris/security/UserAuthenticationService.java
new file mode 100644
index 00000000..763c6b94
--- /dev/null
+++ b/src/main/java/net/contargo/iris/security/UserAuthenticationService.java
@@ -0,0 +1,17 @@
+package net.contargo.iris.security;
+
+import org.springframework.security.core.Authentication;
+
+
+/**
+ * Service to get information about the current User.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ */
+public interface UserAuthenticationService {
+
+    /**
+     * @return  the current user as {@link org.springframework.security.core.Authentication}
+     */
+    Authentication getCurrentUser();
+}
diff --git a/src/main/java/net/contargo/iris/sequence/UniqueIdSequence.java b/src/main/java/net/contargo/iris/sequence/UniqueIdSequence.java
new file mode 100644
index 00000000..d9dfe885
--- /dev/null
+++ b/src/main/java/net/contargo/iris/sequence/UniqueIdSequence.java
@@ -0,0 +1,72 @@
+package net.contargo.iris.sequence;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+
+/**
+ * Represents the next id to assign to an entity.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@Entity
+public class UniqueIdSequence {
+
+    public static final String SYSTEM_UNIQUEID_PREFIX = "1301";
+    public static final int SYSTEM_UNIQUEID_LENGTH = 16;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotEmpty
+    private String entityName;
+
+    private BigInteger nextId;
+
+    UniqueIdSequence() {
+
+        // JPA Entity classes must have a default constructor.
+    }
+
+
+    public UniqueIdSequence(String entityName, BigInteger nextId) {
+
+        this.entityName = entityName;
+        this.nextId = nextId;
+    }
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public String getEntityName() {
+
+        return entityName;
+    }
+
+
+    public BigInteger getNextId() {
+
+        return nextId;
+    }
+
+
+    public void incrementNextId() {
+
+        nextId = nextId.add(BigInteger.ONE);
+    }
+
+
+    public void setNextId(BigInteger nextId) {
+
+        this.nextId = nextId;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/sequence/persistence/UniqueIdSequenceRepository.java b/src/main/java/net/contargo/iris/sequence/persistence/UniqueIdSequenceRepository.java
new file mode 100644
index 00000000..f5cbfb4a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/sequence/persistence/UniqueIdSequenceRepository.java
@@ -0,0 +1,14 @@
+package net.contargo.iris.sequence.persistence;
+
+import net.contargo.iris.sequence.UniqueIdSequence;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface UniqueIdSequenceRepository extends JpaRepository<UniqueIdSequence, Long> {
+
+    UniqueIdSequence findByEntityName(String entityName);
+}
diff --git a/src/main/java/net/contargo/iris/sequence/service/SequenceService.java b/src/main/java/net/contargo/iris/sequence/service/SequenceService.java
new file mode 100644
index 00000000..2a8840ff
--- /dev/null
+++ b/src/main/java/net/contargo/iris/sequence/service/SequenceService.java
@@ -0,0 +1,30 @@
+package net.contargo.iris.sequence.service;
+
+import java.math.BigInteger;
+
+
+/**
+ * Manages Sequences of IDs in the database.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public interface SequenceService {
+
+    /**
+     * Determines the next id to use for the Entity of the given entity name and increments the Id in the DB.
+     *
+     * @param  entityName  as selector to search next id of this entity
+     *
+     * @return  the next id of the given entity
+     */
+    BigInteger getNextId(String entityName);
+
+
+    /**
+     * Set the next id to use manually.
+     *
+     * @param  entityName  to set the id
+     * @param  id  to set
+     */
+    void setNextId(String entityName, BigInteger id);
+}
diff --git a/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceException.java b/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceException.java
new file mode 100644
index 00000000..2b09ae79
--- /dev/null
+++ b/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceException.java
@@ -0,0 +1,12 @@
+package net.contargo.iris.sequence.service;
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class UniqueIdSequenceServiceException extends RuntimeException {
+
+    public UniqueIdSequenceServiceException(String message) {
+
+        super(message);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImpl.java b/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImpl.java
new file mode 100644
index 00000000..183d4a95
--- /dev/null
+++ b/src/main/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImpl.java
@@ -0,0 +1,72 @@
+package net.contargo.iris.sequence.service;
+
+import net.contargo.iris.sequence.UniqueIdSequence;
+import net.contargo.iris.sequence.persistence.UniqueIdSequenceRepository;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigInteger;
+
+
+/**
+ * Manages sequences of Unique IDs in the UniqueIdSequence table.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@Transactional
+public class UniqueIdSequenceServiceImpl implements SequenceService {
+
+    private final UniqueIdSequenceRepository uniqueIdSequenceRepository;
+
+    public UniqueIdSequenceServiceImpl(UniqueIdSequenceRepository uniqueIdSequenceRepository) {
+
+        this.uniqueIdSequenceRepository = uniqueIdSequenceRepository;
+    }
+
+    @Override
+    public synchronized BigInteger getNextId(String entityName) {
+
+        UniqueIdSequence uniqueIdSequence = uniqueIdSequenceRepository.findByEntityName(entityName);
+
+        if (uniqueIdSequence == null) {
+            throw new UniqueIdSequenceServiceException("No uniqueId sequence found in the database.");
+        }
+
+        BigInteger nextUniqueId = uniqueIdSequence.getNextId();
+
+        incrementNextId(uniqueIdSequence);
+
+        return nextUniqueId;
+    }
+
+
+    private void incrementNextId(UniqueIdSequence uniqueIdSequence) {
+
+        uniqueIdSequence.incrementNextId();
+
+        checkValidity(uniqueIdSequence.getNextId());
+
+        uniqueIdSequenceRepository.save(uniqueIdSequence);
+    }
+
+
+    void checkValidity(BigInteger nextId) {
+
+        if (!nextId.toString().startsWith(UniqueIdSequence.SYSTEM_UNIQUEID_PREFIX)
+                || nextId.toString().length() != UniqueIdSequence.SYSTEM_UNIQUEID_LENGTH) {
+            throw new UniqueIdSequenceServiceException(
+                "The automatically generated uniqueId is not valid for this system. It has to be 16 digits long and "
+                + "has to start with the system identifier " + UniqueIdSequence.SYSTEM_UNIQUEID_PREFIX);
+        }
+    }
+
+
+    @Override
+    public void setNextId(String entityName, BigInteger id) {
+
+        UniqueIdSequence uniqueIdSequence = uniqueIdSequenceRepository.findByEntityName(entityName);
+        uniqueIdSequence.setNextId(id);
+        checkValidity(uniqueIdSequence.getNextId());
+        uniqueIdSequenceRepository.save(uniqueIdSequence);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/startup/IrisStartupWatcher.java b/src/main/java/net/contargo/iris/startup/IrisStartupWatcher.java
new file mode 100644
index 00000000..5d6b3a4a
--- /dev/null
+++ b/src/main/java/net/contargo/iris/startup/IrisStartupWatcher.java
@@ -0,0 +1,36 @@
+package net.contargo.iris.startup;
+
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+
+
+/**
+ * Looks for event {@link ContextRefreshedEvent}, starts to do tasks that have to be done on application start.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ */
+public class IrisStartupWatcher implements ApplicationListener<ContextRefreshedEvent> {
+
+    private final StaticAddressService staticAddressService;
+
+    private boolean runOnce;
+
+    public IrisStartupWatcher(StaticAddressService staticAddressService) {
+
+        this.staticAddressService = staticAddressService;
+        runOnce = false;
+    }
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+
+        if (!runOnce) {
+            // added this boolean, because ContextRefreshedEvent is fired currently three times,
+            // because this event is fired for each context file separately (applicationContext/web/rest)
+            staticAddressService.fillMissingHashKeys();
+            runOnce = true;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/Region.java b/src/main/java/net/contargo/iris/terminal/Region.java
new file mode 100644
index 00000000..44af9236
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/Region.java
@@ -0,0 +1,25 @@
+package net.contargo.iris.terminal;
+
+/**
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public enum Region {
+
+    NIEDERRHEIN("region.niederrhein"),
+    OBERRHEIN("region.oberrhein"),
+    SCHELDE("region.schelde"),
+    NOT_SET("region.no");
+
+    private final String messageKey;
+
+    private Region(String messageKey) {
+
+        this.messageKey = messageKey;
+    }
+
+    public String getMessageKey() {
+
+        return messageKey;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/Terminal.java b/src/main/java/net/contargo/iris/terminal/Terminal.java
new file mode 100644
index 00000000..a2faa96f
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/Terminal.java
@@ -0,0 +1,145 @@
+package net.contargo.iris.terminal;
+
+import net.contargo.iris.GeoLocation;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.math.BigInteger;
+
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import javax.validation.constraints.Size;
+
+
+/**
+ * Represents a terminal.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Entity(name = "Terminal")
+public class Terminal extends GeoLocation {
+
+    private static final int MAX_NAME_SIZE = 254;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotEmpty
+    @Size(max = MAX_NAME_SIZE)
+    private String name;
+
+    private boolean enabled = false;
+
+    @Enumerated(EnumType.STRING)
+    private Region region = Region.NOT_SET;
+
+    private BigInteger uniqueId;
+
+    public Terminal() {
+
+        // JPA entity classes must have a no-arg constructor
+    }
+
+
+    public Terminal(GeoLocation geoLocation) {
+
+        this.setLatitude(geoLocation.getLatitude());
+        this.setLongitude(geoLocation.getLongitude());
+    }
+
+    public Long getId() {
+
+        return id;
+    }
+
+
+    public void setId(Long id) {
+
+        this.id = id;
+    }
+
+
+    public boolean isEnabled() {
+
+        return enabled;
+    }
+
+
+    public void setEnabled(boolean enabled) {
+
+        this.enabled = enabled;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    public BigInteger getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(BigInteger uniqueId) {
+
+        this.uniqueId = uniqueId;
+    }
+
+
+    public Region getRegion() {
+
+        return region;
+    }
+
+
+    public void setRegion(Region region) {
+
+        this.region = region;
+    }
+
+
+    @Override
+    public String getNiceName() {
+
+        return getName();
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+
+        return new EqualsBuilder().appendSuper(super.equals(o)).isEquals();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return new HashCodeBuilder().appendSuper(super.hashCode()).toHashCode();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return new ToStringBuilder(this).append("id", id).append("name", name).append("enabled", enabled).toString();
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/api/TerminalApiController.java b/src/main/java/net/contargo/iris/terminal/api/TerminalApiController.java
new file mode 100644
index 00000000..fbcd6cf4
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/api/TerminalApiController.java
@@ -0,0 +1,176 @@
+package net.contargo.iris.terminal.api;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.api.NotFoundException;
+import net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+import net.contargo.iris.terminal.dto.TerminalDto;
+import net.contargo.iris.terminal.dto.TerminalDtoService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigInteger;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Api(value = "/terminals", description = "API endpoint to manage terminal.")
+@Controller
+@RequestMapping(value = "/terminals")
+public class TerminalApiController extends AbstractController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TerminalApiController.class);
+
+    private final TerminalDtoService terminalDtoService;
+    private final SeaportDtoService seaportDtoService;
+    private final SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService;
+
+    @Autowired
+    public TerminalApiController(TerminalDtoService terminalDtoService, SeaportDtoService seaportDtoService,
+        SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService) {
+
+        this.terminalDtoService = terminalDtoService;
+        this.seaportDtoService = seaportDtoService;
+        this.seaportTerminalConnectionDtoService = seaportTerminalConnectionDtoService;
+    }
+
+    @ApiOperation(value = "Returns all active terminals.", notes = "Returns all active terminals.")
+    @RequestMapping(method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public TerminalsResponse getTerminals() {
+
+        TerminalsResponse response = new TerminalsResponse();
+
+        response.add(linkTo(methodOn(getClass()).getTerminals()).withSelfRel());
+
+        List<TerminalDto> allActive = terminalDtoService.getAllActive();
+        response.setTerminals(allActive);
+
+        LOG.info("API: Returning {} active terminals", allActive.size());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value =
+            "Returns all terminals that are part of a connection with the given routetype and the specified seaport.",
+        notes =
+            "Returns all terminals that are part of a connection with the given routetype and the specified seaport."
+    )
+    @RequestMapping(params = { "seaportUid", }, method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public TerminalsResponse getTerminalsForSeaportAndRouteType(
+        @RequestParam(value = "seaportUid") BigInteger seaportUID,
+        @RequestParam(value = "routeType") RouteType routeType) {
+
+        TerminalsResponse response = new TerminalsResponse();
+
+        response.add(linkTo(methodOn(getClass()).getTerminalsForSeaportAndRouteType(seaportUID, routeType))
+            .withSelfRel());
+
+        SeaportDto seaportDto = seaportDtoService.getByUid(seaportUID);
+
+        if (seaportDto == null) {
+            response.setTerminals(Collections.<TerminalDto>emptyList());
+
+            LOG.info("Cannnot find Seaport for UID {}", seaportUID);
+        } else {
+            List<TerminalDto> terminals =
+                seaportTerminalConnectionDtoService.findTerminalsConnectedToSeaPortByRouteType(seaportDto, routeType);
+
+            response.setTerminals(terminals);
+
+            LOG.info("API: Returning {} terminals connected to seaport {} via {}", terminals.size(),
+                seaportDto.getName(), routeType);
+        }
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Return the terminal with the given terminalUID.",
+        notes = "Return the terminal with the given terminalUID."
+    )
+    @RequestMapping(value = SLASH + "{terminalUid}", method = RequestMethod.GET)
+    @ModelAttribute(RESPONSE)
+    public TerminalResponse getTerminalByUid(@PathVariable("terminalUid") BigInteger uid) {
+
+        TerminalResponse response = new TerminalResponse();
+
+        response.add(linkTo(methodOn(getClass()).getTerminalByUid(uid)).withSelfRel());
+        response.add(linkTo(methodOn(getClass()).getTerminals()).withRel("terminals"));
+
+        TerminalDto t = terminalDtoService.getByUid(uid);
+
+        if (t == null) {
+            throw new NotFoundException("Cannot find Terminal for UID " + uid);
+        }
+
+        response.setTerminal(t);
+
+        LOG.info("API: Returning terminal {}", t.getName());
+
+        return response;
+    }
+
+
+    @ApiOperation(
+        value = "Saves the terminal with the given terminalUID.",
+        notes = "Saves the terminal with the given terminalUID.", response = Void.class
+    )
+    @RequestMapping(value = SLASH + "{terminalUid}", method = RequestMethod.PUT)
+    public ResponseEntity syncTerminal(@PathVariable("terminalUid") BigInteger terminalUid,
+        @Valid @RequestBody TerminalDto terminalDto) {
+
+        boolean update = terminalDtoService.existsByUniqueId(terminalUid);
+
+        if (update) {
+            terminalDtoService.updateTerminal(terminalUid, terminalDto);
+
+            LOG.info("API: Updating terminal with unique id {}", terminalUid);
+
+            return new ResponseEntity(HttpStatus.NO_CONTENT);
+        } else {
+            terminalDto.setUniqueId(terminalUid.toString());
+
+            terminalDtoService.save(terminalDto);
+
+            LOG.info("API: Creating terminal with unique id {}", terminalUid);
+
+            return new ResponseEntity(HttpStatus.CREATED);
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/api/TerminalResponse.java b/src/main/java/net/contargo/iris/terminal/api/TerminalResponse.java
new file mode 100644
index 00000000..4a114b71
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/api/TerminalResponse.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.terminal.api;
+
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+
+/**
+ * HATEOAS supporting response object for a single {@link net.contargo.iris.terminal.dto.TerminalDto}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+class TerminalResponse extends ResourceSupport {
+
+    private TerminalDto terminal;
+
+    public TerminalDto getTerminal() {
+
+        return terminal;
+    }
+
+
+    public void setTerminal(TerminalDto terminal) {
+
+        this.terminal = terminal;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/api/TerminalsResponse.java b/src/main/java/net/contargo/iris/terminal/api/TerminalsResponse.java
new file mode 100644
index 00000000..348d36f9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/api/TerminalsResponse.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.terminal.api;
+
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import org.springframework.hateoas.ResourceSupport;
+
+import java.util.List;
+
+
+/**
+ * HATEOAS supporting response object for a list of {@link net.contargo.iris.terminal.dto.TerminalDto}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+class TerminalsResponse extends ResourceSupport {
+
+    private List<TerminalDto> terminals;
+
+    public List<TerminalDto> getTerminals() {
+
+        return terminals;
+    }
+
+
+    public void setTerminals(List<TerminalDto> terminals) {
+
+        this.terminals = terminals;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/dto/TerminalDto.java b/src/main/java/net/contargo/iris/terminal/dto/TerminalDto.java
new file mode 100644
index 00000000..5e48bef7
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/dto/TerminalDto.java
@@ -0,0 +1,124 @@
+package net.contargo.iris.terminal.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.terminal.Region;
+import net.contargo.iris.terminal.Terminal;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Size;
+import java.math.BigInteger;
+
+
+/**
+ * View Bean Class for Terminal.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public final class TerminalDto extends GeoLocationDto {
+
+    private static final int MAX_NAME_SIZE = 254;
+    private static final String TERMINAL = "TERMINAL";
+
+    @NotEmpty
+    @Size(max = MAX_NAME_SIZE)
+    private String name;
+
+    private boolean enabled;
+
+    private String uniqueId;
+    private String type;
+    private Region region;
+
+    public TerminalDto() {
+
+        // Used to create JSON Objects
+    }
+
+
+    public TerminalDto(Terminal terminal) {
+
+        super(terminal);
+
+        if (terminal != null) {
+            this.name = terminal.getName();
+            this.enabled = terminal.isEnabled();
+            this.type = TERMINAL;
+            this.uniqueId = terminal.getUniqueId() == null ? null : terminal.getUniqueId().toString();
+
+            if (terminal.getRegion() != null) {
+                this.region = terminal.getRegion();
+            }
+        }
+    }
+
+    @JsonProperty("uniqueId")
+    public String getUniqueId() {
+
+        return uniqueId;
+    }
+
+
+    public void setUniqueId(String uniqueId) {
+
+        this.uniqueId = uniqueId;
+    }
+
+
+    // Setters are needed so this DTO can be used as @ModelAttribute in Spring MVC
+    public void setName(String name) {
+
+        this.name = name;
+    }
+
+
+    public void setEnabled(boolean enabled) {
+
+        this.enabled = enabled;
+    }
+
+
+    public boolean isEnabled() {
+
+        return enabled;
+    }
+
+
+    public String getName() {
+
+        return name;
+    }
+
+
+    public Region getRegion() {
+
+        return region;
+    }
+
+
+    public void setRegion(Region region) {
+
+        this.region = region;
+    }
+
+
+    @Override
+    public Terminal toEntity() {
+
+        Terminal terminal = new Terminal(super.toEntity());
+        terminal.setEnabled(this.enabled);
+        terminal.setName(this.name);
+        terminal.setUniqueId(this.uniqueId == null ? null : new BigInteger(this.uniqueId));
+        terminal.setRegion(this.region);
+
+        return terminal;
+    }
+
+
+    @Override
+    public String getType() {
+
+        return type;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoService.java b/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoService.java
new file mode 100644
index 00000000..fe2e396e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoService.java
@@ -0,0 +1,66 @@
+package net.contargo.iris.terminal.dto;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * View Bean Service for mapping of {@link net.contargo.iris.terminal.Terminal}s to {@link TerminalDto}s, Maps all
+ * return values of the methods of TerminalService to View Beans. For detailed Javadoc see interface
+ * {@link net.contargo.iris.terminal.service.TerminalService}
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface TerminalDtoService {
+
+    /**
+     * @return  a List of all Terminals
+     */
+    List<TerminalDto> getAll();
+
+
+    /**
+     * @return  a List of alle enabled Terminals.
+     */
+    List<TerminalDto> getAllActive();
+
+
+    /**
+     * Save the Terminal.
+     *
+     * @param  terminalDto
+     *
+     * @return  The terminalDto constructed from the saved Entity.
+     */
+    TerminalDto save(TerminalDto terminalDto);
+
+
+    /**
+     * @param  uid  the {@link net.contargo.iris.terminal.Terminal}'s uniqueId
+     *
+     * @return  The Terminal found to the given id. Null if no terminal is found.
+     */
+    TerminalDto getByUid(BigInteger uid);
+
+
+    /**
+     * Checks whether a {@link net.contargo.iris.terminal.Terminal} exists,
+     *
+     * @param  uniqueId  the terminal's uniqueId
+     *
+     * @return  true if the terminal exists, else false
+     */
+    boolean existsByUniqueId(BigInteger uniqueId);
+
+
+    /**
+     * Updates the {@link net.contargo.iris.terminal.Terminal} specified by its uniqueId with the values given in
+     * {@code terminalDto}.
+     *
+     * @param  terminalUid  the uniqueId of the terminal that should be updated
+     * @param  terminalDto  the dto providing values that should be updated
+     */
+    TerminalDto updateTerminal(BigInteger terminalUid, TerminalDto terminalDto);
+}
diff --git a/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImpl.java b/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImpl.java
new file mode 100644
index 00000000..9c666e6e
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImpl.java
@@ -0,0 +1,86 @@
+package net.contargo.iris.terminal.dto;
+
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class TerminalDtoServiceImpl implements TerminalDtoService {
+
+    private final TerminalService terminalService;
+
+    public TerminalDtoServiceImpl(TerminalService terminalService) {
+
+        this.terminalService = terminalService;
+    }
+
+    @Override
+    public List<TerminalDto> getAll() {
+
+        List<TerminalDto> termialDtos = new ArrayList<>();
+        List<Terminal> terminals = terminalService.getAll();
+
+        for (Terminal terminal : terminals) {
+            termialDtos.add(new TerminalDto(terminal));
+        }
+
+        return termialDtos;
+    }
+
+
+    @Override
+    public List<TerminalDto> getAllActive() {
+
+        List<TerminalDto> termialDtos = new ArrayList<>();
+        List<Terminal> terminals = terminalService.getAllActive();
+
+        for (Terminal terminal : terminals) {
+            termialDtos.add(new TerminalDto(terminal));
+        }
+
+        return termialDtos;
+    }
+
+
+    @Override
+    public TerminalDto save(TerminalDto terminalDto) {
+
+        Terminal terminalToSave = terminalDto.toEntity();
+        Terminal savedTerminal = terminalService.save(terminalToSave);
+
+        return new TerminalDto(savedTerminal);
+    }
+
+
+    @Override
+    public TerminalDto getByUid(BigInteger uid) {
+
+        Terminal terminal = terminalService.getByUniqueId(uid);
+
+        return terminal == null ? null : new TerminalDto(terminal);
+    }
+
+
+    @Override
+    public boolean existsByUniqueId(BigInteger uniqueId) {
+
+        return terminalService.existsByUniqueId(uniqueId);
+    }
+
+
+    @Override
+    public TerminalDto updateTerminal(BigInteger terminalUid, TerminalDto terminalDto) {
+
+        Terminal terminal = terminalService.updateTerminal(terminalUid, terminalDto.toEntity());
+
+        return new TerminalDto(terminal);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/persistence/TerminalRepository.java b/src/main/java/net/contargo/iris/terminal/persistence/TerminalRepository.java
new file mode 100644
index 00000000..679373bb
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/persistence/TerminalRepository.java
@@ -0,0 +1,36 @@
+package net.contargo.iris.terminal.persistence;
+
+import net.contargo.iris.terminal.Terminal;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Repository interface for {@link Terminal}s.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public interface TerminalRepository extends JpaRepository<Terminal, Long> {
+
+    List<Terminal> findByEnabled(boolean enabled);
+
+
+    Terminal findByLatitudeAndLongitude(BigDecimal latitude, BigDecimal longitude);
+
+
+    Terminal findByUniqueId(BigInteger uniqueId);
+
+
+    Terminal findByName(String name);
+
+
+    Terminal findByLatitudeAndLongitudeAndIdNot(BigDecimal latitude, BigDecimal longitude, Long terminalId);
+
+
+    Terminal findByNameAndIdNot(String name, Long terminalId);
+}
diff --git a/src/main/java/net/contargo/iris/terminal/service/NonUniqueTerminalException.java b/src/main/java/net/contargo/iris/terminal/service/NonUniqueTerminalException.java
new file mode 100644
index 00000000..e4b423bd
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/service/NonUniqueTerminalException.java
@@ -0,0 +1,25 @@
+package net.contargo.iris.terminal.service;
+
+import java.util.List;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class NonUniqueTerminalException extends IllegalArgumentException {
+
+    private final List<String> badFields;
+
+    public NonUniqueTerminalException(String... badFields) {
+
+        super("Terminal name and coordinates have to be unique.");
+        this.badFields = asList(badFields);
+    }
+
+    public List<String> getBadFields() {
+
+        return badFields;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/service/TerminalService.java b/src/main/java/net/contargo/iris/terminal/service/TerminalService.java
new file mode 100644
index 00000000..7eead494
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/service/TerminalService.java
@@ -0,0 +1,93 @@
+package net.contargo.iris.terminal.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.terminal.Terminal;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+
+/**
+ * Provides services related to {@link Terminal} entities.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public interface TerminalService {
+
+    /**
+     * Returns all (active/inactive) {@link Terminal}s of the System.
+     *
+     * @return  a List of all {@link Terminal}s
+     */
+    List<Terminal> getAll();
+
+
+    /**
+     * Returns all active {@link Terminal}s of the System.
+     *
+     * @return  a List of active {@link Terminal}s
+     */
+    List<Terminal> getAllActive();
+
+
+    /**
+     * Saves a {@link Terminal}.
+     *
+     * @param  terminal  to save
+     *
+     * @return  Terminal the saved {@link Terminal}
+     */
+    Terminal save(Terminal terminal);
+
+
+    /**
+     * Returns a {@link Terminal} by its id or null if not found.
+     *
+     * @param  id  the id to search for
+     *
+     * @return  the {@link Terminal} with the corresponding id or null
+     */
+    Terminal getById(Long id);
+
+
+    /**
+     * Returns a {@link Terminal} by its uniqueId.
+     *
+     * @param  uniqueId  the uniqueId to search for
+     *
+     * @return  the {@link Terminal} with the corresponding id or null
+     */
+    Terminal getByUniqueId(BigInteger uniqueId);
+
+
+    /**
+     * Returns a {@link Terminal} by its latitude and longitude.
+     *
+     * @param  location  credentials to find terminal with
+     *
+     * @return  {@link Terminal} with given {@link GeoLocation}
+     */
+    Terminal getByGeoLocation(GeoLocation location);
+
+
+    /**
+     * Checks whether a {@link net.contargo.iris.terminal.Terminal} exists,
+     *
+     * @param  uniqueId  the terminal's uniqueId
+     *
+     * @return  true if the terminal exists, else false
+     */
+    boolean existsByUniqueId(BigInteger uniqueId);
+
+
+    /**
+     * Updates the {@link net.contargo.iris.terminal.Terminal} specified by its uniqueId with the values given in
+     * {@code terminalDto}.
+     *
+     * @param  terminalUid  the uniqueId of the terminal that should be updated
+     * @param  terminal  the dto providing values that should be updated
+     */
+    Terminal updateTerminal(BigInteger terminalUid, Terminal terminal);
+}
diff --git a/src/main/java/net/contargo/iris/terminal/service/TerminalServiceImpl.java b/src/main/java/net/contargo/iris/terminal/service/TerminalServiceImpl.java
new file mode 100644
index 00000000..88309d2c
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/service/TerminalServiceImpl.java
@@ -0,0 +1,164 @@
+package net.contargo.iris.terminal.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.sequence.service.SequenceService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.persistence.TerminalRepository;
+
+import org.slf4j.Logger;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.invoke.MethodHandles;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Provides implementations related to {@link Terminal} entities.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Transactional
+public class TerminalServiceImpl implements TerminalService {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private final TerminalRepository terminalRepository;
+    private final SequenceService uniqueIdSequenceService;
+
+    public TerminalServiceImpl(TerminalRepository terminalRepository, SequenceService uniqueIdSequenceService) {
+
+        this.terminalRepository = terminalRepository;
+        this.uniqueIdSequenceService = uniqueIdSequenceService;
+    }
+
+    @Override
+    public List<Terminal> getAll() {
+
+        return terminalRepository.findAll();
+    }
+
+
+    @Override
+    public List<Terminal> getAllActive() {
+
+        return terminalRepository.findByEnabled(true);
+    }
+
+
+    @Override
+    public synchronized Terminal save(Terminal terminal) {
+
+        if (terminal.getUniqueId() == null) {
+            terminal.setUniqueId(determineUniqueId());
+        }
+
+        checkUniqueConstraints(terminal);
+
+        return terminalRepository.save(terminal);
+    }
+
+
+    BigInteger determineUniqueId() {
+
+        String entityName = Terminal.class.getAnnotation(Entity.class).name();
+        BigInteger nextUniqueId = uniqueIdSequenceService.getNextId(entityName);
+
+        boolean isUniqueIdAlreadyAssigned = terminalRepository.findByUniqueId(nextUniqueId) != null;
+
+        while (isUniqueIdAlreadyAssigned) {
+            // In this loop we increment the ID by ourselves to avoid write-accesses to the DB for performance.
+            LOG.warn("Terminal uniqueId {} already assigned - trying next uniqueId", nextUniqueId);
+            nextUniqueId = nextUniqueId.add(BigInteger.ONE);
+
+            if (!(terminalRepository.findByUniqueId(nextUniqueId) != null)) {
+                isUniqueIdAlreadyAssigned = false;
+                uniqueIdSequenceService.setNextId(entityName, nextUniqueId);
+            }
+        }
+
+        return nextUniqueId;
+    }
+
+
+    @Override
+    public Terminal getById(Long id) {
+
+        return terminalRepository.findOne(id);
+    }
+
+
+    @Override
+    public Terminal getByUniqueId(BigInteger uniqueId) {
+
+        return terminalRepository.findByUniqueId(uniqueId);
+    }
+
+
+    @Override
+    public Terminal getByGeoLocation(GeoLocation location) {
+
+        return terminalRepository.findByLatitudeAndLongitude(location.getLatitude(), location.getLongitude());
+    }
+
+
+    @Override
+    public boolean existsByUniqueId(BigInteger uniqueId) {
+
+        return getByUniqueId(uniqueId) != null;
+    }
+
+
+    @Override
+    public Terminal updateTerminal(BigInteger terminalUid, Terminal terminal) {
+
+        Terminal savedTerminal = getByUniqueId(terminalUid);
+        savedTerminal.setEnabled(terminal.isEnabled());
+        savedTerminal.setName(terminal.getName());
+        savedTerminal.setLatitude(terminal.getLatitude());
+        savedTerminal.setLongitude(terminal.getLongitude());
+        savedTerminal.setRegion(terminal.getRegion());
+
+        return save(savedTerminal);
+    }
+
+
+    @Transactional(readOnly = true)
+    void checkUniqueConstraints(Terminal terminal) {
+
+        boolean uniqueCoordinates;
+        boolean uniqueName;
+
+        if (terminal.getId() == null) {
+            // create
+            uniqueCoordinates = terminalRepository.findByLatitudeAndLongitude(terminal.getLatitude(),
+                    terminal.getLongitude()) == null;
+
+            uniqueName = terminalRepository.findByName(terminal.getName()) == null;
+        } else {
+            // update
+            Long terminalId = terminal.getId();
+
+            uniqueCoordinates = terminalRepository.findByLatitudeAndLongitudeAndIdNot(terminal.getLatitude(),
+                    terminal.getLongitude(), terminalId) == null;
+
+            uniqueName = terminalRepository.findByNameAndIdNot(terminal.getName(), terminalId) == null;
+        }
+
+        if (!uniqueCoordinates) {
+            throw new NonUniqueTerminalException("latitude", "longitude");
+        }
+
+        if (!uniqueName) {
+            throw new NonUniqueTerminalException("name");
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/terminal/web/TerminalController.java b/src/main/java/net/contargo/iris/terminal/web/TerminalController.java
new file mode 100644
index 00000000..0c6a730d
--- /dev/null
+++ b/src/main/java/net/contargo/iris/terminal/web/TerminalController.java
@@ -0,0 +1,149 @@
+package net.contargo.iris.terminal.web;
+
+import net.contargo.iris.Message;
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceException;
+import net.contargo.iris.terminal.Region;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.NonUniqueTerminalException;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.slf4j.Logger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.validation.BindingResult;
+
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import java.lang.invoke.MethodHandles;
+
+import javax.validation.Valid;
+
+import static net.contargo.iris.api.AbstractController.SLASH;
+import static net.contargo.iris.api.AbstractController.TERMINALS;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+
+/**
+ * Controller Class for all operations with {@link net.contargo.iris.terminal.api.Terminal}s.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Controller
+@RequestMapping(SLASH + TERMINALS)
+public class TerminalController extends AbstractController {
+
+    private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final String CONTROLLER_CONTEXT = "terminalManagement" + SLASH;
+
+    private static final String TERMINALS_ATTRIBUTE = TERMINALS;
+    private static final String TERMINAL_ATTRIBUTE = "terminal";
+
+    private static final String TERMINALS_VIEW = TERMINALS;
+    private static final String TERMINAL_FORM_VIEW = "terminal";
+
+    private static final Message SAVE_SUCCESS_MESSAGE = Message.success("terminal.success.save.message");
+    private static final Message UPDATE_SUCCESS_MESSAGE = Message.success("terminal.success.update.message");
+    private static final String REGIONS_ATTRIBUTE = "regions";
+
+    private final TerminalService terminalService;
+
+    @Autowired
+    public TerminalController(TerminalService terminalService) {
+
+        this.terminalService = terminalService;
+    }
+
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public String getAllTerminals(Model model) {
+
+        model.addAttribute(TERMINALS_ATTRIBUTE, terminalService.getAll());
+
+        return CONTROLLER_CONTEXT + TERMINALS_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + "new", method = RequestMethod.GET)
+    public String prepareForCreate(Model model) {
+
+        model.addAttribute(TERMINAL_ATTRIBUTE, new Terminal());
+        model.addAttribute(REGIONS_ATTRIBUTE, Region.values());
+
+        return CONTROLLER_CONTEXT + TERMINAL_FORM_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH, method = RequestMethod.POST)
+    public String saveTerminal(@Valid @ModelAttribute Terminal terminal, BindingResult result, Model model,
+        RedirectAttributes redirectAttributes) {
+
+        return saveOrUpdateTerminal(model, result, terminal, redirectAttributes, SAVE_SUCCESS_MESSAGE);
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.GET)
+    public String getTerminal(@PathVariable Long id, Model model) {
+
+        model.addAttribute(TERMINAL_ATTRIBUTE, terminalService.getById(id));
+        model.addAttribute(REGIONS_ATTRIBUTE, Region.values());
+
+        return CONTROLLER_CONTEXT + TERMINAL_FORM_VIEW;
+    }
+
+
+    @RequestMapping(value = SLASH + ID_PARAM, method = RequestMethod.PUT)
+    public String updateTerminal(@Valid @ModelAttribute Terminal terminal, BindingResult result, @PathVariable Long id,
+        Model model, RedirectAttributes redirectAttributes) {
+
+        Terminal dbTerminal = terminalService.getById(id);
+
+        terminal.setId(dbTerminal.getId());
+
+        return saveOrUpdateTerminal(model, result, terminal, redirectAttributes, UPDATE_SUCCESS_MESSAGE);
+    }
+
+
+    private String saveOrUpdateTerminal(Model model, BindingResult result, Terminal terminal,
+        RedirectAttributes redirectAttributes, Message successMessage) {
+
+        if (result.hasErrors()) {
+            model.addAttribute(TERMINAL_ATTRIBUTE, terminal);
+
+            return CONTROLLER_CONTEXT + TERMINAL_FORM_VIEW;
+        }
+
+        try {
+            redirectAttributes.addFlashAttribute(MESSAGE, successMessage);
+
+            Long id = terminalService.save(terminal).getId();
+
+            return REDIRECT + WEBAPI_ROOT_URL + TERMINALS + SLASH + id;
+        } catch (NonUniqueTerminalException e) {
+            for (String fieldName : e.getBadFields()) {
+                result.rejectValue(fieldName, "terminal.nonunique." + fieldName);
+            }
+
+            model.addAttribute(TERMINAL_ATTRIBUTE, terminal);
+
+            return CONTROLLER_CONTEXT + TERMINAL_FORM_VIEW;
+        } catch (UniqueIdSequenceServiceException e) {
+            model.addAttribute(TERMINAL_ATTRIBUTE, terminal);
+            model.addAttribute(AbstractController.MESSAGE, UNIQUEID_ERROR_MESSAGE);
+            LOG.error(e.getMessage());
+
+            return CONTROLLER_CONTEXT + TERMINAL_FORM_VIEW;
+        }
+    }
+}
diff --git a/src/main/java/net/contargo/iris/truck/TruckRoute.java b/src/main/java/net/contargo/iris/truck/TruckRoute.java
new file mode 100644
index 00000000..72dc4b76
--- /dev/null
+++ b/src/main/java/net/contargo/iris/truck/TruckRoute.java
@@ -0,0 +1,38 @@
+package net.contargo.iris.truck;
+
+import java.math.BigDecimal;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ */
+public class TruckRoute {
+
+    private final BigDecimal distance;
+    private final BigDecimal duration;
+    private final BigDecimal tollDistance;
+
+    public TruckRoute(BigDecimal distance, BigDecimal tollDistance, BigDecimal duration) {
+
+        this.distance = distance;
+        this.tollDistance = tollDistance;
+        this.duration = duration;
+    }
+
+    public BigDecimal getDistance() {
+
+        return distance;
+    }
+
+
+    public BigDecimal getDuration() {
+
+        return duration;
+    }
+
+
+    public BigDecimal getTollDistance() {
+
+        return tollDistance;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/truck/service/OSRMNonRoutableRouteException.java b/src/main/java/net/contargo/iris/truck/service/OSRMNonRoutableRouteException.java
new file mode 100644
index 00000000..1dbac5c9
--- /dev/null
+++ b/src/main/java/net/contargo/iris/truck/service/OSRMNonRoutableRouteException.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.truck.service;
+
+/**
+ * Thrown when a OSRMJsonResponse getting a non routable route.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class OSRMNonRoutableRouteException extends RuntimeException {
+
+    private static final long serialVersionUID = -4222863212840480759L;
+
+    public OSRMNonRoutableRouteException(String message) {
+
+        super(message);
+    }
+
+
+    public OSRMNonRoutableRouteException(String message, Exception cause) {
+
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/truck/service/OSRMTruckRouteService.java b/src/main/java/net/contargo/iris/truck/service/OSRMTruckRouteService.java
new file mode 100644
index 00000000..2aa31145
--- /dev/null
+++ b/src/main/java/net/contargo/iris/truck/service/OSRMTruckRouteService.java
@@ -0,0 +1,106 @@
+package net.contargo.iris.truck.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.osrm.service.OSRMQueryResult;
+import net.contargo.iris.osrm.service.OSRMQueryService;
+import net.contargo.iris.truck.TruckRoute;
+
+import org.springframework.cache.annotation.Cacheable;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+
+/**
+ * Service to get information of the truck route via OSRM. The toll will be calculates through the route instructions.
+ * Further information see below.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class OSRMTruckRouteService implements TruckRouteService {
+
+    private static final BigDecimal METERS_PER_KILOMETER = new BigDecimal("1000.0");
+    private static final BigDecimal SECONDS_PER_MINUTE = new BigDecimal("60.0");
+    private static final int STATUS_NO_ROUTE = 207;
+    private static final int SCALE = 5;
+    private static final int STANDARD_STREETDETAILS_LENGTH = 4;
+    private static final int INDEX_3 = 3;
+    private static final int INDEX_2 = 2;
+
+    private final OSRMQueryService osrmQueryService;
+
+    public OSRMTruckRouteService(OSRMQueryService osrmQueryService) {
+
+        this.osrmQueryService = osrmQueryService;
+    }
+
+    @Override
+    @Cacheable(value = "routingCache")
+    public TruckRoute route(GeoLocation start, GeoLocation destination) {
+
+        OSRMQueryResult osrmResult = osrmQueryService.getOSRMXmlRoute(start, destination);
+
+        if (osrmResult.getStatus() == STATUS_NO_ROUTE) {
+            throw new OSRMNonRoutableRouteException("Start: "
+                + start.toString() + " Destination: " + destination.toString() + " Status: " + osrmResult.getStatus());
+        }
+
+        BigDecimal toll = extractToll(osrmResult.getRouteInstructions());
+        BigDecimal distance = new BigDecimal(osrmResult.getTotalDistance()).divide(METERS_PER_KILOMETER, SCALE,
+                RoundingMode.HALF_UP);
+        BigDecimal duration = new BigDecimal(osrmResult.getTotalTime()).divide(SECONDS_PER_MINUTE, SCALE,
+                RoundingMode.HALF_UP);
+
+        return new TruckRoute(distance, toll, duration);
+    }
+
+
+    private BigDecimal extractToll(String[][] routeInstructions) {
+
+        BigDecimal toll = BigDecimal.ZERO;
+        toll = toll.setScale(SCALE);
+
+        for (String[] routeInstruction : routeInstructions) {
+            /*
+             * route_instructions:
+             *
+             * 0 - driving directions : integer numbers as defined in the source
+             * file DataStructures/TurnInstructions.h.
+             *
+             * 1 - way name (string)
+             *    [
+             *      street_name ("A 65")
+             *      street_type ("motorway")
+             *      toll_route ("yes")
+             *      country ("DE")
+             *    ]
+             *
+             * 2 - length in meters (integer)
+             *
+             * 3 - position
+             *
+             * 4 - time
+             *
+             * 5 - length with unit (string)
+             *
+             * 6 - Direction abbreviation (string) N: north, S: south, E: east, W: west, NW: North West, ...
+             *
+             * 7 - azimuth (float)
+             */
+            BigDecimal distance = new BigDecimal(routeInstruction[2]);
+            distance = distance.divide(METERS_PER_KILOMETER);
+
+            String[] streetDetails = routeInstruction[1].split("/;");
+
+            // currently, only german ("DE") toll roads are considered.
+            if (streetDetails.length == STANDARD_STREETDETAILS_LENGTH
+                    && ("yes".equalsIgnoreCase(streetDetails[INDEX_2])
+                        && "de".equalsIgnoreCase(streetDetails[INDEX_3]))) {
+                toll = toll.add(distance);
+            }
+        }
+
+        return toll;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/truck/service/TruckRouteService.java b/src/main/java/net/contargo/iris/truck/service/TruckRouteService.java
new file mode 100644
index 00000000..93900036
--- /dev/null
+++ b/src/main/java/net/contargo/iris/truck/service/TruckRouteService.java
@@ -0,0 +1,24 @@
+
+package net.contargo.iris.truck.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.truck.TruckRoute;
+
+
+/**
+ * Generates routings for Trucks.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ */
+public interface TruckRouteService {
+
+    /**
+     * Generate a truck routing.
+     *
+     * @param  start  The start coordinates
+     * @param  destination  The destination coordinates
+     *
+     * @return  The calculated routing
+     */
+    TruckRoute route(GeoLocation start, GeoLocation destination);
+}
diff --git a/src/main/java/net/contargo/iris/util/BigDecimalComparator.java b/src/main/java/net/contargo/iris/util/BigDecimalComparator.java
new file mode 100644
index 00000000..0969b46b
--- /dev/null
+++ b/src/main/java/net/contargo/iris/util/BigDecimalComparator.java
@@ -0,0 +1,34 @@
+package net.contargo.iris.util;
+
+import java.io.Serializable;
+
+import java.math.BigDecimal;
+
+import java.util.Comparator;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class BigDecimalComparator implements Comparator<BigDecimal>, Serializable {
+
+    private static final long serialVersionUID = -4798283898023294179L;
+
+    @Override
+    public int compare(BigDecimal o1, BigDecimal o2) {
+
+        if (o1 == null && o2 == null) {
+            return 0;
+        }
+
+        if (o1 == null) {
+            return 1;
+        }
+
+        if (o2 == null) {
+            return -1;
+        }
+
+        return o1.compareTo(o2);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/util/HttpUtil.java b/src/main/java/net/contargo/iris/util/HttpUtil.java
new file mode 100644
index 00000000..87460731
--- /dev/null
+++ b/src/main/java/net/contargo/iris/util/HttpUtil.java
@@ -0,0 +1,95 @@
+package net.contargo.iris.util;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.lang.invoke.MethodHandles;
+
+
+/**
+ * Util class for dealing with Http stuff.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public class HttpUtil {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    private static final int STATUS_CODE_300 = 300;
+    private static final int STATUS_CODE_199 = 199;
+    private final HttpClient httpClient;
+
+    public HttpUtil(HttpClient httpClient) {
+
+        this.httpClient = httpClient;
+    }
+
+    /**
+     * Gets the response as String for the given String representing an URL.
+     *
+     * @param  url  String
+     *
+     * @return  response as String
+     */
+    public String getResponseContent(String url) {
+
+        HttpEntity entity = getHttpEntityForGETRequest(url);
+        String response = null;
+
+        if (entity != null) {
+            try(InputStream is = entity.getContent()) {
+                response = InputStreamUtil.convertInputStreamToString(is);
+            } catch (IOException ex) {
+                throw new HttpUtilException("Could not get content (InputStream) of HttpEntity", ex);
+            }
+        }
+
+        return response;
+    }
+
+
+    /**
+     * Sends GET request to the given url and returns the response's HttpEntity.
+     *
+     * @param  url  String
+     *
+     * @return  HttpEntity
+     */
+    private HttpEntity getHttpEntityForGETRequest(String url) {
+
+        HttpEntity entity;
+
+        try {
+            LOG.debug("Sending GET request to {} ", url);
+
+            HttpGet httpGet = new HttpGet(url);
+            HttpResponse response = httpClient.execute(httpGet);
+
+            int statusCode = response.getStatusLine().getStatusCode();
+
+            if (statusCode > STATUS_CODE_199 && statusCode < STATUS_CODE_300) {
+                LOG.debug("Received response with status code {} for URL {}", statusCode, url);
+            } else {
+                LOG.error("Problem requesting {} - Code {} - {}", url, statusCode, response.getStatusLine());
+            }
+
+            entity = response.getEntity();
+
+            if (entity == null) {
+                LOG.warn("No response content found for url {} ", url);
+            }
+        } catch (IOException ex) {
+            throw new HttpUtilException("Error getting response for url " + url, ex);
+        }
+
+        return entity;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/util/HttpUtilException.java b/src/main/java/net/contargo/iris/util/HttpUtilException.java
new file mode 100644
index 00000000..fc1661aa
--- /dev/null
+++ b/src/main/java/net/contargo/iris/util/HttpUtilException.java
@@ -0,0 +1,14 @@
+package net.contargo.iris.util;
+
+/**
+ * Exception thrown if anything goes awry in {@link net.contargo.iris.util.HttpUtil}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class HttpUtilException extends RuntimeException {
+
+    public HttpUtilException(String message, Throwable t) {
+
+        super(message, t);
+    }
+}
diff --git a/src/main/java/net/contargo/iris/util/InputStreamUtil.java b/src/main/java/net/contargo/iris/util/InputStreamUtil.java
new file mode 100644
index 00000000..b4a638c2
--- /dev/null
+++ b/src/main/java/net/contargo/iris/util/InputStreamUtil.java
@@ -0,0 +1,109 @@
+
+package net.contargo.iris.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.core.io.ClassPathResource;
+
+import org.w3c.dom.Document;
+
+import org.xml.sax.SAXException;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+
+/**
+ * This is a helper class for actions concerning {@link java.io.InputStream}s.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public final class InputStreamUtil {
+
+    private static final Logger LOG = LoggerFactory.getLogger(InputStreamUtil.class);
+
+    private InputStreamUtil() {
+    }
+
+    /**
+     * Gets the file with the given path plus file name of the classpath and converts it to an InputStream.
+     *
+     * @param  fileName
+     *
+     * @return  InputStream
+     */
+    public static InputStream getFileInputStream(String fileName) {
+
+        InputStream in = null;
+
+        try {
+            ClassPathResource resource = new ClassPathResource(fileName);
+            File file = resource.getFile();
+            in = new FileInputStream(file);
+        } catch (IOException ex) {
+            LOG.warn("File '" + fileName + "' could not be converted to InputStream.", ex);
+        }
+
+        return in;
+    }
+
+
+    /**
+     * Converts the given InputStream to String.
+     *
+     * @param  in  InputStream
+     *
+     * @return  String content of the InputStream
+     */
+    public static String convertInputStreamToString(InputStream in) throws IOException {
+
+        StringBuilder builder = new StringBuilder();
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+
+        String line = reader.readLine();
+
+        while (line != null) {
+            builder.append(line);
+            line = reader.readLine();
+        }
+
+        return builder.toString();
+    }
+
+
+    /**
+     * Converts {@link java.io.InputStream} to {@link org.w3c.dom.Document}.
+     *
+     * @param  in  InputStream
+     *
+     * @return  Document
+     */
+    public static Document getDocument(InputStream in) {
+
+        Document doc = null;
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+        DocumentBuilder docBuilder = null;
+
+        try {
+            docBuilder = factory.newDocumentBuilder();
+
+            doc = docBuilder.parse(in);
+        } catch (ParserConfigurationException | SAXException | IOException ex) {
+            LOG.warn("Error fetching xml document.", ex);
+        }
+
+        return doc;
+    }
+}
diff --git a/src/main/java/net/contargo/iris/web/RootController.java b/src/main/java/net/contargo/iris/web/RootController.java
new file mode 100644
index 00000000..6c102411
--- /dev/null
+++ b/src/main/java/net/contargo/iris/web/RootController.java
@@ -0,0 +1,33 @@
+package net.contargo.iris.web;
+
+import net.contargo.iris.api.AbstractController;
+
+import org.springframework.stereotype.Controller;
+
+import org.springframework.ui.Model;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Controller
+public class RootController extends AbstractController {
+
+    public static final String ROOT = SLASH;
+
+    @RequestMapping(value = SLASH + STAR, method = RequestMethod.GET)
+    public String index(Model model) {
+
+        return INDEX;
+    }
+
+
+    @RequestMapping(value = SLASH + TRIANGLE + SLASH, method = RequestMethod.GET)
+    public String triangle() {
+
+        return TRIANGLE_VIEW;
+    }
+}
diff --git a/src/main/resources/application-context.xml b/src/main/resources/application-context.xml
new file mode 100644
index 00000000..078ee843
--- /dev/null
+++ b/src/main/resources/application-context.xml
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!--
+    Configuring Context Parameters
+    -->
+    <import resource="jpa-context.xml"/>
+    <import resource="web-security.xml"/>
+
+    <context:annotation-config/>
+
+    <context:property-placeholder ignore-resource-not-found="true"
+                                  location="classpath:application.properties, classpath:application-${environment:dev}.properties"/>
+
+    <!-- this is needed to find the messages in messages.properties -->
+    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+        <property name="basename" value="messages.messages"/>
+        <property name="useCodeAsDefaultMessage" value="true"/>
+    </bean>
+
+    <!--
+    logback
+    -->
+    <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+        <property name="targetClass" value="ch.qos.logback.ext.spring.LogbackConfigurer"/>
+        <property name="targetMethod" value="initLogging"/>
+        <property name="arguments" value="classpath:${logback.configuration.file}"/>
+    </bean>
+
+    <!--
+    EH Cache Infrastructure
+    -->
+    <bean id="ehCacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+        <property name="configLocation" value="classpath:ehcache.xml"/>
+        <property name="shared" value="true"/>
+    </bean>
+
+    <bean id="ehCacheFactory" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+        <property name="cacheManager">
+            <ref local="ehCacheManager"/>
+        </property>
+        <property name="cacheName" value="addressCache"/>
+    </bean>
+
+    <bean id="addressCache" class="org.springframework.cache.ehcache.EhCacheCache">
+        <constructor-arg name="ehcache" ref="ehCacheFactory"/>
+    </bean>
+
+    <!-- 
+    Utils, Helpers and supporting Services 
+    -->
+    <bean id="httpUtil" class="net.contargo.iris.util.HttpUtil">
+        <constructor-arg ref="httpClient"/>
+    </bean>
+
+    <bean id="httpClientBuilder" class="org.apache.http.impl.client.HttpClientBuilder" factory-method="create"/>
+
+    <bean id="httpClient" factory-bean="httpClientBuilder" factory-method="build"/>
+
+    <bean id="roundingService" class="net.contargo.iris.rounding.RoundingServiceImpl"/>
+
+    <bean id="urlSerializationService" class="net.contargo.iris.connection.api.RouteUrlSerializationServiceImpl"/>
+
+    <bean id="irisStartupWatcher" class="net.contargo.iris.startup.IrisStartupWatcher">
+        <constructor-arg ref="staticAddressService"/>
+    </bean>
+
+    <!--
+    All Beans for Addresses
+    -->
+    <bean id="addressSorter" class="net.contargo.iris.address.nominatim.service.AddressSorter">
+        <constructor-arg name="gisService" ref="gisService"/>
+    </bean>
+
+    <bean id="addressHelper" class="net.contargo.iris.address.nominatim.service.AddressServiceHelper"/>
+
+    <bean id="addressValidator" class="net.contargo.iris.address.nominatim.service.AddressValidator"/>
+
+    <bean id="addressService" class="net.contargo.iris.address.nominatim.service.NominatimAddressService">
+        <constructor-arg>
+            <bean class="net.contargo.iris.address.nominatim.service.NominatimUrlBuilder">
+                <constructor-arg name="baseUrl" value="${nominatim.base.url}"/>
+                <constructor-arg name="language" value="${nominatim.language}"/>
+                <constructor-arg name="countryService" ref="countryService"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg>
+            <bean class="net.contargo.iris.address.nominatim.service.NominatimJsonResponseParser">
+                <constructor-arg name="httpUtil" ref="httpUtil"/>
+                <constructor-arg name="objectMapper" ref="duplicateDetectionObjectMapper"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg name="addressSorter" ref="addressSorter"/>
+        <constructor-arg name="addressHelper" ref="addressHelper"/>
+        <constructor-arg name="addressValidator" ref="addressValidator"/>
+    </bean>
+
+    <bean id="normalizerService" class="net.contargo.iris.normalizer.NormalizerServiceImpl"/>
+
+    <bean id="staticAddressService" class="net.contargo.iris.address.staticsearch.service.StaticAddressServiceImpl">
+        <constructor-arg name="repository" ref="staticAddressRepository"/>
+        <constructor-arg ref="uniqueIdSequenceService"/>
+        <constructor-arg ref="normalizerService"/>
+    </bean>
+
+    <bean id="staticAddressDtoService" class="net.contargo.iris.address.staticsearch.dto.StaticAddressDtoServiceImpl">
+        <constructor-arg name="staticAddressService" ref="staticAddressService"/>
+    </bean>
+
+    <bean id="addressServiceWrapper" class="net.contargo.iris.address.service.AddressServiceWrapper">
+        <constructor-arg name="addressService" ref="addressService"/>
+        <constructor-arg name="staticAddressService" ref="staticAddressService"/>
+        <constructor-arg name="cache">
+            <bean class="net.contargo.iris.address.service.AddressCache">
+                <constructor-arg ref="addressCache"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg name="normalizerService" ref="normalizerService"/>
+    </bean>
+
+    <bean id="addressDtoService" class="net.contargo.iris.address.dto.AddressDtoServiceImpl">
+        <constructor-arg name="addressService" ref="addressService"/>
+        <constructor-arg name="addressServiceWrapper" ref="addressServiceWrapper"/>
+    </bean>
+
+
+    <!--
+    All beans for countries
+    -->
+    <bean id="countryService" class="net.contargo.iris.countries.service.CountryCodeCountryService"/>
+
+    <bean id="countryDtoService" class="net.contargo.iris.countries.dto.CountryCodeCountryDtoService">
+        <constructor-arg name="service" ref="countryService"/>
+    </bean>
+
+
+    <!--
+    All beans for airline distance
+    -->
+    <bean id="gisService" class="net.contargo.iris.gis.service.GisServiceImpl"/>
+
+    <bean id="airlineDistanceDtoService" class="net.contargo.iris.gis.dto.AirlineDistanceDtoServiceImpl">
+        <constructor-arg name="gisService" ref="gisService"/>
+    </bean>
+
+    <bean id="airlineDistanceResponseAssembler" class="net.contargo.iris.gis.api.AirlineDistanceResponseAssembler"/>
+
+    <bean id="uniqueIdSequenceService" class="net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl">
+        <constructor-arg ref="uniqueIdSequenceRepository"/>
+    </bean>
+
+
+    <!-- All beans for seaport -->
+    <bean id="seaportService" class="net.contargo.iris.seaport.service.SeaportServiceImpl">
+        <constructor-arg name="seaportRepository" ref="seaportRepository"/>
+        <constructor-arg ref="uniqueIdSequenceService"/>
+    </bean>
+
+    <bean id="seaportDtoService" class="net.contargo.iris.seaport.dto.SeaportDtoServiceImpl">
+        <constructor-arg ref="seaportService"/>
+    </bean>
+
+    <!-- All beans for terminals -->
+    <bean id="terminalService" class="net.contargo.iris.terminal.service.TerminalServiceImpl">
+        <constructor-arg ref="terminalRepository"/>
+        <constructor-arg ref="uniqueIdSequenceService"/>
+    </bean>
+
+    <bean id="terminalDtoService" class="net.contargo.iris.terminal.dto.TerminalDtoServiceImpl">
+        <constructor-arg ref="terminalService"/>
+    </bean>
+
+    <!--
+    All Beans for Truck Routing
+    -->
+    <bean id="duplicateDetectionObjectMapper"
+          class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
+        <property name="featuresToEnable">
+            <array>
+                <util:constant
+                        static-field="com.fasterxml.jackson.core.JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION"/>
+            </array>
+        </property>
+    </bean>
+
+    <bean id="osrmQueryService" class="net.contargo.iris.osrm.service.OSRMQueryServiceImpl">
+        <constructor-arg name="baseUrl" value="${osrm.url}"/>
+        <constructor-arg ref="httpUtil"/>
+        <constructor-arg ref="duplicateDetectionObjectMapper"/>
+    </bean>
+
+    <bean id="truckRouteService" class="net.contargo.iris.truck.service.OSRMTruckRouteService">
+        <constructor-arg name="osrmQueryService" ref="osrmQueryService"/>
+    </bean>
+
+    <bean id="cloudRoutingService" class="net.contargo.iris.distancecloud.service.DistanceCloudAddressServiceImpl">
+        <constructor-arg name="truckRouteService" ref="truckRouteService"/>
+        <constructor-arg name="repository" ref="staticAddressRepository"/>
+        <constructor-arg name="roundingService" ref="roundingService"/>
+        <constructor-arg name="gisService" ref="gisService"/>
+        <constructor-arg name="terminalService" ref="terminalService"/>
+    </bean>
+
+    <bean id="distanceCloudAddressDtoService"
+          class="net.contargo.iris.distancecloud.dto.DistanceCloudAddressDtoServiceImpl">
+        <constructor-arg ref="cloudRoutingService"/>
+    </bean>
+
+    <!-- All Beans for Connection -->
+    <bean id="connectionService" class="net.contargo.iris.connection.service.MainRunConnectionServiceImpl">
+        <constructor-arg name="mainRunConnectionRepository" ref="mainRunConnectionRepository"/>
+    </bean>
+
+    <bean id="seaportTerminalConnectionService"
+          class="net.contargo.iris.connection.service.SeaportTerminalConnectionServiceImpl">
+        <constructor-arg name="mainRunConnectionRepository" ref="mainRunConnectionRepository"/>
+        <constructor-arg name="seaportService" ref="seaportService"/>
+        <constructor-arg name="terminalService" ref="terminalService"/>
+    </bean>
+
+    <bean id="seaportTerminalConnectionDtoService"
+          class="net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoServiceImpl">
+        <constructor-arg name="seaportTerminalConnectionService" ref="seaportTerminalConnectionService"/>
+    </bean>
+
+    <bean id="seaportConnectionRoutesService"
+          class="net.contargo.iris.connection.service.SeaportConnectionRoutesServiceImpl">
+        <constructor-arg name="seaportTerminalConnectionService" ref="seaportTerminalConnectionService"/>
+        <constructor-arg name="mainRunAdvisor" ref="mainRunAdvisor"/>
+    </bean>
+
+    <bean id="mainRunDurationService" class="net.contargo.iris.mainrun.service.MainRunDurationServiceImpl">
+        <constructor-arg name="roundingService" ref="roundingService"/>
+    </bean>
+
+    <bean id="connectionDistanceService" class="net.contargo.iris.distance.service.ConnectionDistanceServiceImpl">
+        <constructor-arg name="roundingService" ref="roundingService"/>
+    </bean>
+
+    <bean id="distanceService" class="net.contargo.iris.distance.service.DistanceServiceImpl">
+        <constructor-arg name="roundingService" ref="roundingService"/>
+    </bean>
+
+    <bean id="durationService" class="net.contargo.iris.duration.service.DurationServiceImpl">
+        <constructor-arg name="roundingService" ref="roundingService"/>
+    </bean>
+
+    <bean id="mainRunAdvisor" class="net.contargo.iris.connection.advice.MainRunAdvisor">
+        <constructor-arg name="mainRunRoundTripImportAdvice">
+            <bean class="net.contargo.iris.connection.advice.MainRunRoundTripImportStrategy"/>
+        </constructor-arg>
+        <constructor-arg name="mainRunRoundTripExportAdvice">
+            <bean class="net.contargo.iris.connection.advice.MainRunRoundTripExportStrategy"/>
+        </constructor-arg>
+        <constructor-arg name="mainRunOneWayImportAdvice">
+            <bean class="net.contargo.iris.connection.advice.MainRunOneWayImportStrategy"/>
+        </constructor-arg>
+        <constructor-arg name="mainRunOneWayExportAdvice">
+            <bean class="net.contargo.iris.connection.advice.MainRunOneWayExportStrategy"/>
+        </constructor-arg>
+    </bean>
+
+    <bean id="geoLocationService" class="net.contargo.iris.location.GeoLocationServiceImpl">
+        <constructor-arg name="terminalService" ref="terminalService"/>
+        <constructor-arg name="seaportService" ref="seaportService"/>
+        <constructor-arg name="addressServiceWrapper" ref="addressServiceWrapper"/>
+    </bean>
+
+    <bean id="seaportConnectionRoutesDtoService"
+          class="net.contargo.iris.connection.dto.SeaportConnectionRoutesDtoServiceImpl">
+        <constructor-arg name="seaportConnectionRoutesService" ref="seaportConnectionRoutesService"/>
+    </bean>
+
+    <bean id="enricherService" class="net.contargo.iris.enricher.service.EnricherServiceImpl">
+        <constructor-arg name="routePartEnricherList">
+            <!-- Please keep in mind that the order of the enrichers is very important - before you add or remove something -->
+            <list>
+                <bean class="net.contargo.iris.enricher.service.GeoLocationPartEnricher">
+                    <constructor-arg name="geoLocationService" ref="geoLocationService"/>
+                </bean>
+                <bean class="net.contargo.iris.enricher.service.AirLineDistancePartEnricher">
+                    <constructor-arg name="gisService" ref="gisService"/>
+                    <constructor-arg name="roundingService" ref="roundingService"/>
+                </bean>
+                <bean class="net.contargo.iris.enricher.service.MainRunPartEnricher">
+                    <constructor-arg name="mainRunConnectionService" ref="connectionService"/>
+                    <constructor-arg name="mainRunDurationService" ref="mainRunDurationService"/>
+                    <constructor-arg name="connectionDistanceService" ref="connectionDistanceService"/>
+                </bean>
+                <bean class="net.contargo.iris.enricher.service.TruckRoutingPartEnricher">
+                    <constructor-arg name="truckRouteService" ref="truckRouteService"/>
+                    <constructor-arg name="durationService" ref="durationService"/>
+                    <constructor-arg name="distanceService" ref="distanceService"/>
+                </bean>
+                <bean class="net.contargo.iris.enricher.service.Co2PartEnricher"/>
+                <bean class="net.contargo.iris.enricher.service.RouteDataRevisionPartEnricher">
+                    <constructor-arg name="routeDataRevisionService" ref="routeDataRevisionService"/>
+                </bean>
+            </list>
+        </constructor-arg>
+        <constructor-arg name="routeTotalEnricherList">
+            <!-- Please keep in mind that the order of the enrichers is very important - before you add or remove something -->
+            <list>
+                <bean class="net.contargo.iris.enricher.service.Co2TotalEnricher"/>
+                <bean class="net.contargo.iris.enricher.service.TruckingTotalEnricher"/>
+                <bean class="net.contargo.iris.enricher.service.TotalEnricher"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="routeDataRevisionService"
+          class="net.contargo.iris.routedatarevision.service.RouteDataRevisionServiceImpl">
+        <constructor-arg name="routeDataRevisionRepository" ref="routeDataRevisionRepository"/>
+    </bean>
+
+    <bean id="enricherDtoService" class="net.contargo.iris.enricher.dto.EnricherDtoServiceImpl">
+        <constructor-arg ref="enricherService"/>
+    </bean>
+
+    <bean id="directTruckRouteBuilder" class="net.contargo.iris.route.DirectTruckRouteBuilder">
+        <constructor-arg name="truckRouteService" ref="truckRouteService"/>
+    </bean>
+
+    <bean id="co2Service" class="net.contargo.iris.co2.service.Co2ServiceImpl">
+        <constructor-arg name="directTruckRouteBuilder" ref="directTruckRouteBuilder"/>
+        <constructor-arg name="co2PartStrategyAdvisor" ref="co2PartStrategyAdvisor"/>
+    </bean>
+
+    <bean id="co2PartStrategyAdvisor" class="net.contargo.iris.co2.advice.Co2PartStrategyAdvisor">
+        <constructor-arg name="bargeStrategy">
+            <bean class="net.contargo.iris.co2.advice.Co2PartBargeStrategy">
+                <constructor-arg name="co2BargeRegionMap">
+                    <bean class="net.contargo.iris.co2.advice.Co2BargeRegionMap"/>
+                </constructor-arg>
+            </bean>
+        </constructor-arg>
+        <constructor-arg name="railStrategy">
+            <bean class="net.contargo.iris.co2.advice.Co2PartRailStrategy"/>
+        </constructor-arg>
+        <constructor-arg name="truckStrategy">
+            <bean class="net.contargo.iris.co2.advice.Co2PartTruckStrategy"/>
+        </constructor-arg>
+    </bean>
+
+    <bean id="userAuthenticationService" class="net.contargo.iris.security.SpringUserAuthenticationService"/>
+
+    <bean class="net.contargo.iris.connection.dto.MainRunConnectionDtoServiceImpl">
+        <constructor-arg name="mainRunConnectionService" ref="connectionService"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/src/main/resources/application-jenkins.properties b/src/main/resources/application-jenkins.properties
new file mode 100644
index 00000000..08792ff0
--- /dev/null
+++ b/src/main/resources/application-jenkins.properties
@@ -0,0 +1,22 @@
+# Settings for using Nominatim to geocode addresses
+# http://nominatim.openstreetmap.org/
+# For further information about query parameters have a look at: http://wiki.openstreetmap.org/wiki/Nominatim
+
+nominatim.base.url=http://maps.contargo.net/nominatim/
+osrm.url=http://maps2.contargo.net/osrm/viaroute
+error.reports.basepath=error-reports
+
+# preferred language for showing search results, overrides browser language
+nominatim.language=de
+
+application.version=${project.groupId}:${project.artifactId}:${project.version} - build at ${buildTime} by ${user.name}
+
+
+#Database
+liquibase.context=
+database.driver=com.mysql.jdbc.Driver
+database.url=jdbc:mysql://localhost:3306/irisci
+database.username=root
+database.password=
+hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+hibernate.hbm2ddl.auto=validate
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 00000000..d4c1788e
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1,23 @@
+# Settings for using Nominatim to geocode addresses
+# http://nominatim.openstreetmap.org/
+# For further information about query parameters have a look at: http://wiki.openstreetmap.org/wiki/Nominatim
+
+nominatim.base.url=http://maps.contargo.net/nominatim/
+osrm.url=http://maps.contargo.net/osrm/viaroute
+error.reports.basepath=error-reports
+
+# preferred language for showing search results, overrides browser language
+nominatim.language=de
+
+application.version=${project.groupId}:${project.artifactId}:${project.version} - build at ${buildTime} by ${user.name}
+
+#Database
+liquibase.context=
+database.driver=com.mysql.jdbc.Driver
+database.url=jdbc:mysql://localhost:3306/iris
+database.username=root
+database.password=
+hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+hibernate.hbm2ddl.auto=validate
+
+logback.configuration.file=logback.xml
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.10-add-not-null-constraint-to-terminal-region.xml b/src/main/resources/dbchangelogs/db.changelog-0.10-add-not-null-constraint-to-terminal-region.xml
new file mode 100644
index 00000000..c371579a
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.10-add-not-null-constraint-to-terminal-region.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="franke@synyx.de" id="addNotNullConstraintToTerminalRegion">
+        <addNotNullConstraint
+                tableName="Terminal"
+                columnName="region"
+                defaultNullValue="NOT_SET"
+                columnDataType="varchar(255)"/>
+        <addDefaultValue tableName="Terminal" columnName="region" defaultValue="NOT_SET"/>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.11-add-column-hashkey-to-staticaddress.xml b/src/main/resources/dbchangelogs/db.changelog-0.11-add-column-hashkey-to-staticaddress.xml
new file mode 100644
index 00000000..30a23273
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.11-add-column-hashkey-to-staticaddress.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="franke@synyx.de" id="add-column-hashkey-to-staticaddress">
+                
+        <addColumn tableName="StaticAddress">
+            <column name="hashKey" type="VARCHAR(5)">
+                <constraints unique="true"/>
+            </column>
+                    
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.2-add-notnull-static-address.xml b/src/main/resources/dbchangelogs/db.changelog-0.2-add-notnull-static-address.xml
new file mode 100644
index 00000000..4efac1f3
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.2-add-notnull-static-address.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+    <changeSet author="hoffmann@synyx.de" id="add-notnull-static-address">
+        <comment>Add NOT-NULL constraints for columns postalcode, city and cityNormalized</comment>
+
+        <addNotNullConstraint tableName="StaticAddress" columnName="postalcode" columnDataType="varchar(10)" defaultNullValue=""/>
+        
+        <addNotNullConstraint tableName="StaticAddress" columnName="city" columnDataType="varchar(255)" defaultNullValue=""/>
+
+        <addNotNullConstraint tableName="StaticAddress" columnName="cityNormalized" columnDataType="varchar(255)" defaultNullValue=""/>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.2-create-connection.xml b/src/main/resources/dbchangelogs/db.changelog-0.2-create-connection.xml
new file mode 100644
index 00000000..05bec3bd
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.2-create-connection.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+    <changeSet author="thieme@synyx.de" id="create-connection">
+        <comment>Create table for connections</comment>
+
+        <createTable tableName="Connection">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="seaport_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="terminal_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="dieselDistance" type="DECIMAL(15,10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="electricDistance" type="DECIMAL(15,10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="routeType" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="enabled" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+        <addForeignKeyConstraint baseTableName="Connection" baseColumnNames="seaport_id"
+                                 constraintName="FK_Connection_Seaport"
+                                 referencedTableName="Seaport"
+                                 referencedColumnNames="id"/>
+
+        <addForeignKeyConstraint baseTableName="Connection" baseColumnNames="terminal_id"
+                                 constraintName="FK_Connection_Terminal"
+                                 referencedTableName="Terminal"
+                                 referencedColumnNames="id"/>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.2-create-seaport.xml b/src/main/resources/dbchangelogs/db.changelog-0.2-create-seaport.xml
new file mode 100644
index 00000000..742d0740
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.2-create-seaport.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+    <changeSet author="thieme@synyx.de" id="create-seaport">
+        <comment>Create table for seaports</comment>
+
+        <createTable tableName="Seaport">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" />
+            </column>
+            <column name="name" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="enabled" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="latitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+            <column name="longitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+        </createTable>
+
+        <createIndex indexName="idx_seaport_1" tableName="Seaport" unique="false">
+            <column name="enabled" />
+        </createIndex>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.2-create-static-address.xml b/src/main/resources/dbchangelogs/db.changelog-0.2-create-static-address.xml
new file mode 100644
index 00000000..a76c544e
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.2-create-static-address.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+	<changeSet author="franke@synyx.de" id="create-static-address">
+		<comment>Create table for static address list</comment>
+
+        <createTable tableName="StaticAddress">
+
+			<column autoIncrement="true" name="id" type="BIGINT">
+				<constraints nullable="false" primaryKey="true" />
+			</column>
+
+			<column name="country" type="varchar(5)" />
+
+            <column name="postalcode" type="varchar(10)" />
+
+            <column name="city" type="varchar(255)" />
+            
+            <column name="cityNormalized" type="varchar(255)" />
+
+            <column name="suburb" type="varchar(255)" />
+
+            <column name="suburbNormalized" type="varchar(255)" />
+
+            <column name="latitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+
+            <column name="longitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+
+		</createTable>
+
+        <createIndex indexName="idx_staticaddress_1" tableName="StaticAddress" unique="false">
+            <column name="postalcode" />
+        </createIndex>
+        <createIndex indexName="idx_staticaddress_2" tableName="StaticAddress" unique="false">
+            <column name="country" />
+        </createIndex>
+        <createIndex indexName="idx_staticaddress_3" tableName="StaticAddress" unique="false">
+            <column name="cityNormalized" />
+        </createIndex>
+        <createIndex indexName="idx_staticaddress_4" tableName="StaticAddress" unique="false">
+            <column name="suburbNormalized" />
+        </createIndex>
+        <createIndex indexName="staticAddressLatitudeLongitudeUnique" tableName="StaticAddress" unique="true">
+            <column name="latitude" />
+            <column name="longitude" />
+        </createIndex>
+
+	</changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.2-create-terminal.xml b/src/main/resources/dbchangelogs/db.changelog-0.2-create-terminal.xml
new file mode 100644
index 00000000..b2e5c918
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.2-create-terminal.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+    <changeSet author="thieme@synyx.de" id="create-terminal">
+        <comment>Create table for terminals</comment>
+
+        <createTable tableName="Terminal">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" />
+            </column>
+            <column name="name" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="enabled" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column name="latitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+            <column name="longitude" type="DECIMAL(15,10)">
+                <constraints nullable="false" />
+            </column>
+        </createTable>
+
+        <createIndex indexName="idx_terminal_1" tableName="Seaport" unique="false">
+            <column name="enabled" />
+        </createIndex>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.3-Unique_constraint_main_run_connections.xml b/src/main/resources/dbchangelogs/db.changelog-0.3-Unique_constraint_main_run_connections.xml
new file mode 100644
index 00000000..49d7b271
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.3-Unique_constraint_main_run_connections.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    
+    <changeSet author="schneider@synyx.de" id="addUniqueConstraintConnections">
+        <comment>Add unique constraint to connections</comment>
+
+        <addUniqueConstraint tableName="Connection" columnNames="seaport_id,terminal_id,routeType" constraintName="Unique_seaport_terminal_routeType"/>
+        
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.3-add-column-region-to-terminal.xml b/src/main/resources/dbchangelogs/db.changelog-0.3-add-column-region-to-terminal.xml
new file mode 100644
index 00000000..13979db1
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.3-add-column-region-to-terminal.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="messner@synyx.de" id="add-column-region-to-terminal">
+        <addColumn tableName="Terminal">
+            <column name="region" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.6-add-column-uniqueId-to-terminal-seaport.xml b/src/main/resources/dbchangelogs/db.changelog-0.6-add-column-uniqueId-to-terminal-seaport.xml
new file mode 100644
index 00000000..8b3bd9c6
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.6-add-column-uniqueId-to-terminal-seaport.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="franke@synyx.de" id="add-column-uniqueId-to-terminal-seaport">
+                
+        <addColumn tableName="Terminal">
+            <column name="uniqueId" type="NUMBER(22)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+                    
+        </addColumn>
+
+        <addColumn tableName="Seaport">
+            <column name="uniqueId" type="NUMBER(22)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.6-add-uniquie-contraints-to-terminal-seaport.xml b/src/main/resources/dbchangelogs/db.changelog-0.6-add-uniquie-contraints-to-terminal-seaport.xml
new file mode 100644
index 00000000..32647c20
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.6-add-uniquie-contraints-to-terminal-seaport.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="thieme@synyx.de" id="add-unique-constraints-to-terminal">
+
+        <comment>Add unique constraints on both the terminal's name and its coordinates.</comment>
+
+        <addUniqueConstraint tableName="Terminal" columnNames="name" constraintName="terminalUniqueName"/>
+
+        <addUniqueConstraint tableName="Terminal" columnNames="latitude, longitude"
+                             constraintName="terminalUniqueCoordinates"/>
+
+    </changeSet>
+
+    <changeSet author="thieme@synyx.de" id="add-unique-constraints-to-seaport">
+
+        <comment>Add unique constraints on both the seaport's name and its coordinates.</comment>
+
+        <addUniqueConstraint tableName="Seaport" columnNames="name" constraintName="seaportUniqueName"/>
+
+        <addUniqueConstraint tableName="Seaport" columnNames="latitude, longitude"
+                             constraintName="seaportUniqueCoordinates"/>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.7-add-column-uniqueId-to-staticaddress.xml b/src/main/resources/dbchangelogs/db.changelog-0.7-add-column-uniqueId-to-staticaddress.xml
new file mode 100644
index 00000000..1d15a4fc
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.7-add-column-uniqueId-to-staticaddress.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="franke@synyx.de" id="add-column-uniqueId-to-staticaddress">
+                
+        <addColumn tableName="StaticAddress">
+            <column name="uniqueId" type="NUMBER(22)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+                    
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.7-create-uniqueIdSequence.xml b/src/main/resources/dbchangelogs/db.changelog-0.7-create-uniqueIdSequence.xml
new file mode 100644
index 00000000..b1ed4d2b
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.7-create-uniqueIdSequence.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="franke@synyx.de" id="create-uniqueIdSequence">
+        <comment>Create table for managing id sequences</comment>
+
+        <createTable tableName="UniqueIdSequence">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" />
+            </column>
+            <column name="entityName" type="VARCHAR(255)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="nextId" type="NUMBER(22)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+    </changeSet>
+    
+    <changeSet id="insert-start-sequence-terminal" author="franke@synyx.de">
+        <insert tableName="UniqueIdSequence">
+            <column name="entityName" value="Terminal"/>
+            <column name="nextId" value="1301000000000001"/>
+        </insert>
+    </changeSet>
+
+    <changeSet id="insert-start-sequence-seaport" author="franke@synyx.de">
+        <insert tableName="UniqueIdSequence">
+            <column name="entityName" value="Seaport"/>
+            <column name="nextId" value="1301000000000001"/>
+        </insert>
+    </changeSet>
+
+    <changeSet id="insert-start-sequence-staticaddress" author="franke@synyx.de">
+        <insert tableName="UniqueIdSequence">
+            <column name="entityName" value="StaticAddress"/>
+            <column name="nextId" value="1301000000000001"/>
+        </insert>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-0.9-fix-terminal-idx.xml b/src/main/resources/dbchangelogs/db.changelog-0.9-fix-terminal-idx.xml
new file mode 100644
index 00000000..48080eaa
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-0.9-fix-terminal-idx.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="schneider@synyx.de" id="fix-terminal-index">
+        <comment>Fix terminal index</comment>
+
+        <dropIndex tableName="Seaport" indexName="idx_terminal_1"/>
+
+        <createIndex indexName="idx_terminal_1" tableName="Terminal" unique="false">
+            <column name="enabled" />
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-1.6-add-route-data-revisions.xml b/src/main/resources/dbchangelogs/db.changelog-1.6-add-route-data-revisions.xml
new file mode 100644
index 00000000..ff4e84f0
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-1.6-add-route-data-revisions.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="schneider@synyx.de" id="add-route-data-revisions">
+
+        <createTable tableName="RouteDataRevision">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="terminal_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="truckDistanceOneWay" type="DECIMAL(15,2)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="tollDistanceOneWay" type="DECIMAL(15,2)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="airlineDistance" type="DECIMAL(15,2)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="latitude" type="DECIMAL(13,10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="longitude" type="DECIMAL(13,10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="radius" type="DECIMAL(15,2)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+        <addForeignKeyConstraint
+                baseTableName="RouteDataRevision" baseColumnNames="terminal_id"
+                constraintName="FK_RouteDataRevision_Terminal"
+                referencedTableName="Terminal"
+                referencedColumnNames="id"/>
+
+        <addUniqueConstraint
+                tableName="RouteDataRevision"
+                columnNames="terminal_id,latitude,longitude,radius"
+                constraintName="Unique_terminal_latitude_longitude_radius"/>
+
+    </changeSet>
+
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/dbchangelogs/db.changelog-master.xml b/src/main/resources/dbchangelogs/db.changelog-master.xml
new file mode 100644
index 00000000..08cb72ff
--- /dev/null
+++ b/src/main/resources/dbchangelogs/db.changelog-master.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                                       http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <include file="dbchangelogs/db.changelog-0.2-create-static-address.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.2-create-seaport.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.2-create-terminal.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.2-create-connection.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.2-add-notnull-static-address.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.3-Unique_constraint_main_run_connections.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.3-add-column-region-to-terminal.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.6-add-column-uniqueId-to-terminal-seaport.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.6-add-uniquie-contraints-to-terminal-seaport.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.7-add-column-uniqueId-to-staticaddress.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.7-create-uniqueIdSequence.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.9-fix-terminal-idx.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.10-add-not-null-constraint-to-terminal-region.xml"/>
+
+    <include file="dbchangelogs/db.changelog-0.11-add-column-hashkey-to-staticaddress.xml"/>
+
+    <include file="dbchangelogs/db.changelog-1.6-add-route-data-revisions.xml"/>
+
+</databaseChangeLog>
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
new file mode 100644
index 00000000..5ade5f05
--- /dev/null
+++ b/src/main/resources/ehcache.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created. If the path is a Java System Property it is
+         replaced by its value in the running VM. The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path
+    -->
+    <diskStore path="java.io.tmpdir"/>
+
+    <!-- Default Cache configuration. These will applied to caches programmatically created through the CacheManager.
+         The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires.
+                            i.e. The maximum amount of time between accesses before an element expires
+                            Is only used if the element is not eternal.
+                            Optional attribute. A value of 0 means that an Element can idle for infinity
+        timeToLiveSeconds - Sets the time to live for an element before it expires.
+                            i.e. The maximum time between creation time and when an element expires.
+                            Is only used if the element is not eternal.
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+    -->
+    <defaultCache maxElementsInMemory="900" eternal="false"
+                  timeToIdleSeconds="500" timeToLiveSeconds="500" overflowToDisk="true"/>
+
+    <cache name="addressCache" maxElementsInMemory="900" eternal="false"
+           timeToIdleSeconds="500" timeToLiveSeconds="500" overflowToDisk="false"/>
+
+</ehcache>
\ No newline at end of file
diff --git a/src/main/resources/jpa-context.xml b/src/main/resources/jpa-context.xml
new file mode 100644
index 00000000..b839bbb0
--- /dev/null
+++ b/src/main/resources/jpa-context.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jpa="http://www.springframework.org/schema/data/jpa"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+            http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
+
+    <!-- Directory to scan for repository classes -->
+    <jpa:repositories base-package="net.contargo.iris.**.persistence**"/>
+
+    <bean class="org.springframework.orm.jpa.JpaTransactionManager"
+          id="transactionManager">
+        <property name="entityManagerFactory"
+                  ref="entityManagerFactory"/>
+        <property name="jpaDialect">
+            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaDialect"/>
+        </property>
+    </bean>
+
+    <bean id="entityManagerFactory" depends-on="liquibase"
+          class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="jpaVendorAdapter">
+            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
+                <property name="generateDdl" value="true"/>
+                <property name="database" value="MYSQL"/>
+            </bean>
+        </property>
+        <property name="jpaPropertyMap">
+            <map>
+                <entry key="hibernate.hbm2ddl.delimiter.type" value="InnoDB"/>
+                <entry key="hibernate.dialect" value="${hibernate.dialect}"/>
+                <entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}"/>
+            </map>
+        </property>
+
+        <property name="packagesToScan" value="net.contargo.iris"/>
+    </bean>
+
+    <bean id="liquibase" class="liquibase.integration.spring.SpringLiquibase">
+        <property name="dataSource" ref="dataSource"/>
+        <property name="changeLog" value="classpath:dbchangelogs/db.changelog-master.xml"/>
+        <property name="contexts" value="${liquibase.context}"/>
+    </bean>
+
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource">
+        <property name="driverClassName" value="${database.driver}"/>
+        <property name="url" value="${database.url}"/>
+        <property name="username" value="${database.username}"/>
+        <property name="password" value="${database.password}"/>
+        <property name="validationQuery" value="SELECT 1"/>
+        <property name="testOnBorrow" value="true"/>
+    </bean>
+</beans>
diff --git a/src/main/resources/logback-access.xml b/src/main/resources/logback-access.xml
new file mode 100644
index 00000000..84f088f8
--- /dev/null
+++ b/src/main/resources/logback-access.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+
+    <filter class="ch.qos.logback.access.filter.CountingFilter">
+        <name>countingFilter</name>
+    </filter>
+
+    <appender name="accessfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/iris-access.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/backup-access/iris-access.%d{yyyy-MM}.log.gz</fileNamePattern>
+            <maxHistory>4</maxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>combined</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%n%fullRequest%n%fullResponse%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="reqrespfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/iris-req-resp.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/backup-access/iris-req-resp.%d{yyyy-MM}.log.gz</fileNamePattern>
+            <maxHistory>4</maxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>%n%fullRequest%n%fullResponse%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender-ref ref="accessfile" />
+    <appender-ref ref="reqrespfile" />
+    <appender-ref ref="console" />
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback-prod.xml b/src/main/resources/logback-prod.xml
new file mode 100644
index 00000000..8a424ccd
--- /dev/null
+++ b/src/main/resources/logback-prod.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+
+    <!-- To enable JMX Management -->
+    <jmxConfigurator/>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/iris.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/backup/iris.%d{yyyy-MM}.log.gz</fileNamePattern>
+            <maxHistory>4</maxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>%d | %5p  | %-4relative [%thread] | %logger{35} - %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Application Loggers -->
+    <logger name="net.contargo">
+        <level value="info" />
+    </logger>
+
+    <!-- 3rdparty Loggers -->
+    <logger name="org.springframework">
+        <level value="info" />
+    </logger>
+
+    <logger name="org.hibernate">
+        <level value="info" />
+    </logger>
+
+    <root>
+        <level value="info" />
+        <appender-ref ref="file" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 00000000..4883a83c
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+
+    <!-- To enable JMX Management -->
+    <jmxConfigurator/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d | %5p  | %t | %-55logger{55} | %m %n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/iris.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>logs/backup/iris.%d{yyyy-MM}.log.gz</fileNamePattern>
+            <maxHistory>4</maxHistory>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>%d | %5p  | %-4relative [%thread] | %logger{35} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Application Loggers -->
+    <logger name="net.contargo">
+        <level value="info" />
+    </logger>
+
+    <!-- 3rdparty Loggers -->
+    <logger name="org.springframework">
+        <level value="info" />
+    </logger>
+
+    <logger name="org.hibernate">
+        <level value="info" />
+    </logger>
+
+    <root>
+        <level value="info" />
+        <appender-ref ref="console" />
+        <appender-ref ref="file" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
new file mode 100644
index 00000000..c0ba53b5
--- /dev/null
+++ b/src/main/resources/messages/messages.properties
@@ -0,0 +1,140 @@
+################################## index.jsp
+index.page.title=IRIS - Welcome
+index.page.clients=IRIS Clients
+index.page.clients.description=IRIS can be accessed conveniently via a modern web application.
+index.page.triangle=Triangular Traffic
+index.page.triangle.description=Using the Triangular Traffic you are able to route multistop truck routes via terminals and arbitrary addresses in any order.
+index.page.search.api=Search API
+index.page.docs.api=API Documentation
+index.page.restful=RESTful Webservice
+index.page.restful.description=For automation, a <i>RESTful</i> web service is provided. The api is self-explanatory, and can be accessed with your web browser as well.
+index.page.what.is.iris=What is IRIS?
+index.page.what.is.iris.name=Intermodal Routing Information System
+index.page.what.is.iris.vision=Vision
+index.page.what.is.iris.vision.description.1=The goal of IRIS is to create a centralized and transparent database for distance calculations in short-haul goods transport. IRIS aims to provide such a platform, for both clients and service providers.
+index.page.what.is.iris.vision.description.2=IRIS is used to calculate truckings for transports from a hinterland terminal to the place of loading and the other way around. The place of loading can be set very detailed by adjusting its coordinates. IRIS uses these coordinates to calculate the truck route, distance, toll kilometers and the duration of the trucking. An extension for barge and rail routings is already planned.
+index.page.what.is.iris.vision.description.3=Example: A freight container arrives in Mannheim via cargo ship and needs to be transported to 48 Berliner Str., Heidelberg, Germany. After arriving at the Contargo terminal in Mannheim it needs to be loaded on a truck to be transported to its destination. There, the recipient unloads the content and the truck transports the empty container back to the terminal.
+index.page.remarks=Remarks
+index.page.remarks.1=Distances are road distances. Their values depend on which route is selected between starting point and destination.
+index.page.remarks.2=IRIS also takes streets with restrictions for trucks into consideration.
+index.page.remarks.3=Currently, IRIS does not support car ferries, for example between France and the UK.
+index.page.remarks.4=Currently, German motorways and highways (Autobahn, Bundesstra\u00dfe) are the only toll roads considered. Due to, the total toll distance only reflect the mentioned roads.
+index.page.remarks.5=Contargo assumes no guarantee and no liability for the data and information delivered and made available by them being correct, complete, and up-to-date.
+index.page.remarks.6=Due to changes in the infrastructure there can be differences in the outcome of your routings from time to time. We try to catch up with the latest changes as soon as possible.
+index.page.remarks.7=The duration of truckings depends on the database to which IRIS refers. Meanderings due to traffic jams and building sites are not taken into consideration.
+
+############################ general-error.jsp
+iris.internal.error=An unexpected error occured :-(
+iris.error.report=Please report this code to an IRIS admin\: {0}
+
+################################## MAIN
+management.page.title=IRIS - Management
+
+table.newLabel=New
+table.editLabel=Edit
+
+form.backTitle=Back
+form.save=Save
+form.update=Update
+
+page.navbar.index=Startpage
+page.navbar.terminalmanagement=Terminals
+page.navbar.seaportmanagement=Seaports
+page.navbar.connectionmanagement=Connections
+page.navbar.staticaddresses=Static Addresses
+page.navbar.trianglerouting=Triangular Traffic
+page.toTopScrollerToolTip=Back to top
+
+mappicker.chooselocation=Choose geolocation
+mappicker.close=Close
+mappicker.closebutton=x
+mappicker.select=Select
+
+uniqueid.error.message=Error generating new unique identifier. Please contact an Administrator.
+
+terminals.page.title=IRIS - Terminal management
+terminal.create.title=Save terminal 
+terminal.update.title=Update terminal
+terminal.name=Name
+terminal.region=Region
+terminal.enabled=Enabled
+terminal.metaInformation=Information
+terminal.success.save.message=Terminal saved successfully.
+terminal.success.update.message=Terminal updated successfully.
+terminal.nonunique.latitude=Coordinates have to be unique.
+terminal.nonunique.longitude=Coordinates have to be unique.
+terminal.nonunique.name=Name has to be unique.
+
+seaports.page.title=IRIS - Seaport management
+seaport.create.title=Save seaport 
+seaport.update.title=Update seaport
+seaport.name=Name
+seaport.enabled=Enabled
+seaport.metaInformation=Information
+seaport.success.save.message=Seaport saved successfully.
+seaport.success.update.message=Seaport updated successfully.
+seaport.nonunique.latitude=Coordinates have to be unique.
+seaport.nonunique.longitude=Coordinates have to be unique.
+seaport.nonunique.name=Name has to be unique.
+
+geolocation.latitude=Latitude
+geolocation.longitude=Longitude
+
+mainrunconnection.page.title=IRIS - Connection management
+mainrunconnection.seaport.name=Seaport
+mainrunconnection.seaport.enabled=Seaport enabled?
+mainrunconnection.terminal.name=Terminal
+mainrunconnection.terminal.enabled=Terminal enabled?
+mainrunconnection.routeType=Type
+mainrunconnection.enabled=Connection enabled
+mainrunconnection.everythingenabled=Everything enabled?
+mainrunconnection.terminal.isenabled.true=(enabled)
+mainrunconnection.terminal.isenabled.false=(NOT enabled!)
+mainrunconnection.seaport.isenabled.true=(enabled)
+mainrunconnection.seaport.isenabled.false=(NOT enabled!)
+mainrunconnection.dieselDistance=Diesel km
+mainrunconnection.electricDistance=Electrical km
+mainrunconnection.create.title=Create new main run connection
+mainrunconnection.duplicate.connection.seaport=This combination of seaport... 
+mainrunconnection.duplicate.connection.terminal=... and terminal with ...
+mainrunconnection.duplicate.connection.routetype=.. this route type is already defined.
+mainrunconnection.update.title=Edit main run connection - 
+mainrunconnection.success.save.message = Main run connection saved successfully.
+mainrunconnection.success.edit.message = Main run connection updated successfully.
+
+staticaddress.page.title=IRIS - Static Addresses management
+staticaddress.label.search=Search
+staticaddress.label.postalcode=Postalcode
+staticaddress.label.city=City
+staticaddress.label.suburb=Suburb
+staticaddress.label.country=Country
+staticaddress.label.lat=Latitude
+staticaddress.label.lon=Longitude
+staticaddress.label.hashkey=Hashkey
+staticaddress.editmode.create=Create Static Address
+staticaddress.editmode.edit=Update Static Address
+staticaddress.error.duplicate=There is already a static address with same city, suburb and postalcode.
+staticaddress.error.coordinates.duplicate=There is already a static address with same latitude and longitude.
+staticaddress.save.success=Static address saved successfully.
+staticaddress.update.success=Static address updated successfully.
+
+triangle.page.title=Triangular Traffic
+
+route.type.barge=Barge
+route.type.rail=Rail
+route.type.truck=Truck
+
+
+############################ login.jsp
+login.title=Login
+login.use=Use IRIS
+login.signin=Sign In
+login.email.label=E-Mail
+login.password.label=Password
+login.description=If you already have a user account you can login here.
+login.error.title=Login failed
+login.error.text=You have probably used the wrong email or password. Please try again to login with correct credentials.
+
+browser.too.old.warningTitle=Unsupported Browser
+browser.too.old.warning=Your browser is too old. We recommend an updated Google Chrome or Firefox. Or at least a newer version of Internet Explorer (>= 8).
+browser.too.old.popup.warning=You are using an unsupported browser!
\ No newline at end of file
diff --git a/src/main/resources/nominatim/json_sample.json b/src/main/resources/nominatim/json_sample.json
new file mode 100644
index 00000000..ba556241
--- /dev/null
+++ b/src/main/resources/nominatim/json_sample.json
@@ -0,0 +1,5 @@
+[{"place_id":"84069287","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"90085697","boundingbox":["49.002025604248","49.0021591186523","8.39366722106934","8.39412879943848"],"lat":"49.002095196515","lon":"8.39391718305592","display_name":"Fotostudio Becker, 68, Karlstrasse, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)","class":"amenity","type":"photo_studio","address":{"amenity":"Fotostudio Becker","house_number":"68","road":"Karlstraße","suburb":"Suedweststadt","city":"Karlsruhe","county":"Karlsruhe","state_district":"Regierungsbezirk Karlsruhe","state":"Baden-Wuerttemberg","postcode":"76137","country":"Federal Republic of Germany (land mass)","country_code":"de"}},
+{"place_id":"42804539","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"34185237","boundingbox":["48.9919967651367","48.9927024841309","8.39306163787842","8.39326763153076"],"lat":"48.9923342170845","lon":"8.39320538751983","display_name":"Karlstraße, Beiertheim-Bulach, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)","class":"highway","type":"tertiary","address":{"road":"Karlstraße","suburb":"Beiertheim-Bulach","city":"Karlsruhe","county":"Karlsruhe","state_district":"Regierungsbezirk Karlsruhe","state":"Baden-Wuerttemberg","postcode":"76137","country":"Federal Republic of Germany (land mass)","country_code":"de"}},
+{"place_id":"18535393","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"4230619","boundingbox":["48.9971389770508","48.9983367919922","8.39372158050537","8.39389991760254"],"lat":"48.9977192676553","lon":"8.39385460879033","display_name":"Karlstraße, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)","class":"highway","type":"secondary","address":{"road":"Karlstraße","suburb":"Suedweststadt","city":"Karlsruhe","county":"Karlsruhe","state_district":"Regierungsbezirk Karlsruhe","state":"Baden-Wuerttemberg","postcode":"76137","country":"Federal Republic of Germany (land mass)","country_code":"de"}},
+{"place_id":"84069287","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"90085697","boundingbox":["49.002025604248","49.0021591186523","8.39366722106934","8.39412879943848"],"lat":"49.002095196515","lon":"8.39391718305592","display_name":"Fotostudio Becker, 68, Karlstraße, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)","class":"amenity","type":"photo_studio","address":{"amenity":"Fotostudio Becker","house_number":"68","road":"Karlstraße","suburb":"Suedweststadt","city":"Karlsruhe","county":"Karlsruhe","state_district":"Regierungsbezirk Karlsruhe","state":"Baden-Wuerttemberg","postcode":"76137","country":"Federal Republic of Germany (land mass)","country_code":"de"}},
+{"place_id":"18535965","licence":"Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.","osm_type":"way","osm_id":"4230623","boundingbox":["49.005012512207","49.0055770874023","8.39449977874756","8.39451885223389"],"lat":"49.0052941887663","lon":"8.39451053751155","display_name":"Karlstraße, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76133, Federal Republic of Germany (land mass)","class":"highway","type":"secondary","address":{"road":"Karlstraße","suburb":"Suedweststadt","city":"Karlsruhe","county":"Karlsruhe","state_district":"Regierungsbezirk Karlsruhe","state":"Baden-Wuerttemberg","postcode":"76133","country":"Federal Republic of Germany (land mass)","country_code":"de"}}]
diff --git a/src/main/resources/nominatim/json_sample_single_result.json b/src/main/resources/nominatim/json_sample_single_result.json
new file mode 100644
index 00000000..69f7c2ab
--- /dev/null
+++ b/src/main/resources/nominatim/json_sample_single_result.json
@@ -0,0 +1,23 @@
+{
+    "place_id": "84069287",
+    "licence": "Data Copyright OpenStreetMap Contributors, Some Rights Reserved. CC-BY-SA 2.0.",
+    "osm_type": "way",
+    "osm_id": "90085697",
+    "boundingbox": ["49.002025604248", "49.0021591186523", "8.39366722106934", "8.39412879943848"],
+    "lat": "49.002095196515", "lon": "8.39391718305592",
+    "display_name": "Fotostudio Becker, 68, Karlstrasse, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)", "class": "amenity",
+    "type": "photo_studio",
+    "address": {
+        "amenity": "Fotostudio Becker",
+        "house_number": "68",
+        "road": "Karlstraße",
+        "suburb": "Suedweststadt",
+        "city": "Karlsruhe",
+        "county": "Karlsruhe",
+        "state_district": "Regierungsbezirk Karlsruhe",
+        "state": "Baden-Wuerttemberg",
+        "postcode": "76137",
+        "country": "Federal Republic of Germany (land mass)",
+        "country_code": "de"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/openrouteservice/ors_geocoding_sample.xml b/src/main/resources/openrouteservice/ors_geocoding_sample.xml
new file mode 100644
index 00000000..01cab6f5
--- /dev/null
+++ b/src/main/resources/openrouteservice/ors_geocoding_sample.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xls:XLS version="1.1" xsi:schemaLocation="http://www.opengis.net/xls http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd">
+    <xls:ResponseHeader xsi:type="xls:ResponseHeaderType"/>
+    <xls:Response xsi:type="xls:ResponseType" requestID="123456789" version="1.1" numberOfResponses="1">
+        <xls:GeocodeResponse xsi:type="xls:GeocodeResponseType">
+            <xls:GeocodeResponseList numberOfGeocodedAddresses="4">
+                <xls:GeocodedAddress>
+                    <gml:Point>
+                        <gml:pos srsName="EPSG:4326">8.4044366 49.0140679</gml:pos>
+                    </gml:Point>
+                    <xls:Address countryCode="de">
+                        <xls:StreetAddress>
+                            <xls:Street/>
+                        </xls:StreetAddress>
+                        <xls:Place type="CountrySubdivision">Baden-Württemberg</xls:Place>
+                        <xls:Place type="Municipality">Karlsruhe</xls:Place>
+                        <xls:PostalCode>76131</xls:PostalCode>
+                    </xls:Address>
+                    <xls:GeocodeMatchCode accuracy="1.0"/>
+                </xls:GeocodedAddress>
+                <xls:GeocodedAddress>
+                    <gml:Point>
+                        <gml:pos srsName="EPSG:4326">7.2931383 51.1526207</gml:pos>
+                    </gml:Point>
+                    <xls:Address countryCode="de">
+                        <xls:StreetAddress>
+                            <xls:Street/>
+                        </xls:StreetAddress>
+                        <xls:Place type="CountrySubdivision">Nordrhein-Westfalen</xls:Place>
+                        <xls:Place type="Municipality">Karlsruhe</xls:Place>
+                        <xls:PostalCode>42897</xls:PostalCode>
+                    </xls:Address>
+                    <xls:GeocodeMatchCode accuracy="1.0"/>
+                </xls:GeocodedAddress>
+                <xls:GeocodedAddress>
+                    <gml:Point>
+                        <gml:pos srsName="EPSG:4326">8.39390170659984 49.0020971544562</gml:pos>
+                    </gml:Point>
+                    <xls:Address countryCode="de">
+                        <xls:StreetAddress>
+                            <xls:Building xsi:type="xls:BuildingLocatorType" number="68"/>
+                            <xls:Street officialName="Karlstraße"/>
+                        </xls:StreetAddress>
+                        <xls:Place type="CountrySubdivision">Baden-Württemberg</xls:Place>
+                        <xls:Place type="Municipality">Karlsruhe</xls:Place>
+                        <xls:PostalCode>76137</xls:PostalCode>
+                    </xls:Address>
+                    <xls:GeocodeMatchCode accuracy="0.53"/>
+                </xls:GeocodedAddress>
+                <xls:GeocodedAddress>
+                    <gml:Point>
+                        <gml:pos srsName="EPSG:4326">8.39390170659984 49.0020971544562</gml:pos>
+                    </gml:Point>
+                    <xls:Address countryCode="de">
+                        <xls:StreetAddress>
+                            <xls:Street officialName="Karlstraße"/>
+                        </xls:StreetAddress>
+                        <xls:Place type="CountrySubdivision">Baden-Württemberg</xls:Place>
+                        <xls:Place type="Municipality">Karlsruhe</xls:Place>
+                        <xls:PostalCode>76137</xls:PostalCode>
+                    </xls:Address>
+                    <xls:GeocodeMatchCode accuracy="0.53"/>
+                </xls:GeocodedAddress>
+                </xls:GeocodeResponseList>
+            </xls:GeocodeResponse>
+        </xls:Response>
+</xls:XLS>
\ No newline at end of file
diff --git a/src/main/resources/public-api-context.xml b/src/main/resources/public-api-context.xml
new file mode 100644
index 00000000..fd5a3ea6
--- /dev/null
+++ b/src/main/resources/public-api-context.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/mvc"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:beans="http://www.springframework.org/schema/beans"
+             xmlns:context="http://www.springframework.org/schema/context"
+             xmlns:util="http://www.springframework.org/schema/util"
+             xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+                http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
+
+    <context:property-placeholder
+            ignore-resource-not-found="true"
+            location="classpath:application.properties, classpath:application-${environment:dev}.properties"/>
+
+    <!-- Enables the Spring MVC @Controller programming model -->
+    <annotation-driven/>
+
+    <!-- Resolves views selected for rendering by @Controllers to .jsp resources in the /WEB-INF/views directory -->
+    <beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <beans:property name="prefix" value="/WEB-INF/views/"/>
+        <beans:property name="suffix" value=".jsp"/>
+    </beans:bean>
+
+    <context:component-scan base-package="net.contargo.iris.address.api"/>
+    <context:component-scan base-package="net.contargo.iris.address.staticsearch.api"/>
+    <context:component-scan base-package="net.contargo.iris.api"/>
+    <context:component-scan base-package="net.contargo.iris.countries.api"/>
+    <context:component-scan base-package="net.contargo.iris.gis.api"/>
+    <context:component-scan base-package="net.contargo.iris.connection.api"/>
+    <context:component-scan base-package="net.contargo.iris.terminal.api"/>
+    <context:component-scan base-package="net.contargo.iris.seaport.api"/>
+    <context:component-scan base-package="net.contargo.iris.enricher.api"/>
+    <context:component-scan base-package="net.contargo.iris.distancecloud.api"/>
+    <context:component-scan base-package="com.mangofactory"/>
+
+    <beans:bean id="userAuthenticationService" class="net.contargo.iris.security.SpringUserAuthenticationService"/>
+
+    <beans:bean id="viewResolver" class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+        <!--
+        To support the resolution of a view based on a file extension, ContentNegotiatingViewResolver's bean property
+        MediaTypes is used to specify a mapping of file extensions to media types. For more information on the algorithm
+        to determine the request media type, refer to the API documentation for ContentNegotiatingViewResolver..
+        -->
+        <beans:property name="mediaTypes">
+            <beans:map>
+                <beans:entry key="json" value="application/json"/>
+                <beans:entry key="html" value="text/html"/>
+            </beans:map>
+        </beans:property>
+
+        <beans:property name="defaultContentType" value="application/json"/>
+        <beans:property name="favorPathExtension" value="true"/>
+        <beans:property name="ignoreAcceptHeader" value="false"/>
+
+        <beans:property name="viewResolvers">
+            <beans:list>
+                <beans:bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
+            </beans:list>
+        </beans:property>
+
+        <beans:property name="defaultViews">
+            <beans:list>
+                <beans:bean class="net.contargo.iris.api.discover.TestExplainView">
+                    <beans:constructor-arg name="userAuthenticationService" ref="userAuthenticationService"/>
+                    <beans:constructor-arg name="objectMapper" ref="duplicateDetectionObjectMapper"/>
+                </beans:bean>
+                <beans:bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
+                    <beans:property name="objectMapper" ref="duplicateDetectionObjectMapper"/>
+                </beans:bean>
+            </beans:list>
+        </beans:property>
+    </beans:bean>
+
+    <beans:bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
+        <beans:property name="supportedMethods" value="GET,PUT,POST,HEAD,DELETE"/>
+        <beans:property name="messageConverters">
+            <beans:list>
+                <beans:bean class="org.springframework.http.converter.StringHttpMessageConverter"/>
+                <beans:bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+                    <beans:constructor-arg name="objectMapper" ref="duplicateDetectionObjectMapper"/>
+                </beans:bean>
+            </beans:list>
+        </beans:property>
+    </beans:bean>
+
+    <beans:bean id="duplicateDetectionObjectMapper"
+          class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
+        <beans:property name="featuresToEnable">
+            <beans:array>
+                <util:constant
+                        static-field="com.fasterxml.jackson.core.JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION"/>
+            </beans:array>
+        </beans:property>
+    </beans:bean>
+
+
+    <!-- own ExceptionHandler for our Public API -->
+    <beans:bean class="net.contargo.iris.api.PublicAPIExceptionHandler"/>
+
+    <!-- set locale default to en -->
+    <beans:bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
+        <beans:property name="defaultLocale" value="en_EN"/>
+    </beans:bean>
+
+    <context:annotation-config/>
+    <beans:bean class="net.contargo.iris.config.SwaggerConfig"/>
+    <resources location="/api-docs/" mapping="/**"/>
+    <resources location="/api-docs/css/" mapping="/css/**"/>
+    <resources location="/api-docs/images/" mapping="/images/**"/>
+    <resources location="/api-docs/lib/" mapping="/lib/**"/>
+</beans:beans>
\ No newline at end of file
diff --git a/src/main/resources/usercredentials-ci.properties b/src/main/resources/usercredentials-ci.properties
new file mode 100644
index 00000000..f31ddd40
--- /dev/null
+++ b/src/main/resources/usercredentials-ci.properties
@@ -0,0 +1,2 @@
+admin@example.com=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918,ROLE_ADMIN,enabled
+user@example.com=04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb,ROLE_USER,enabled
\ No newline at end of file
diff --git a/src/main/resources/usercredentials-dev.properties b/src/main/resources/usercredentials-dev.properties
new file mode 100644
index 00000000..f31ddd40
--- /dev/null
+++ b/src/main/resources/usercredentials-dev.properties
@@ -0,0 +1,2 @@
+admin@example.com=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918,ROLE_ADMIN,enabled
+user@example.com=04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb,ROLE_USER,enabled
\ No newline at end of file
diff --git a/src/main/resources/usercredentials-jenkins.properties b/src/main/resources/usercredentials-jenkins.properties
new file mode 100644
index 00000000..f31ddd40
--- /dev/null
+++ b/src/main/resources/usercredentials-jenkins.properties
@@ -0,0 +1,2 @@
+admin@example.com=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918,ROLE_ADMIN,enabled
+user@example.com=04f8996da763b7a969b1028ee3007569eaf3a635486ddab211d512c85b9df8fb,ROLE_USER,enabled
\ No newline at end of file
diff --git a/src/main/resources/web-api-context.xml b/src/main/resources/web-api-context.xml
new file mode 100644
index 00000000..33e68600
--- /dev/null
+++ b/src/main/resources/web-api-context.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <!-- DispatcherServlet Context: defines this servlet's request-processing 
+         infrastructure -->
+
+    <context:property-placeholder
+            ignore-resource-not-found="true"
+            location="classpath:application.properties, classpath:application-${environment:dev}.properties"/>
+
+    <!-- Enables the Spring MVC @Controller programming model -->
+    <mvc:annotation-driven/>
+
+    <!-- Resolves views selected for rendering by @Controllers to .jsp resources 
+         in the /WEB-INF/views directory -->
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/WEB-INF/views/"/>
+        <property name="suffix" value=".jsp"/>
+    </bean>
+
+    <context:component-scan base-package="net.contargo.iris.address.staticsearch.web"/>
+    <context:component-scan base-package="net.contargo.iris.connection.web"/>
+    <context:component-scan base-package="net.contargo.iris.seaport.web"/>
+    <context:component-scan base-package="net.contargo.iris.terminal.web"/>
+    <context:component-scan base-package="net.contargo.iris.login.web"/>
+    <context:component-scan base-package="net.contargo.iris.web"/>
+
+    <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+        <property name="contentNegotiationManager" ref="cnManager"/>
+        <property name="viewResolvers">
+            <list>
+                <bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
+            </list>
+        </property>
+    </bean>
+    <bean id="cnManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+        <property name="favorPathExtension" value="true"/>
+        <property name="ignoreAcceptHeader" value="false"/>
+        <property name="defaultContentType" value="application/xml"/>
+        <property name="mediaTypes">
+            <map>
+                <entry key="json" value="application/json"/>
+                <entry key="html" value="text/html"/>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="cacheInterceptor" class="org.springframework.web.servlet.mvc.WebContentInterceptor">
+        <property name="supportedMethods" value="GET,PUT,POST,HEAD,DELETE"/>
+    </bean>
+
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping">
+        <property name="useSuffixPatternMatch" value="false"/>
+        <property name="interceptors">
+            <list>
+                <ref bean="cacheInterceptor"/>
+                <bean class="org.synyx.sitemesh.ViewWebRequestEnricher"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter">
+        <property name="supportedMethods" value="GET,PUT,POST,HEAD,DELETE"/>
+        <property name="messageConverters">
+            <list>
+                <bean class="org.springframework.http.converter.StringHttpMessageConverter"/>
+                <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+                    <constructor-arg name="objectMapper" ref="duplicateDetectionObjectMapper"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="duplicateDetectionObjectMapper"
+                class="org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean">
+        <property name="featuresToEnable">
+            <array>
+                <util:constant
+                        static-field="com.fasterxml.jackson.core.JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION"/>
+            </array>
+        </property>
+    </bean>
+    
+    <!-- Error handling: generating error reports and redirect to specific error jsps-->
+    <bean id="exceptionResolver" class="net.contargo.iris.api.WebExceptionHandler">
+        <constructor-arg value="${error.reports.basepath}/exceptions"/>
+        <constructor-arg ref="userAuthenticationService"/>
+        <property name="defaultErrorView" value="general-error"/>
+
+        <!-- If you want to map Exceptions to specific jsps you can do it this way -->
+        <!--        <property name="exceptionMappings">
+            <props>
+                <prop key="org.springframework.security.access.AccessDeniedException">accessDenied</prop>
+            </props>
+        </property>-->
+
+    </bean>
+
+    <!-- set locale default to en -->
+    <bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
+        <property name="defaultLocale" value="en_EN"/>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/src/main/resources/web-security.xml b/src/main/resources/web-security.xml
new file mode 100644
index 00000000..77f9186b
--- /dev/null
+++ b/src/main/resources/web-security.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:security="http://www.springframework.org/schema/security"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+
+    <security:http use-expressions="true" entry-point-ref="delegatingAuthenticationEntryPoint">
+        <security:intercept-url pattern="/web/login" access="permitAll()"/>
+        <security:intercept-url pattern="/web/login/process" access="permitAll()"/>
+        <security:intercept-url pattern="/web/**" access="hasRole('ROLE_ADMIN')"/>
+        <security:intercept-url pattern="/api/terminals/*" method="PUT" access="hasRole('ROLE_ADMIN')"/>
+        <security:intercept-url pattern="/api/seaports/*" method="PUT" access="hasRole('ROLE_ADMIN')"/>
+        <security:intercept-url pattern="/api/**" access="isAuthenticated()"/>
+        <security:intercept-url pattern="/api-docs/**" access="isAuthenticated()"/>
+        <security:form-login login-page="/web/login" login-processing-url="/web/login/process"
+                             authentication-failure-url="/web/login?error=true"
+                             username-parameter="email" password-parameter="password"/>
+        <security:logout logout-url="/web/logout"/>
+        <security:http-basic entry-point-ref="basicAuthenticationEntryPoint"/>
+    </security:http>
+
+    <bean id="delegatingAuthenticationEntryPoint" class="org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint">
+        <constructor-arg>
+            <map>
+                <entry key="hasHeader('Content-Type', 'application/json')" value-ref="basicAuthenticationEntryPoint" />
+                <entry key="not(hasHeader('Accept', 'text/html'))" value-ref="basicAuthenticationEntryPoint" />
+            </map>
+        </constructor-arg>
+        <property name="defaultEntryPoint" ref="formAuthenticationEntryPoint"/>
+    </bean>
+
+    <bean id="basicAuthenticationEntryPoint" class="org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint">
+        <property name="realmName" value="IRIS API"/>
+    </bean>
+
+    <bean id="formAuthenticationEntryPoint" class="org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint">
+        <constructor-arg value="/web/login"/>
+    </bean>
+
+    <security:authentication-manager>
+        <security:authentication-provider>
+            <security:password-encoder hash="sha-256"/>
+            <security:user-service properties="classpath:usercredentials-${environment:dev}.properties"/>
+        </security:authentication-provider>
+    </security:authentication-manager>
+</beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml
new file mode 100644
index 00000000..df6c8f7d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/decorators.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<decorators defaultdir="/decorators/">
+    
+    <decorator name="help-theme" page="minimal-template.jsp">
+       
+        <pattern>**/help/*</pattern>
+
+    </decorator>
+
+    <decorator name="basic-theme" page="template.jsp">
+        <pattern>*</pattern>
+    </decorator>
+    
+</decorators>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/sitemesh.xml b/src/main/webapp/WEB-INF/sitemesh.xml
new file mode 100644
index 00000000..1c0f3bdb
--- /dev/null
+++ b/src/main/webapp/WEB-INF/sitemesh.xml
@@ -0,0 +1,20 @@
+<sitemesh>
+    <property name="decorators-file" value="/WEB-INF/decorators.xml" />
+    <excludes file="${decorators-file}" />
+
+    <page-parsers>
+        <parser content-type="text/html"
+            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
+        <parser content-type="text/html;charset=UTF-8"
+            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
+    </page-parsers>
+
+    <decorator-mappers>
+        <mapper class="org.synyx.sitemesh.SitemeshDecoratorMapper">
+            <param name="config" value="${decorators-file}" />
+        </mapper>
+        <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
+            <param name="config" value="${decorators-file}" />
+        </mapper>
+    </decorator-mappers>
+</sitemesh>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/checkboxFieldNormal.tag b/src/main/webapp/WEB-INF/tags/checkboxFieldNormal.tag
new file mode 100644
index 00000000..196552d9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/checkboxFieldNormal.tag
@@ -0,0 +1,18 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
+<%@ attribute name="property" type="java.lang.String" required="true"%>
+<%@ attribute name="messageKey" type="java.lang.String" required="true"%>
+<%@ attribute name="size" type="java.lang.String" required="false"%>
+
+<div class="control-group">
+	<form:label path="${property}" cssClass="control-label" cssErrorClass="control-label error">
+		<spring:message code="${messageKey}" />
+	</form:label>
+	<div class="controls">
+		<div class="checkbox inline">
+			<form:checkbox path="${property}" />
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/inputField.tag b/src/main/webapp/WEB-INF/tags/inputField.tag
new file mode 100644
index 00000000..85635fda
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/inputField.tag
@@ -0,0 +1,44 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
+<%@ attribute name="property" type="java.lang.String" required="true"%>
+<%@ attribute name="messageKey" type="java.lang.String" required="true"%>
+
+<%@ attribute name="size" type="java.lang.String" required="false"%>
+<%@ attribute name="maxlength" type="java.lang.String" required="false"%>
+<%@ attribute name="title" type="java.lang.String" required="false"%>
+<%@ attribute name="readonly" type="java.lang.Boolean" required="false"%>
+<%@ attribute name="unitMessageKey" type="java.lang.String" required="false"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false"%>
+<%@ attribute name="onkeypress" type="java.lang.String" required="false"%>
+
+<div class="control-group">
+	<form:label path="${property}" cssClass="control-label" cssErrorClass="control-label error">
+		<spring:message code="${messageKey}" var="TRANSLATED_MESSAGE" />
+		<c:out value="${TRANSLATED_MESSAGE}" />
+	</form:label>
+	<div class="controls">
+		<c:choose>
+			<c:when test="${title}">
+                <form:input cssClass="${cssClass}" path="${property}" size="${size}" cssErrorClass="error"
+                            title="${title}" readonly="${readonly}" maxlength="${maxlength}"
+                            onkeypress="${onkeypress}"/>
+                <c:if test="${!empty unitMessageKey}">
+                    <span id="inputFieldUnit">${unitMessageKey}</span>
+                </c:if>
+				<form:errors path="${property}" cssClass="help-inline error" />
+			</c:when>
+			<c:otherwise>
+                <form:input cssClass="${cssClass}" path="${property}" size="${size}" cssErrorClass="error"
+                            title="${TRANSLATED_MESSAGE}" readonly="${readonly}" maxlength="${maxlength}"
+                            onkeypress="${onkeypress}"/>
+                <c:if test="${!empty unitMessageKey}">
+                    <span id="inputFieldUnit"><spring:message code="${unitMessageKey}"/></span>
+                </c:if>
+				<form:errors path="${property}" cssClass="help-inline error" />
+			</c:otherwise>
+		</c:choose>
+	</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/mappicker.tag b/src/main/webapp/WEB-INF/tags/mappicker.tag
new file mode 100644
index 00000000..e1c79fd8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/mappicker.tag
@@ -0,0 +1,30 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
+<%@ attribute name="latitudeId" type="java.lang.String" required="true"%>
+<%@ attribute name="longitudeId" type="java.lang.String" required="true"%>
+
+<link href="<c:url value="/client/js/lib/leaflet.css"/>" rel="stylesheet">
+<script src="<c:url value="/client/js/lib/leaflet.js" />"></script>
+<script src="<c:url value="/client/js/lib/mappicker.js" />"></script>
+
+
+
+<%--link to display modal dialog--%>
+<a href="#mappicker" role="button" id="mapPickerButton" class="btn" onclick="showMap('${latitudeId}','${longitudeId}');return false;"><i class="icon-map-marker"></i></a>
+
+<%-- modal dialog --%>
+<div class="modal hide" id="mappicker" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><spring:message code="mappicker.closebutton" /></button>
+        <h3 id="myModalLabel"><spring:message code="mappicker.chooselocation" /></h3>
+    </div>
+    <div class="modal-body">
+        <div id="map" style="height: 400px;"></div>
+    </div>
+    <div class="modal-footer">
+        <button id="closedialog" class="btn" data-dismiss="modal" aria-hidden="true"><spring:message code="mappicker.close" /></button>
+        <button id="selectcoorinates" onclick="selectCoordinates();return false;" class="btn btn-primary"><spring:message code="mappicker.select" /></button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/oldBrowserWarning.tag b/src/main/webapp/WEB-INF/tags/oldBrowserWarning.tag
new file mode 100644
index 00000000..c1e3dc7b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/oldBrowserWarning.tag
@@ -0,0 +1,18 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
+<spring:message code="browser.too.old.warningTitle" var="title" />
+<spring:message code="browser.too.old.warning" var="message" />
+
+<span id="browserWarning" class="popup unsupported-browser" title="${title}" data-content="${message}">
+    <i class="icon-info-sign icon-red"></i> <spring:message code="browser.too.old.popup.warning"/>
+</span>
+
+<script type="text/javascript">
+    $(".popup").popover();
+
+	var $element = $("#browserWarning").hide();
+	if ($.browser.msie && parseInt($.browser.version, 10) <= 7) {
+		$element.show();
+	}
+</script>
diff --git a/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnection.jsp b/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnection.jsp
new file mode 100644
index 00000000..62d4e9fa
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnection.jsp
@@ -0,0 +1,138 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+<c:url var="BASE_URL" value="/web/connections/"/>
+
+<c:choose>
+    <c:when test="${mainRunConnection.id == null}">
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.save"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="mainrunconnection.create.title"/>
+        <c:set var="METHOD" value="POST"/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.update"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="mainrunconnection.update.title"/>
+        <c:set var="METHOD" value="PUT"/>
+    </c:otherwise>
+</c:choose>
+
+
+<div class="container-fluid">
+
+    <div class="row-fluid">
+        <a class="back-button-link" href="${BASE_URL}"></a>
+
+        <div class="content-title">
+            <h2>
+                <spring:message code="${HEADER_MESSAGE_KEY}"/>
+                <c:if test="${mainRunConnection.id != null}">
+                    <c:out value="${mainRunConnection.seaport.name}"/>
+                    to
+                    <c:out value="${mainRunConnection.terminal.name}"/>
+                </c:if>
+            </h2>
+        </div>
+    </div>
+
+    <div class="row-fluid">
+        <div class="span12 content">
+            <form:form action="${BASE_URL}${mainRunConnection.id}"
+                       modelAttribute="mainRunConnection"
+                       method="${METHOD}" cssClass="form-horizontal">
+
+                <fieldset>
+
+                    <div class="control-group">
+                        <form:label path="seaport.id" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="mainrunconnection.seaport.name"/>
+                        </form:label>
+                        <div class="controls">
+
+                            <form:select path="seaport.id" cssErrorClass="error">
+                                <c:forEach var="seaport" items="${seaports}">
+                                    <spring:message code="mainrunconnection.seaport.isenabled.${seaport.enabled}"
+                                                    var="isenabled"/>
+                                    <form:option value="${seaport.id}" label="${seaport.name} ${isenabled}"/>
+                                </c:forEach>
+                            </form:select>
+
+                            <form:errors path="seaport.id" cssClass="help-inline error"/>
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <form:label path="terminal.id"
+                                    cssClass="control-label"
+                                    cssErrorClass="control-label error">
+                            <spring:message code="mainrunconnection.terminal.name"/>
+                        </form:label>
+                        <div class="controls">
+
+                            <form:select path="terminal.id" cssErrorClass="error">
+                                <c:forEach var="terminal" items="${terminals}">
+                                    <spring:message
+                                            code="mainrunconnection.terminal.isenabled.${terminal.enabled}"
+                                            var="isenabled"/>
+                                    <form:option value="${terminal.id}" label="${terminal.name} ${isenabled}"/>
+                                </c:forEach>
+                            </form:select>
+
+                            <form:errors path="terminal.id" cssClass="help-inline error"/>
+                        </div>
+                    </div>
+
+                    <div class="control-group">
+                        <form:label path="routeType" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="mainrunconnection.routeType"/>
+                        </form:label>
+                        <div class="controls">
+
+                            <form:select path="routeType" cssErrorClass="error">
+                                <c:forEach var="routeType" items="${routetypes}">
+                                    <form:option value="${routeType}">
+                                        <spring:message code="${routeType.messageKey}"/>
+                                    </form:option>
+                                </c:forEach>
+                            </form:select>
+
+                            <form:errors path="routeType" cssClass="help-inline error"/>
+                        </div>
+                    </div>
+
+                    <iris:inputField property="dieselDistance"
+                                     cssClass="comma-replacement-aware"
+                                     messageKey="mainrunconnection.dieselDistance"/>
+
+                    <iris:inputField property="electricDistance"
+                                     cssClass="comma-replacement-aware"
+                                     messageKey="mainrunconnection.electricDistance"/>
+
+                    <iris:checkboxFieldNormal property="enabled" messageKey="mainrunconnection.enabled"/>
+
+                    <div class="form-actions">
+                        <input id="submit-button" class="btn btn-primary" type="submit"
+                               value="<spring:message code="${SUBMIT_BUTTON_MESSAGE_KEY}" />"/>
+                        <a id="back-button" class="btn" href="${BASE_URL}"><spring:message code="form.backTitle"/></a>
+                    </div>
+                </fieldset>
+            </form:form>
+        </div>
+    </div>
+</div>
+<script type="text/javascript" src="<c:url value='/client/js/lib/ReplaceCommaByPoint.js' />"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnections.jsp b/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnections.jsp
new file mode 100644
index 00000000..ce287743
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/connectionManagement/mainrunconnections.jsp
@@ -0,0 +1,87 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+<div class="container-fluid">
+    <div class="row-fluid">
+        <div class="content-title">
+            <h2>
+                <spring:message code="mainrunconnection.page.title"/>
+            </h2>
+        </div>
+    </div>
+
+    <div class="row-fluid">
+        <div class="span12">
+            <div class="content">
+
+                <c:url value="/web/connections/new" var="COMPLETE_CREATE_URL"/>
+
+                <div class="management-button-top">
+                    <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-top" id="top-new">
+                        <i class="icon-plus-sign icon-white"></i>
+                        <spring:message code="table.newLabel"/>
+                    </a>
+                </div>
+
+                <c:url var="completeUrl" value="/web/connections/"/>
+                <display:table name="mainRunConnections"
+                               class="table iris-table"
+                               uid="routingconnectiondetail"
+                               requestURI="${completeUrl}">
+
+                    <spring:message code="mainrunconnection.seaport.name" var="label"/>
+                    <display:column title="${label}" property="seaport.name" sortable="true"/>
+                    <spring:message code="mainrunconnection.seaport.enabled" var="label"/>
+                    <display:column title="${label}" property="seaport.enabled" sortable="true"/>
+
+                    <spring:message code="mainrunconnection.terminal.name" var="label"/>
+                    <display:column title="${label}" property="terminal.name" sortable="true"/>
+                    <spring:message code="mainrunconnection.terminal.enabled" var="label"/>
+                    <display:column title="${label}" property="terminal.enabled" sortable="true"/>
+
+                    <spring:message code="mainrunconnection.routeType" var="label"/>
+                    <display:column title="${label}" property="routeType" sortable="true"/>
+
+                    <spring:message code="mainrunconnection.enabled" var="label"/>
+                    <display:column title="${label}" property="enabled" sortable="true"/>
+
+                    <spring:message code="mainrunconnection.everythingenabled" var="label"/>
+                    <display:column title="${label}" property="everythingEnabled" sortable="true"/>
+
+                    <display:column class="table-buttons">
+
+                        <c:url var="detailUrl" value="/web/connections/${routingconnectiondetail.id}"/>
+
+                        <a href="${detailUrl}" class="btn btn-primary">
+                            <i class="icon-edit icon-white"></i>
+                            <spring:message code="table.editLabel"/>
+                        </a>
+
+                    </display:column>
+
+                </display:table>
+
+                <div class="management-button-bottom">
+                    <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-bottom" id="bottom-new">
+                        <i class="icon-plus-sign icon-white"></i>
+                        <spring:message code="table.newLabel"/>
+                    </a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/general-error.jsp b/src/main/webapp/WEB-INF/views/general-error.jsp
new file mode 100644
index 00000000..54bfb3ad
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/general-error.jsp
@@ -0,0 +1,32 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@page import="java.io.PrintWriter" %>
+
+<div class="container-fluid">
+    <div id="internal_server_error">
+        <spring:message code="iris.internal.error"/>
+        <c:if test="${not empty exception_id}">
+            <br/><spring:message code="iris.error.report" arguments="${exception_id}"/>
+        </c:if>
+    </div>
+
+    <div id="internal_server_error_details">
+        <h3>${exception}</h3>
+
+        <p>
+            <pre style="font-size:9px;">
+            <%
+                Exception e = (Exception) pageContext.findAttribute("exception");
+                if (e != null) {
+                    PrintWriter pw = new PrintWriter(out);
+                    e.printStackTrace(pw);
+                    pw.flush();
+                } else {
+                    pageContext.getOut().write("No Exception");
+                }
+            %>
+            </pre>
+        </p>
+    </div>
+</div>
+<br/>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
new file mode 100644
index 00000000..92a163e1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/html">
+    <head>
+        <title>
+            <spring:message code="index.page.title" />
+        </title>
+    </head>
+    <body>
+        <div class="container-fluid">
+            <jsp:include page="iris-explain.jsp" />
+            <jsp:include page="iris-actions.jsp" />
+        </div>
+    </body>
+</html>
diff --git a/src/main/webapp/WEB-INF/views/iris-actions.jsp b/src/main/webapp/WEB-INF/views/iris-actions.jsp
new file mode 100644
index 00000000..aca212ed
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/iris-actions.jsp
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<div class="row-fluid">
+    <div class="span2">
+        <h3>
+            <spring:message code="index.page.clients"/>
+        </h3>
+    </div>
+    <div class="span10">
+        <div class="row-fluid">
+            <div class="span10">
+                <p>
+                    <spring:message code="index.page.clients.description"/>
+                </p>
+            </div>
+        </div>
+
+        <div class="row-fluid">
+            <div class="span2">
+                <a href="<c:url value="/web/triangle/" />" class="btn btn-large">
+                    <spring:message code="index.page.triangle"/>
+                </a>
+            </div>
+            <div class="span8">
+                <h4>
+                    <spring:message code="index.page.triangle"/>
+                </h4>
+
+                <p>
+                    <spring:message code="index.page.triangle.description"/>
+                </p>
+            </div>
+        </div>
+
+        <div class="row-fluid">
+            <div class="span2">
+                <a href="<c:url value="/api/" />" class="btn btn-large">
+                    <spring:message code="index.page.search.api"/>
+                </a>
+            </div>
+
+            <div class="span8">
+                <h4>
+                    <spring:message code="index.page.restful"/>
+                </h4>
+
+                <p>
+                    <spring:message code="index.page.restful.description"/>
+                </p>
+            </div>
+        </div>
+
+        <div class="row-fluid">
+            <div class="span2">
+                <a href="<c:url value="/api/docs.html" />" class="btn btn-large">
+                    <spring:message code="index.page.docs.api"/>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/iris-explain.jsp b/src/main/webapp/WEB-INF/views/iris-explain.jsp
new file mode 100644
index 00000000..3d2d9699
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/iris-explain.jsp
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<div class="row-fluid">
+    <div class="span2">
+        <h3>
+            <spring:message code="index.page.what.is.iris"/>
+        </h3>
+    </div>
+    <div class="span8">
+        <h2>
+            <spring:message code="index.page.what.is.iris.name"/>
+        </h2>
+        <h4>
+            <spring:message code="index.page.what.is.iris.vision"/>
+        </h4>
+
+        <p>
+            <spring:message code="index.page.what.is.iris.vision.description.1"/>
+        </p>
+
+        <p>
+            <spring:message code="index.page.what.is.iris.vision.description.2"/>
+        </p>
+
+        <p>
+            <spring:message code="index.page.what.is.iris.vision.description.3"/>
+        </p>
+
+        <strong><spring:message code="index.page.remarks"/></strong>
+        <ul>
+            <li>
+                <spring:message code="index.page.remarks.1"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.2"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.3"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.4"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.5"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.6"/>
+            </li>
+            <li>
+                <spring:message code="index.page.remarks.7"/>
+            </li>
+        </ul>
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/login/login.jsp b/src/main/webapp/WEB-INF/views/login/login.jsp
new file mode 100644
index 00000000..c667611a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/login/login.jsp
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title>
+        <spring:message code="index.page.title"/>
+    </title>
+</head>
+
+<body>
+
+<div class="container-fluid">
+    <jsp:include page="../iris-explain.jsp"/>
+</div>
+
+<div class="container-fluid">
+
+    <div class="row-fluid">
+        <div class="span2">
+            <h3>
+                <spring:message code="login.use"/>
+            </h3>
+        </div>
+
+        <div class="span10">
+            <h4>
+                <spring:message code="login.title"/>
+            </h4>
+
+            <p>
+                <spring:message code="login.description"/>
+            </p>
+
+            <form action="/web/login/process" method="post" class="form-inline">
+                <fieldset>
+                    <div class="control-group">
+                        <div class="controls">
+                            <input id="email" type="email" name="email" size="20" title="E-Mail"
+                                   placeholder="<spring:message code="login.email.label"/>"/>
+                            <input id="password" name="password" type="password" size="20" title="Password"
+                                   placeholder="<spring:message code="login.password.label"/>"/>
+                            <input id="login" class="btn btn-primary " type="submit"
+                                   value="<spring:message code="login.signin"/>"/>
+                        </div>
+                    </div>
+                </fieldset>
+            </form>
+
+            <iris:oldBrowserWarning/>
+
+            <c:if test="${not empty param.error}">
+                <div class="alert error" id="login-error">
+                    <h4>
+                        <spring:message code="login.error.title"/>
+                    </h4>
+                    <spring:message code="login.error.text"/>
+                </div>
+            </c:if>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/routing/triangle.jsp b/src/main/webapp/WEB-INF/views/routing/triangle.jsp
new file mode 100644
index 00000000..0ad52bb0
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/routing/triangle.jsp
@@ -0,0 +1,92 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title><spring:message code="triangle.page.title"/></title>
+</head>
+
+<body>
+
+<div class="container-fluid">
+    <div id="userdata" class="btn-group"></div>
+</div>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <div class="span12">
+            <div id="appcontent">Application is loading...</div>
+            <div class='notifications bottom-left'></div>
+            <div id="logindialog"></div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    /** install dummy console for headless mode. So IE8 works without JS-console open */
+    if (window.console == undefined) {
+        window.console = {
+            log: function () {
+            },
+            error: function () {
+            }
+        };
+    }
+</script>
+
+
+<!-- libs -->
+<script src="<c:url value="/client/js/lib/underscore.js" />"></script>
+<script src="<c:url value="/client/js/lib/backbone.js" />"></script>
+<script src="<c:url value="/client/js/lib/handlebars-1.3.0.js" />"></script>
+<script src="<c:url value="/client/js/lib/modernizr.custom.00395.js" />"></script>
+
+<!-- model -->
+<script src="<c:url value="/client/js/routing/SelectableAwareCollection.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/Seaport.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/Terminal.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/Address.js" />"></script>
+<!-- Views -->
+<script src="<c:url value="/client/js/routing/views/GeoCodingView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/GeoCodeRequestView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/BootstrapDropDownView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/AddressListView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/TriangleDropDownWithAddButtonView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/TerminalView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/SeaportView.js" />"></script>
+
+<script src="<c:url value="/client/js/routing/Server.js" />"></script>
+<script src="<c:url value="/client/js/routing/Helper.js" />"></script>
+<script src="<c:url value="/client/js/routing/TemplateManager.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/GeoCoding.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/GeoCodeRequest.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/SearchStatus.js" />"></script>
+
+
+<script src="<c:url value="/client/js/routing/TriangleRoutingRouter.js" />"></script>
+<script src="<c:url value="/client/js/routing/TriangleRoutingApp.js" />"></script>
+
+<script src="<c:url value="/client/js/routing/models/TriangleRoutePart.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/TrianglePoints.js" />"></script>
+<script src="<c:url value="/client/js/routing/models/TriangleModel.js" />"></script>
+
+<script src="<c:url value="/client/js/routing/views/TriangleRouteTotalView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/TriangleRoutePartView.js" />"></script>
+<script src="<c:url value="/client/js/routing/views/TrianglePointsView.js" />"></script>
+
+<script src="<c:url value="/client/js/routing/views/TriangleView.js" />"></script>
+
+<script type="text/javascript">
+    $(function () {
+        exportTemplateManagerAsGlobalFunction("<c:url value='/client/js/routing/templates/' />");
+
+        var app = new TriangleRoutingApp({contextpath: "<c:url value="/" />"});
+        app.start();
+    });
+</script>
+
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/views/seaportManagement/seaport.jsp b/src/main/webapp/WEB-INF/views/seaportManagement/seaport.jsp
new file mode 100644
index 00000000..476f7174
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/seaportManagement/seaport.jsp
@@ -0,0 +1,100 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+
+<c:url var="BASE_URL" value="/web/seaports/"/>
+
+<c:choose>
+    <c:when test="${seaport.id == null}">
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.save"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="seaport.create.title"/>
+        <c:set var="METHOD" value="POST"/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.update"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="seaport.update.title"/>
+        <c:set var="METHOD" value="PUT"/>
+    </c:otherwise>
+</c:choose>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+
+        <a class="back-button-link" href="${BASE_URL}"></a>
+
+        <div class="content-title">
+            <h2>
+                <spring:message code="${HEADER_MESSAGE_KEY}"/> <c:out value="${seaport.name}"/>
+            </h2>
+        </div>
+
+    </div>
+    <div class="row-fluid">
+        <div class="span12 content">
+            <form:form action="${BASE_URL}${seaport.id}"
+                       modelAttribute="seaport"
+                       method="${METHOD}"
+                       cssClass="form-horizontal">
+                <fieldset>
+
+                        <%-- Seaport Information --%>
+                    <h2>
+                        <spring:message code="seaport.metaInformation"/>
+                    </h2>
+
+                    <iris:inputField property="name" messageKey="seaport.name"/>
+
+                    <div class="control-group">
+
+                        <spring:message code="geolocation.latitude" var="TRANSLATED_MESSAGE"/>
+                        <c:set var="latMsg" value="${TRANSLATED_MESSAGE}"/>
+
+                        <form:label path="latitude" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="geolocation.latitude"/>
+                        </form:label>
+
+                        <div class="controls">
+                            <form:input path="latitude" size="20" cssErrorClass="error" title="${latMsg}"/>
+                            <form:errors path="latitude" cssClass="help-inline error"/>
+                                    
+                                    <span class="help-inline"> 
+                                        <iris:mappicker latitudeId="latitude" longitudeId="longitude"/>
+                                    </span>
+
+                        </div>
+                        <form:hidden path="uniqueId"/>
+                    </div>
+                    <iris:inputField property="longitude" messageKey="geolocation.longitude"
+                                     title="geolocation.longitude.title"/>
+
+                    <iris:checkboxFieldNormal property="enabled" messageKey="seaport.enabled"/>
+
+                    <div class="form-actions">
+                        <input id="submit-seaport" class="btn btn-primary " type="submit"
+                               value="<spring:message code="${SUBMIT_BUTTON_MESSAGE_KEY}" />"/>
+                        <a class="btn" href="${BASE_URL}" id="back-button">
+                            <spring:message code="form.backTitle"/>
+                        </a>
+                    </div>
+
+                </fieldset>
+            </form:form>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/seaportManagement/seaports.jsp b/src/main/webapp/WEB-INF/views/seaportManagement/seaports.jsp
new file mode 100644
index 00000000..a74e2d9c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/seaportManagement/seaports.jsp
@@ -0,0 +1,71 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+<div class="container-fluid">
+
+    <div class="row-fluid">
+        <div class="content-title">
+            <h2>
+                <spring:message code="seaports.page.title"/>
+            </h2>
+        </div>
+    </div>
+
+    <div class="row-fluid">
+        <div class="span12">
+            <div class="content">
+
+                <c:url value="/web/seaports/new" var="COMPLETE_CREATE_URL"/>
+
+                <div class="management-button-top">
+                    <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-top" id="top-new">
+                        <i class="icon-plus-sign icon-white"></i>
+                        <spring:message code="table.newLabel"/>
+                    </a>
+                </div>
+
+                <c:url var="completeUrl" value="/web/seaports/"/>
+                <display:table name="seaports" class="table iris-table" uid="seaport" requestURI="${completeUrl}">
+
+                    <spring:message code="seaport.name" var="label"/>
+                    <display:column title="${label}" property="name" sortable="true"/>
+
+                    <spring:message code="seaport.enabled" var="label"/>
+                    <display:column title="${label}" property="enabled" sortable="true"/>
+
+                    <display:column class="table-buttons">
+
+                        <a href="<c:url value="/web/seaports/${seaport.id}" />" class="btn btn-primary">
+                            <i class="icon-edit icon-white"></i>
+                            <spring:message code="table.editLabel"/>
+                        </a>
+
+                    </display:column>
+
+                </display:table>
+
+                <div class="management-button-bottom">
+                    <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-bottom" id="bottom-new">
+                        <i class="icon-plus-sign icon-white"></i>
+                        <spring:message code="table.newLabel"/>
+                    </a>
+                </div>
+
+            </div>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddressForm.jsp b/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddressForm.jsp
new file mode 100644
index 00000000..45c56eb2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddressForm.jsp
@@ -0,0 +1,90 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+<c:url var="BASE_URL" value="/web/staticaddresses/"/>
+<c:url var="ACTION_URL" value="/web/staticaddresses/${staticAddress.id}"/>
+
+<c:choose>
+    <c:when test="${staticAddress.id == null}">
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.save"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="staticaddress.editmode.create"/>
+        <c:set var="METHOD" value="POST"/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.update"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="staticaddress.editmode.edit"/>
+        <c:set var="METHOD" value="PUT"/>
+    </c:otherwise>
+</c:choose>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <a class="back-button-link" href="${BASE_URL}"></a>
+
+        <div class="content-title">
+            <h2>
+                <spring:message code="${HEADER_MESSAGE_KEY}"/>
+            </h2>
+        </div>
+    </div>
+
+    <div class="row-fluid">
+        <div class="span12 content">
+            <form:form action="${ACTION_URL}" modelAttribute="staticAddress" method="${METHOD}"
+                       cssClass="form-horizontal"
+                       name="staticAddress">
+                <fieldset>
+                    <iris:inputField property="postalcode" messageKey="staticaddress.label.postalcode"/>
+                    <iris:inputField property="city" messageKey="staticaddress.label.city"/>
+                    <iris:inputField property="suburb" messageKey="staticaddress.label.suburb"/>
+                    <iris:inputField property="country" messageKey="staticaddress.label.country"/>
+
+                    <div class="control-group">
+                        <spring:message code="staticaddress.label.lat" var="TRANSLATED_MESSAGE"/>
+
+                        <form:label path="latitude" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="staticaddress.label.lat"/>
+                        </form:label>
+
+                        <div class="controls">
+                            <form:input path="latitude" size="20" cssErrorClass="error" title="${TRANSLATED_MESSAGE}"/>
+                            <form:errors path="latitude" cssClass="help-inline error"/>
+                                    
+                                    <span class="help-inline">
+                                        <iris:mappicker latitudeId="latitude" longitudeId="longitude"/>
+                                    </span>
+                        </div>
+                    </div>
+
+                    <iris:inputField property="longitude" messageKey="staticaddress.label.lon"/>
+                    <iris:inputField messageKey="staticaddress.label.hashkey" property="hashKey" readonly="true"/>
+                    <form:hidden path="uniqueId"/>
+
+                    <div class="form-actions">
+                        <input id="submit" class="btn btn-primary" type="submit" name="submit"
+                               value="<spring:message code="${SUBMIT_BUTTON_MESSAGE_KEY}"/>"/>
+
+                        <a id="back" class="btn" href="${BASE_URL}">
+                            <spring:message code="form.backTitle"/>
+                        </a>
+                    </div>
+                </fieldset>
+            </form:form>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddresses.jsp b/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddresses.jsp
new file mode 100644
index 00000000..fa8e25fa
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/staticAddressManagement/staticaddresses.jsp
@@ -0,0 +1,86 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+<%@ taglib uri="http://displaytag.sf.net" prefix="display" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+<c:set var="METHOD" value="GET"/>
+<c:url var="BASE_URL" value="/web/staticaddresses/"/>
+<c:url var="CREATE_URL" value="/web/staticaddresses/new"/>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <div class="content-title">
+            <h2>
+                <spring:message code="staticaddress.page.title"/>
+            </h2>
+        </div>
+    </div>
+
+    <div class="row-fluid">
+        <div class="span12">
+            <div class="content">
+                <form:form action="${BASE_URL}" modelAttribute="request" method="${METHOD}" cssClass="form-horizontal">
+                    <fieldset>
+                        <iris:inputField property="postalcode" messageKey="staticaddress.label.postalcode"/>
+                        <iris:inputField property="city" messageKey="staticaddress.label.city"/>
+
+                        <div class="form-actions">
+                            <input id="search" class="btn btn-primary" type="submit"
+                                   value="<spring:message code="staticaddress.label.search" />"/>
+
+                            <a href="${CREATE_URL}" id="new" class="btn btn-primary">
+                                <i class="icon-plus-sign icon-white"></i>
+                                <spring:message code="table.newLabel"/>
+                            </a>
+                        </div>
+                    </fieldset>
+                </form:form>
+            </div>
+        </div>
+    </div>
+
+    <c:if test="${param.postalcode != null && param.city != null}">
+        <div class="row-fluid">
+            <div class="span12">
+                <div class="content">
+                    <display:table name="staticAddresses" class="table iris-table" uid="address"
+                                   requestURI="${BASE_URL}">
+
+                        <spring:message code="staticaddress.label.postalcode" var="label"/>
+                        <display:column title="${label}" property="postalcode" sortable="true"/>
+
+                        <spring:message code="staticaddress.label.city" var="label"/>
+                        <display:column title="${label}" property="city" sortable="true"/>
+
+                        <spring:message code="staticaddress.label.suburb" var="label"/>
+                        <display:column title="${label}" property="suburb" sortable="true"/>
+
+                        <spring:message code="staticaddress.label.country" var="label"/>
+                        <display:column title="${label}" property="country" sortable="true"/>
+
+                        <display:column class="table-buttons">
+                            <a href="<c:url value="/web/staticaddresses/${address.id}" />"
+                               class="btn btn-primary">
+                                <i class="icon-edit icon-white"></i>
+                                <spring:message code="table.editLabel"/>
+                            </a>
+                        </display:column>
+                    </display:table>
+                </div>
+            </div>
+        </div>
+    </c:if>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/terminalManagement/terminal.jsp b/src/main/webapp/WEB-INF/views/terminalManagement/terminal.jsp
new file mode 100644
index 00000000..4b387e70
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/terminalManagement/terminal.jsp
@@ -0,0 +1,106 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="iris" tagdir="/WEB-INF/tags" %>
+
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>
+        <spring:message code="management.page.title"/>
+    </title>
+</head>
+
+<body>
+
+<c:url var="BASE_URL" value="/web/terminals/"/>
+
+<c:choose>
+    <c:when test="${terminal.id == null}">
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.save"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="terminal.create.title"/>
+        <c:set var="METHOD" value="POST"/>
+    </c:when>
+    <c:otherwise>
+        <c:set var="SUBMIT_BUTTON_MESSAGE_KEY" value="form.update"/>
+        <c:set var="HEADER_MESSAGE_KEY" value="terminal.update.title"/>
+        <c:set var="METHOD" value="PUT"/>
+    </c:otherwise>
+</c:choose>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <a class="back-button-link" href="${BASE_URL}"></a>
+
+        <div class="content-title">
+            <h2>
+                <spring:message code="${HEADER_MESSAGE_KEY}"/> <c:out value="${terminal.name}"/>
+            </h2>
+        </div>
+
+    </div>
+    <div class="row-fluid">
+        <div class="span12 content">
+            <form:form action="${BASE_URL}${terminal.id}" modelAttribute="terminal" method="${METHOD}"
+                       cssClass="form-horizontal">
+                <fieldset>
+
+                        <%-- Terminal Information --%>
+                    <h2>
+                        <spring:message code="terminal.metaInformation"/>
+                    </h2>
+
+                    <iris:inputField property="name" messageKey="terminal.name"/>
+                    <div class="control-group">
+
+                        <spring:message code="geolocation.latitude" var="TRANSLATED_MESSAGE"/>
+                        <c:set var="latMsg" value="${TRANSLATED_MESSAGE}"/>
+
+                        <form:label path="latitude" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="geolocation.latitude"/>
+                        </form:label>
+                        <div class="controls">
+                            <form:input path="latitude" size="20" cssErrorClass="error" title="${latMsg}"/>
+                            <form:errors path="latitude" cssClass="help-inline error"/>
+                                    <span class="help-inline"> 
+                                        <iris:mappicker latitudeId="latitude" longitudeId="longitude"/>
+                                    </span>
+                            <form:hidden path="uniqueId"/>
+                        </div>
+                    </div>
+                    <iris:inputField property="longitude" messageKey="geolocation.longitude"
+                                     title="geolocation.longitude.title"/>
+
+                    <div class="control-group">
+                        <form:label path="region" cssClass="control-label" cssErrorClass="control-label error">
+                            <spring:message code="terminal.region"/>
+                        </form:label>
+                        <div class="controls">
+                            <form:select path="region" cssErrorClass="error">
+                                <c:forEach var="region" items="${regions}">
+                                    <form:option value="${region}" label="${region}"/>
+                                </c:forEach>
+                            </form:select>
+                        </div>
+                    </div>
+
+                    <iris:checkboxFieldNormal property="enabled" messageKey="terminal.enabled"/>
+
+                    <div class="form-actions">
+                        <input id="submit-terminal" class="btn btn-primary" type="submit"
+                               value="<spring:message code="${SUBMIT_BUTTON_MESSAGE_KEY}" />"/>
+                        <a class="btn" href="${BASE_URL}" id="back-button">
+                            <spring:message code="form.backTitle"/>
+                        </a>
+                    </div>
+
+                </fieldset>
+            </form:form>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/terminalManagement/terminals.jsp b/src/main/webapp/WEB-INF/views/terminalManagement/terminals.jsp
new file mode 100644
index 00000000..9968b6e8
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/terminalManagement/terminals.jsp
@@ -0,0 +1,68 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib uri="http://displaytag.sf.net" prefix="display"%>
+
+<!DOCTYPE html>
+
+<html>
+    <head>
+        <title>
+            <spring:message code="management.page.title" />
+        </title>
+    </head>
+    <body>
+        <div class="container-fluid">
+            <div class="row-fluid">
+                <div class="content-title">
+                    <h2>
+                        <spring:message code="terminals.page.title" />
+                    </h2>
+                </div>
+            </div>
+    
+            <div class="row-fluid">
+                <div class="span12">
+                    <div class="content">
+                        
+                        <c:url value="/web/terminals/new" var="COMPLETE_CREATE_URL" />
+
+                        <div class="management-button-top">
+                            <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-top" id="top-new">
+                                <i class="icon-plus-sign icon-white"></i>
+                                <spring:message code="table.newLabel" />
+                            </a>
+                        </div>
+                        
+                        <c:url var="completeUrl" value="/web/terminals/" />
+                        <display:table name="terminals" class="table iris-table" uid="terminal" requestURI="${completeUrl}">
+    
+                            <spring:message code="terminal.name" var="label" />
+                            <display:column title="${label}" property="name" sortable="true" />
+    
+                            <spring:message code="terminal.enabled" var="label" />
+                            <display:column title="${label}" property="enabled" sortable="true" />
+    
+                            <display:column class="table-buttons">
+    
+                                <a href="<c:url value="/web/terminals/${terminal.id}" />" class="btn btn-primary">
+                                    <i class="icon-edit icon-white"></i>
+                                    <spring:message code="table.editLabel"/>
+                                </a>
+    
+                            </display:column>
+    
+                        </display:table>
+
+                        <div class="management-button-bottom">
+                            <a href="${COMPLETE_CREATE_URL}" class="btn btn-primary btn-create-bottom" id="bottom-new">
+                                <i class="icon-plus-sign icon-white"></i>
+                                <spring:message code="table.newLabel" />
+                            </a>
+                        </div>
+                        
+                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..cb6f1d20
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+
+    <!-- The definition of the Root Spring Container shared by all Servlets 
+         and Filters -->
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath:application-context.xml</param-value>
+    </context-param>
+
+    <!-- Creates the Spring Container shared by all Servlets and Filters -->
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
+
+    <session-config>
+        <!--  set session timeout to 8 hours -->
+        <session-timeout>480</session-timeout>
+        <cookie-config>
+            <name>IRISSESSION</name>
+        </cookie-config>
+    </session-config>
+
+    <!-- Processes requests of the public API-->
+    <servlet>
+        <servlet-name>publicApi</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:/public-api-context.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>publicApi</servlet-name>
+        <url-pattern>/api/*</url-pattern>
+    </servlet-mapping>
+    
+    <!-- Servlet for Processing of gui requests -->
+    <servlet>
+        <servlet-name>webServlet</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>classpath:/web-api-context.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>webServlet</servlet-name>
+        <url-pattern>/web/*</url-pattern>
+    </servlet-mapping>
+
+    <filter>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--converts hidden input field methods to request methods. Necessary because e.g. html form doesn't support PUT-->
+    <filter>
+        <filter-name>hiddenHttpMethodFilter</filter-name>
+        <filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>hiddenHttpMethodFilter</filter-name>
+        <servlet-name>webServlet</servlet-name>
+    </filter-mapping>
+
+    <!-- Enables Spring Security -->
+    <filter>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+
+    <!--sitemesh templating for the html footer, header etc.-->
+    <filter>
+        <filter-name>sitemesh</filter-name>
+        <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/web/*</url-pattern>
+    </filter-mapping>
+</web-app>
diff --git a/src/main/webapp/api-docs/css/reset.css b/src/main/webapp/api-docs/css/reset.css
new file mode 100644
index 00000000..b2b07894
--- /dev/null
+++ b/src/main/webapp/api-docs/css/reset.css
@@ -0,0 +1,125 @@
+/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
+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,
+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,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: '';
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
diff --git a/src/main/webapp/api-docs/css/screen.css b/src/main/webapp/api-docs/css/screen.css
new file mode 100644
index 00000000..1232eeea
--- /dev/null
+++ b/src/main/webapp/api-docs/css/screen.css
@@ -0,0 +1,1256 @@
+/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org> */
+.swagger-section pre code {
+  display: block;
+  padding: 0.5em;
+  background: #F0F0F0;
+}
+.swagger-section pre code,
+.swagger-section pre .subst,
+.swagger-section pre .tag .title,
+.swagger-section pre .lisp .title,
+.swagger-section pre .clojure .built_in,
+.swagger-section pre .nginx .title {
+  color: black;
+}
+.swagger-section pre .string,
+.swagger-section pre .title,
+.swagger-section pre .constant,
+.swagger-section pre .parent,
+.swagger-section pre .tag .value,
+.swagger-section pre .rules .value,
+.swagger-section pre .rules .value .number,
+.swagger-section pre .preprocessor,
+.swagger-section pre .ruby .symbol,
+.swagger-section pre .ruby .symbol .string,
+.swagger-section pre .aggregate,
+.swagger-section pre .template_tag,
+.swagger-section pre .django .variable,
+.swagger-section pre .smalltalk .class,
+.swagger-section pre .addition,
+.swagger-section pre .flow,
+.swagger-section pre .stream,
+.swagger-section pre .bash .variable,
+.swagger-section pre .apache .tag,
+.swagger-section pre .apache .cbracket,
+.swagger-section pre .tex .command,
+.swagger-section pre .tex .special,
+.swagger-section pre .erlang_repl .function_or_atom,
+.swagger-section pre .markdown .header {
+  color: #800;
+}
+.swagger-section pre .comment,
+.swagger-section pre .annotation,
+.swagger-section pre .template_comment,
+.swagger-section pre .diff .header,
+.swagger-section pre .chunk,
+.swagger-section pre .markdown .blockquote {
+  color: #888;
+}
+.swagger-section pre .number,
+.swagger-section pre .date,
+.swagger-section pre .regexp,
+.swagger-section pre .literal,
+.swagger-section pre .smalltalk .symbol,
+.swagger-section pre .smalltalk .char,
+.swagger-section pre .go .constant,
+.swagger-section pre .change,
+.swagger-section pre .markdown .bullet,
+.swagger-section pre .markdown .link_url {
+  color: #080;
+}
+.swagger-section pre .label,
+.swagger-section pre .javadoc,
+.swagger-section pre .ruby .string,
+.swagger-section pre .decorator,
+.swagger-section pre .filter .argument,
+.swagger-section pre .localvars,
+.swagger-section pre .array,
+.swagger-section pre .attr_selector,
+.swagger-section pre .important,
+.swagger-section pre .pseudo,
+.swagger-section pre .pi,
+.swagger-section pre .doctype,
+.swagger-section pre .deletion,
+.swagger-section pre .envvar,
+.swagger-section pre .shebang,
+.swagger-section pre .apache .sqbracket,
+.swagger-section pre .nginx .built_in,
+.swagger-section pre .tex .formula,
+.swagger-section pre .erlang_repl .reserved,
+.swagger-section pre .prompt,
+.swagger-section pre .markdown .link_label,
+.swagger-section pre .vhdl .attribute,
+.swagger-section pre .clojure .attribute,
+.swagger-section pre .coffeescript .property {
+  color: #8888ff;
+}
+.swagger-section pre .keyword,
+.swagger-section pre .id,
+.swagger-section pre .phpdoc,
+.swagger-section pre .title,
+.swagger-section pre .built_in,
+.swagger-section pre .aggregate,
+.swagger-section pre .css .tag,
+.swagger-section pre .javadoctag,
+.swagger-section pre .phpdoc,
+.swagger-section pre .yardoctag,
+.swagger-section pre .smalltalk .class,
+.swagger-section pre .winutils,
+.swagger-section pre .bash .variable,
+.swagger-section pre .apache .tag,
+.swagger-section pre .go .typename,
+.swagger-section pre .tex .command,
+.swagger-section pre .markdown .strong,
+.swagger-section pre .request,
+.swagger-section pre .status {
+  font-weight: bold;
+}
+.swagger-section pre .markdown .emphasis {
+  font-style: italic;
+}
+.swagger-section pre .nginx .built_in {
+  font-weight: normal;
+}
+.swagger-section pre .coffeescript .javascript,
+.swagger-section pre .javascript .xml,
+.swagger-section pre .tex .formula,
+.swagger-section pre .xml .javascript,
+.swagger-section pre .xml .vbscript,
+.swagger-section pre .xml .css,
+.swagger-section pre .xml .cdata {
+  opacity: 0.5;
+}
+.swagger-section .swagger-ui-wrap {
+  line-height: 1;
+  font-family: "Droid Sans", sans-serif;
+  max-width: 960px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.swagger-section .swagger-ui-wrap b,
+.swagger-section .swagger-ui-wrap strong {
+  font-family: "Droid Sans", sans-serif;
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap q,
+.swagger-section .swagger-ui-wrap blockquote {
+  quotes: none;
+}
+.swagger-section .swagger-ui-wrap p {
+  line-height: 1.4em;
+  padding: 0 0 10px;
+  color: #333333;
+}
+.swagger-section .swagger-ui-wrap q:before,
+.swagger-section .swagger-ui-wrap q:after,
+.swagger-section .swagger-ui-wrap blockquote:before,
+.swagger-section .swagger-ui-wrap blockquote:after {
+  content: none;
+}
+.swagger-section .swagger-ui-wrap .heading_with_menu h1,
+.swagger-section .swagger-ui-wrap .heading_with_menu h2,
+.swagger-section .swagger-ui-wrap .heading_with_menu h3,
+.swagger-section .swagger-ui-wrap .heading_with_menu h4,
+.swagger-section .swagger-ui-wrap .heading_with_menu h5,
+.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
+  display: block;
+  clear: none;
+  float: left;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  width: 60%;
+}
+.swagger-section .swagger-ui-wrap table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.swagger-section .swagger-ui-wrap table thead tr th {
+  padding: 5px;
+  font-size: 0.9em;
+  color: #666666;
+  border-bottom: 1px solid #999999;
+}
+.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
+  border-bottom: none;
+}
+.swagger-section .swagger-ui-wrap table tbody tr.offset {
+  background-color: #f0f0f0;
+}
+.swagger-section .swagger-ui-wrap table tbody tr td {
+  padding: 6px;
+  font-size: 0.9em;
+  border-bottom: 1px solid #cccccc;
+  vertical-align: top;
+  line-height: 1.3em;
+}
+.swagger-section .swagger-ui-wrap ol {
+  margin: 0px 0 10px;
+  padding: 0 0 0 18px;
+  list-style-type: decimal;
+}
+.swagger-section .swagger-ui-wrap ol li {
+  padding: 5px 0px;
+  font-size: 0.9em;
+  color: #333333;
+}
+.swagger-section .swagger-ui-wrap ol,
+.swagger-section .swagger-ui-wrap ul {
+  list-style: none;
+}
+.swagger-section .swagger-ui-wrap h1 a,
+.swagger-section .swagger-ui-wrap h2 a,
+.swagger-section .swagger-ui-wrap h3 a,
+.swagger-section .swagger-ui-wrap h4 a,
+.swagger-section .swagger-ui-wrap h5 a,
+.swagger-section .swagger-ui-wrap h6 a {
+  text-decoration: none;
+}
+.swagger-section .swagger-ui-wrap h1 a:hover,
+.swagger-section .swagger-ui-wrap h2 a:hover,
+.swagger-section .swagger-ui-wrap h3 a:hover,
+.swagger-section .swagger-ui-wrap h4 a:hover,
+.swagger-section .swagger-ui-wrap h5 a:hover,
+.swagger-section .swagger-ui-wrap h6 a:hover {
+  text-decoration: underline;
+}
+.swagger-section .swagger-ui-wrap h1 span.divider,
+.swagger-section .swagger-ui-wrap h2 span.divider,
+.swagger-section .swagger-ui-wrap h3 span.divider,
+.swagger-section .swagger-ui-wrap h4 span.divider,
+.swagger-section .swagger-ui-wrap h5 span.divider,
+.swagger-section .swagger-ui-wrap h6 span.divider {
+  color: #aaaaaa;
+}
+.swagger-section .swagger-ui-wrap a {
+  color: #547f00;
+}
+.swagger-section .swagger-ui-wrap a img {
+  border: none;
+}
+.swagger-section .swagger-ui-wrap article,
+.swagger-section .swagger-ui-wrap aside,
+.swagger-section .swagger-ui-wrap details,
+.swagger-section .swagger-ui-wrap figcaption,
+.swagger-section .swagger-ui-wrap figure,
+.swagger-section .swagger-ui-wrap footer,
+.swagger-section .swagger-ui-wrap header,
+.swagger-section .swagger-ui-wrap hgroup,
+.swagger-section .swagger-ui-wrap menu,
+.swagger-section .swagger-ui-wrap nav,
+.swagger-section .swagger-ui-wrap section,
+.swagger-section .swagger-ui-wrap summary {
+  display: block;
+}
+.swagger-section .swagger-ui-wrap pre {
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  background-color: #fcf6db;
+  border: 1px solid #e5e0c6;
+  padding: 10px;
+}
+.swagger-section .swagger-ui-wrap pre code {
+  line-height: 1.6em;
+  background: none;
+}
+.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
+  clear: both;
+  display: block;
+  color: #0F6AB4;
+  font-size: 1.1em;
+  margin: 0;
+  padding: 15px 0 5px;
+}
+.swagger-section .swagger-ui-wrap .content pre {
+  font-size: 12px;
+  margin-top: 5px;
+  padding: 5px;
+}
+.swagger-section .swagger-ui-wrap .icon-btn {
+  cursor: pointer;
+}
+.swagger-section .swagger-ui-wrap .info_title {
+  padding-bottom: 10px;
+  font-weight: bold;
+  font-size: 25px;
+}
+.swagger-section .swagger-ui-wrap p.big,
+.swagger-section .swagger-ui-wrap div.big p {
+  font-size: 1em;
+  margin-bottom: 10px;
+}
+.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
+.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
+.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
+.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
+  width: 500px !important;
+}
+.swagger-section .swagger-ui-wrap .info_license {
+  padding-bottom: 5px;
+}
+.swagger-section .swagger-ui-wrap .info_tos {
+  padding-bottom: 5px;
+}
+.swagger-section .swagger-ui-wrap .message-fail {
+  color: #cc0000;
+}
+.swagger-section .swagger-ui-wrap .info_url {
+  padding-bottom: 5px;
+}
+.swagger-section .swagger-ui-wrap .info_email {
+  padding-bottom: 5px;
+}
+.swagger-section .swagger-ui-wrap .info_name {
+  padding-bottom: 5px;
+}
+.swagger-section .swagger-ui-wrap .info_description {
+  padding-bottom: 10px;
+  font-size: 15px;
+}
+.swagger-section .swagger-ui-wrap .markdown ol li,
+.swagger-section .swagger-ui-wrap .markdown ul li {
+  padding: 3px 0px;
+  line-height: 1.4em;
+  color: #333333;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
+  display: block;
+  padding: 4px;
+  width: auto;
+  clear: both;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
+  font-size: 1.3em;
+}
+.swagger-section .swagger-ui-wrap table.fullwidth {
+  width: 100%;
+}
+.swagger-section .swagger-ui-wrap .model-signature {
+  font-family: "Droid Sans", sans-serif;
+  font-size: 1em;
+  line-height: 1.5em;
+}
+.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
+  text-decoration: none;
+  color: #AAA;
+}
+.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
+  text-decoration: underline;
+  color: black;
+}
+.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
+  color: black;
+  text-decoration: none;
+}
+.swagger-section .swagger-ui-wrap .model-signature .propType {
+  color: #5555aa;
+}
+.swagger-section .swagger-ui-wrap .model-signature pre:hover {
+  background-color: #ffffdd;
+}
+.swagger-section .swagger-ui-wrap .model-signature pre {
+  font-size: .85em;
+  line-height: 1.2em;
+  overflow: auto;
+  max-height: 200px;
+  cursor: pointer;
+}
+.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
+  display: block;
+  margin: 0;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
+  padding-right: 0;
+  border-right: none;
+}
+.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
+  float: left;
+  margin: 0 5px 5px 0;
+  padding: 2px 5px 2px 0;
+  border-right: 1px solid #ddd;
+}
+.swagger-section .swagger-ui-wrap .model-signature .propOpt {
+  color: #555;
+}
+.swagger-section .swagger-ui-wrap .model-signature .snippet small {
+  font-size: 0.75em;
+}
+.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
+  font-style: italic;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .strong {
+  font-weight: bold;
+  color: #000;
+  font-size: .9em;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description div {
+  font-size: 0.9em;
+  line-height: 1.5em;
+  margin-left: 1em;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
+  font-weight: bold;
+  color: #000;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper {
+  border-spacing: 0;
+  position: absolute;
+  background-color: #ffffff;
+  border: 1px solid #bbbbbb;
+  display: none;
+  font-size: 11px;
+  max-width: 400px;
+  line-height: 30px;
+  color: black;
+  padding: 5px;
+  margin-left: 10px;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper th {
+  text-align: center;
+  background-color: #eeeeee;
+  border: 1px solid #bbbbbb;
+  font-size: 11px;
+  color: #666666;
+  font-weight: bold;
+  padding: 5px;
+  line-height: 15px;
+}
+.swagger-section .swagger-ui-wrap .model-signature .description .propWrap .optionsWrapper .optionName {
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap .model-signature .propName {
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap .model-signature .signature-container {
+  clear: both;
+}
+.swagger-section .swagger-ui-wrap .body-textarea {
+  width: 300px;
+  height: 100px;
+  border: 1px solid #aaa;
+}
+.swagger-section .swagger-ui-wrap .markdown p code,
+.swagger-section .swagger-ui-wrap .markdown li code {
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  background-color: #f0f0f0;
+  color: black;
+  padding: 1px 3px;
+}
+.swagger-section .swagger-ui-wrap .required {
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap input.parameter {
+  width: 300px;
+  border: 1px solid #aaa;
+}
+.swagger-section .swagger-ui-wrap h1 {
+  color: black;
+  font-size: 1.5em;
+  line-height: 1.3em;
+  padding: 10px 0 10px 0;
+  font-family: "Droid Sans", sans-serif;
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap .heading_with_menu {
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+}
+.swagger-section .swagger-ui-wrap .heading_with_menu ul {
+  display: block;
+  clear: none;
+  float: right;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-top: 10px;
+}
+.swagger-section .swagger-ui-wrap h2 {
+  color: black;
+  font-size: 1.3em;
+  padding: 10px 0 10px 0;
+}
+.swagger-section .swagger-ui-wrap h2 a {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap h2 span.sub {
+  font-size: 0.7em;
+  color: #999999;
+  font-style: italic;
+}
+.swagger-section .swagger-ui-wrap h2 span.sub a {
+  color: #777777;
+}
+.swagger-section .swagger-ui-wrap span.weak {
+  color: #666666;
+}
+.swagger-section .swagger-ui-wrap .message-success {
+  color: #89BF04;
+}
+.swagger-section .swagger-ui-wrap caption,
+.swagger-section .swagger-ui-wrap th,
+.swagger-section .swagger-ui-wrap td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+.swagger-section .swagger-ui-wrap .code {
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
+  font-family: "Droid Sans", sans-serif;
+  height: 250px;
+  padding: 4px;
+  display: block;
+  clear: both;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
+  display: block;
+  clear: both;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
+  display: block;
+  float: left;
+  clear: none;
+  margin: 0;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
+  display: block;
+  float: left;
+  clear: none;
+  margin: 0 5px 0 0;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
+  display: block;
+  clear: both;
+  width: auto;
+  padding: 0 0 3px;
+  color: #666666;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
+  padding-left: 3px;
+  color: #888888;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
+  margin-left: 0;
+  font-style: italic;
+  font-size: 0.9em;
+  margin: 0;
+}
+.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
+  margin: 0;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap span.blank,
+.swagger-section .swagger-ui-wrap span.empty {
+  color: #888888;
+  font-style: italic;
+}
+.swagger-section .swagger-ui-wrap .markdown h3 {
+  color: #547f00;
+}
+.swagger-section .swagger-ui-wrap .markdown h4 {
+  color: #666666;
+}
+.swagger-section .swagger-ui-wrap .markdown pre {
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  background-color: #fcf6db;
+  border: 1px solid #e5e0c6;
+  padding: 10px;
+  margin: 0 0 10px 0;
+}
+.swagger-section .swagger-ui-wrap .markdown pre code {
+  line-height: 1.6em;
+}
+.swagger-section .swagger-ui-wrap div.gist {
+  margin: 20px 0 25px 0 !important;
+}
+.swagger-section .swagger-ui-wrap ul#resources {
+  font-family: "Droid Sans", sans-serif;
+  font-size: 0.9em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource {
+  border-bottom: 1px solid #dddddd;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
+.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
+.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
+  color: #555555;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
+  border-bottom: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
+  border: 1px solid transparent;
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
+  overflow: hidden;
+  padding: 0;
+  display: block;
+  clear: none;
+  float: right;
+  margin: 14px 10px 0 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
+  float: left;
+  clear: none;
+  margin: 0;
+  padding: 2px 10px;
+  border-right: 1px solid #dddddd;
+  color: #666666;
+  font-size: 0.9em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
+  color: #aaaaaa;
+  text-decoration: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
+  text-decoration: underline;
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
+  text-decoration: underline;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
+  padding-left: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
+  padding-right: 0;
+  border-right: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
+  padding-left: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
+  color: #999999;
+  padding-left: 0;
+  display: block;
+  clear: none;
+  float: left;
+  font-family: "Droid Sans", sans-serif;
+  font-weight: bold;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
+  color: #999999;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+  margin: 0 0 10px;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+  margin: 0;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
+  display: block;
+  clear: none;
+  float: left;
+  width: auto;
+  margin: 0;
+  padding: 0;
+  line-height: 1.1em;
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
+  padding-left: 10px;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
+  color: black;
+  text-decoration: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
+  text-decoration: underline;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
+  text-transform: uppercase;
+  text-decoration: none;
+  color: white;
+  display: inline-block;
+  width: 50px;
+  font-size: 0.7em;
+  text-align: center;
+  padding: 7px 0 4px;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  -o-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -khtml-border-radius: 2px;
+  border-radius: 2px;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
+  margin: 0;
+  padding: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
+  overflow: hidden;
+  padding: 0;
+  display: block;
+  clear: none;
+  float: right;
+  margin: 6px 10px 0 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
+  float: left;
+  clear: none;
+  margin: 0;
+  padding: 2px 10px;
+  font-size: 0.9em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
+  text-decoration: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
+  color: black;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
+  border-top: none;
+  padding: 10px;
+  -moz-border-radius-bottomleft: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -o-border-bottom-left-radius: 6px;
+  -ms-border-bottom-left-radius: 6px;
+  -khtml-border-bottom-left-radius: 6px;
+  border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -o-border-bottom-right-radius: 6px;
+  -ms-border-bottom-right-radius: 6px;
+  -khtml-border-bottom-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+  margin: 0 0 20px;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
+  font-size: 1.1em;
+  margin: 0;
+  padding: 15px 0 5px;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
+  float: none;
+  clear: both;
+  overflow: hidden;
+  display: block;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
+  padding: 4px 0 0 10px;
+  display: inline-block;
+  font-size: 0.9em;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
+  display: block;
+  clear: none;
+  float: left;
+  padding: 6px 8px;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header span.response_throbber {
+  background-image: url('../images/throbber.gif');
+  width: 128px;
+  height: 16px;
+  display: block;
+  clear: none;
+  float: right;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
+  outline: 2px solid black;
+  outline-color: #cc0000;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
+  font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
+  padding: 10px;
+  font-size: 0.9em;
+  max-height: 400px;
+  overflow-y: auto;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
+  background-color: #f9f2e9;
+  border: 1px solid #f0e0ca;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
+  background-color: #c5862b;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #f0e0ca;
+  color: #c5862b;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
+  color: #c5862b;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
+  background-color: #faf5ee;
+  border: 1px solid #f0e0ca;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
+  color: #c5862b;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
+  color: #dcb67f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
+  background-color: #fcffcd;
+  border: 1px solid black;
+  border-color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
+  text-transform: uppercase;
+  background-color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #ffd20f;
+  color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
+  color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
+  background-color: #fcffcd;
+  border: 1px solid black;
+  border-color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
+  color: #ffd20f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
+  color: #6fc992;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
+  background-color: #f5e8e8;
+  border: 1px solid #e8c6c7;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
+  text-transform: uppercase;
+  background-color: #a41e22;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #e8c6c7;
+  color: #a41e22;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
+  color: #a41e22;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
+  background-color: #f7eded;
+  border: 1px solid #e8c6c7;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
+  color: #a41e22;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
+  color: #c8787a;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
+  background-color: #e7f6ec;
+  border: 1px solid #c3e8d1;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
+  background-color: #10a54a;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #c3e8d1;
+  color: #10a54a;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
+  color: #10a54a;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
+  background-color: #ebf7f0;
+  border: 1px solid #c3e8d1;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
+  color: #10a54a;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
+  color: #6fc992;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
+  background-color: #FCE9E3;
+  border: 1px solid #F5D5C3;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
+  background-color: #D38042;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #f0cecb;
+  color: #D38042;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
+  color: #D38042;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
+  background-color: #faf0ef;
+  border: 1px solid #f0cecb;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
+  color: #D38042;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
+  color: #dcb67f;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
+  background-color: #e7f0f7;
+  border: 1px solid #c3d9ec;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
+  background-color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #c3d9ec;
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
+  background-color: #ebf3f9;
+  border: 1px solid #c3d9ec;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
+  color: #6fa5d2;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
+  background-color: #e7f0f7;
+  border: 1px solid #c3d9ec;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
+  background-color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
+  border-right: 1px solid #dddddd;
+  border-right-color: #c3d9ec;
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
+  background-color: #ebf3f9;
+  border: 1px solid #c3d9ec;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
+  color: #0f6ab4;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
+  color: #6fa5d2;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
+  border-top: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
+  padding-right: 0;
+  border-right: none;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
+  text-decoration: underline;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
+  padding-left: 0;
+}
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
+.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
+  padding-left: 0;
+}
+.swagger-section .swagger-ui-wrap p#colophon {
+  margin: 0 15px 40px 15px;
+  padding: 10px 0;
+  font-size: 0.8em;
+  border-top: 1px solid #dddddd;
+  font-family: "Droid Sans", sans-serif;
+  color: #999999;
+  font-style: italic;
+}
+.swagger-section .swagger-ui-wrap p#colophon a {
+  text-decoration: none;
+  color: #547f00;
+}
+.swagger-section .swagger-ui-wrap h3 {
+  color: black;
+  font-size: 1.1em;
+  padding: 10px 0 10px 0;
+}
+.swagger-section .swagger-ui-wrap .markdown ol,
+.swagger-section .swagger-ui-wrap .markdown ul {
+  font-family: "Droid Sans", sans-serif;
+  margin: 5px 0 10px;
+  padding: 0 0 0 18px;
+  list-style-type: disc;
+}
+.swagger-section .swagger-ui-wrap form.form_box {
+  background-color: #ebf3f9;
+  border: 1px solid #c3d9ec;
+  padding: 10px;
+}
+.swagger-section .swagger-ui-wrap form.form_box label {
+  color: #0f6ab4 !important;
+}
+.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
+  display: block;
+  padding: 10px;
+}
+.swagger-section .swagger-ui-wrap form.form_box p.weak {
+  font-size: 0.8em;
+}
+.swagger-section .swagger-ui-wrap form.form_box p {
+  font-size: 0.9em;
+  padding: 0 0 15px;
+  color: #7e7b6d;
+}
+.swagger-section .swagger-ui-wrap form.form_box p a {
+  color: #646257;
+}
+.swagger-section .swagger-ui-wrap form.form_box p strong {
+  color: black;
+}
+.swagger-section .title {
+  font-style: bold;
+}
+.swagger-section .secondary_form {
+  display: none;
+}
+.swagger-section .main_image {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+.swagger-section .oauth_body {
+  margin-left: 100px;
+  margin-right: 100px;
+}
+.swagger-section .oauth_submit {
+  text-align: center;
+}
+.swagger-section .api-popup-dialog {
+  z-index: 10000;
+  position: absolute;
+  width: 500px;
+  background: #FFF;
+  padding: 20px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  display: none;
+  font-size: 13px;
+  color: #777;
+}
+.swagger-section .api-popup-dialog .api-popup-title {
+  font-size: 24px;
+  padding: 10px 0;
+}
+.swagger-section .api-popup-dialog .api-popup-title {
+  font-size: 24px;
+  padding: 10px 0;
+}
+.swagger-section .api-popup-dialog p.error-msg {
+  padding-left: 5px;
+  padding-bottom: 5px;
+}
+.swagger-section .api-popup-dialog button.api-popup-authbtn {
+  height: 30px;
+}
+.swagger-section .api-popup-dialog button.api-popup-cancel {
+  height: 30px;
+}
+.swagger-section .api-popup-scopes {
+  padding: 10px 20px;
+}
+.swagger-section .api-popup-scopes li {
+  padding: 5px 0;
+  line-height: 20px;
+}
+.swagger-section .api-popup-scopes .api-scope-desc {
+  padding-left: 20px;
+  font-style: italic;
+}
+.swagger-section .api-popup-scopes li input {
+  position: relative;
+  top: 2px;
+}
+.swagger-section .api-popup-actions {
+  padding-top: 10px;
+}
+.swagger-section .access {
+  float: right;
+}
+.swagger-section .auth {
+  float: right;
+}
+.swagger-section #api_information_panel {
+  position: absolute;
+  background: #FFF;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  display: none;
+  font-size: 13px;
+  max-width: 300px;
+  line-height: 30px;
+  color: black;
+  padding: 5px;
+}
+.swagger-section #api_information_panel p .api-msg-enabled {
+  color: green;
+}
+.swagger-section #api_information_panel p .api-msg-disabled {
+  color: red;
+}
+.swagger-section .api-ic {
+  height: 18px;
+  vertical-align: middle;
+  display: inline-block;
+  background: url(../images/explorer_icons.png) no-repeat;
+}
+.swagger-section .ic-info {
+  background-position: 0 0;
+  width: 18px;
+  margin-top: -7px;
+  margin-left: 4px;
+}
+.swagger-section .ic-warning {
+  background-position: -60px 0;
+  width: 18px;
+  margin-top: -7px;
+  margin-left: 4px;
+}
+.swagger-section .ic-error {
+  background-position: -30px 0;
+  width: 18px;
+  margin-top: -7px;
+  margin-left: 4px;
+}
+.swagger-section .ic-off {
+  background-position: -90px 0;
+  width: 58px;
+  margin-top: -4px;
+  cursor: pointer;
+}
+.swagger-section .ic-on {
+  background-position: -160px 0;
+  width: 58px;
+  margin-top: -4px;
+  cursor: pointer;
+}
+.swagger-section #header {
+  background-color: #00305d;
+  padding: 14px;
+}
+.swagger-section #header a#logo {
+  font-size: 1.5em;
+  font-weight: bold;
+  text-decoration: none;
+  background: transparent url(../images/logo_small.png) no-repeat left center;
+  padding: 20px 0 20px 40px;
+  color: white;
+}
+.swagger-section #header form#api_selector {
+  display: block;
+  clear: none;
+  float: right;
+}
+.swagger-section #header form#api_selector .input {
+  display: block;
+  clear: none;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.swagger-section #header form#api_selector .input input#input_apiKey {
+  width: 200px;
+}
+.swagger-section #header form#api_selector .input input#input_baseUrl {
+  width: 400px;
+}
+.swagger-section #header form#api_selector .input a#explore {
+  display: block;
+  text-decoration: none;
+  font-weight: bold;
+  padding: 6px 8px;
+  font-size: 0.9em;
+  color: white;
+  background-color: #547f00;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -o-border-radius: 4px;
+  -ms-border-radius: 4px;
+  -khtml-border-radius: 4px;
+  border-radius: 4px;
+}
+.swagger-section #header form#api_selector .input a#explore:hover {
+  background-color: #547f00;
+}
+.swagger-section #header form#api_selector .input input {
+  font-size: 0.9em;
+  padding: 3px;
+  margin: 0;
+}
+.swagger-section #content_message {
+  margin: 10px 15px;
+  font-style: italic;
+  color: #999999;
+}
+.swagger-section #message-bar {
+  min-height: 30px;
+  text-align: center;
+  padding-top: 10px;
+}
diff --git a/src/main/webapp/api-docs/css/typography.css b/src/main/webapp/api-docs/css/typography.css
new file mode 100644
index 00000000..27c3751a
--- /dev/null
+++ b/src/main/webapp/api-docs/css/typography.css
@@ -0,0 +1,26 @@
+/* droid-sans-regular - latin */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/droid-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */
+  src: local('Droid Sans'), local('DroidSans'),
+       url('../fonts/droid-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/droid-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/droid-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/droid-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/droid-sans-v6-latin-regular.svg#DroidSans') format('svg'); /* Legacy iOS */
+}
+/* droid-sans-700 - latin */
+@font-face {
+  font-family: 'Droid Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/droid-sans-v6-latin-700.eot'); /* IE9 Compat Modes */
+  src: local('Droid Sans Bold'), local('DroidSans-Bold'),
+       url('../fonts/droid-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('../fonts/droid-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+       url('../fonts/droid-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */
+       url('../fonts/droid-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
+       url('../fonts/droid-sans-v6-latin-700.svg#DroidSans') format('svg'); /* Legacy iOS */
+}
diff --git a/src/main/webapp/api-docs/docs.html b/src/main/webapp/api-docs/docs.html
new file mode 100644
index 00000000..9ed64d2f
--- /dev/null
+++ b/src/main/webapp/api-docs/docs.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Swagger UI</title>
+  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+  <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
+  <script type="text/javascript" src="lib/shred.bundle.js"></script>
+  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
+  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+  <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
+  <script src='lib/underscore-min.js' type='text/javascript'></script>
+  <script src='lib/backbone-min.js' type='text/javascript'></script>
+  <script src='lib/swagger-client.js' type='text/javascript'></script>
+  <script src='swagger-ui.js' type='text/javascript'></script>
+  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+  <script src='lib/marked.js' type='text/javascript'></script>
+
+  <!-- enabling this will enable oauth2 implicit scope support -->
+  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+  <script type="text/javascript">
+    $(function () {
+      var url = window.location.search.match(/url=([^&]+)/);
+      if (url && url.length > 1) {
+        url = decodeURIComponent(url[1]);
+      } else {
+        url = "../api-docs";
+      }
+      window.swaggerUi = new SwaggerUi({
+        url: url,
+        dom_id: "swagger-ui-container",
+        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
+        onComplete: function(swaggerApi, swaggerUi){
+          if(typeof initOAuth == "function") {
+            /*
+            initOAuth({
+              clientId: "your-client-id",
+              realm: "your-realms",
+              appName: "your-app-name"
+            });
+            */
+          }
+          $('pre code').each(function(i, e) {
+            hljs.highlightBlock(e)
+          });
+        },
+        onFailure: function(data) {
+          log("Unable to Load SwaggerUI");
+        },
+        docExpansion: "none",
+        sorter : "alpha"
+      });
+
+      function addApiKeyAuthorization() {
+        var key = $('#input_apiKey')[0].value;
+        log("key: " + key);
+        if(key && key.trim() != "") {
+            log("added key " + key);
+            window.authorizations.add("api_key", new ApiKeyAuthorization("api_key", key, "query"));
+        }
+      }
+
+      $('#input_apiKey').change(function() {
+        addApiKeyAuthorization();
+      });
+
+      // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
+      /*
+        var apiKey = "myApiKeyXXXX123456789";
+        $('#input_apiKey').val(apiKey);
+        addApiKeyAuthorization();
+      */
+
+      window.swaggerUi.load();
+  });
+  </script>
+</head>
+
+<body class="swagger-section">
+<div id='header'>
+  <div class="swagger-ui-wrap">
+    <a id="logo" href="http://swagger.io">swagger</a>
+  </div>
+</div>
+
+<div id="message-bar" class="swagger-ui-wrap">&nbsp;</div>
+<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</body>
+</html>
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.eot b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.eot
new file mode 100644
index 00000000..2250b71a
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.eot differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.svg b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.svg
new file mode 100644
index 00000000..a54bbbbf
--- /dev/null
+++ b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.svg
@@ -0,0 +1,411 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="DroidSans" horiz-adv-x="1123" ><font-face
+    font-family="Droid Sans"
+    units-per-em="2048"
+    panose-1="2 11 8 6 3 8 4 2 2 4"
+    ascent="1907"
+    descent="-492"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="586" d="M416 485H172L121 1462H467L416 485ZM117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131
+66T117 143Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="967" d="M412 1462L371 934H174L133 1462H412ZM834 1462L793 934H596L555 1462H834Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M999 844L952 612H1210V406H913L836 0H616L694 406H500L424 0H209L283 406H45V612H322L369 844H117V1053H406L483 1460H702L625 1053H823L901 1460H1116L1038 1053H1278V844H999ZM539 612H735L782
+844H586L539 612Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1128" d="M1061 457Q1061 382 1035 318T956 206T825 127T645 86V-119H508V82Q442 84 386 90T281 107T188 133T100 168V432Q142 411 191 392T294 358T401 331T508 317V635Q500 638 491 642Q483 645 475 648T461
+653Q370 688 302 726T189 811T121 915T98 1044Q98 1119 126 1180T208 1287T337 1361T508 1399V1556H645V1405Q732 1400 823 1380T1014 1317L913 1083Q848 1109 778 1129T645 1155V862L684 848Q779 813 850 776T968 693T1038 590T1061 457ZM760 451Q760 475 754
+493T733 526T698 553T645 580V328Q704 337 732 367T760 451ZM399 1051Q399 1004 425 973T508 920V1153Q454 1147 427 1123T399 1051Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="1804" d="M315 1024Q315 897 337 835T410 772Q459 772 482 834T506 1024Q506 1274 410 1274Q360 1274 338 1213T315 1024ZM758 1026Q758 918 738 832T674 687T565 597T408 565Q323 565 259 596T151 687T85
+832T63 1026Q63 1134 83 1219T145 1362T253 1452T408 1483Q494 1483 559 1452T669 1363T735 1219T758 1026ZM1425 1462L614 0H375L1186 1462H1425ZM1298 440Q1298 313 1320 251T1393 188Q1442 188 1465 250T1489 440Q1489 690 1393 690Q1343 690 1321 629T1298
+440ZM1741 442Q1741 334 1721 249T1657 104T1548 14T1391 -18Q1306 -18 1242 13T1135 104T1069 248T1047 442Q1047 550 1067 635T1129 778T1236 868T1391 899Q1477 899 1542 868T1652 779T1718 635T1741 442Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1479" d="M1475 0H1098L1001 100Q921 45 825 13T612 -20Q492 -20 395 10T228 94T120 225T82 395Q82 472 100 532T153 642T235 731T344 807Q306 853 280 895T237 979T214 1062T207 1149Q207 1227 237
+1288T322 1393T452 1460T618 1483Q704 1483 776 1462T901 1401T984 1301T1014 1165Q1014 1096 992 1039T931 932T842 842T731 766L991 498Q1026 564 1052 637T1098 784H1415Q1400 727 1380 664T1332 538T1270 411T1192 291L1475 0ZM403 424Q403 380 419 345T463
+286T530 249T614 236Q674 236 725 251T819 295L510 625Q459 583 431 535T403 424ZM731 1124Q731 1155 721 1176T695 1212T658 1232T616 1239Q594 1239 572 1233T531 1214T501 1178T489 1122Q489 1070 512 1024T575 932Q652 976 691 1020T731 1124Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="545" d="M412 1462L371 934H174L133 1462H412Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="694" d="M82 561Q82 686 100 807T155 1043T248 1263T383 1462H633Q492 1269 420 1038T348 563Q348 444 366 326T420 95T509 -124T631 -324H383Q305 -234 249 -131T155 84T100 317T82 561Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="694" d="M612 561Q612 437 594 317T539 85T446 -131T311 -324H63Q132 -230 185 -124T274 95T328 326T346 563Q346 807 274 1038T61 1462H311Q389 1369 445 1264T539 1044T594 808T612 561Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1116" d="M688 1556L647 1188L1020 1292L1053 1040L713 1016L936 719L709 598L553 911L416 600L180 719L401 1016L63 1042L102 1292L467 1188L426 1556H688Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="1128" d="M455 612H88V831H455V1200H674V831H1040V612H674V248H455V612Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="594" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M61 424V674H598V424H61Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="584" d="M117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131 66T117 143Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="846" d="M836 1462L291 0H14L559 1462H836Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="1128" d="M1065 731Q1065 554 1038 415T950 179T794 31T563 -20Q436 -20 342 31T186 179T94 415T63 731Q63 908 90 1048T178 1285T333 1433T563 1485Q689 1485 783 1434T940 1286T1034 1049T1065 731ZM371 731Q371
+481 414 355T563 229Q667 229 712 354T758 731Q758 982 713 1108T563 1235Q510 1235 474 1203T414 1108T381 951T371 731Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="1128" d="M817 0H508V846Q508 872 508 908T510 984T513 1064T516 1137Q511 1131 499 1119T472 1093T441 1063T410 1036L242 901L92 1087L563 1462H817V0Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="1128" d="M1063 0H82V215L426 586Q491 656 544 715T635 830T694 944T715 1069Q715 1143 671 1184T551 1225Q472 1225 399 1186T246 1075L78 1274Q123 1315 172 1352T280 1419T410 1465T569 1483Q674 1483 757
+1454T900 1372T990 1242T1022 1071Q1022 985 992 907T910 753T790 603T643 451L467 274V260H1063V0Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="1128" d="M1006 1135Q1006 1059 982 999T915 893T815 817T690 770V764Q867 742 958 657T1049 426Q1049 330 1015 249T909 107T729 14T473 -20Q355 -20 251 -1T57 59V322Q102 298 152 280T252 250T350 231T442
+225Q528 225 585 241T676 286T724 355T739 444Q739 489 721 525T661 587T552 627T387 641H283V858H385Q477 858 538 874T635 919T687 986T702 1067Q702 1145 654 1189T500 1233Q452 1233 411 1224T334 1200T269 1168T215 1133L59 1339Q101 1370 150 1396T258 1441T383
+1472T526 1483Q634 1483 722 1460T874 1392T971 1283T1006 1135Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="1128" d="M1085 303H909V0H608V303H4V518L625 1462H909V543H1085V303ZM608 543V791Q608 804 608 828T610 884T612 948T615 1011T618 1063T621 1096H612Q594 1054 572 1007T520 913L276 543H608Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="1128" d="M598 934Q692 934 773 905T914 820T1008 681T1042 489Q1042 370 1005 276T896 116T718 15T473 -20Q418 -20 364 -15T261 -1T167 24T86 59V326Q121 306 167 289T262 259T362 239T457 231Q591 231 661
+286T731 463Q731 571 663 627T451 684Q425 684 396 681T338 673T283 663T238 651L115 717L170 1462H942V1200H438L414 913Q446 920 488 927T598 934Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="1128" d="M76 621Q76 726 87 830T128 1029T208 1207T336 1349T522 1444T776 1479Q797 1479 822 1478T872 1476T922 1471T965 1464V1217Q927 1226 885 1231T799 1237Q664 1237 577 1204T439 1110T367 966T340
+780H352Q372 816 400 847T467 901T552 937T659 950Q754 950 830 919T958 829T1039 684T1067 487Q1067 368 1034 274T938 115T788 15T590 -20Q482 -20 388 18T225 136T116 335T76 621ZM584 227Q625 227 658 242T716 289T754 369T768 483Q768 590 724 651T588 713Q542
+713 504 695T439 648T398 583T383 510Q383 459 395 409T433 318T496 252T584 227Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="1128" d="M207 0L727 1200H55V1460H1063V1266L530 0H207Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="1128" d="M565 1481Q656 1481 737 1459T879 1393T976 1283T1012 1128Q1012 1062 992 1009T937 912T854 834T750 772Q808 741 863 703T962 618T1031 511T1057 379Q1057 288 1021 214T920 88T765 8T565 -20Q447
+-20 355 7T200 84T105 207T72 371Q72 446 94 506T154 614T243 699T352 764Q303 795 260 831T186 912T136 1011T117 1130Q117 1217 153 1282T252 1392T395 1459T565 1481ZM358 389Q358 349 371 316T409 258T473 221T561 207Q666 207 718 256T770 387Q770 429 753
+462T708 524T645 577T575 623L553 637Q509 615 473 590T412 534T372 467T358 389ZM563 1255Q530 1255 502 1245T453 1216T420 1169T408 1106Q408 1064 420 1034T454 980T504 938T565 901Q596 917 624 936T673 979T708 1035T721 1106Q721 1141 709 1169T676 1216T626
+1245T563 1255Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="1128" d="M1055 838Q1055 733 1044 629T1003 429T923 252T795 109T609 15T354 -20Q333 -20 308 -19T258 -17T208 -13T166 -6V242Q203 232 245 227T332 221Q467 221 554 254T692 348T764 493T791 678H778Q758
+642 730 611T664 557T578 521T471 508Q376 508 300 539T172 629T91 774T63 971Q63 1090 96 1184T192 1343T342 1444T541 1479Q649 1479 743 1441T906 1323T1015 1123T1055 838ZM547 1231Q506 1231 472 1216T414 1170T376 1090T362 975Q362 869 407 807T543 745Q589
+745 627 763T692 810T733 875T748 948Q748 999 736 1049T698 1140T635 1206T547 1231Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="584" d="M117 143Q117 190 130 222T168 275T224 304T293 313Q328 313 359 304T415 275T453 223T467 143Q467 98 453 66T415 13T360 -17T293 -27Q256 -27 224 -18T168 13T131 66T117 143ZM117 969Q117 1016
+130 1048T168 1101T224 1130T293 1139Q328 1139 359 1130T415 1101T453 1049T467 969Q467 924 453 892T415 839T360 809T293 799Q256 799 224 808T168 838T131 891T117 969Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="594" d="M444 238L459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444ZM117 969Q117 1016 130 1048T168 1101T224 1130T293 1139Q328 1139 359 1130T415
+1101T453 1049T467 969Q467 924 453 892T415 839T360 809T293 799Q256 799 224 808T168 838T131 891T117 969Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1128" d="M1040 203L88 641V784L1040 1280V1040L397 723L1040 442V203Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="1128" d="M88 807V1024H1040V807H88ZM88 418V637H1040V418H88Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1128" d="M88 442L731 723L88 1040V1280L1040 784V641L88 203V442Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="940" d="M264 485V559Q264 610 274 651T306 730T362 803T444 877Q486 910 515 936T562 987T588 1041T596 1106Q596 1163 558 1200T440 1237Q371 1237 292 1208T127 1137L25 1358Q68 1383 118 1405T223 1445T334
+1473T444 1483Q546 1483 628 1459T767 1387T854 1273T885 1120Q885 1057 871 1008T830 916T761 834T664 750Q622 717 596 693T554 646T534 601T528 545V485H264ZM231 143Q231 190 244 222T282 275T338 304T408 313Q443 313 474 304T530 275T568 223T582 143Q582
+98 568 66T530 13T475 -17T408 -27Q371 -27 339 -18T282 13T245 66T231 143Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="1774" d="M1673 752Q1673 657 1651 564T1582 398T1467 279T1303 233Q1265 233 1232 242T1170 269T1122 310T1090 362H1075Q1056 337 1031 314T975 272T907 244T825 233Q742 233 678 261T569 342T502 468T479 631Q479
+734 510 820T599 968T740 1065T926 1100Q971 1100 1019 1095T1111 1082T1195 1064T1262 1044L1241 625Q1239 603 1239 582T1239 555Q1239 513 1245 486T1262 444T1286 422T1315 416Q1350 416 1376 443T1419 516T1445 623T1454 754Q1454 882 1416 982T1311 1151T1150
+1256T948 1292Q795 1292 679 1241T484 1099T365 882T324 608Q324 470 359 364T463 185T633 75T866 37Q922 37 981 44T1098 63T1213 92T1321 129V-63Q1227 -105 1113 -129T868 -154Q687 -154 545 -103T304 46T154 283T102 602Q102 726 129 839T207 1050T331 1227T499
+1363T706 1450T948 1481Q1106 1481 1239 1431T1468 1286T1619 1056T1673 752ZM711 627Q711 515 749 466T850 416Q892 416 922 435T972 490T1002 575T1016 686L1028 907Q1008 912 981 915T926 918Q867 918 826 893T760 827T723 734T711 627Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489 608H846Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="1315" d="M184 1462H612Q750 1462 854 1443T1028 1380T1133 1266T1169 1092Q1169 1030 1154 976T1110 881T1040 813T944 776V766Q999 754 1046 732T1129 670T1185 570T1206 424Q1206 324 1171 246T1071 113T912
+29T700 0H184V1462ZM494 883H655Q713 883 752 893T815 925T849 977T860 1051Q860 1135 808 1171T641 1208H494V883ZM494 637V256H676Q737 256 778 270T845 310T882 373T893 455Q893 496 882 529T845 587T775 624T668 637H494Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="1305" d="M805 1225Q716 1225 648 1191T533 1092T462 935T438 727Q438 610 459 519T525 366T639 271T805 238Q894 238 983 258T1178 315V55Q1130 35 1083 21T987 -2T887 -15T776 -20Q607 -20 483 34T278 186T158
+422T119 729Q119 895 164 1033T296 1272T511 1427T805 1483Q914 1483 1023 1456T1233 1380L1133 1128Q1051 1167 968 1196T805 1225Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="1434" d="M1315 745Q1315 560 1265 421T1119 188T885 47T569 0H184V1462H612Q773 1462 902 1416T1124 1280T1265 1055T1315 745ZM1001 737Q1001 859 977 947T906 1094T792 1180T637 1208H494V256H608Q804 256 902
+376T1001 737Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="1124" d="M489 0H184V1462H1022V1208H489V831H985V578H489V0Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="1483" d="M739 821H1319V63Q1261 44 1202 29T1080 3T947 -14T799 -20Q635 -20 509 28T296 172T164 408T119 733Q119 905 169 1044T316 1280T556 1430T883 1483Q1000 1483 1112 1458T1317 1393L1214 1145Q1146 1179
+1061 1202T881 1225Q779 1225 698 1190T558 1089T469 932T438 727Q438 619 459 530T527 375T645 274T819 238Q885 238 930 244T1016 258V563H739V821Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="1485" d="M1300 0H991V631H494V0H184V1462H494V889H991V1462H1300V0Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="678" d="M-2 -430Q-67 -430 -116 -424T-199 -408V-150Q-162 -158 -122 -164T-33 -170Q13 -170 52 -160T121 -126T167 -60T184 43V1462H494V53Q494 -73 458 -164T356 -314T199 -402T-2 -430Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="1298" d="M1298 0H946L610 608L494 522V0H184V1462H494V758L616 965L950 1462H1294L827 803L1298 0Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="1096" d="M184 0V1462H494V256H1026V0H184Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="1870" d="M772 0L451 1147H442Q448 1055 452 969Q454 932 455 893T458 816T460 743T461 680V0H184V1462H606L922 344H928L1264 1462H1686V0H1397V692Q1397 718 1397 751T1399 821T1401 896T1404 970Q1408 1054
+1411 1145H1403L1057 0H772Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="1604" d="M1419 0H1026L451 1106H442Q448 1029 452 953Q456 888 458 817T461 688V0H184V1462H575L1149 367H1155Q1152 443 1148 517Q1147 549 1146 582T1143 649T1142 714T1141 770V1462H1419V0Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430 733ZM438
+733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="1225" d="M494 774H555Q686 774 752 826T819 995Q819 1104 760 1156T573 1208H494V774ZM1133 1006Q1133 910 1104 822T1009 667T834 560T565 520H494V0H184V1462H590Q731 1462 833 1431T1002 1341T1101 1198T1133 1006Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1548" d="M1430 733Q1430 614 1411 510T1352 319T1253 166T1112 55L1473 -348H1075L807 -18Q800 -18 794 -19Q789 -20 784 -20T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483
+1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430 733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733Z"
+/>
+<glyph unicode="R" glyph-name="R" horiz-adv-x="1290" d="M494 813H578Q707 813 763 864T819 1016Q819 1120 759 1164T573 1208H494V813ZM494 561V0H184V1462H584Q865 1462 999 1354T1133 1024Q1133 949 1113 888T1060 780T983 697T891 637Q1002 459 1090 319Q1128
+259 1163 202T1227 100T1273 28L1290 0H946L629 561H494Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="1073" d="M985 406Q985 308 952 230T854 96T696 10T481 -20Q375 -20 277 2T94 68V356Q142 333 191 312T290 273T391 246T492 236Q543 236 579 247T638 279T671 328T682 391Q682 432 665 463T616 522T540 576T440
+631Q394 655 337 689T230 773T145 895T111 1067Q111 1165 143 1242T236 1373T381 1455T573 1483Q626 1483 676 1476T776 1456T876 1424T979 1380L879 1139Q834 1160 795 1176T719 1203T647 1219T575 1225Q497 1225 456 1184T414 1073Q414 1036 426 1008T466 954T537
+903T643 844Q718 804 781 763T889 671T960 556T985 406Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="1124" d="M717 0H408V1204H41V1462H1083V1204H717V0Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="1249" d="M936 1462H1249L793 0H455L0 1462H313L561 582Q566 565 574 525T592 437T611 341T625 260Q630 293 639 341T658 436T677 524T692 582L936 1462Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="1898" d="M1546 0H1194L1014 721Q1010 736 1005 763T992 824T978 895T965 967T955 1031T948 1079Q946 1061 942 1032T931 968T919 896T906 825T893 763T883 719L705 0H352L0 1462H305L471 664Q474 648 479 618T492
+549T506 469T521 387T534 313T543 256Q546 278 551 312T563 384T576 464T590 540T601 603T610 643L813 1462H1085L1288 643Q1291 631 1296 604T1308 541T1322 464T1335 385T1347 312T1356 256Q1359 278 1364 312T1377 387T1391 469T1406 549T1418 617T1427 664L1593
+1462H1898L1546 0Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="1284" d="M1284 0H930L631 553L332 0H0L444 754L31 1462H373L647 936L915 1462H1249L831 737L1284 0Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1196" d="M598 860L862 1462H1196L752 569V0H444V559L0 1462H336L598 860Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1104" d="M1055 0H49V201L668 1206H68V1462H1036V1262L418 256H1055V0Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="678" d="M627 -324H143V1462H627V1251H403V-113H627V-324Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="846" d="M289 1462L834 0H557L12 1462H289Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="678" d="M51 -113H274V1251H51V1462H535V-324H51V-113Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1090" d="M8 520L446 1470H590L1085 520H846L524 1163Q455 1002 384 839T244 520H8Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="842" d="M846 -324H-4V-184H846V-324Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M645 1241Q611 1269 564 1310T470 1396T386 1480T332 1548V1569H674Q690 1535 711 1495T756 1414T803 1335T848 1268V1241H645Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190 1040Q274
+1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="1245" d="M756 1139Q842 1139 913 1102T1035 992T1114 811T1143 561Q1143 417 1115 309T1034 127T909 17T748 -20Q692 -20 649 -8T571 24T512 69T465 123H444L393 0H160V1556H465V1194Q465 1161 463 1123T459 1051Q456
+1012 453 973H465Q486 1008 513 1038T575 1090T656 1126T756 1139ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="1022" d="M625 -20Q505 -20 409 13T244 115T139 293T102 553Q102 720 139 832T245 1013T410 1110T625 1139Q711 1139 796 1118T956 1059L868 827Q802 856 741 874T625 893Q514 893 464 809T414 555Q414 387 464
+307T621 227Q708 227 779 249T924 307V53Q887 35 852 21T782 -2T708 -15T625 -20Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="1245" d="M489 -20Q403 -20 332 17T210 126T131 307T102 557Q102 701 130 809T211 991T337 1102T498 1139Q552 1139 597 1127T678 1092T742 1040T793 975H803Q797 1014 792 1054Q787 1088 784 1126T780 1198V1556H1085V0H852L793
+145H780Q759 111 732 81T670 28T590 -7T489 -20ZM600 223Q654 223 692 241T753 297T788 391T801 522V555Q801 636 791 699T758 804T696 869T598 891Q502 891 457 805T412 553Q412 388 457 306T600 223Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139 810 1106T962
+1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="793" d="M741 889H514V0H209V889H41V1036L209 1118V1200Q209 1307 235 1377T309 1490T425 1549T578 1567Q670 1567 733 1553T840 1520L768 1296Q737 1307 703 1316T623 1325Q563 1325 539 1287T514 1188V1118H741V889Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="1130" d="M1085 1116V950L922 899Q942 865 950 829T958 750Q958 665 931 595T851 474T718 397T532 369Q509 369 482 371T442 377Q422 360 411 342T399 297Q399 276 412 264T446 244T495 234T553 231H727Q808 231
+872 213T980 156T1049 60T1073 -80Q1073 -175 1035 -251T922 -381T734 -463T475 -492Q361 -492 276 -471T134 -409T49 -311T20 -182Q20 -121 41 -76T97 1T176 53T268 84Q247 93 227 109T190 146T163 192T152 246Q152 278 161 304T189 352T234 395T295 436Q207 474
+156 558T104 756Q104 846 132 917T214 1037T348 1113T532 1139Q552 1139 577 1137T626 1131T672 1123T705 1116H1085ZM285 -158Q285 -183 295 -206T330 -248T393 -276T489 -287Q645 -287 724 -243T803 -125Q803 -62 754 -41T602 -20H461Q434 -20 403 -26T346 -49T303
+-91T285 -158ZM395 752Q395 661 429 611T532 561Q604 561 636 611T668 752Q668 842 637 895T532 948Q395 948 395 752Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 788 834T672 895Q613 895 573 871T509 800T475 684T465 526V0H160V1556H465V1239Q465 1197 463 1151T458 1065Q454 1019 451 975H467Q516 1062 592 1100T764 1139Q847 1139 914
+1116T1030 1042T1104 915T1130 729V0Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="625" d="M147 1407Q147 1450 160 1478T195 1524T248 1549T313 1556Q347 1556 377 1549T429 1525T465 1479T479 1407Q479 1365 466 1336T430 1290T377 1265T313 1257Q279 1257 249 1264T196 1289T160 1336T147 1407ZM465
+0H160V1118H465V0Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="625" d="M102 -492Q54 -492 3 -485T-82 -467V-227Q-51 -237 -24 -241T37 -246Q62 -246 84 -239T123 -212T150 -160T160 -76V1118H465V-121Q465 -198 446 -265T383 -383T270 -463T102 -492ZM147 1407Q147 1450 160
+1478T195 1524T248 1549T313 1556Q347 1556 377 1549T429 1525T465 1479T479 1407Q479 1365 466 1336T430 1290T377 1265T313 1257Q279 1257 249 1264T196 1289T160 1336T147 1407Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="1208" d="M453 608L565 778L838 1118H1182L778 633L1208 0H856L584 430L465 348V0H160V1556H465V862L449 608H453Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="625" d="M465 0H160V1556H465V0Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="1929" d="M1120 0H815V653Q815 774 779 834T666 895Q608 895 570 871T508 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 508 1049T582 1100T667 1129T758 1139Q873 1139 953 1100T1077 975H1102Q1126
+1018 1160 1049T1235 1100T1321 1129T1413 1139Q1593 1139 1684 1042T1776 729V0H1470V653Q1470 774 1434 834T1321 895Q1212 895 1166 809T1120 561V0Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 789 834T672 895Q612 895 572 871T509 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 509 1049T585 1100T672 1129T766 1139Q848 1139 915 1116T1030 1042T1104
+915T1130 729V0Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246 131T140 313T102
+561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="1245" d="M748 -20Q693 -20 650 -8T572 24T512 69T465 123H449Q453 88 457 57Q460 31 462 4T465 -39V-492H160V1118H408L451 973H465Q486 1007 513 1037T575 1089T656 1125T756 1139Q843 1139 914 1102T1036 992T1115
+811T1143 561Q1143 418 1114 310T1033 128T908 17T748 -20ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="1245" d="M602 219Q657 219 694 237T755 293T789 386T801 518V555Q801 636 792 699T759 804T697 869T600 891Q504 891 459 805T414 553Q414 385 459 302T602 219ZM489 -20Q402 -20 331 17T209 126T130 307T102
+557Q102 700 130 808T211 990T337 1101T498 1139Q554 1139 599 1127T680 1092T745 1040T795 975H803L827 1118H1085V-492H780V-23Q780 -4 782 24T787 80Q790 112 793 145H780Q760 111 733 81T671 28T590 -7T489 -20Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="889" d="M743 1139Q755 1139 769 1139T797 1137T822 1134T840 1130V844Q832 846 818 848T789 851T758 853T733 854Q674 854 625 839T540 791T485 703T465 569V0H160V1118H391L436 950H451Q475 993 503 1028T565
+1087T643 1125T743 1139Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="985" d="M905 332Q905 244 873 178T782 68T639 2T451 -20Q396 -20 349 -17T260 -5T179 15T100 45V297Q142 276 188 259T281 230T370 210T451 203Q492 203 521 210T568 231T595 263T604 303Q604 324 598 340T568
+375T501 417T381 475Q308 508 255 540T167 613T115 704T98 827Q98 905 128 963T213 1061T345 1119T518 1139Q618 1139 708 1116T893 1047L801 831Q725 867 656 890T518 913Q456 913 429 891T401 831Q401 811 408 796T436 764T495 728T594 680Q665 649 722 619T820
+549T883 458T905 332Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="848" d="M614 223Q659 223 699 233T782 258V31Q739 9 676 -5T537 -20Q464 -20 401 -3T292 56T220 170T193 350V889H47V1018L215 1120L303 1356H498V1118H770V889H498V350Q498 285 530 254T614 223Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="1104" d="M395 0L0 1118H319L504 481Q521 424 533 363T549 252H555Q558 305 570 364T600 481L784 1118H1104L709 0H395Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="1651" d="M1014 0L928 391Q924 408 918 439T903 510T887 594T869 683Q849 786 825 905H819Q796 786 777 682Q769 638 761 593T744 509T730 437T719 387L629 0H301L0 1118H303L416 623Q425 584 434 530T452 420T468
+315T479 236H485Q486 255 489 285T498 351T508 422T519 491T529 547T537 582L659 1118H995L1112 582Q1117 560 1125 514T1141 416T1156 314T1163 236H1169Q1172 261 1179 310T1196 415T1215 528T1235 623L1352 1118H1651L1346 0H1014Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="1122" d="M389 571L29 1118H375L561 782L750 1118H1096L731 571L1112 0H766L561 362L356 0H10L389 571Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91 -238 123 -242T190
+-246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="936" d="M877 0H55V180L512 885H86V1118H858V920L416 233H877V0Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="745" d="M287 367T222 408T31 449V688Q93 688 141 697T223 728T272 784T287 866V1184Q287 1258 306 1310T374 1396T509 1446T725 1462V1237Q685 1236 653 1230T598 1209T563 1166T551 1096V797Q545 610
+317 575V563Q432 546 493 491T551 342V43Q551 0 563 -27T597 -69T652 -91T725 -98V-324Q594 -324 509 -308T375 -259T306 -172T287 -45V270Q287 367 222 408Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M455 1550H674V-465H455V1550Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="745" d="M469 -45Q469 -119 450 -172T382 -258T247 -308T31 -324V-98Q71 -97 103 -91T157 -70T192 -27T205 43V342Q202 436 263 491T438 563V575Q211 610 205 797V1096Q205 1139 193 1166T158 1208T103
+1230T31 1237V1462Q162 1462 247 1446T381 1397T450 1311T469 1184V866Q468 818 484 784T533 729T614 698T725 688V449Q600 449 535 408T469 270V-45Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1128" d="M528 616Q491 632 463 643T411 660T366 669T322 672Q293 672 262 663T201 637T143 598T88 551V782Q139 836 202 863T344 891Q374 891 399 889T453 879T517 860T600 827Q638 811 666 801T719
+784T764 775T807 772Q836 772 867 781T928 807T986 845T1040 893V662Q939 553 784 553Q754 553 729 555T675 564T611 583T528 616Z" />
+<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="586" d="M168 606H412L463 -369H117L168 606ZM467 948Q467 901 454 869T416 816T360 787T291 778Q256 778 225 787T169 816T131 868T117 948Q117 993 131 1025T169 1078T224 1108T291 1118Q328 1118
+360 1109T416 1079T453 1026T467 948Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1128" d="M543 -20V186Q451 199 377 236T251 340T171 506T143 743Q143 884 171 985T251 1155T378 1260T543 1311V1483H721V1319Q759 1318 797 1313T870 1299T937 1281T993 1260L907 1034Q886 1044 860
+1053T805 1070T750 1082T698 1087Q632 1087 586 1067T511 1006T468 901T455 750Q455 579 512 500T698 420Q774 420 844 438T965 481V242Q914 213 852 198T721 180V-20H543Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1128" d="M680 1483Q790 1483 879 1459T1049 1401L956 1171Q885 1200 827 1217T705 1235Q638 1235 601 1197T563 1063V870H897V651H563V508Q563 453 550 413T514 343T466 294T412 260H1090V0H82V248Q124
+266 157 287T214 337T250 407T262 506V651H84V870H262V1065Q262 1178 293 1257T380 1387T512 1460T680 1483Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1128" d="M168 723Q168 777 182 826T221 920L92 1047L240 1194L367 1067Q410 1092 461 1106T563 1120Q617 1120 665 1107T760 1065L887 1194L1036 1051L907 922Q932 880 946 829T961 723Q961 667 947
+618T907 524L1032 399L887 254L760 379Q716 356 667 342T563 328Q507 328 458 340T365 379L240 256L94 401L221 526Q168 617 168 723ZM375 723Q375 684 390 650T430 590T490 550T563 535Q603 535 638 549T699 589T741 649T756 723Q756 763 741 797T700 857T638
+898T563 913Q524 913 490 898T431 858T390 798T375 723Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1128" d="M565 860L809 1462H1122L760 715H954V537H709V399H954V221H709V0H422V221H174V399H422V537H174V715H365L8 1462H324L565 860Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M455 1550H674V735H455V1550ZM455 350H674V-465H455V350Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="995" d="M121 805Q121 849 131 886T160 955T203 1012T254 1055Q191 1095 156 1154T121 1288Q121 1353 150 1406T232 1498T360 1556T526 1577Q628 1577 716 1554T889 1493L807 1303Q739 1335 669 1360T520
+1386Q439 1386 402 1363T365 1292Q365 1267 377 1246T415 1206T481 1167T578 1124Q649 1096 707 1062T807 987T872 895T895 782Q895 682 861 621T770 522Q832 482 863 430T895 303Q895 229 864 170T776 68T638 3T455 -20Q345 -20 261 0T106 59V266Q145 246 190
+229T281 198T371 176T455 168Q511 168 548 177T607 202T639 239T649 285Q649 310 642 329T612 368T549 408T442 457Q366 489 306 521T205 593T143 685T121 805ZM344 827Q344 764 400 716T575 616L590 610Q605 621 619 635T644 668T661 708T668 756Q668 788 658
+815T621 867T550 917T434 967Q416 960 400 947T372 915T352 875T344 827Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1182" d="M248 1405Q248 1440 259 1465T288 1507T332 1532T387 1540Q416 1540 441 1532T486 1508T516 1466T528 1405Q528 1371 517 1346T486 1305T442 1280T387 1272Q358 1272 333 1280T289 1304T259
+1346T248 1405ZM651 1405Q651 1440 662 1465T692 1507T737 1532T793 1540Q821 1540 846 1532T891 1508T922 1466T934 1405Q934 1371 923 1346T892 1305T847 1280T793 1272Q733 1272 692 1305T651 1405Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M895 1010Q798 1010 745 936T692 731Q692 596 740 524T895 451Q952 451 1018 466T1141 510V319Q1084 292 1025 277T889 262Q782 262 702 296T569 392T488 540T461 733Q461 836 487 921T565
+1068T697 1164T881 1198Q964 1198 1041 1176T1186 1120L1112 952Q999 1010 895 1010ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384
+200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM242 731Q242 604 290 493T420 300T614 169T852 121Q979 121 1090 169T1283 299T1414 493T1462 731Q1462 858 1414 969T1284 1162T1090 1293T852 1341Q725 1341 614 1293T421
+1163T290 969T242 731Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="743" d="M520 764L489 874Q449 816 393 784T268 752Q218 752 178 765T108 806T63 876T47 975Q47 1035 68 1076T130 1144T230 1184T365 1202L455 1206Q455 1269 426 1296T342 1323Q302 1323 253
+1306T152 1262L86 1397Q148 1429 222 1454T387 1479Q455 1479 505 1460T589 1405T638 1319T655 1206V764H520ZM373 1081Q335 1078 312 1068T275 1044T257 1012T252 977Q252 939 271 921T317 903Q349 903 374 914T418 944T445 991T455 1051V1087L373 1081Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="1198" d="M82 573L391 1028L610 909L393 561L610 213L391 94L82 547V573ZM588 573L897 1028L1116 909L899 561L1116 213L897 94L588 547V573Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1128" d="M1040 248H821V612H88V831H1040V248Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M61 424V674H598V424H61Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M1157 905Q1157 811 1119 756T1014 672L1251 272H997L819 610H772V272H543V1188H807Q989 1188 1073 1118T1157 905ZM772 778H803Q869 778 897 806T926 901Q926 936 919 959T896 995T857
+1014T801 1020H772V778ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384 200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320
+199T203 351T127 531T100 731ZM242 731Q242 604 290 493T420 300T614 169T852 121Q979 121 1090 169T1283 299T1414 493T1462 731Q1462 858 1414 969T1284 1162T1090 1293T852 1341Q725 1341 614 1293T421 1163T290 969T242 731Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1757H1030V1556Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M92 1137Q92 1208 119 1271T193 1381T303 1455T438 1483Q510 1483 573 1456T683 1381T757 1271T784 1137Q784 1065 757 1002T684 893T574 820T438 793Q366 793 303 819T193 892T119 1002T92
+1137ZM283 1137Q283 1106 295 1078T328 1029T377 996T438 983Q470 983 498 995T548 1029T581 1078T594 1137Q594 1169 582 1197T548 1247T499 1281T438 1294Q406 1294 378 1282T328 1248T295 1198T283 1137Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1128" d="M455 674H88V893H455V1262H674V893H1040V674H674V309H455V674ZM88 0V219H1040V0H88Z" />
+<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="776" d="M702 586H55V754L279 973Q325 1018 355 1051T404 1111T430 1161T438 1212Q438 1250 414 1270T350 1290Q310 1290 267 1270T170 1202L47 1354Q112 1411 193 1447T383 1483Q449 1483 503
+1467T596 1419T656 1341T678 1233Q678 1187 666 1147T626 1065T557 980T455 881L350 786H702V586Z" />
+<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="776" d="M666 1249Q666 1180 626 1130T496 1051V1038Q547 1028 584 1007T645 959T682 898T694 829Q694 708 606 639T332 569Q256 569 190 586T59 639V829Q125 789 191 764T330 739Q404 739 438
+766T473 846Q473 867 465 886T438 919T387 943T307 952H195V1112H287Q339 1112 371 1121T421 1145T445 1180T451 1221Q451 1259 426 1284T350 1309Q303 1309 261 1290T162 1231L61 1372Q123 1419 198 1450T377 1481Q439 1481 492 1465T583 1418T644 1345T666 1249Z"
+/>
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1182" d="M332 1241V1268Q353 1297 377 1335T424 1413T469 1494T506 1569H848V1548Q837 1530 816 1506T768 1453T710 1396T648 1338T587 1285T535 1241H332Z" />
+<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1290" d="M465 465Q465 344 502 284T621 223Q679 223 718 247T781 318T815 434T825 592V1118H1130V0H897L854 150H842Q807 65 755 23T627 -20Q573 -20 528 3T455 70Q457 28 460 -15Q462 -52 463 -94T465
+-172V-492H160V1118H465V465Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1167 -260H1006V1356H840V-260H678V559Q617 541 532 541Q437 541 360 566T228 651T143 806T113 1042Q113 1189 145 1287T237 1446T380 1531T563 1556H1167V-260Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="584" d="M117 723Q117 770 130 802T168 855T224 884T293 893Q328 893 359 884T415 855T453 803T467 723Q467 678 453 646T415 593T360 563T293 553Q256 553 224 562T168 592T131 645T117 723Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="420" d="M418 -250Q418 -307 403 -352T351 -428T256 -475T109 -492Q64 -492 28 -486T-37 -471V-303Q-22 -307 -4 -310T34 -317T72 -322T106 -324Q135 -324 156 -311T178 -262Q178 -225 141 -197T12
+-154L90 0H283L256 -61Q287 -71 316 -88T367 -128T404 -182T418 -250Z" />
+<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="776" d="M584 586H346V1032Q346 1052 346 1082T348 1144T351 1201T354 1239Q348 1231 339 1221T319 1199T298 1178T279 1161L201 1100L92 1227L393 1462H584V586Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="754" d="M696 1116Q696 1029 674 962T609 848T508 777T375 752Q306 752 248 776T147 847T81 961T57 1116Q57 1203 79 1270T143 1384T244 1455T379 1479Q447 1479 504 1455T605 1385T672 1271T696
+1116ZM260 1116Q260 1016 287 966T377 915Q437 915 464 965T492 1116Q492 1216 465 1265T377 1315Q315 1315 288 1266T260 1116Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="1198" d="M1118 547L809 94L590 213L807 561L590 909L809 1028L1118 573V547ZM612 547L303 94L84 213L301 561L84 909L303 1028L612 573V547Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1804" d="M1370 1462L559 0H320L1131 1462H1370ZM794 586H556V1032Q556 1052 556 1082T558 1144T561 1201T564 1239Q558 1231 549 1221T529 1199T508 1178T489 1161L411 1100L302 1227L603 1462H794V586ZM1682
+152H1557V1H1319V152H936V306L1321 883H1557V320H1682V152ZM1319 320V484Q1319 526 1320 572T1325 668Q1320 655 1311 634T1290 590T1268 546T1248 511L1121 320H1319Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1804" d="M1370 1462L559 0H320L1131 1462H1370ZM794 586H556V1032Q556 1052 556 1082T558 1144T561 1201T564 1239Q558 1231 549 1221T529 1199T508 1178T489 1161L411 1100L302 1227L603 1462H794V586ZM1716
+1H1069V169L1293 388Q1339 433 1369 466T1418 526T1444 576T1452 627Q1452 665 1428 685T1364 705Q1324 705 1281 685T1184 617L1061 769Q1126 826 1207 862T1397 898Q1463 898 1517 882T1610 834T1670 756T1692 648Q1692 602 1680 562T1640 480T1571 395T1469
+296L1364 201H1716V1Z" />
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1804" d="M1441 1462L630 0H391L1202 1462H1441ZM1712 152H1587V1H1349V152H966V306L1351 883H1587V320H1712V152ZM1349 320V484Q1349 526 1350 572T1355 668Q1350 655 1341 634T1320 590T1298
+546T1278 511L1151 320H1349ZM697 1249Q697 1180 657 1130T527 1051V1038Q578 1028 615 1007T676 959T713 898T725 829Q725 708 637 639T363 569Q287 569 221 586T90 639V829Q156 789 222 764T361 739Q435 739 469 766T504 846Q504 867 496 886T469 919T418 943T338
+952H226V1112H318Q370 1112 402 1121T452 1145T476 1180T482 1221Q482 1259 457 1284T381 1309Q334 1309 292 1290T193 1231L92 1372Q154 1419 229 1450T408 1481Q470 1481 523 1465T614 1418T675 1345T697 1249Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="940" d="M686 606V532Q686 481 676 440T644 361T588 288T506 215Q464 182 435 156T388 105T362 51T354 -14Q354 -71 393 -108T510 -145Q579 -145 659 -116T823 -45L926 -266Q883 -292 832 -314T727
+-354T616 -381T506 -391Q404 -391 323 -367T184 -296T97 -182T66 -29Q66 34 79 83T121 175T190 258T287 342Q328 375 354 399T396 446T416 492T422 547V606H686ZM719 948Q719 901 706 869T668 816T612 787T543 778Q508 778 477 787T421 816T383 868T369 948Q369
+993 383 1025T421 1078T476 1108T543 1118Q580 1118 612 1109T668 1079T705 1026T719 948Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
+608H846ZM632 1579Q598 1607 551 1648T457 1734T373 1818T319 1886V1907H661Q677 1873 698 1833T743 1752T790 1673T835 1606V1579H632Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
+608H846ZM494 1579V1606Q515 1635 539 1673T586 1751T631 1832T668 1907H1010V1886Q999 1868 978 1844T930 1791T872 1734T810 1676T749 1623T697 1579H494Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582
+928L489 608H846ZM879 1579Q828 1613 773 1656T666 1755Q612 1699 560 1656T457 1579H254V1606Q280 1635 311 1673T375 1751T438 1832T490 1907H846Q867 1873 897 1833T959 1752T1024 1673T1082 1606V1579H879Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
+608H846ZM504 1684Q473 1684 455 1658T424 1577H275Q281 1657 301 1715T353 1811T430 1867T527 1886Q568 1886 607 1870T684 1835T760 1799T834 1782Q865 1782 883 1808T914 1888H1063Q1057 1809 1037 1751T983 1655T907 1598T811 1579Q771 1579 731 1595T653 1631T578
+1667T504 1684Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
+608H846ZM324 1743Q324 1778 335 1803T364 1845T408 1870T463 1878Q492 1878 517 1870T562 1846T592 1804T604 1743Q604 1709 593 1684T562 1643T518 1618T463 1610Q434 1610 409 1618T365 1642T335 1684T324 1743ZM727 1743Q727 1778 738 1803T768 1845T813 1870T869
+1878Q897 1878 922 1870T967 1846T998 1804T1010 1743Q1010 1709 999 1684T968 1643T923 1618T869 1610Q809 1610 768 1643T727 1743Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1331" d="M1018 0L918 348H414L313 0H0L475 1468H854L1331 0H1018ZM846 608L752 928Q746 946 734 987T709 1077T683 1177T666 1262Q662 1240 656 1210T641 1147T623 1079T606 1015T592 962T582 928L489
+608H846ZM918 1567Q918 1511 899 1467T845 1391T764 1344T664 1327Q609 1327 563 1343T485 1390T434 1465T416 1565Q416 1620 434 1664T484 1738T563 1785T664 1802Q717 1802 763 1786T843 1739T898 1665T918 1567ZM760 1565Q760 1610 733 1635T664 1661Q622 1661
+595 1636T568 1565Q568 1520 592 1494T664 1468Q706 1468 733 1494T760 1565Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1888" d="M1767 0H926V348H465L315 0H0L655 1462H1767V1208H1235V887H1731V633H1235V256H1767V0ZM578 608H926V1198H829L578 608Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1305" d="M805 1225Q716 1225 648 1191T533 1092T462 935T438 727Q438 610 459 519T525 366T639 271T805 238Q894 238 983 258T1178 315V55Q1130 35 1083 21T987 -2T887 -15T776 -20Q607 -20 483 34T278
+186T158 422T119 729Q119 895 164 1033T296 1272T511 1427T805 1483Q914 1483 1023 1456T1233 1380L1133 1128Q1051 1167 968 1196T805 1225ZM926 -250Q926 -307 911 -352T859 -428T764 -475T617 -492Q572 -492 536 -486T471 -471V-303Q486 -307 504 -310T542 -317T580
+-322T614 -324Q643 -324 664 -311T686 -262Q686 -225 649 -197T520 -154L598 0H791L764 -61Q795 -71 824 -88T875 -128T912 -182T926 -250Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM572 1579Q538 1607 491 1648T397 1734T313 1818T259 1886V1907H601Q617 1873 638 1833T683 1752T730 1673T775 1606V1579H572Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM424 1579V1606Q445 1635 469 1673T516 1751T561 1832T598 1907H940V1886Q929 1868 908 1844T860 1791T802 1734T740 1676T679
+1623T627 1579H424Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM832 1579Q781 1613 726 1656T619 1755Q565 1699 513 1656T410 1579H207V1606Q233 1635 264 1673T328 1751T391 1832T443
+1907H799Q820 1873 850 1833T912 1752T977 1673T1035 1606V1579H832Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1147" d="M1026 0H184V1462H1026V1208H494V887H989V633H494V256H1026V0ZM273 1743Q273 1778 284 1803T313 1845T357 1870T412 1878Q441 1878 466 1870T511 1846T541 1804T553 1743Q553 1709 542 1684T511
+1643T467 1618T412 1610Q383 1610 358 1618T314 1642T284 1684T273 1743ZM676 1743Q676 1778 687 1803T717 1845T762 1870T818 1878Q846 1878 871 1870T916 1846T947 1804T959 1743Q959 1709 948 1684T917 1643T872 1618T818 1610Q758 1610 717 1643T676 1743Z"
+/>
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM355 1579Q321 1607 274 1648T180 1734T96 1818T42 1886V1907H384Q400 1873 421 1833T466 1752T513 1673T558 1606V1579H355Z"
+/>
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM237 1579V1606Q258 1635 282 1673T329 1751T374 1832T411 1907H753V1886Q742 1868 721 1844T673 1791T615 1734T553
+1676T492 1623T440 1579H237Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM609 1579Q558 1613 503 1656T396 1755Q342 1699 290 1656T187 1579H-16V1606Q10 1635 41 1673T105 1751T168
+1832T220 1907H576Q597 1873 627 1833T689 1752T754 1673T812 1606V1579H609Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="797" d="M731 0H66V176L244 258V1204L66 1286V1462H731V1286L553 1204V258L731 176V0ZM54 1743Q54 1778 65 1803T94 1845T138 1870T193 1878Q222 1878 247 1870T292 1846T322 1804T334 1743Q334 1709
+323 1684T292 1643T248 1618T193 1610Q164 1610 139 1618T95 1642T65 1684T54 1743ZM457 1743Q457 1778 468 1803T498 1845T543 1870T599 1878Q627 1878 652 1870T697 1846T728 1804T740 1743Q740 1709 729 1684T698 1643T653 1618T599 1610Q539 1610 498 1643T457
+1743Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1434" d="M47 850H184V1462H612Q773 1462 902 1416T1124 1280T1265 1055T1315 745Q1315 560 1265 421T1119 188T885 47T569 0H184V596H47V850ZM1001 737Q1001 859 977 947T906 1094T792 1180T637 1208H494V850H731V596H494V256H608Q804
+256 902 376T1001 737Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1604" d="M1419 0H1026L451 1106H442Q448 1029 452 953Q456 888 458 817T461 688V0H184V1462H575L1149 367H1155Q1152 443 1148 517Q1147 549 1146 582T1143 649T1142 714T1141 770V1462H1419V0ZM623
+1684Q592 1684 574 1658T543 1577H394Q400 1657 420 1715T472 1811T549 1867T646 1886Q687 1886 726 1870T803 1835T879 1799T953 1782Q984 1782 1002 1808T1033 1888H1182Q1176 1809 1156 1751T1102 1655T1026 1598T930 1579Q890 1579 850 1595T772 1631T697 1667T623
+1684Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
+733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM729 1579Q695 1607 648 1648T554 1734T470 1818T416 1886V1907H758Q774
+1873 795 1833T840 1752T887 1673T932 1606V1579H729Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
+733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM590 1579V1606Q611 1635 635 1673T682 1751T727 1832T764 1907H1106V1886Q1095
+1868 1074 1844T1026 1791T968 1734T906 1676T845 1623T793 1579H590Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390
+1043T1430 733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM975 1579Q924 1613 869 1656T762 1755Q708 1699
+656 1656T553 1579H350V1606Q376 1635 407 1673T471 1751T534 1832T586 1907H942Q963 1873 993 1833T1055 1752T1120 1673T1178 1606V1579H975Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
+733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM612 1684Q581 1684 563 1658T532 1577H383Q389 1657 409 1715T461
+1811T538 1867T635 1886Q676 1886 715 1870T792 1835T868 1799T942 1782Q973 1782 991 1808T1022 1888H1171Q1165 1809 1145 1751T1091 1655T1015 1598T919 1579Q879 1579 839 1595T761 1631T686 1667T612 1684Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q606 -20 483 34T279 187T159 425T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q944 1485 1067 1432T1270 1280T1390 1043T1430
+733ZM438 733Q438 618 458 527T519 372T624 274T774 240Q863 240 926 274T1030 371T1090 526T1110 733Q1110 848 1091 939T1031 1095T927 1193T776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM428 1743Q428 1778 439 1803T468 1845T512 1870T567 1878Q596
+1878 621 1870T666 1846T696 1804T708 1743Q708 1709 697 1684T666 1643T622 1618T567 1610Q538 1610 513 1618T469 1642T439 1684T428 1743ZM831 1743Q831 1778 842 1803T872 1845T917 1870T973 1878Q1001 1878 1026 1870T1071 1846T1102 1804T1114 1743Q1114
+1709 1103 1684T1072 1643T1027 1618T973 1610Q913 1610 872 1643T831 1743Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1128" d="M408 723L109 1024L260 1178L561 879L866 1178L1020 1028L715 723L1016 420L866 268L561 569L260 270L111 422L408 723Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1548" d="M1430 733Q1430 564 1391 425T1270 187T1066 34T774 -20Q595 -20 467 41L395 -76L227 18L309 152Q212 252 166 400T119 735Q119 905 158 1043T279 1280T483 1431T776 1485Q867 1485 944 1469T1087
+1421L1157 1532L1323 1436L1243 1307Q1337 1208 1383 1063T1430 733ZM438 733Q438 553 485 438L942 1184Q873 1227 776 1227Q689 1227 625 1193T520 1095T458 940T438 733ZM1110 733Q1110 904 1067 1020L612 279Q646 260 686 250T774 240Q863 240 926 274T1030
+371T1090 526T1110 733Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM706
+1579Q672 1607 625 1648T531 1734T447 1818T393 1886V1907H735Q751 1873 772 1833T817 1752T864 1673T909 1606V1579H706Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM570
+1579V1606Q591 1635 615 1673T662 1751T707 1832T744 1907H1086V1886Q1075 1868 1054 1844T1006 1791T948 1734T886 1676T825 1623T773 1579H570Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM942
+1579Q891 1613 836 1656T729 1755Q675 1699 623 1656T520 1579H317V1606Q343 1635 374 1673T438 1751T501 1832T553 1907H909Q930 1873 960 1833T1022 1752T1087 1673T1145 1606V1579H942Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1466" d="M1292 1462V516Q1292 402 1258 304T1153 134T976 21T727 -20Q592 -20 489 18T316 128T210 298T174 520V1462H483V543Q483 462 499 405T546 311T625 257T735 240Q866 240 924 316T983 545V1462H1292ZM393
+1743Q393 1778 404 1803T433 1845T477 1870T532 1878Q561 1878 586 1870T631 1846T661 1804T673 1743Q673 1709 662 1684T631 1643T587 1618T532 1610Q503 1610 478 1618T434 1642T404 1684T393 1743ZM796 1743Q796 1778 807 1803T837 1845T882 1870T938 1878Q966
+1878 991 1870T1036 1846T1067 1804T1079 1743Q1079 1709 1068 1684T1037 1643T992 1618T938 1610Q878 1610 837 1643T796 1743Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1196" d="M598 860L862 1462H1196L752 569V0H444V559L0 1462H336L598 860ZM422 1579V1606Q443 1635 467 1673T514 1751T559 1832T596 1907H938V1886Q927 1868 906 1844T858 1791T800 1734T738 1676T677
+1623T625 1579H422Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1225" d="M1133 770Q1133 676 1108 590T1024 438T870 333T633 293H494V0H184V1462H494V1233H655Q779 1233 869 1200T1017 1107T1104 961T1133 770ZM494 543H578Q699 543 759 595T819 770Q819 878 766
+929T598 981H494V543Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1395" d="M1188 1241Q1188 1177 1167 1129T1114 1042T1045 975T976 922T923 877T901 834Q901 814 913 797T952 760T1020 715T1118 651Q1167 620 1205 588T1269 517T1309 432T1323 326Q1323 154 1206
+67T862 -20Q764 -20 692 -6T559 43V285Q583 269 617 254T690 226T768 207T842 199Q922 199 966 229T1010 322Q1010 349 1003 370T976 412T918 457T821 516Q758 552 716 584T647 647T609 713T598 788Q598 841 618 880T670 950T737 1007T805 1059T856 1117T877 1188Q877
+1251 827 1290T680 1329Q572 1329 519 1281T465 1128V0H160V1139Q160 1248 197 1328T302 1462T467 1541T680 1567Q795 1567 889 1546T1049 1483T1152 1380T1188 1241Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
+1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM808 1241Q774 1269 727 1310T633 1396T549 1480T495 1548V1569H837Q853
+1535 874 1495T919 1414T966 1335T1011 1268V1241H808Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
+1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM441 1241V1268Q462 1297 486 1335T533 1413T578 1494T615
+1569H957V1548Q946 1530 925 1506T877 1453T819 1396T757 1338T696 1285T644 1241H441Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289
+838L190 1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM801 1496Q750 1530 695 1573T588 1672Q534 1616
+482 1573T379 1496H176V1523Q202 1552 233 1590T297 1668T360 1749T412 1824H768Q789 1790 819 1750T881 1669T946 1590T1004 1523V1496H801Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
+1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM681 1346Q650 1346 632 1320T601 1239H452Q458 1319 478
+1377T530 1473T607 1529T704 1548Q745 1548 784 1532T861 1497T937 1461T1011 1444Q1042 1444 1060 1470T1091 1550H1240Q1234 1471 1214 1413T1160 1317T1084 1260T988 1241Q948 1241 908 1257T830 1293T755 1329T681 1346Z" />
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289
+838L190 1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM254 1405Q254 1440 265 1465T294 1507T338 1532T393
+1540Q422 1540 447 1532T492 1508T522 1466T534 1405Q534 1371 523 1346T492 1305T448 1280T393 1272Q364 1272 339 1280T295 1304T265 1346T254 1405ZM657 1405Q657 1440 668 1465T698 1507T743 1532T799 1540Q827 1540 852 1532T897 1508T928 1466T940 1405Q940
+1371 929 1346T898 1305T853 1280T799 1272Q739 1272 698 1305T657 1405Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1176" d="M809 0L750 152H741Q708 107 675 75T603 21T516 -10T403 -20Q335 -20 277 1T177 66T110 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427 894T289 838L190
+1040Q274 1087 376 1114T590 1141Q799 1141 910 1043T1022 745V0H809ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM842 1479Q842 1423 823 1379T769 1303T688 1256T588 1239Q533
+1239 487 1255T409 1302T358 1377T340 1477Q340 1532 358 1576T408 1650T487 1697T588 1714Q641 1714 687 1698T767 1651T822 1577T842 1479ZM684 1477Q684 1522 657 1547T588 1573Q546 1573 519 1548T492 1477Q492 1432 516 1406T588 1380Q630 1380 657 1406T684
+1477Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1806" d="M1268 -20Q1137 -20 1030 30T854 186Q811 132 769 94T678 30T568 -8T424 -20Q356 -20 295 1T187 66T113 176T86 334Q86 512 200 596T541 690L719 696V780Q719 849 679 882T567 915Q495 915 427
+894T289 838L190 1040Q274 1087 376 1114T590 1141Q804 1141 913 1010Q1039 1139 1227 1139Q1338 1139 1427 1106T1579 1007T1674 848T1708 631V483H1026Q1028 419 1046 368T1098 281T1179 226T1288 207Q1382 207 1469 228T1645 295V59Q1605 38 1565 24T1479 -1T1382
+-15T1268 -20ZM719 518L618 514Q557 512 515 498T448 461T411 405T399 332Q399 262 433 233T522 203Q564 203 600 217T662 260T704 330T719 426V518ZM1229 922Q1147 922 1094 865T1032 686H1421Q1420 737 1408 780T1373 854T1313 904T1229 922Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="1022" d="M625 -20Q505 -20 409 13T244 115T139 293T102 553Q102 720 139 832T245 1013T410 1110T625 1139Q711 1139 796 1118T956 1059L868 827Q802 856 741 874T625 893Q514 893 464 809T414 555Q414
+387 464 307T621 227Q708 227 779 249T924 307V53Q887 35 852 21T782 -2T708 -15T625 -20ZM778 -250Q778 -307 763 -352T711 -428T616 -475T469 -492Q424 -492 388 -486T323 -471V-303Q338 -307 356 -310T394 -317T432 -322T466 -324Q495 -324 516 -311T538 -262Q538
+-225 501 -197T372 -154L450 0H643L616 -61Q647 -71 676 -88T727 -128T764 -182T778 -250Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
+810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM834 1241Q800 1269 753 1310T659 1396T575 1480T521 1548V1569H863Q879 1535 900
+1495T945 1414T992 1335T1037 1268V1241H834Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
+810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM447 1241V1268Q468 1297 492 1335T539 1413T584 1494T621 1569H963V1548Q952 1530
+931 1506T883 1453T825 1396T763 1338T702 1285T650 1241H447Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721
+1139 810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM819 1241Q768 1275 713 1318T606 1417Q552 1361 500 1318T397 1241H194V1268Q220
+1297 251 1335T315 1413T378 1494T430 1569H786Q807 1535 837 1495T899 1414T964 1335T1022 1268V1241H819Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1190" d="M612 922Q531 922 478 865T416 686H805Q804 737 792 780T756 854T696 904T612 922ZM651 -20Q531 -20 430 15T256 120T143 298T102 551Q102 698 139 808T242 991T402 1102T610 1139Q721 1139
+810 1106T962 1007T1058 848T1092 631V483H410Q412 419 430 368T482 281T563 226T672 207Q723 207 768 212T857 229T942 256T1028 295V59Q988 38 948 24T862 -1T765 -15T651 -20ZM266 1405Q266 1440 277 1465T306 1507T350 1532T405 1540Q434 1540 459 1532T504
+1508T534 1466T546 1405Q546 1371 535 1346T504 1305T460 1280T405 1272Q376 1272 351 1280T307 1304T277 1346T266 1405ZM669 1405Q669 1440 680 1465T710 1507T755 1532T811 1540Q839 1540 864 1532T909 1508T940 1466T952 1405Q952 1371 941 1346T910 1305T865
+1280T811 1272Q751 1272 710 1305T669 1405Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM269 1241Q235 1269 188 1310T94 1396T10 1480T-44 1548V1569H298Q314 1535 335 1495T380 1414T427 1335T472 1268V1241H269Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM145 1241V1268Q166 1297 190 1335T237 1413T282 1494T319 1569H661V1548Q650 1530 629 1506T581 1453T523 1396T461 1338T400 1285T348 1241H145Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM521 1241Q470 1275 415 1318T308 1417Q254 1361 202 1318T99 1241H-104V1268Q-78 1297 -47 1335T17 1413T80 1494T132 1569H488Q509 1535 539 1495T601 1414T666
+1335T724 1268V1241H521Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="625" d="M465 0H160V1118H465V0ZM-32 1405Q-32 1440 -21 1465T8 1507T52 1532T107 1540Q136 1540 161 1532T206 1508T236 1466T248 1405Q248 1371 237 1346T206 1305T162 1280T107 1272Q78 1272 53
+1280T9 1304T-21 1346T-32 1405ZM371 1405Q371 1440 382 1465T412 1507T457 1532T513 1540Q541 1540 566 1532T611 1508T642 1466T654 1405Q654 1371 643 1346T612 1305T567 1280T513 1272Q453 1272 412 1305T371 1405Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1182" d="M457 1309Q423 1330 384 1354T303 1401L399 1571Q472 1537 536 1503T657 1430L883 1569L983 1415L809 1309Q881 1240 935 1162T1024 993T1078 798T1096 573Q1096 431 1060 321T957 135T795 20T582
+-20Q471 -20 378 14T218 113T112 272T74 489Q74 611 106 705T197 863T337 961T516 995Q612 995 680 964T780 883L801 885Q773 973 723 1050T606 1184L375 1040L274 1196L457 1309ZM784 532Q784 579 773 622T737 698T675 750T586 770Q478 770 432 700T385 487Q385
+424 396 372T432 283T495 226T586 205Q692 205 738 286T784 532Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1284" d="M1130 0H825V653Q825 774 789 834T672 895Q612 895 572 871T509 800T475 684T465 526V0H160V1118H393L434 975H451Q475 1018 509 1049T585 1100T672 1129T766 1139Q848 1139 915 1116T1030
+1042T1104 915T1130 729V0ZM477 1346Q446 1346 428 1320T397 1239H248Q254 1319 274 1377T326 1473T403 1529T500 1548Q541 1548 580 1532T657 1497T733 1461T807 1444Q838 1444 856 1470T887 1550H1036Q1030 1471 1010 1413T956 1317T880 1260T784 1241Q744 1241
+704 1257T626 1293T551 1329T477 1346Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
+131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM841 1241Q807 1269 760 1310T666 1396T582 1480T528 1548V1569H870Q886 1535 907 1495T952 1414T999 1335T1044 1268V1241H841Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
+131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM434 1241V1268Q455 1297 479 1335T526 1413T571 1494T608 1569H950V1548Q939 1530 918 1506T870 1453T812 1396T750 1338T689 1285T637 1241H434Z"
+/>
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
+131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM821 1241Q770 1275 715 1318T608 1417Q554 1361 502 1318T399 1241H196V1268Q222 1297 253 1335T317 1413T380 1494T432 1569H788Q809 1535 839
+1495T901 1414T966 1335T1024 1268V1241H821Z" />
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
+131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM444 1346Q413 1346 395 1320T364 1239H215Q221 1319 241 1377T293 1473T370 1529T467 1548Q508 1548 547 1532T624 1497T700 1461T774 1444Q805
+1444 823 1470T854 1550H1003Q997 1471 977 1413T923 1317T847 1260T751 1241Q711 1241 671 1257T593 1293T518 1329T444 1346Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1227" d="M414 561Q414 394 461 310T614 225Q719 225 766 310T813 561Q813 728 766 810T612 893Q507 893 461 811T414 561ZM1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q499 -20 406 18T246
+131T140 313T102 561Q102 700 137 808T239 989T401 1101T616 1139Q727 1139 820 1101T980 990T1086 808T1124 561ZM266 1405Q266 1440 277 1465T306 1507T350 1532T405 1540Q434 1540 459 1532T504 1508T534 1466T546 1405Q546 1371 535 1346T504 1305T460 1280T405
+1272Q376 1272 351 1280T307 1304T277 1346T266 1405ZM669 1405Q669 1440 680 1465T710 1507T755 1532T811 1540Q839 1540 864 1532T909 1508T940 1466T952 1405Q952 1371 941 1346T910 1305T865 1280T811 1272Q751 1272 710 1305T669 1405Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1128" d="M88 612V831H1040V612H88ZM424 373Q424 415 435 444T465 490T509 516T563 524Q591 524 616 516T660 491T690 444T702 373Q702 333 691 304T660 257T616 230T563 221Q535 221 510 229T465 256T435
+304T424 373ZM424 1071Q424 1113 435 1142T465 1189T509 1215T563 1223Q591 1223 616 1215T660 1189T690 1142T702 1071Q702 1031 691 1003T660 956T616 929T563 920Q535 920 510 928T465 955T435 1002T424 1071Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1227" d="M1124 561Q1124 421 1089 313T987 131T825 19T610 -20Q553 -20 501 -10T401 18L344 -76L182 14L250 125Q181 199 142 308T102 561Q102 700 137 808T239 989T401 1101T616 1139Q678 1139 735
+1126T844 1090L893 1169L1053 1073L991 975Q1054 903 1089 799T1124 561ZM414 561Q414 475 426 410L709 868Q669 893 612 893Q507 893 461 811T414 561ZM813 561Q813 625 807 674L539 240Q556 232 574 229T614 225Q719 225 766 310T813 561Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM839
+1241Q805 1269 758 1310T664 1396T580 1480T526 1548V1569H868Q884 1535 905 1495T950 1414T997 1335T1042 1268V1241H839Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM461
+1241V1268Q482 1297 506 1335T553 1413T598 1494T635 1569H977V1548Q966 1530 945 1506T897 1453T839 1396T777 1338T716 1285T664 1241H461Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM842
+1241Q791 1275 736 1318T629 1417Q575 1361 523 1318T420 1241H217V1268Q243 1297 274 1335T338 1413T401 1494T453 1569H809Q830 1535 860 1495T922 1414T987 1335T1045 1268V1241H842Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1284" d="M891 0L850 143H834Q809 100 775 70T699 19T612 -10T518 -20Q436 -20 369 3T254 77T180 204T154 389V1118H459V465Q459 344 495 284T612 223Q672 223 712 247T775 318T809 434T819 592V1118H1124V0H891ZM295
+1405Q295 1440 306 1465T335 1507T379 1532T434 1540Q463 1540 488 1532T533 1508T563 1466T575 1405Q575 1371 564 1346T533 1305T489 1280T434 1272Q405 1272 380 1280T336 1304T306 1346T295 1405ZM698 1405Q698 1440 709 1465T739 1507T784 1532T840 1540Q868
+1540 893 1532T938 1508T969 1466T981 1405Q981 1371 970 1346T939 1305T894 1280T840 1272Q780 1272 739 1305T698 1405Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91 -238
+123 -242T190 -246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118ZM393 1241V1268Q414 1297 438 1335T485 1413T530 1494T567 1569H909V1548Q898 1530 877 1506T829 1453T771 1396T709 1338T648 1285T596 1241H393Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1245" d="M465 973Q485 1008 512 1038T576 1090T656 1126T756 1139Q842 1139 913 1102T1035 992T1114 811T1143 561Q1143 418 1115 310T1036 128T914 17T756 -20Q701 -20 656 -10T576 20T513 64T465 117H451Q454
+85 458 55Q461 29 463 3T465 -39V-492H160V1556H465V1165Q465 1141 463 1108T458 1045Q454 1010 451 973H465ZM653 895Q602 895 567 877T509 821T477 728T465 596V563Q465 482 474 419T506 314T564 249T655 227Q746 227 788 313T831 565Q831 730 789 812T653 895Z"
+/>
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1104" d="M0 1118H334L514 489Q530 437 537 378T547 272H553Q555 295 558 323T567 380T578 437T592 489L768 1118H1104L662 -143Q600 -320 493 -406T225 -492Q173 -492 135 -487T70 -475V-233Q91
+-238 123 -242T190 -246Q238 -246 272 -233T330 -197T372 -140T403 -66L422 -10L0 1118ZM466 1405Q466 1440 477 1465T506 1507T550 1532T605 1540Q634 1540 659 1532T704 1508T734 1466T746 1405Q746 1371 735 1346T704 1305T660 1280T605 1272Q576 1272 551 1280T507
+1304T477 1346T466 1405ZM869 1405Q869 1440 880 1465T910 1507T955 1532T1011 1540Q1039 1540 1064 1532T1109 1508T1140 1466T1152 1405Q1152 1371 1141 1346T1110 1305T1065 1280T1011 1272Q951 1272 910 1305T869 1405Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 436V666H942V436H82Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 436V666H1966V436H82Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="440" d="M37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H418Q403 1401 389 1335T361 1204T336 1076T317 961H37Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="440" d="M403 1462L418 1440Q404 1385 385 1325T342 1202T293 1078T242 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H403Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="594" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="907" d="M489 983Q503 1037 523 1098T566 1221T615 1344T666 1462H885Q870 1401 856 1335T828 1204T803 1076T784 961H504L489 983ZM23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H418Q403
+1401 389 1335T361 1204T336 1076T317 961H37L23 983Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="907" d="M418 1440Q404 1385 385 1325T342 1202T293 1078T242 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H403L418 1440ZM885 1440Q871 1385 852 1325T809 1202T760 1078T709 961H489Q504
+1021 518 1087T546 1219T571 1347T590 1462H870L885 1440Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="1061" d="M459 215Q445 161 426 100T383 -23T334 -146T283 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H444L459 215ZM926 215Q912 161 893 100T850 -23T801 -146T750 -264H530Q545 -203
+559 -137T587 -6T612 122T631 238H911L926 215Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M98 748Q98 834 120 894T180 992T271 1047T385 1065Q444 1065 496 1048T588 992T649 894T672 748Q672 663 650 603T588 505T497 448T385 430Q324 430 272 448T181 504T120 603T98 748Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="692" d="M82 573L391 1028L610 909L393 561L610 213L391 94L82 547V573Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="692" d="M610 547L301 94L82 213L299 561L82 909L301 1028L610 573V547Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.ttf b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.ttf
new file mode 100644
index 00000000..523cb92d
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.ttf differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff
new file mode 100644
index 00000000..67e3e25f
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff2 b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff2
new file mode 100644
index 00000000..1e726a7c
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-700.woff2 differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.eot b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.eot
new file mode 100644
index 00000000..ac2698e8
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.eot differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.svg b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.svg
new file mode 100644
index 00000000..d9f2a214
--- /dev/null
+++ b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.svg
@@ -0,0 +1,403 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<defs >
+<font id="DroidSans" horiz-adv-x="1062" ><font-face
+    font-family="Droid Sans"
+    units-per-em="2048"
+    panose-1="2 11 6 6 3 8 4 2 2 4"
+    ascent="1907"
+    descent="-492"
+    alphabetic="0" />
+<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
+<glyph unicode="!" glyph-name="exclam" horiz-adv-x="551" d="M336 414H215L164 1462H387L336 414ZM147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157
+47T147 111Z" />
+<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="823" d="M330 1462L289 934H174L133 1462H330ZM690 1462L649 934H535L494 1462H690Z" />
+<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M983 893L920 565H1200V428H893L811 0H664L748 428H457L375 0H231L309 428H51V565H336L401 893H127V1030H426L508 1462H655L573 1030H866L950 1462H1094L1010 1030H1272V893H983ZM483 565H774L838
+893H547L483 565Z" />
+<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1128" d="M985 446Q985 376 960 319T889 220T776 151T625 111V-119H487V102Q437 102 386 106T287 120T197 142T123 172V344Q156 328 199 312T291 282T389 261T487 252V686Q398 716 333 749T224 824T160 922T139
+1051Q139 1118 163 1173T233 1270T343 1338T487 1374V1554H625V1378Q725 1373 809 1352T961 1300L895 1155Q839 1180 769 1200T625 1227V805Q713 774 780 741T893 667T962 572T985 446ZM809 446Q809 479 799 506T768 556T711 598T625 635V262Q718 276 763 325T809
+446ZM315 1049Q315 1013 323 985T352 933T405 890T487 854V1223Q398 1207 357 1163T315 1049Z" />
+<glyph unicode="%" glyph-name="percent" horiz-adv-x="1690" d="M250 1026Q250 861 285 779T401 696Q557 696 557 1026Q557 1354 401 1354Q321 1354 286 1273T250 1026ZM705 1026Q705 918 687 832T632 687T538 597T401 565Q328 565 272 596T178 687T121 832T102
+1026Q102 1134 119 1219T173 1362T266 1452T401 1483Q476 1483 532 1452T627 1363T685 1219T705 1026ZM1133 440Q1133 275 1168 193T1284 111Q1440 111 1440 440Q1440 768 1284 768Q1204 768 1169 687T1133 440ZM1587 440Q1587 332 1570 247T1515 102T1421 12T1284
+-20Q1210 -20 1154 11T1061 102T1004 246T985 440Q985 548 1002 633T1056 776T1149 866T1284 897Q1359 897 1415 866T1510 777T1567 633T1587 440ZM1331 1462L520 0H362L1174 1462H1331Z" />
+<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1438" d="M422 1165Q422 1131 430 1099T454 1034T497 968T559 897Q618 932 661 963T732 1026T774 1093T788 1169Q788 1205 776 1235T740 1288T683 1322T608 1335Q522 1335 472 1291T422 1165ZM557
+141Q615 141 664 152T755 184T833 231T901 289L514 696Q462 663 422 632T355 564T313 486T299 387Q299 333 316 288T367 210T448 159T557 141ZM109 381Q109 459 129 520T187 631T281 724T408 809Q377 845 347 883T295 965T258 1058T244 1165Q244 1240 269 1299T341
+1400T457 1463T614 1485Q697 1485 762 1464T873 1401T943 1300T967 1165Q967 1101 942 1047T875 946T779 860T664 784L1016 412Q1043 441 1064 471T1103 535T1133 608T1157 694H1341Q1326 628 1306 573T1259 468T1200 377T1128 293L1405 0H1180L1012 172Q963 127
+915 92T813 32T697 -6T557 -20Q452 -20 369 6T228 84T140 210T109 381Z" />
+<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="463" d="M330 1462L289 934H174L133 1462H330Z" />
+<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="616" d="M82 561Q82 686 100 807T155 1043T248 1263T383 1462H555Q415 1269 343 1038T270 563Q270 444 288 326T342 95T431 -124T553 -324H383Q305 -234 249 -131T155 84T100 317T82 561Z" />
+<glyph unicode=")" glyph-name="parenright" horiz-adv-x="616" d="M535 561Q535 437 517 317T462 85T368 -131T233 -324H63Q132 -230 185 -124T274 95T328 326T346 563Q346 807 274 1038T61 1462H233Q311 1369 367 1264T461 1044T517 808T535 561Z" />
+<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1128" d="M664 1556L621 1163L1018 1274L1044 1081L666 1053L911 727L733 631L557 989L399 631L215 727L457 1053L82 1081L111 1274L502 1163L459 1556H664Z" />
+<glyph unicode="+" glyph-name="plus" horiz-adv-x="1128" d="M489 647H102V797H489V1186H639V797H1026V647H639V262H489V647Z" />
+<glyph unicode="," glyph-name="comma" horiz-adv-x="512" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362Z" />
+<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M82 465V633H578V465H82Z" />
+<glyph unicode="." glyph-name="period" horiz-adv-x="549" d="M147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157 47T147 111Z" />
+<glyph unicode="/" glyph-name="slash" horiz-adv-x="764" d="M743 1462L199 0H20L565 1462H743Z" />
+<glyph unicode="0" glyph-name="zero" horiz-adv-x="1128" d="M1032 733Q1032 556 1007 416T925 179T779 31T563 -20Q445 -20 358 31T213 179T127 416T98 733Q98 910 123 1050T204 1286T348 1434T563 1485Q682 1485 770 1435T916 1288T1003 1051T1032 733ZM283
+733Q283 583 298 471T346 285T432 173T563 135Q640 135 694 172T782 283T832 469T848 733Q848 883 833 995T783 1181T694 1292T563 1329Q486 1329 433 1292T346 1181T298 995T283 733Z" />
+<glyph unicode="1" glyph-name="one" horiz-adv-x="1128" d="M711 0H535V913Q535 956 535 1005T537 1102T540 1195T543 1274Q526 1256 513 1243T487 1218T458 1193T422 1161L274 1040L178 1163L561 1462H711V0Z" />
+<glyph unicode="2" glyph-name="two" horiz-adv-x="1128" d="M1008 0H96V156L446 537Q521 618 580 685T680 816T744 944T766 1085Q766 1144 749 1189T701 1265T626 1313T530 1329Q435 1329 359 1291T213 1192L111 1311Q151 1347 197 1378T296 1433T408 1469T532
+1483Q628 1483 705 1456T837 1379T920 1256T950 1092Q950 1007 924 930T851 779T740 629T600 473L319 174V166H1008V0Z" />
+<glyph unicode="3" glyph-name="three" horiz-adv-x="1128" d="M961 1120Q961 1047 938 987T874 883T774 811T645 770V764Q822 742 914 652T1006 416Q1006 320 974 240T875 102T708 12T469 -20Q360 -20 264 -3T82 59V229Q169 183 270 158T465 133Q557 133 624
+153T734 210T798 301T819 422Q819 490 793 538T717 618T598 665T438 680H305V831H438Q519 831 582 851T687 908T752 996T774 1108Q774 1160 756 1201T705 1270T626 1314T524 1329Q417 1329 336 1296T180 1208L88 1333Q126 1364 172 1391T274 1438T391 1471T524
+1483Q632 1483 713 1456T850 1381T933 1266T961 1120Z" />
+<glyph unicode="4" glyph-name="four" horiz-adv-x="1128" d="M1087 328H874V0H698V328H23V487L686 1470H874V494H1087V328ZM698 494V850Q698 906 699 967T703 1087T707 1197T711 1282H702Q695 1262 685 1238T662 1189T636 1141T612 1102L201 494H698Z" />
+<glyph unicode="5" glyph-name="five" horiz-adv-x="1128" d="M545 897Q644 897 729 870T878 788T978 654T1014 469Q1014 355 980 264T879 110T714 14T487 -20Q436 -20 387 -15T292 -1T205 24T131 59V231Q164 208 208 190T302 160T400 142T492 135Q571 135 633
+153T738 211T804 309T827 449Q827 592 739 667T483 743Q456 743 425 741T362 734T302 726T252 717L162 774L217 1462H907V1296H375L336 877Q368 883 420 890T545 897Z" />
+<glyph unicode="6" glyph-name="six" horiz-adv-x="1128" d="M113 625Q113 730 123 834T160 1033T233 1211T350 1353T520 1448T752 1483Q771 1483 794 1482T840 1479T885 1473T924 1464V1309Q889 1321 845 1327T758 1333Q668 1333 600 1312T481 1251T398 1158T343
+1039T312 899T299 745H311Q331 781 359 812T426 866T511 902T618 915Q713 915 790 886T921 799T1004 660T1034 471Q1034 357 1003 266T914 112T774 14T590 -20Q490 -20 403 19T251 138T150 339T113 625ZM588 133Q648 133 697 153T783 215T838 320T858 471Q858 541
+842 596T792 691T710 751T594 772Q527 772 472 749T377 688T317 602T295 506Q295 439 313 373T368 253T460 167T588 133Z" />
+<glyph unicode="7" glyph-name="seven" horiz-adv-x="1128" d="M281 0L844 1296H90V1462H1030V1317L475 0H281Z" />
+<glyph unicode="8" glyph-name="eight" horiz-adv-x="1128" d="M565 1485Q649 1485 723 1463T854 1397T944 1287T977 1133Q977 1066 957 1012T902 915T819 837T715 774Q773 743 828 705T927 620T997 513T1024 381Q1024 289 991 215T897 88T752 8T565 -20Q455 -20
+370 7T226 84T137 208T106 373Q106 448 128 508T189 616T279 701T389 766Q340 797 297 833T223 915T173 1014T154 1135Q154 1222 187 1287T278 1397T409 1463T565 1485ZM285 371Q285 318 301 274T351 198T437 149T561 131Q631 131 684 148T774 198T828 277T846
+379Q846 431 827 473T771 551T683 619T569 682L539 696Q413 636 349 559T285 371ZM563 1333Q457 1333 395 1280T332 1126Q332 1069 349 1028T398 955T472 898T567 848Q615 870 657 896T731 955T781 1030T799 1126Q799 1227 736 1280T563 1333Z" />
+<glyph unicode="9" glyph-name="nine" horiz-adv-x="1128" d="M1028 838Q1028 733 1018 629T981 429T908 252T791 109T621 15T389 -20Q370 -20 347 -19T301 -16T256 -10T217 -2V154Q252 141 296 135T383 129Q518 129 605 176T743 303T815 491T842 717H829Q809
+681 781 650T715 596T629 560T522 547Q427 547 350 576T219 663T136 802T106 991Q106 1105 137 1196T226 1351T366 1449T551 1483Q652 1483 739 1444T890 1325T991 1124T1028 838ZM553 1329Q493 1329 444 1309T358 1247T303 1142T283 991Q283 921 299 866T349 771T431
+711T547 690Q615 690 670 713T764 774T824 860T846 956Q846 1023 828 1089T773 1209T681 1296T553 1329Z" />
+<glyph unicode=":" glyph-name="colon" horiz-adv-x="549" d="M147 111Q147 149 157 175T184 218T224 242T274 250Q300 250 323 243T364 219T391 176T401 111Q401 74 391 48T364 4T324 -21T274 -29Q247 -29 224 -21T184 4T157 47T147 111ZM147 987Q147 1026 157
+1052T184 1095T224 1119T274 1126Q300 1126 323 1119T364 1096T391 1053T401 987Q401 950 391 924T364 881T324 856T274 848Q247 848 224 856T184 881T157 924T147 987Z" />
+<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="549" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362ZM147 987Q147 1026 157 1052T184 1095T224 1119T274 1126Q300 1126 323 1119T364
+1096T391 1053T401 987Q401 950 391 924T364 881T324 856T274 848Q247 848 224 856T184 881T157 924T147 987Z" />
+<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1128" d="M1026 238L102 662V764L1026 1245V1085L291 721L1026 399V238Z" />
+<glyph unicode="=" glyph-name="equal" horiz-adv-x="1128" d="M102 852V1001H1026V852H102ZM102 442V592H1026V442H102Z" />
+<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1128" d="M102 399L838 721L102 1085V1245L1026 764V662L102 238V399Z" />
+<glyph unicode="?" glyph-name="question" horiz-adv-x="872" d="M281 414V451Q281 508 288 554T315 640T368 718T451 799Q499 840 533 873T588 941T620 1015T631 1108Q631 1156 616 1195T573 1263T502 1307T403 1323Q320 1323 245 1297T100 1237L37 1382Q118
+1424 212 1453T403 1483Q496 1483 570 1458T697 1384T777 1267T805 1110Q805 1043 792 991T751 893T684 806T590 717Q538 672 505 639T453 574T427 509T420 432V414H281ZM233 111Q233 149 243 175T270 218T310 242T360 250Q386 250 409 243T450 219T477 176T487
+111Q487 74 477 48T450 4T410 -21T360 -29Q333 -29 310 -21T270 4T243 47T233 111Z" />
+<glyph unicode="@" glyph-name="at" horiz-adv-x="1774" d="M1665 731Q1665 669 1656 607T1628 488T1581 383T1514 298T1428 242T1321 221Q1276 221 1240 236T1177 276T1135 333T1112 401H1108Q1090 364 1063 331T1001 274T921 235T823 221Q746 221 687 249T586
+327T524 449T502 606Q502 707 531 791T616 936T751 1031T928 1065Q973 1065 1018 1061T1104 1050T1179 1035T1237 1018L1214 602Q1213 580 1213 567T1212 545T1212 533T1212 526Q1212 473 1222 439T1250 385T1288 358T1333 350Q1379 350 1414 380T1472 463T1508
+585T1520 733Q1520 875 1477 985T1358 1172T1178 1287T950 1327Q781 1327 652 1272T436 1117T303 881T258 582Q258 431 297 314T413 117T603 -4T864 -45Q925 -45 984 -38T1099 -19T1205 8T1298 41V-100Q1212 -138 1104 -160T866 -182Q687 -182 547 -131T309 17T160
+255T109 575Q109 763 168 925T336 1207T601 1394T950 1462Q1106 1462 1237 1412T1463 1267T1612 1037T1665 731ZM662 602Q662 469 712 410T848 350Q903 350 942 372T1006 436T1044 535T1061 662L1075 915Q1047 923 1009 929T928 936Q854 936 804 907T722 831T676
+724T662 602Z" />
+<glyph unicode="A" glyph-name="A" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836Z" />
+<glyph unicode="B" glyph-name="B" horiz-adv-x="1272" d="M199 1462H598Q726 1462 823 1443T986 1380T1085 1266T1118 1092Q1118 1030 1099 976T1042 881T951 813T827 776V766Q896 754 956 732T1062 670T1133 570T1159 424Q1159 324 1127 246T1033 113T883 29T684
+0H199V1462ZM385 842H629Q713 842 770 857T862 901T912 975T928 1079Q928 1199 851 1251T608 1303H385V842ZM385 686V158H651Q739 158 798 178T894 234T947 320T963 432Q963 488 947 535T893 615T793 667T639 686H385Z" />
+<glyph unicode="C" glyph-name="C" horiz-adv-x="1235" d="M793 1319Q686 1319 599 1279T451 1162T356 977T322 731Q322 590 351 481T440 296T587 182T793 143Q882 143 962 160T1120 201V39Q1081 24 1042 13T961 -6T870 -16T762 -20Q598 -20 478 34T280 187T163
+425T125 733Q125 899 168 1037T296 1274T506 1428T793 1483Q901 1483 999 1461T1176 1397L1098 1241Q1035 1273 961 1296T793 1319Z" />
+<glyph unicode="D" glyph-name="D" horiz-adv-x="1401" d="M1276 745Q1276 560 1228 421T1089 188T866 47T565 0H199V1462H606Q759 1462 883 1416T1094 1280T1228 1055T1276 745ZM1079 739Q1079 885 1046 991T950 1167T795 1269T586 1303H385V160H547Q811 160
+945 306T1079 739Z" />
+<glyph unicode="E" glyph-name="E" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0Z" />
+<glyph unicode="F" glyph-name="F" horiz-adv-x="1006" d="M385 0H199V1462H958V1298H385V782H920V618H385V0Z" />
+<glyph unicode="G" glyph-name="G" horiz-adv-x="1413" d="M782 772H1266V55Q1211 37 1155 23T1040 0T916 -15T776 -20Q619 -20 498 32T294 182T168 419T125 733Q125 905 172 1044T311 1280T535 1430T840 1483Q951 1483 1053 1461T1243 1397L1171 1235Q1135 1252
+1094 1267T1008 1293T918 1312T825 1319Q703 1319 609 1279T452 1162T355 977T322 731Q322 601 349 493T437 307T592 186T821 143Q865 143 901 145T969 152T1027 161T1081 172V608H782V772Z" />
+<glyph unicode="H" glyph-name="H" horiz-adv-x="1436" d="M1237 0H1051V682H385V0H199V1462H385V846H1051V1462H1237V0Z" />
+<glyph unicode="I" glyph-name="I" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0Z" />
+<glyph unicode="J" glyph-name="J" horiz-adv-x="555" d="M-29 -389Q-80 -389 -118 -383T-184 -365V-205Q-150 -214 -111 -219T-27 -225Q10 -225 47 -216T115 -181T165 -112T184 0V1462H371V20Q371 -85 342 -162T260 -289T134 -364T-29 -389Z" />
+<glyph unicode="K" glyph-name="K" horiz-adv-x="1186" d="M1186 0H975L524 698L385 584V0H199V1462H385V731L506 899L958 1462H1167L647 825L1186 0Z" />
+<glyph unicode="L" glyph-name="L" horiz-adv-x="1006" d="M199 0V1462H385V166H958V0H199Z" />
+<glyph unicode="M" glyph-name="M" horiz-adv-x="1782" d="M803 0L360 1280H352Q358 1206 362 1133Q366 1070 368 1001T371 874V0H199V1462H475L887 270H893L1307 1462H1583V0H1397V887Q1397 939 1399 1006T1404 1134Q1408 1205 1411 1278H1403L956 0H803Z" />
+<glyph unicode="N" glyph-name="N" horiz-adv-x="1493" d="M1294 0H1079L360 1210H352Q358 1133 362 1057Q366 992 368 921T371 793V0H199V1462H412L1128 258H1135Q1132 334 1128 408Q1127 440 1126 473T1123 540T1121 605T1120 662V1462H1294V0Z" />
+<glyph unicode="O" glyph-name="O" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393 733ZM322
+733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733Z" />
+<glyph unicode="P" glyph-name="P" horiz-adv-x="1180" d="M1075 1034Q1075 943 1048 859T957 711T791 608T535 569H385V0H199V1462H561Q695 1462 792 1434T952 1351T1045 1216T1075 1034ZM385 727H514Q607 727 676 743T791 794T860 886T883 1024Q883 1166 801
+1234T545 1303H385V727Z" />
+<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1518" d="M1393 733Q1393 602 1369 489T1297 286T1178 129T1014 25Q1057 -69 1125 -140T1284 -272L1163 -414Q1060 -341 974 -242T836 -16Q819 -18 799 -19T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125
+905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393 733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428
+1165T348 980T322 733Z" />
+<glyph unicode="R" glyph-name="R" horiz-adv-x="1208" d="M385 604V0H199V1462H555Q821 1462 948 1359T1075 1047Q1075 960 1051 895T986 784T893 706T786 655L1184 0H965L614 604H385ZM385 762H549Q639 762 702 779T805 831T864 917T883 1038Q883 1110 863 1160T801
+1242T696 1288T545 1303H385V762Z" />
+<glyph unicode="S" glyph-name="S" horiz-adv-x="1063" d="M969 391Q969 294 935 218T836 88T680 8T473 -20Q362 -20 266 -3T104 49V227Q138 211 181 196T273 168T372 149T473 141Q633 141 709 201T786 373Q786 427 772 467T721 540T623 605T469 674Q380 709 315
+750T207 844T144 962T123 1112Q123 1200 155 1269T245 1385T383 1458T561 1483Q680 1483 775 1461T944 1403L877 1247Q812 1276 730 1297T559 1319Q437 1319 370 1263T303 1110Q303 1053 318 1012T368 937T460 874T602 811Q693 775 761 737T876 651T945 540T969
+391Z" />
+<glyph unicode="T" glyph-name="T" horiz-adv-x="1063" d="M625 0H438V1298H20V1462H1042V1298H625V0Z" />
+<glyph unicode="U" glyph-name="U" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245Z" />
+<glyph unicode="V" glyph-name="V" horiz-adv-x="1163" d="M965 1462H1163L674 0H487L0 1462H197L492 535Q521 444 542 360T580 201Q595 275 618 359T672 541L965 1462Z" />
+<glyph unicode="W" glyph-name="W" horiz-adv-x="1810" d="M809 1462H1006L1235 606Q1250 550 1264 494T1291 386T1313 286T1329 201Q1333 239 1339 284T1353 378T1370 479T1391 580L1591 1462H1790L1423 0H1235L981 938Q967 989 954 1043T930 1144Q918 1199 907
+1251Q896 1200 885 1145Q875 1098 863 1042T836 932L594 0H406L20 1462H217L440 573Q452 527 462 478T480 379T496 285T508 201Q513 238 520 287T538 390T559 499T584 604L809 1462Z" />
+<glyph unicode="X" glyph-name="X" horiz-adv-x="1120" d="M1120 0H909L555 635L188 0H0L453 764L31 1462H229L561 903L895 1462H1085L664 770L1120 0Z" />
+<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1079" d="M539 723L879 1462H1079L633 569V0H446V559L0 1462H203L539 723Z" />
+<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1104" d="M1022 0H82V145L793 1296H102V1462H1001V1317L291 166H1022V0Z" />
+<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="621" d="M569 -324H164V1462H569V1313H346V-174H569V-324Z" />
+<glyph unicode="\" glyph-name="backslash" horiz-adv-x="764" d="M201 1462L745 0H567L23 1462H201Z" />
+<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="621" d="M51 -174H274V1313H51V1462H457V-324H51V-174Z" />
+<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1090" d="M41 549L500 1473H602L1049 549H888L551 1284L202 549H41Z" />
+<glyph unicode="_" glyph-name="underscore" horiz-adv-x="842" d="M846 -324H-4V-184H846V-324Z" />
+<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M786 1241H666Q631 1269 590 1310T511 1396T441 1480T393 1548V1569H612Q628 1535 649 1495T694 1414T741 1335T786 1268V1241Z" />
+<glyph unicode="a" glyph-name="a" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967 374 943T236
+885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127Z" />
+<glyph unicode="b" glyph-name="b" horiz-adv-x="1200" d="M670 1118Q764 1118 841 1082T972 975T1057 797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20Q611 -20 563 -7T477 27T409 78T356 139H344L307 0H174V1556H356V1180Q356 1145 355 1106T352 1032Q350
+992 348 954H356Q379 989 408 1019T475 1071T562 1105T670 1118ZM635 967Q555 967 502 942T416 864T370 734T356 551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
+<glyph unicode="c" glyph-name="c" horiz-adv-x="948" d="M594 -20Q493 -20 405 11T252 111T150 286T113 543Q113 700 151 809T255 987T411 1087T602 1118Q680 1118 754 1101T879 1059L825 905Q802 915 774 924T716 941T657 953T602 958Q445 958 373 858T301 545Q301
+334 373 237T594 139Q675 139 740 157T860 201V39Q806 10 745 -5T594 -20Z" />
+<glyph unicode="d" glyph-name="d" horiz-adv-x="1200" d="M852 147H844Q822 113 793 83T725 29T638 -7T530 -20Q437 -20 360 16T228 123T143 301T113 547Q113 688 143 794T228 973T360 1081T530 1118Q589 1118 637 1105T723 1070T792 1019T844 958H856Q853 992
+850 1023Q848 1049 846 1076T844 1120V1556H1026V0H879L852 147ZM565 131Q641 131 693 154T778 224T826 341T844 506V547Q844 648 831 726T785 858T698 939T563 967Q428 967 365 858T301 545Q301 336 364 234T565 131Z" />
+<glyph unicode="e" glyph-name="e" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704 144T788 158T867
+182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967Z" />
+<glyph unicode="f" glyph-name="f" horiz-adv-x="674" d="M651 961H406V0H223V961H29V1036L223 1104V1200Q223 1307 245 1377T310 1490T415 1549T555 1567Q614 1567 663 1556T752 1530L705 1389Q674 1400 638 1408T561 1417Q521 1417 492 1408T444 1374T416 1309T406
+1202V1098H651V961Z" />
+<glyph unicode="g" glyph-name="g" horiz-adv-x="1061" d="M1020 1098V985L823 958Q851 923 870 869T889 745Q889 669 866 605T795 493T677 420T514 393Q492 393 470 393T434 397Q417 387 401 375T371 346T349 310T340 266Q340 239 352 223T384 197T433 185T492
+182H668Q761 182 825 159T929 95T988 1T1006 -115Q1006 -203 974 -273T874 -391T705 -466T463 -492Q356 -492 276 -471T143 -410T64 -314T37 -186Q37 -126 56 -81T109 -2T185 52T276 84Q234 103 207 144T180 238Q180 299 212 343T313 430Q270 448 235 479T175 551T137
+640T123 739Q123 828 148 898T222 1017T344 1092T514 1118Q551 1118 590 1113T657 1098H1020ZM209 -180Q209 -217 222 -249T264 -304T342 -340T463 -354Q649 -354 741 -297T834 -131Q834 -85 822 -56T783 -11T710 12T600 18H424Q389 18 351 10T282 -20T230 -80T209
+-180ZM301 745Q301 630 355 574T508 518Q608 518 659 573T711 748Q711 871 659 929T506 987Q407 987 354 927T301 745Z" />
+<glyph unicode="h" glyph-name="h" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1556H356V1094L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860Z" />
+<glyph unicode="i" glyph-name="i" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM160 1395Q160 1455 190 1482T266 1509Q288 1509 307 1503T341 1482T364 1447T373 1395Q373 1337 342 1309T266 1280Q221 1280 191 1308T160 1395Z" />
+<glyph unicode="j" glyph-name="j" horiz-adv-x="530" d="M66 -492Q18 -492 -13 -485T-68 -467V-319Q-42 -329 -15 -334T47 -340Q74 -340 97 -333T137 -306T164 -254T174 -170V1098H356V-158Q356 -235 339 -296T286 -401T196 -468T66 -492ZM160 1395Q160 1455
+190 1482T266 1509Q288 1509 307 1503T341 1482T364 1447T373 1395Q373 1337 342 1309T266 1280Q221 1280 191 1308T160 1395Z" />
+<glyph unicode="k" glyph-name="k" horiz-adv-x="1016" d="M342 567L477 737L770 1098H981L580 623L1008 0H799L463 504L354 422V0H174V1556H354V842L338 567H342Z" />
+<glyph unicode="l" glyph-name="l" horiz-adv-x="530" d="M356 0H174V1556H356V0Z" />
+<glyph unicode="m" glyph-name="m" horiz-adv-x="1835" d="M1489 0V707Q1489 837 1439 902T1284 967Q1211 967 1160 944T1077 875T1029 762T1014 606V0H831V707Q831 837 782 902T627 967Q550 967 498 941T415 864T370 739T356 569V0H174V1098H322L348 950H358Q382
+993 415 1024T487 1077T571 1108T662 1118Q782 1118 861 1074T979 936H987Q1013 983 1049 1017T1129 1073T1221 1107T1319 1118Q1494 1118 1582 1023T1671 717V0H1489Z" />
+<glyph unicode="n" glyph-name="n" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1098H322L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860Z" />
+<glyph unicode="o" glyph-name="o" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301 551Q301
+342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551Z" />
+<glyph unicode="p" glyph-name="p" horiz-adv-x="1200" d="M670 -20Q611 -20 563 -7T477 27T409 78T356 139H344Q347 105 350 74Q352 48 354 21T356 -23V-492H174V1098H322L348 950H356Q379 985 408 1015T475 1068T562 1104T670 1118Q764 1118 841 1082T972 975T1057
+797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20ZM635 967Q559 967 507 944T422 874T374 757T356 592V551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
+<glyph unicode="q" glyph-name="q" horiz-adv-x="1200" d="M565 131Q641 131 693 154T778 224T826 341T844 506V547Q844 648 831 726T785 858T698 939T563 967Q428 967 365 858T301 545Q301 336 364 234T565 131ZM530 -20Q437 -20 360 16T228 123T143 301T113
+547Q113 688 143 794T228 973T360 1081T530 1118Q589 1118 637 1105T723 1069T791 1016T844 950H852L879 1098H1026V-492H844V-23Q844 -4 846 25T850 81Q853 113 856 147H844Q822 113 793 83T725 29T638 -7T530 -20Z" />
+<glyph unicode="r" glyph-name="r" horiz-adv-x="817" d="M649 1118Q678 1118 714 1116T776 1108L752 940Q724 945 695 948T639 952Q576 952 524 927T435 854T377 740T356 592V0H174V1098H322L344 897H352Q377 940 405 980T469 1050T549 1099T649 1118Z" />
+<glyph unicode="s" glyph-name="s" horiz-adv-x="924" d="M831 301Q831 221 802 161T719 61T587 0T414 -20Q305 -20 227 -3T90 49V215Q121 199 159 184T239 156T325 137T414 129Q479 129 524 140T598 171T640 221T653 287Q653 318 643 343T607 392T534 442T416
+498Q344 529 287 559T189 626T128 711T106 827Q106 897 133 951T211 1043T331 1099T487 1118Q584 1118 664 1097T817 1042L754 895Q689 924 621 945T481 967Q379 967 330 934T281 838Q281 803 292 777T332 728T407 682T524 629Q596 599 652 569T749 502T810 416T831
+301Z" />
+<glyph unicode="t" glyph-name="t" horiz-adv-x="694" d="M506 129Q524 129 546 131T590 136T628 143T655 150V12Q642 6 622 0T578 -10T528 -17T477 -20Q415 -20 362 -4T271 51T210 156T188 324V961H33V1042L188 1120L266 1350H371V1098H647V961H371V324Q371 227
+402 178T506 129Z" />
+<glyph unicode="u" glyph-name="u" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885Z" />
+<glyph unicode="v" glyph-name="v" horiz-adv-x="981" d="M375 0L0 1098H188L387 487Q398 454 413 402T443 296T470 194T487 121H494Q499 146 511 194T538 296T568 402T594 487L793 1098H981L606 0H375Z" />
+<glyph unicode="w" glyph-name="w" horiz-adv-x="1528" d="M1008 0L840 616Q836 634 830 656T818 704T806 755T793 806Q779 864 764 926H758Q744 863 731 805Q720 755 708 702T684 612L512 0H301L20 1098H211L342 514Q352 469 362 417T381 313T397 216T408 141H414Q419
+167 427 210T446 302T468 398T489 479L668 1098H864L1036 479Q1045 445 1056 399T1079 306T1099 214T1112 141H1118Q1121 167 1127 210T1143 306T1162 412T1184 514L1321 1098H1507L1223 0H1008Z" />
+<glyph unicode="x" glyph-name="x" horiz-adv-x="1024" d="M408 563L55 1098H262L512 688L762 1098H969L614 563L987 0H780L512 436L242 0H35L408 563Z" />
+<glyph unicode="y" glyph-name="y" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130 -492 92 -487T27
+-475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098Z" />
+<glyph unicode="z" glyph-name="z" horiz-adv-x="903" d="M821 0H82V125L618 961H115V1098H803V952L279 137H821V0Z" />
+<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="725" d="M500 -16Q500 -64 512 -94T546 -142T601 -166T674 -174V-324Q597 -323 532 -307T419 -255T344 -164T317 -31V303Q317 406 252 449T61 492V647Q186 647 251 690T317 836V1169Q317 1247 344 1302T418
+1392T531 1444T674 1462V1313Q634 1312 602 1306T547 1282T512 1234T500 1155V823Q500 718 441 657T266 575V563Q381 543 440 482T500 315V-16Z" />
+<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M489 1556H639V-492H489V1556Z" />
+<glyph unicode="}" glyph-name="braceright" horiz-adv-x="725" d="M225 315Q225 421 284 482T459 563V575Q344 595 285 656T225 823V1155Q225 1203 213 1233T179 1281T124 1305T51 1313V1462Q128 1461 193 1445T306 1393T381 1302T408 1169V836Q408 784 424 748T473
+690T554 657T664 647V492Q539 492 474 449T408 303V-31Q408 -109 381 -164T307 -254T194 -306T51 -324V-174Q91 -173 123 -167T178 -143T213 -95T225 -16V315Z" />
+<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1128" d="M530 651Q493 667 466 678T416 695T373 704T330 707Q302 707 272 698T213 672T155 633T102 586V748Q202 856 350 856Q379 856 404 854T456 845T517 826T598 793Q635 777 662 766T713 749T757
+740T799 737Q827 737 857 746T916 772T974 811T1026 858V696Q927 588 778 588Q749 588 724 590T672 599T611 618T530 651Z" />
+<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
+<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="551" d="M213 676H334L385 -373H162L213 676ZM401 979Q401 941 392 915T365 872T324 848T274 840Q248 840 225 847T185 871T157 914T147 979Q147 1016 157 1042T184 1085T225 1110T274 1118Q301
+1118 324 1110T364 1085T391 1042T401 979Z" />
+<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1128" d="M886 212T831 197T700 180V-20H563V186Q476 199 407 236T289 340T214 506T188 743Q188 884 214 985T289 1155T407 1260T563 1311V1483H700V1319Q772 1316 840 1300T954 1260L901 1106Q878 1116
+850 1125T792 1142T733 1154T678 1159Q521 1159 449 1058T377 745Q377 535 449 438T670 340Q751 340 816 358T936 401V240Q886 212 831 197Z" />
+<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1128" d="M666 1481Q772 1481 859 1459T1012 1401L946 1257Q890 1286 820 1307T674 1329Q626 1329 585 1316T514 1273T468 1196T451 1083V788H827V651H451V440Q451 378 440 334T409 257T364 204T311
+166H1059V0H68V154Q112 165 148 185T211 240T253 322T268 438V651H70V788H268V1112Q268 1199 297 1267T379 1383T505 1456T666 1481Z" />
+<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1128" d="M186 723Q186 782 203 835T252 936L123 1065L221 1163L348 1034Q395 1066 449 1084T563 1102Q623 1102 676 1084T776 1034L905 1163L1004 1067L874 938Q905 892 923 838T942 723Q942 663
+925 608T874 508L1001 381L905 285L776 412Q730 381 677 364T563 346Q503 346 448 364T348 414L221 287L125 383L252 510Q221 555 204 609T186 723ZM324 723Q324 673 342 630T393 554T469 502T563 483Q614 483 658 502T736 553T788 629T807 723Q807 774 788 818T736
+896T659 948T563 967Q513 967 470 948T394 896T343 819T324 723Z" />
+<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1128" d="M563 723L909 1462H1100L715 694H954V557H653V399H954V262H653V0H475V262H174V399H475V557H174V694H408L29 1462H221L563 723Z" />
+<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M489 1556H639V776H489V1556ZM489 289H639V-492H489V289Z" />
+<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="995" d="M137 809Q137 860 150 901T185 975T237 1029T297 1067Q222 1105 180 1162T137 1303Q137 1364 164 1413T242 1496T362 1548T518 1567Q615 1567 693 1547T844 1495L788 1356Q723 1384 653 1403T512
+1423Q413 1423 362 1394T311 1307Q311 1280 323 1257T363 1212T439 1167T557 1114Q629 1086 685 1054T781 982T841 895T862 784Q862 732 850 690T818 613T771 555T717 514Q786 476 824 422T862 289Q862 218 833 163T749 69T618 10T444 -10Q336 -10 258 6T121 55V213Q152
+198 190 183T270 157T356 138T444 131Q513 131 559 143T633 174T672 219T684 272Q684 301 676 323T642 368T569 415T446 471Q373 502 316 533T218 603T158 692T137 809ZM291 831Q291 794 305 763T350 702T432 646T555 588L590 573Q610 586 630 604T667 645T694
+696T705 758Q705 796 692 828T647 889T560 947T424 1006Q399 998 376 983T333 945T303 893T291 831Z" />
+<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1182" d="M307 1395Q307 1449 335 1473T403 1497Q442 1497 471 1473T500 1395Q500 1342 471 1317T403 1292Q363 1292 335 1317T307 1395ZM682 1395Q682 1449 710 1473T778 1497Q797 1497 814 1491T845
+1473T866 1441T874 1395Q874 1342 845 1317T778 1292Q738 1292 710 1317T682 1395Z" />
+<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M891 1053Q830 1053 783 1031T704 968T656 866T639 731Q639 653 653 593T698 492T776 430T891 408Q914 408 941 411T996 421T1053 435T1106 453V322Q1082 311 1058 302T1007 286T950 276T885
+272Q783 272 707 305T581 399T505 545T479 733Q479 834 506 917T585 1061T714 1154T891 1188Q954 1188 1020 1172T1145 1126L1083 999Q1031 1025 983 1039T891 1053ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231
+1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384 200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM209 731Q209 598 259 481T397 277T602 139T852 88Q985 88 1102 138T1306 276T1444 481T1495
+731Q1495 864 1445 981T1307 1185T1102 1323T852 1374Q719 1374 602 1324T398 1186T260 981T209 731Z" />
+<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="678" d="M487 797L459 879Q441 857 422 840T379 810T327 791T264 784Q221 784 185 797T123 835T83 899T68 989Q68 1091 138 1145T352 1204L451 1208V1239Q451 1311 421 1339T334 1368Q286 1368
+241 1354T154 1317L106 1417Q157 1443 215 1461T334 1479Q459 1479 518 1426T578 1251V797H487ZM377 1110Q326 1107 292 1098T238 1074T208 1038T199 987Q199 936 224 914T291 891Q325 891 354 901T404 934T438 988T451 1065V1114L377 1110Z" />
+<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="997" d="M82 553L391 967L508 889L270 541L508 193L391 115L82 526V553ZM489 553L799 967L915 889L678 541L915 193L799 115L489 526V553Z" />
+<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1128" d="M1026 797V262H877V647H102V797H1026Z" />
+<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M82 465V633H578V465H82Z" />
+<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M743 768H815Q906 768 945 804T985 909Q985 983 944 1012T813 1042H743V768ZM1145 913Q1145 865 1132 828T1096 762T1045 713T985 680Q1052 570 1105 483Q1128 446 1149 411T1186 347T1213
+302L1223 285H1044L838 637H743V285H586V1178H819Q987 1178 1066 1113T1145 913ZM100 731Q100 835 127 931T202 1110T320 1263T472 1380T652 1456T852 1483Q956 1483 1052 1456T1231 1381T1384 1263T1501 1111T1577 931T1604 731Q1604 627 1577 531T1502 352T1384
+200T1232 82T1052 7T852 -20Q748 -20 652 6T473 82T320 199T203 351T127 531T100 731ZM209 731Q209 598 259 481T397 277T602 139T852 88Q985 88 1102 138T1306 276T1444 481T1495 731Q1495 864 1445 981T1307 1185T1102 1323T852 1374Q719 1374 602 1324T398 1186T260
+981T209 731Z" />
+<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1696H1030V1556Z" />
+<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M123 1167Q123 1232 148 1289T215 1390T315 1458T438 1483Q503 1483 560 1458T661 1390T729 1290T754 1167Q754 1102 729 1045T661 946T561 879T438 854Q373 854 316 878T216 945T148 1045T123
+1167ZM246 1167Q246 1128 261 1094T302 1033T363 992T438 977Q478 977 513 992T574 1033T616 1093T631 1167Q631 1207 616 1242T575 1304T513 1346T438 1362Q398 1362 363 1347T302 1305T261 1243T246 1167Z" />
+<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1128" d="M489 647H102V797H489V1186H639V797H1026V647H639V262H489V647ZM102 0V150H1026V0H102Z" />
+<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="678" d="M621 586H49V698L258 926Q315 988 351 1030T407 1106T434 1169T442 1233Q442 1298 409 1330T322 1362Q271 1362 225 1337T133 1274L55 1368Q109 1416 175 1448T324 1481Q384 1481 432 1465T515
+1417T567 1340T586 1237Q586 1187 572 1144T530 1059T464 971T373 870L225 713H621V586Z" />
+<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="678" d="M590 1255Q590 1177 550 1124T440 1047Q528 1024 572 971T616 840Q616 780 596 730T535 645T430 589T281 569Q211 569 150 581T31 625V758Q94 724 160 705T279 686Q377 686 421 727T465
+842Q465 916 412 949T262 983H164V1096H262Q354 1096 396 1135T438 1239Q438 1271 428 1294T401 1333T360 1355T309 1362Q250 1362 202 1342T102 1284L33 1380Q62 1403 92 1421T157 1453T229 1473T311 1481Q380 1481 432 1464T520 1417T572 1346T590 1255Z" />
+<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1182" d="M393 1268Q415 1297 438 1335T485 1413T530 1494T567 1569H786V1548Q770 1521 739 1481T669 1396T590 1311T514 1241H393V1268Z" />
+<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1217" d="M356 391Q356 261 409 196T573 131Q655 131 710 157T798 233T846 358T860 528V1098H1042V0H895L868 147H858Q810 64 738 22T563 -20Q491 -20 438 3T350 68Q351 30 353 -10Q355 -45 355 -87T356
+-172V-492H174V1098H356V391Z" />
+<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1126 -260H1006V1397H799V-260H678V559Q617 541 532 541Q437 541 360 566T228 651T143 806T113 1042Q113 1189 145 1287T237 1446T380 1531T563 1556H1126V-260Z" />
+<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="549" d="M147 723Q147 761 157 787T184 830T224 854T274 862Q300 862 323 855T364 831T391 788T401 723Q401 686 391 660T364 617T324 592T274 584Q247 584 224 592T184 617T157 660T147 723Z" />
+<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="420" d="M408 -287Q408 -384 338 -438T117 -492Q95 -492 73 -489T35 -483V-375Q50 -378 74 -379T115 -381Q186 -381 226 -360T266 -289Q266 -265 253 -248T217 -217T163 -195T94 -176L184 0H305L248
+-115Q282 -123 311 -136T361 -169T395 -219T408 -287Z" />
+<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="678" d="M307 1462H442V586H297V1102Q297 1127 297 1157T299 1217T302 1275T305 1325Q291 1308 272 1288T231 1251L137 1178L63 1274L307 1462Z" />
+<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="717" d="M651 1133Q651 1050 631 985T572 876T479 808T356 784Q293 784 240 807T148 875T88 985T66 1133Q66 1216 86 1280T145 1389T237 1456T360 1479Q422 1479 475 1456T568 1389T629 1281T651
+1133ZM197 1133Q197 1014 234 954T358 893Q443 893 480 953T518 1133Q518 1253 481 1310T358 1368Q272 1368 235 1311T197 1133Z" />
+<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="997" d="M918 526L608 115L492 193L729 541L492 889L608 967L918 553V526ZM510 526L201 115L84 193L322 541L84 889L201 967L510 553V526Z" />
+<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1509" d="M307 1462H442V586H297V1102Q297 1127 297 1157T299 1217T302 1275T305 1325Q291 1308 272 1288T231 1251L137 1178L63 1274L307 1462ZM1202 1462L391 0H234L1045 1462H1202ZM1419 193H1294V1H1151V193H776V304L1153
+883H1294V320H1419V193ZM1151 320V515Q1151 557 1152 606T1157 705Q1152 694 1142 676T1121 636T1098 595T1077 560L922 320H1151Z" />
+<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1509" d="M544 1462H679V586H534V1102Q534 1127 534 1157T536 1217T539 1275T542 1325Q528 1308 509 1288T468 1251L374 1178L300 1274L544 1462ZM1181 1462L370 0H213L1024 1462H1181ZM1440 1H868V113L1077
+341Q1134 403 1170 445T1226 521T1253 584T1261 648Q1261 713 1228 745T1141 777Q1090 777 1044 752T952 689L874 783Q928 831 994 863T1143 896Q1203 896 1251 880T1334 832T1386 755T1405 652Q1405 602 1391 559T1349 474T1283 386T1192 285L1044 128H1440V1Z"
+/>
+<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1509" d="M590 1255Q590 1177 550 1124T440 1047Q528 1024 572 971T616 840Q616 780 596 730T535 645T430 589T281 569Q211 569 150 581T31 625V758Q94 724 160 705T279 686Q377 686 421 727T465
+842Q465 916 412 949T262 983H164V1096H262Q354 1096 396 1135T438 1239Q438 1271 428 1294T401 1333T360 1355T309 1362Q250 1362 202 1342T102 1284L33 1380Q62 1403 92 1421T157 1453T229 1473T311 1481Q380 1481 432 1464T520 1417T572 1346T590 1255ZM1296
+1462L485 0H328L1139 1462H1296ZM1486 193H1361V1H1218V193H843V304L1220 883H1361V320H1486V193ZM1218 320V515Q1218 557 1219 606T1224 705Q1219 694 1209 676T1188 636T1165 595T1144 560L989 320H1218Z" />
+<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="872" d="M592 676V639Q592 581 584 536T557 450T505 371T422 291Q374 250 340 217T285 149T253 75T242 -18Q242 -66 257 -105T300 -173T371 -217T469 -233Q553 -233 628 -208T772 -147L836 -293Q754
+-335 660 -364T469 -393Q376 -393 302 -368T176 -294T96 -177T68 -20Q68 48 81 100T121 197T188 284T283 373Q335 418 368 451T420 516T446 580T453 657V676H592ZM639 979Q639 941 630 915T603 872T562 848T512 840Q486 840 463 847T423 871T395 914T385 979Q385
+1016 395 1042T422 1085T463 1110T512 1118Q539 1118 562 1110T602 1085T629 1042T639 979Z" />
+<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM719
+1579H599Q564 1607 523 1648T444 1734T374 1818T326 1886V1907H545Q561 1873 582 1833T627 1752T674 1673T719 1606V1579Z" />
+<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM534
+1606Q556 1635 579 1673T626 1751T671 1832T708 1907H927V1886Q911 1859 880 1819T810 1734T731 1649T655 1579H534V1606Z" />
+<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM953
+1579H832Q781 1613 727 1661T621 1765Q567 1710 514 1662T410 1579H289V1606Q315 1635 349 1673T416 1751T479 1832T525 1907H717Q733 1873 762 1833T825 1752T893 1673T953 1606V1579Z" />
+<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM772
+1581Q732 1581 693 1598T615 1637T542 1676T475 1694Q430 1694 406 1668T368 1579H264Q269 1639 285 1688T328 1771T392 1824T475 1843Q517 1843 557 1826T636 1787T708 1749T772 1731Q817 1731 840 1757T878 1845H983Q978 1785 962 1737T919 1654T855 1600T772
+1581Z" />
+<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM340
+1733Q340 1787 368 1811T436 1835Q475 1835 504 1811T533 1733Q533 1680 504 1655T436 1630Q396 1630 368 1655T340 1733ZM715 1733Q715 1787 743 1811T811 1835Q830 1835 847 1829T878 1811T899 1779T907 1733Q907 1680 878 1655T811 1630Q771 1630 743 1655T715
+1733Z" />
+<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1245" d="M1055 0L895 453H350L188 0H0L537 1468H707L1245 0H1055ZM836 618L688 1042Q682 1060 674 1086T656 1142T638 1204T621 1268Q614 1237 605 1204T587 1141T570 1085T555 1042L410 618H836ZM848
+1583Q848 1532 831 1492T783 1423T710 1381T619 1366Q569 1366 528 1380T458 1423T412 1490T396 1581Q396 1632 412 1671T457 1739T528 1781T619 1796Q667 1796 709 1782T782 1740T830 1673T848 1583ZM731 1581Q731 1634 700 1664T619 1694Q569 1694 538 1664T506
+1581Q506 1528 534 1498T619 1468Q668 1468 699 1498T731 1581Z" />
+<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1745" d="M1622 0H862V453H387L184 0H-2L653 1462H1622V1298H1049V846H1583V684H1049V164H1622V0ZM459 618H862V1298H754L459 618Z" />
+<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1235" d="M793 1319Q686 1319 599 1279T451 1162T356 977T322 731Q322 590 351 481T440 296T587 182T793 143Q882 143 962 160T1120 201V39Q1081 24 1042 13T961 -6T870 -16T762 -20Q598 -20 478 34T280
+187T163 425T125 733Q125 899 168 1037T296 1274T506 1428T793 1483Q901 1483 999 1461T1176 1397L1098 1241Q1035 1273 961 1296T793 1319ZM916 -287Q916 -384 846 -438T625 -492Q603 -492 581 -489T543 -483V-375Q558 -378 582 -379T623 -381Q694 -381 734 -360T774
+-289Q774 -265 761 -248T725 -217T671 -195T602 -176L692 0H813L756 -115Q790 -123 819 -136T869 -169T903 -219T916 -287Z" />
+<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM713 1579H593Q558 1607 517 1648T438 1734T368 1818T320 1886V1907H539Q555 1873 576 1833T621 1752T668 1673T713 1606V1579Z" />
+<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM456 1606Q478 1635 501 1673T548 1751T593 1832T630 1907H849V1886Q833 1859 802 1819T732 1734T653 1649T577 1579H456V1606Z" />
+<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM907 1579H786Q735 1613 681 1661T575 1765Q521 1710 468 1662T364 1579H243V1606Q269 1635 303 1673T370 1751T433 1832T479
+1907H671Q687 1873 716 1833T779 1752T847 1673T907 1606V1579Z" />
+<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1081" d="M958 0H199V1462H958V1298H385V846H920V684H385V164H958V0ZM296 1733Q296 1787 324 1811T392 1835Q431 1835 460 1811T489 1733Q489 1680 460 1655T392 1630Q352 1630 324 1655T296 1733ZM671
+1733Q671 1787 699 1811T767 1835Q786 1835 803 1829T834 1811T855 1779T863 1733Q863 1680 834 1655T767 1630Q727 1630 699 1655T671 1733Z" />
+<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM455 1579H335Q300 1607 259 1648T180 1734T110 1818T62 1886V1907H281Q297 1873 318 1833T363 1752T410 1673T455
+1606V1579Z" />
+<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM257 1606Q279 1635 302 1673T349 1751T394 1832T431 1907H650V1886Q634 1859 603 1819T533 1734T454 1649T378
+1579H257V1606Z" />
+<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM681 1579H560Q509 1613 455 1661T349 1765Q295 1710 242 1662T138 1579H17V1606Q43 1635 77 1673T144 1751T207
+1832T253 1907H445Q461 1873 490 1833T553 1752T621 1673T681 1606V1579Z" />
+<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="694" d="M612 0H82V102L254 143V1319L82 1360V1462H612V1360L440 1319V143L612 102V0ZM64 1733Q64 1787 92 1811T160 1835Q199 1835 228 1811T257 1733Q257 1680 228 1655T160 1630Q120 1630 92 1655T64
+1733ZM439 1733Q439 1787 467 1811T535 1835Q554 1835 571 1829T602 1811T623 1779T631 1733Q631 1680 602 1655T535 1630Q495 1630 467 1655T439 1733Z" />
+<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1401" d="M47 805H199V1462H606Q759 1462 883 1416T1094 1280T1228 1055T1276 745Q1276 560 1228 421T1089 188T866 47T565 0H199V643H47V805ZM1079 739Q1079 885 1046 991T950 1167T795 1269T586 1303H385V805H721V643H385V160H547Q811
+160 945 306T1079 739Z" />
+<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1493" d="M1294 0H1079L360 1210H352Q358 1133 362 1057Q366 992 368 921T371 793V0H199V1462H412L1128 258H1135Q1132 334 1128 408Q1127 440 1126 473T1123 540T1121 605T1120 662V1462H1294V0ZM905
+1581Q865 1581 826 1598T748 1637T675 1676T608 1694Q563 1694 539 1668T501 1579H397Q402 1639 418 1688T461 1771T525 1824T608 1843Q650 1843 690 1826T769 1787T841 1749T905 1731Q950 1731 973 1757T1011 1845H1116Q1111 1785 1095 1737T1052 1654T988 1600T905
+1581Z" />
+<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
+733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM870 1579H750Q715 1607 674 1648T595 1734T525 1818T477 1886V1907H696Q712
+1873 733 1833T778 1752T825 1673T870 1606V1579Z" />
+<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
+733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM651 1606Q673 1635 696 1673T743 1751T788 1832T825 1907H1044V1886Q1028
+1859 997 1819T927 1734T848 1649T772 1579H651V1606Z" />
+<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352
+1043T1393 733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM1096 1579H975Q924 1613 870 1661T764 1765Q710
+1710 657 1662T553 1579H432V1606Q458 1635 492 1673T559 1751T622 1832T668 1907H860Q876 1873 905 1833T968 1752T1036 1673T1096 1606V1579Z" />
+<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
+733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM891 1581Q851 1581 812 1598T734 1637T661 1676T594 1694Q549
+1694 525 1668T487 1579H383Q388 1639 404 1688T447 1771T511 1824T594 1843Q636 1843 676 1826T755 1787T827 1749T891 1731Q936 1731 959 1757T997 1845H1102Q1097 1785 1081 1737T1038 1654T974 1600T891 1581Z" />
+<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1520" d="M1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q597 -20 478 34T280 187T163 425T125 735Q125 905 163 1043T280 1280T479 1431T762 1485Q917 1485 1034 1432T1232 1280T1352 1043T1393
+733ZM322 733Q322 596 348 487T427 301T563 184T760 143Q874 143 956 183T1092 300T1171 486T1196 733Q1196 871 1171 980T1093 1164T958 1280T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM477 1733Q477 1787 505 1811T573 1835Q612 1835 641 1811T670
+1733Q670 1680 641 1655T573 1630Q533 1630 505 1655T477 1733ZM852 1733Q852 1787 880 1811T948 1835Q967 1835 984 1829T1015 1811T1036 1779T1044 1733Q1044 1680 1015 1655T948 1630Q908 1630 880 1655T852 1733Z" />
+<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1128" d="M459 723L141 1042L246 1147L563 829L885 1147L989 1044L668 723L987 403L885 301L563 618L246 303L143 406L459 723Z" />
+<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1520" d="M1300 1454L1208 1305Q1299 1206 1346 1061T1393 733Q1393 564 1353 425T1232 187T1034 34T760 -20Q571 -20 438 51L360 -76L223 2L313 147Q216 247 171 396T125 735Q125 905 163 1043T280
+1280T479 1431T762 1485Q856 1485 936 1464T1083 1405L1163 1532L1300 1454ZM322 733Q322 602 345 498T416 315L995 1260Q947 1289 890 1305T762 1321Q648 1321 565 1281T428 1165T348 980T322 733ZM1196 733Q1196 990 1108 1141L530 201Q577 173 634 158T760 143Q874
+143 956 183T1092 300T1171 486T1196 733Z" />
+<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM847
+1579H727Q692 1607 651 1648T572 1734T502 1818T454 1886V1907H673Q689 1873 710 1833T755 1752T802 1673T847 1606V1579Z" />
+<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM590
+1606Q612 1635 635 1673T682 1751T727 1832T764 1907H983V1886Q967 1859 936 1819T866 1734T787 1649T711 1579H590V1606Z" />
+<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059
+512V1464H1245ZM1043 1579H922Q871 1613 817 1661T711 1765Q657 1710 604 1662T500 1579H379V1606Q405 1635 439 1673T506 1751T569 1832T615 1907H807Q823 1873 852 1833T915 1752T983 1673T1043 1606V1579Z" />
+<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1430" d="M1245 1464V516Q1245 402 1212 304T1113 134T946 21T709 -20Q581 -20 483 18T319 128T218 298T184 520V1462H371V510Q371 335 457 239T719 143Q808 143 872 170T977 246T1038 363T1059 512V1464H1245ZM432
+1733Q432 1787 460 1811T528 1835Q567 1835 596 1811T625 1733Q625 1680 596 1655T528 1630Q488 1630 460 1655T432 1733ZM807 1733Q807 1787 835 1811T903 1835Q922 1835 939 1829T970 1811T991 1779T999 1733Q999 1680 970 1655T903 1630Q863 1630 835 1655T807
+1733Z" />
+<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1079" d="M539 723L879 1462H1079L633 569V0H446V559L0 1462H203L539 723ZM442 1606Q464 1635 487 1673T534 1751T579 1832T616 1907H835V1886Q819 1859 788 1819T718 1734T639 1649T563 1579H442V1606Z" />
+<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1180" d="M1075 782Q1075 691 1048 607T957 459T791 356T535 317H385V0H199V1462H385V1210H561Q695 1210 792 1182T952 1099T1045 964T1075 782ZM385 475H514Q607 475 676 491T791 542T860 634T883 772Q883
+915 801 983T545 1051H385V475Z" />
+<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1233" d="M1010 1260Q1010 1203 989 1159T936 1078T867 1011T798 954T745 899T723 842Q723 821 730 805T756 769T811 725T903 662Q959 625 1003 589T1077 512T1124 423T1141 313Q1141 226 1113 163T1035
+60T914 0T758 -20Q661 -20 592 -3T469 49V215Q495 199 527 184T596 156T670 137T745 129Q801 129 841 141T908 176T946 231T958 303Q958 339 950 368T920 426T862 483T770 547Q707 587 665 621T596 688T558 757T547 834Q547 888 567 927T619 998T686 1057T753 1113T804
+1175T825 1253Q825 1295 809 1326T762 1377T691 1407T598 1417Q549 1417 505 1408T428 1374T376 1309T356 1202V0H174V1200Q174 1304 205 1374T293 1487T428 1548T598 1567Q690 1567 766 1548T896 1491T980 1395T1010 1260Z" />
+<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
+374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM934 1241H814Q779
+1269 738 1310T659 1396T589 1480T541 1548V1569H760Q776 1535 797 1495T842 1414T889 1335T934 1268V1241Z" />
+<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
+374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM446 1268Q468 1297
+491 1335T538 1413T583 1494T620 1569H839V1548Q823 1521 792 1481T722 1396T643 1311T567 1241H446V1268Z" />
+<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445
+967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM1148 1241H1027Q976
+1275 922 1323T816 1427Q762 1372 709 1324T605 1241H484V1268Q510 1297 544 1335T611 1413T674 1494T720 1569H912Q928 1535 957 1495T1020 1414T1088 1335T1148 1268V1241Z" />
+<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
+374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM955 1243Q915 1243
+876 1260T798 1299T725 1338T658 1356Q613 1356 589 1330T551 1241H447Q452 1301 468 1350T511 1433T575 1486T658 1505Q700 1505 740 1488T819 1449T891 1411T955 1393Q1000 1393 1023 1419T1061 1507H1166Q1161 1447 1145 1399T1102 1316T1038 1262T955 1243Z"
+/>
+<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445
+967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM529 1395Q529
+1449 557 1473T625 1497Q664 1497 693 1473T722 1395Q722 1342 693 1317T625 1292Q585 1292 557 1317T529 1395ZM904 1395Q904 1449 932 1473T1000 1497Q1019 1497 1036 1491T1067 1473T1088 1441T1096 1395Q1096 1342 1067 1317T1000 1292Q960 1292 932 1317T904
+1395Z" />
+<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1087" d="M793 0L756 152H748Q715 107 682 75T610 21T523 -10T412 -20Q343 -20 285 -1T185 59T118 161T94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967
+374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q630 1118 704 1098T827 1033T900 919T924 752V0H793ZM459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305Q283 213 331 170T459 127ZM1039 1458Q1039
+1407 1022 1367T974 1298T901 1256T810 1241Q760 1241 719 1255T649 1298T603 1365T587 1456Q587 1507 603 1546T648 1614T719 1656T810 1671Q858 1671 900 1657T973 1615T1021 1548T1039 1458ZM922 1456Q922 1509 891 1539T810 1569Q760 1569 729 1539T697 1456Q697
+1403 725 1373T810 1343Q859 1343 890 1373T922 1456Z" />
+<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1706" d="M94 307Q94 471 209 559T561 655L745 662V731Q745 798 731 843T689 915T621 955T528 967Q445 967 374 943T236 885L172 1022Q246 1062 337 1090T528 1118Q659 1118 742 1076T868 940Q919 1025 1002
+1071T1188 1118Q1285 1118 1362 1083T1493 983T1575 828T1604 627V514H932Q937 321 1010 230T1231 139Q1280 139 1322 144T1404 158T1480 182T1554 215V53Q1515 34 1478 20T1401 -3T1319 -16T1227 -20Q1089 -20 988 37T825 209Q791 155 753 113T668 41T562 -4T430
+-20Q359 -20 298 -1T191 59T120 161T94 307ZM283 305Q283 213 331 170T459 127Q520 127 572 146T662 203T721 300T743 438V537L600 530Q510 526 449 510T352 466T299 397T283 305ZM1184 967Q1074 967 1011 889T936 662H1407Q1407 730 1394 786T1354 883T1284 945T1184
+967Z" />
+<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="948" d="M594 -20Q493 -20 405 11T252 111T150 286T113 543Q113 700 151 809T255 987T411 1087T602 1118Q680 1118 754 1101T879 1059L825 905Q802 915 774 924T716 941T657 953T602 958Q445 958 373
+858T301 545Q301 334 373 237T594 139Q675 139 740 157T860 201V39Q806 10 745 -5T594 -20ZM730 -287Q730 -384 660 -438T439 -492Q417 -492 395 -489T357 -483V-375Q372 -378 396 -379T437 -381Q508 -381 548 -360T588 -289Q588 -265 575 -248T539 -217T485 -195T416
+-176L506 0H627L570 -115Q604 -123 633 -136T683 -169T717 -219T730 -287Z" />
+<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704
+144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM934 1241H814Q779 1269 738 1310T659 1396T589 1480T541 1548V1569H760Q776 1535 797 1495T842 1414T889
+1335T934 1268V1241Z" />
+<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139 704
+144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM475 1268Q497 1297 520 1335T567 1413T612 1494T649 1569H868V1548Q852 1521 821 1481T751 1396T672 1311T596
+1241H475V1268Z" />
+<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139
+704 144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM1144 1241H1023Q972 1275 918 1323T812 1427Q758 1372 705 1324T601 1241H480V1268Q506 1297 540
+1335T607 1413T670 1494T716 1569H908Q924 1535 953 1495T1016 1414T1084 1335T1144 1268V1241Z" />
+<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1096" d="M608 -20Q498 -20 407 17T251 125T149 301T113 541Q113 677 146 784T239 965T382 1079T567 1118Q666 1118 745 1083T879 983T963 828T993 627V514H301Q306 321 382 230T610 139Q661 139
+704 144T788 158T867 182T944 215V53Q904 34 866 20T787 -3T703 -16T608 -20ZM563 967Q449 967 383 889T305 662H797Q797 730 784 786T742 883T669 945T563 967ZM525 1395Q525 1449 553 1473T621 1497Q660 1497 689 1473T718 1395Q718 1342 689 1317T621 1292Q581
+1292 553 1317T525 1395ZM900 1395Q900 1449 928 1473T996 1497Q1015 1497 1032 1491T1063 1473T1084 1441T1092 1395Q1092 1342 1063 1317T996 1292Q956 1292 928 1317T900 1395Z" />
+<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM359 1241H239Q204 1269 163 1310T84 1396T14 1480T-34 1548V1569H185Q201 1535 222 1495T267 1414T314 1335T359 1268V1241Z" />
+<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM185 1268Q207 1297 230 1335T277 1413T322 1494T359 1569H578V1548Q562 1521 531 1481T461 1396T382 1311T306 1241H185V1268Z" />
+<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM597 1241H476Q425 1275 371 1323T265 1427Q211 1372 158 1324T54 1241H-67V1268Q-41 1297 -7 1335T60 1413T123 1494T169 1569H361Q377 1535 406 1495T469 1414T537
+1335T597 1268V1241Z" />
+<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="530" d="M356 0H174V1098H356V0ZM-18 1395Q-18 1449 10 1473T78 1497Q117 1497 146 1473T175 1395Q175 1342 146 1317T78 1292Q38 1292 10 1317T-18 1395ZM357 1395Q357 1449 385 1473T453 1497Q472
+1497 489 1491T520 1473T541 1441T549 1395Q549 1342 520 1317T453 1292Q413 1292 385 1317T357 1395Z" />
+<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1182" d="M1069 573Q1069 431 1036 321T940 135T788 20T588 -20Q484 -20 397 13T246 109T147 265T111 477Q111 596 142 688T233 843T376 938T565 971Q667 971 744 942T864 852L872 856Q841 974 781 1070T631
+1247L375 1094L301 1208L518 1339Q478 1367 436 1394T346 1448L416 1571Q481 1539 542 1503T662 1423L889 1561L963 1448L768 1331Q835 1266 890 1188T985 1017T1047 813T1069 573ZM881 526Q881 582 864 635T812 730T722 796T592 821Q515 821 461 798T371 731T320
+622T303 471Q303 395 319 333T371 225T461 156T592 131Q746 131 813 230T881 526Z" />
+<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1206" d="M860 0V707Q860 837 808 902T643 967Q562 967 507 941T419 864T371 739T356 569V0H174V1098H322L348 950H358Q383 993 417 1024T493 1077T580 1108T674 1118Q857 1118 949 1023T1042 717V0H860ZM1015
+1243Q975 1243 936 1260T858 1299T785 1338T718 1356Q673 1356 649 1330T611 1241H507Q512 1301 528 1350T571 1433T635 1486T718 1505Q760 1505 800 1488T879 1449T951 1411T1015 1393Q1060 1393 1083 1419T1121 1507H1226Q1221 1447 1205 1399T1162 1316T1098
+1262T1015 1243Z" />
+<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
+551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM1002 1241H882Q847 1269 806 1310T727 1396T657 1480T609 1548V1569H828Q844 1535 865 1495T910 1414T957 1335T1002 1268V1241Z" />
+<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
+551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM473 1268Q495 1297 518 1335T565 1413T610 1494T647 1569H866V1548Q850 1521 819 1481T749 1396T670 1311T594 1241H473V1268Z" />
+<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069
+551ZM301 551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM1173 1241H1052Q1001 1275 947 1323T841 1427Q787 1372 734 1324T630 1241H509V1268Q535 1297 569 1335T636 1413T699 1494T745 1569H937Q953
+1535 982 1495T1045 1414T1113 1335T1173 1268V1241Z" />
+<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069 551ZM301
+551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM992 1243Q952 1243 913 1260T835 1299T762 1338T695 1356Q650 1356 626 1330T588 1241H484Q489 1301 505 1350T548 1433T612 1486T695 1505Q737 1505 777
+1488T856 1449T928 1411T992 1393Q1037 1393 1060 1419T1098 1507H1203Q1198 1447 1182 1399T1139 1316T1075 1262T992 1243Z" />
+<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1182" d="M1069 551Q1069 414 1036 308T940 129T788 18T588 -20Q485 -20 398 18T248 128T149 307T113 551Q113 687 146 792T242 970T393 1080T594 1118Q697 1118 784 1081T934 971T1033 793T1069
+551ZM301 551Q301 342 369 237T592 131Q746 131 813 236T881 551Q881 760 813 863T590 967Q436 967 369 864T301 551ZM556 1395Q556 1449 584 1473T652 1497Q691 1497 720 1473T749 1395Q749 1342 720 1317T652 1292Q612 1292 584 1317T556 1395ZM931 1395Q931
+1449 959 1473T1027 1497Q1046 1497 1063 1491T1094 1473T1115 1441T1123 1395Q1123 1342 1094 1317T1027 1292Q987 1292 959 1317T931 1395Z" />
+<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1128" d="M102 647V797H1026V647H102ZM449 373Q449 408 458 431T482 470T518 491T563 498Q586 498 607 492T644 470T669 432T678 373Q678 340 669 317T644 278T607 255T563 248Q539 248 519 255T483
+277T458 316T449 373ZM449 1071Q449 1106 458 1129T482 1168T518 1189T563 1196Q586 1196 607 1190T644 1168T669 1130T678 1071Q678 1038 669 1015T644 976T607 953T563 946Q539 946 519 953T483 975T458 1014T449 1071Z" />
+<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1182" d="M1071 551Q1071 414 1038 308T942 129T790 18T590 -20Q465 -20 367 33L299 -76L168 -2L248 129Q185 201 150 307T115 551Q115 687 148 792T244 970T395 1080T596 1118Q659 1118 715 1104T821
+1061L889 1169L1020 1096L940 967Q1002 894 1036 790T1071 551ZM303 551Q303 467 312 402T344 285L741 932Q712 949 675 958T592 967Q438 967 371 864T303 551ZM883 551Q883 710 844 809L446 164Q477 147 513 139T594 131Q748 131 815 236T883 551Z" />
+<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM949
+1241H829Q794 1269 753 1310T674 1396T604 1480T556 1548V1569H775Q791 1535 812 1495T857 1414T904 1335T949 1268V1241Z" />
+<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM489
+1268Q511 1297 534 1335T581 1413T626 1494T663 1569H882V1548Q866 1521 835 1481T765 1396T686 1311T610 1241H489V1268Z" />
+<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM930
+1241H809Q758 1275 704 1323T598 1427Q544 1372 491 1324T387 1241H266V1268Q292 1297 326 1335T393 1413T456 1494T502 1569H694Q710 1535 739 1495T802 1414T870 1335T930 1268V1241Z" />
+<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1206" d="M885 0L858 147H848Q823 104 789 73T713 21T626 -10T532 -20Q441 -20 372 3T257 75T188 200T164 381V1098H346V391Q346 261 399 196T563 131Q644 131 699 157T787 233T835 358T850 528V1098H1032V0H885ZM309
+1395Q309 1449 337 1473T405 1497Q444 1497 473 1473T502 1395Q502 1342 473 1317T405 1292Q365 1292 337 1317T309 1395ZM684 1395Q684 1449 712 1473T780 1497Q799 1497 816 1491T847 1473T868 1441T876 1395Q876 1342 847 1317T780 1292Q740 1292 712 1317T684
+1395Z" />
+<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130
+-492 92 -487T27 -475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098ZM407 1268Q429 1297 452 1335T499 1413T544 1494T581 1569H800V1548Q784 1521 753 1481T683 1396T604 1311T528 1241H407V1268Z" />
+<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1200" d="M356 950Q379 985 408 1015T475 1068T562 1104T670 1118Q764 1118 841 1082T972 975T1057 797T1087 551Q1087 410 1057 304T973 125T841 17T670 -20Q611 -20 563 -7T477 27T409 78T356 139H344Q347
+105 350 74Q352 48 354 21T356 -23V-492H174V1556H356V1098L348 950H356ZM635 967Q559 967 507 944T422 874T374 757T356 592V551Q356 450 369 372T415 240T502 159T637 131Q772 131 835 240T899 553Q899 761 836 864T635 967Z" />
+<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1001" d="M10 1098H199L414 485Q428 445 442 401T469 313T491 228T504 152H510Q515 177 526 220T550 311T578 407T604 487L803 1098H991L557 -143Q529 -224 497 -288T421 -398T320 -467T182 -492Q130
+-492 92 -487T27 -475V-330Q48 -335 80 -338T147 -342Q195 -342 230 -331T291 -297T335 -243T369 -170L426 -10L10 1098ZM484 1395Q484 1449 512 1473T580 1497Q619 1497 648 1473T677 1395Q677 1342 648 1317T580 1292Q540 1292 512 1317T484 1395ZM859 1395Q859
+1449 887 1473T955 1497Q974 1497 991 1491T1022 1473T1043 1441T1051 1395Q1051 1342 1022 1317T955 1292Q915 1292 887 1317T859 1395Z" />
+<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 465V633H942V465H82Z" />
+<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 465V633H1966V465H82Z" />
+<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="358" d="M37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H336Q321 1401 307 1335T279 1204T255 1076T236 961H37Z" />
+<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="358" d="M322 1462L336 1440Q322 1385 303 1325T260 1202T211 1078T160 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H322Z" />
+<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="512" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362Z" />
+<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="743" d="M422 961L408 983Q422 1037 441 1098T484 1221T533 1344T584 1462H721Q706 1401 692 1335T664 1204T640 1076T621 961H422ZM37 961L23 983Q37 1037 56 1098T99 1221T148 1344T199 1462H336Q321
+1401 307 1335T279 1204T255 1076T236 961H37Z" />
+<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="743" d="M322 1462L336 1440Q322 1385 303 1325T260 1202T211 1078T160 961H23Q37 1021 51 1087T79 1219T104 1347T123 1462H322ZM707 1462L721 1440Q707 1385 688 1325T645 1202T596 1078T545
+961H408Q422 1021 436 1087T464 1219T489 1347T508 1462H707Z" />
+<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="897" d="M362 238L377 215Q363 161 344 100T301 -23T252 -146T201 -264H63Q78 -203 92 -137T120 -6T145 122T164 238H362ZM748 238L762 215Q748 161 729 100T686 -23T637 -146T586 -264H449Q463
+-203 477 -137T505 -6T530 122T549 238H748Z" />
+<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M150 748Q150 819 168 869T217 950T292 996T385 1010Q434 1010 477 996T552 951T602 869T621 748Q621 678 603 628T552 547T477 500T385 485Q335 485 292 500T218 546T168 628T150 748Z" />
+<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="590" d="M82 553L391 967L508 889L270 541L508 193L391 115L82 526V553Z" />
+<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="590" d="M508 526L199 115L82 193L319 541L82 889L199 967L508 553V526Z" />
+</font>
+</defs>
+</svg>
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.ttf b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.ttf
new file mode 100644
index 00000000..76aede27
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.ttf differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff
new file mode 100644
index 00000000..abf19899
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff differ
diff --git a/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff2 b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff2
new file mode 100644
index 00000000..9f93f74c
Binary files /dev/null and b/src/main/webapp/api-docs/fonts/droid-sans-v6-latin-regular.woff2 differ
diff --git a/src/main/webapp/api-docs/images/explorer_icons.png b/src/main/webapp/api-docs/images/explorer_icons.png
new file mode 100644
index 00000000..ed9d2fff
Binary files /dev/null and b/src/main/webapp/api-docs/images/explorer_icons.png differ
diff --git a/src/main/webapp/api-docs/images/logo_small.png b/src/main/webapp/api-docs/images/logo_small.png
new file mode 100644
index 00000000..5496a655
Binary files /dev/null and b/src/main/webapp/api-docs/images/logo_small.png differ
diff --git a/src/main/webapp/api-docs/images/pet_store_api.png b/src/main/webapp/api-docs/images/pet_store_api.png
new file mode 100644
index 00000000..f9f9cd4a
Binary files /dev/null and b/src/main/webapp/api-docs/images/pet_store_api.png differ
diff --git a/src/main/webapp/api-docs/images/throbber.gif b/src/main/webapp/api-docs/images/throbber.gif
new file mode 100644
index 00000000..06393889
Binary files /dev/null and b/src/main/webapp/api-docs/images/throbber.gif differ
diff --git a/src/main/webapp/api-docs/images/wordnik_api.png b/src/main/webapp/api-docs/images/wordnik_api.png
new file mode 100644
index 00000000..dca4f145
Binary files /dev/null and b/src/main/webapp/api-docs/images/wordnik_api.png differ
diff --git a/src/main/webapp/api-docs/lib/backbone-min.js b/src/main/webapp/api-docs/lib/backbone-min.js
new file mode 100644
index 00000000..a3f544be
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/backbone-min.js
@@ -0,0 +1,15 @@
+// Backbone.js 1.1.2
+
+(function(t,e){if(typeof define==="function"&&define.amd){define(["underscore","jquery","exports"],function(i,r,s){t.Backbone=e(t,s,i,r)})}else if(typeof exports!=="undefined"){var i=require("underscore");e(t,exports,i)}else{t.Backbone=e(t,{},t._,t.jQuery||t.Zepto||t.ender||t.$)}})(this,function(t,e,i,r){var s=t.Backbone;var n=[];var a=n.push;var o=n.slice;var h=n.splice;e.VERSION="1.1.2";e.$=r;e.noConflict=function(){t.Backbone=s;return this};e.emulateHTTP=false;e.emulateJSON=false;var u=e.Events={on:function(t,e,i){if(!c(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,r){if(!c(this,"once",t,[e,r])||!e)return this;var s=this;var n=i.once(function(){s.off(t,n);e.apply(this,arguments)});n._callback=e;return this.on(t,n,r)},off:function(t,e,r){var s,n,a,o,h,u,l,f;if(!this._events||!c(this,"off",t,[e,r]))return this;if(!t&&!e&&!r){this._events=void 0;return this}o=t?[t]:i.keys(this._events);for(h=0,u=o.length;h<u;h++){t=o[h];if(a=this._events[t]){this._events[t]=s=[];if(e||r){for(l=0,f=a.length;l<f;l++){n=a[l];if(e&&e!==n.callback&&e!==n.callback._callback||r&&r!==n.context){s.push(n)}}}if(!s.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=o.call(arguments,1);if(!c(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)f(i,e);if(r)f(r,arguments);return this},stopListening:function(t,e,r){var s=this._listeningTo;if(!s)return this;var n=!e&&!r;if(!r&&typeof e==="object")r=this;if(t)(s={})[t._listenId]=t;for(var a in s){t=s[a];t.off(e,r,this);if(n||i.isEmpty(t._events))delete this._listeningTo[a]}return this}};var l=/\s+/;var c=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(l.test(i)){var n=i.split(l);for(var a=0,o=n.length;a<o;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var f=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],o=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,o);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e);return}};var d={listenTo:"on",listenToOnce:"once"};i.each(d,function(t,e){u[e]=function(e,r,s){var n=this._listeningTo||(this._listeningTo={});var a=e._listenId||(e._listenId=i.uniqueId("l"));n[a]=e;if(!s&&typeof r==="object")s=this;e[t](r,s,this);return this}});u.bind=u.on;u.unbind=u.off;i.extend(e,u);var p=e.Model=function(t,e){var r=t||{};e||(e={});this.cid=i.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)r=this.parse(r,e)||{};r=i.defaults({},r,i.result(this,"defaults"));this.set(r,e);this.changed={};this.initialize.apply(this,arguments)};i.extend(p.prototype,u,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return i.clone(this.attributes)},sync:function(){return e.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return i.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,r){var s,n,a,o,h,u,l,c;if(t==null)return this;if(typeof t==="object"){n=t;r=e}else{(n={})[t]=e}r||(r={});if(!this._validate(n,r))return false;a=r.unset;h=r.silent;o=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=i.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in n)this.id=n[this.idAttribute];for(s in n){e=n[s];if(!i.isEqual(c[s],e))o.push(s);if(!i.isEqual(l[s],e)){this.changed[s]=e}else{delete this.changed[s]}a?delete c[s]:c[s]=e}if(!h){if(o.length)this._pending=r;for(var f=0,d=o.length;f<d;f++){this.trigger("change:"+o[f],this,c[o[f]],r)}}if(u)return this;if(!h){while(this._pending){r=this._pending;this._pending=false;this.trigger("change",this,r)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,i.extend({},e,{unset:true}))},clear:function(t){var e={};for(var r in this.attributes)e[r]=void 0;return this.set(e,i.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!i.isEmpty(this.changed);return i.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?i.clone(this.changed):false;var e,r=false;var s=this._changing?this._previousAttributes:this.attributes;for(var n in t){if(i.isEqual(s[n],e=t[n]))continue;(r||(r={}))[n]=e}return r},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return i.clone(this._previousAttributes)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var r=t.success;t.success=function(i){if(!e.set(e.parse(i,t),t))return false;if(r)r(e,i,t);e.trigger("sync",e,i,t)};q(this,t);return this.sync("read",this,t)},save:function(t,e,r){var s,n,a,o=this.attributes;if(t==null||typeof t==="object"){s=t;r=e}else{(s={})[t]=e}r=i.extend({validate:true},r);if(s&&!r.wait){if(!this.set(s,r))return false}else{if(!this._validate(s,r))return false}if(s&&r.wait){this.attributes=i.extend({},o,s)}if(r.parse===void 0)r.parse=true;var h=this;var u=r.success;r.success=function(t){h.attributes=o;var e=h.parse(t,r);if(r.wait)e=i.extend(s||{},e);if(i.isObject(e)&&!h.set(e,r)){return false}if(u)u(h,t,r);h.trigger("sync",h,t,r)};q(this,r);n=this.isNew()?"create":r.patch?"patch":"update";if(n==="patch")r.attrs=s;a=this.sync(n,this,r);if(s&&r.wait)this.attributes=o;return a},destroy:function(t){t=t?i.clone(t):{};var e=this;var r=t.success;var s=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(i){if(t.wait||e.isNew())s();if(r)r(e,i,t);if(!e.isNew())e.trigger("sync",e,i,t)};if(this.isNew()){t.success();return false}q(this,t);var n=this.sync("delete",this,t);if(!t.wait)s();return n},url:function(){var t=i.result(this,"urlRoot")||i.result(this.collection,"url")||M();if(this.isNew())return t;return t.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(t){return this._validate({},i.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=i.extend({},this.attributes,t);var r=this.validationError=this.validate(t,e)||null;if(!r)return true;this.trigger("invalid",this,r,i.extend(e,{validationError:r}));return false}});var v=["keys","values","pairs","invert","pick","omit"];i.each(v,function(t){p.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.attributes);return i[t].apply(i,e)}});var g=e.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,i.extend({silent:true},e))};var m={add:true,remove:true,merge:true};var y={add:true,remove:false};i.extend(g.prototype,u,{model:p,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return e.sync.apply(this,arguments)},add:function(t,e){return this.set(t,i.extend({merge:false},e,y))},remove:function(t,e){var r=!i.isArray(t);t=r?[t]:i.clone(t);e||(e={});var s,n,a,o;for(s=0,n=t.length;s<n;s++){o=t[s]=this.get(t[s]);if(!o)continue;delete this._byId[o.id];delete this._byId[o.cid];a=this.indexOf(o);this.models.splice(a,1);this.length--;if(!e.silent){e.index=a;o.trigger("remove",o,this,e)}this._removeReference(o,e)}return r?t[0]:t},set:function(t,e){e=i.defaults({},e,m);if(e.parse)t=this.parse(t,e);var r=!i.isArray(t);t=r?t?[t]:[]:i.clone(t);var s,n,a,o,h,u,l;var c=e.at;var f=this.model;var d=this.comparator&&c==null&&e.sort!==false;var v=i.isString(this.comparator)?this.comparator:null;var g=[],y=[],_={};var b=e.add,w=e.merge,x=e.remove;var E=!d&&b&&x?[]:false;for(s=0,n=t.length;s<n;s++){h=t[s]||{};if(h instanceof p){a=o=h}else{a=h[f.prototype.idAttribute||"id"]}if(u=this.get(a)){if(x)_[u.cid]=true;if(w){h=h===o?o.attributes:h;if(e.parse)h=u.parse(h,e);u.set(h,e);if(d&&!l&&u.hasChanged(v))l=true}t[s]=u}else if(b){o=t[s]=this._prepareModel(h,e);if(!o)continue;g.push(o);this._addReference(o,e)}o=u||o;if(E&&(o.isNew()||!_[o.id]))E.push(o);_[o.id]=true}if(x){for(s=0,n=this.length;s<n;++s){if(!_[(o=this.models[s]).cid])y.push(o)}if(y.length)this.remove(y,e)}if(g.length||E&&E.length){if(d)l=true;this.length+=g.length;if(c!=null){for(s=0,n=g.length;s<n;s++){this.models.splice(c+s,0,g[s])}}else{if(E)this.models.length=0;var k=E||g;for(s=0,n=k.length;s<n;s++){this.models.push(k[s])}}}if(l)this.sort({silent:true});if(!e.silent){for(s=0,n=g.length;s<n;s++){(o=g[s]).trigger("add",o,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return r?t[0]:t},reset:function(t,e){e||(e={});for(var r=0,s=this.models.length;r<s;r++){this._removeReference(this.models[r],e)}e.previousModels=this.models;this._reset();t=this.add(t,i.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,i.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,i.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return o.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t]||this._byId[t.id]||this._byId[t.cid]},at:function(t){return this.models[t]},where:function(t,e){if(i.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(i.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(i.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return i.invoke(this.models,"get",t)},fetch:function(t){t=t?i.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var r=this;t.success=function(i){var s=t.reset?"reset":"set";r[s](i,t);if(e)e(r,i,t);r.trigger("sync",r,i,t)};q(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?i.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var r=this;var s=e.success;e.success=function(t,i){if(e.wait)r.add(t,e);if(s)s(t,i,e)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof p)return t;e=e?i.clone(e):{};e.collection=this;var r=new this.model(t,e);if(!r.validationError)return r;this.trigger("invalid",this,r.validationError,e);return false},_addReference:function(t,e){this._byId[t.cid]=t;if(t.id!=null)this._byId[t.id]=t;if(!t.collection)t.collection=this;t.on("all",this._onModelEvent,this)},_removeReference:function(t,e){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var _=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];i.each(_,function(t){g.prototype[t]=function(){var e=o.call(arguments);e.unshift(this.models);return i[t].apply(i,e)}});var b=["groupBy","countBy","sortBy","indexBy"];i.each(b,function(t){g.prototype[t]=function(e,r){var s=i.isFunction(e)?e:function(t){return t.get(e)};return i[t](this.models,s,r)}});var w=e.View=function(t){this.cid=i.uniqueId("view");t||(t={});i.extend(this,i.pick(t,E));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var x=/^(\S+)\s*(.*)$/;var E=["model","collection","el","id","attributes","className","tagName","events"];i.extend(w.prototype,u,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,i){if(this.$el)this.undelegateEvents();this.$el=t instanceof e.$?t:e.$(t);this.el=this.$el[0];if(i!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=i.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var r=t[e];if(!i.isFunction(r))r=this[t[e]];if(!r)continue;var s=e.match(x);var n=s[1],a=s[2];r=i.bind(r,this);n+=".delegateEvents"+this.cid;if(a===""){this.$el.on(n,r)}else{this.$el.on(n,a,r)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=i.extend({},i.result(this,"attributes"));if(this.id)t.id=i.result(this,"id");if(this.className)t["class"]=i.result(this,"className");var r=e.$("<"+i.result(this,"tagName")+">").attr(t);this.setElement(r,false)}else{this.setElement(i.result(this,"el"),false)}}});e.sync=function(t,r,s){var n=T[t];i.defaults(s||(s={}),{emulateHTTP:e.emulateHTTP,emulateJSON:e.emulateJSON});var a={type:n,dataType:"json"};if(!s.url){a.url=i.result(r,"url")||M()}if(s.data==null&&r&&(t==="create"||t==="update"||t==="patch")){a.contentType="application/json";a.data=JSON.stringify(s.attrs||r.toJSON(s))}if(s.emulateJSON){a.contentType="application/x-www-form-urlencoded";a.data=a.data?{model:a.data}:{}}if(s.emulateHTTP&&(n==="PUT"||n==="DELETE"||n==="PATCH")){a.type="POST";if(s.emulateJSON)a.data._method=n;var o=s.beforeSend;s.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",n);if(o)return o.apply(this,arguments)}}if(a.type!=="GET"&&!s.emulateJSON){a.processData=false}if(a.type==="PATCH"&&k){a.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var h=s.xhr=e.ajax(i.extend(a,s));r.trigger("request",r,h,s);return h};var k=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};e.ajax=function(){return e.$.ajax.apply(e.$,arguments)};var $=e.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var H=/(\(\?)?:\w+/g;var A=/\*\w+/g;var I=/[\-{}\[\]+?.,\\\^$|#\s]/g;i.extend($.prototype,u,{initialize:function(){},route:function(t,r,s){if(!i.isRegExp(t))t=this._routeToRegExp(t);if(i.isFunction(r)){s=r;r=""}if(!s)s=this[r];var n=this;e.history.route(t,function(i){var a=n._extractParameters(t,i);n.execute(s,a);n.trigger.apply(n,["route:"+r].concat(a));n.trigger("route",r,a);e.history.trigger("route",n,r,a)});return this},execute:function(t,e){if(t)t.apply(this,e)},navigate:function(t,i){e.history.navigate(t,i);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=i.result(this,"routes");var t,e=i.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(I,"\\$&").replace(S,"(?:$1)?").replace(H,function(t,e){return e?t:"([^/?]+)"}).replace(A,"([^?]*?)");return new RegExp("^"+t+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(t,e){var r=t.exec(e).slice(1);return i.map(r,function(t,e){if(e===r.length-1)return t||null;return t?decodeURIComponent(t):null})}});var N=e.History=function(){this.handlers=[];i.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var R=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/#.*$/;N.started=false;i.extend(N.prototype,u,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=decodeURI(this.location.pathname+this.location.search);var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(R,"")},start:function(t){if(N.started)throw new Error("Backbone.history has already been started");N.started=true;this.options=i.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment();var s=document.documentMode;var n=P.exec(navigator.userAgent.toLowerCase())&&(!s||s<=7);this.root=("/"+this.root+"/").replace(O,"/");if(n&&this._wantsHashChange){var a=e.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=a.hide().appendTo("body")[0].contentWindow;this.navigate(r)}if(this._hasPushState){e.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!n){e.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=r;var o=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot()){this.fragment=this.getFragment(null,true);this.location.replace(this.root+"#"+this.fragment);return true}else if(this._hasPushState&&this.atRoot()&&o.hash){this.fragment=this.getHash().replace(R,"");this.history.replaceState({},document.title,this.root+this.fragment)}}if(!this.options.silent)return this.loadUrl()},stop:function(){e.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);if(this._checkUrlInterval)clearInterval(this._checkUrlInterval);N.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return i.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!N.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});e.history=new N;var U=function(t,e){var r=this;var s;if(t&&i.has(t,"constructor")){s=t.constructor}else{s=function(){return r.apply(this,arguments)}}i.extend(s,r,e);var n=function(){this.constructor=s};n.prototype=r.prototype;s.prototype=new n;if(t)i.extend(s.prototype,t);s.__super__=r.prototype;return s};p.extend=g.extend=$.extend=w.extend=N.extend=U;var M=function(){throw new Error('A "url" property or function must be specified')};var q=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}};return e});
+
+// From http://stackoverflow.com/a/19431552
+// Compatibility override - Backbone 1.1 got rid of the 'options' binding
+// automatically to views in the constructor - we need to keep that.
+Backbone.View = (function(View) {
+   return View.extend({
+        constructor: function(options) {
+            this.options = options || {};
+            View.apply(this, arguments);
+        }
+    });
+})(Backbone.View);
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/handlebars-2.0.0.js b/src/main/webapp/api-docs/lib/handlebars-2.0.0.js
new file mode 100644
index 00000000..53cf921d
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/handlebars-2.0.0.js
@@ -0,0 +1,28 @@
+/*!
+
+ handlebars v2.0.0
+
+Copyright (C) 2011-2014 by Yehuda Katz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+@license
+*/
+!function(a,b){"function"==typeof define&&define.amd?define([],b):"object"==typeof exports?module.exports=b():a.Handlebars=a.Handlebars||b()}(this,function(){var a=function(){"use strict";function a(a){this.string=a}var b;return a.prototype.toString=function(){return""+this.string},b=a}(),b=function(a){"use strict";function b(a){return i[a]}function c(a){for(var b=1;b<arguments.length;b++)for(var c in arguments[b])Object.prototype.hasOwnProperty.call(arguments[b],c)&&(a[c]=arguments[b][c]);return a}function d(a){return a instanceof h?a.toString():null==a?"":a?(a=""+a,k.test(a)?a.replace(j,b):a):a+""}function e(a){return a||0===a?n(a)&&0===a.length?!0:!1:!0}function f(a,b){return(a?a+".":"")+b}var g={},h=a,i={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},j=/[&<>"'`]/g,k=/[&<>"'`]/;g.extend=c;var l=Object.prototype.toString;g.toString=l;var m=function(a){return"function"==typeof a};m(/x/)&&(m=function(a){return"function"==typeof a&&"[object Function]"===l.call(a)});var m;g.isFunction=m;var n=Array.isArray||function(a){return a&&"object"==typeof a?"[object Array]"===l.call(a):!1};return g.isArray=n,g.escapeExpression=d,g.isEmpty=e,g.appendContextPath=f,g}(a),c=function(){"use strict";function a(a,b){var d;b&&b.firstLine&&(d=b.firstLine,a+=" - "+d+":"+b.firstColumn);for(var e=Error.prototype.constructor.call(this,a),f=0;f<c.length;f++)this[c[f]]=e[c[f]];d&&(this.lineNumber=d,this.column=b.firstColumn)}var b,c=["description","fileName","lineNumber","message","name","number","stack"];return a.prototype=new Error,b=a}(),d=function(a,b){"use strict";function c(a,b){this.helpers=a||{},this.partials=b||{},d(this)}function d(a){a.registerHelper("helperMissing",function(){if(1===arguments.length)return void 0;throw new g("Missing helper: '"+arguments[arguments.length-1].name+"'")}),a.registerHelper("blockHelperMissing",function(b,c){var d=c.inverse,e=c.fn;if(b===!0)return e(this);if(b===!1||null==b)return d(this);if(k(b))return b.length>0?(c.ids&&(c.ids=[c.name]),a.helpers.each(b,c)):d(this);if(c.data&&c.ids){var g=q(c.data);g.contextPath=f.appendContextPath(c.data.contextPath,c.name),c={data:g}}return e(b,c)}),a.registerHelper("each",function(a,b){if(!b)throw new g("Must pass iterator to #each");var c,d,e=b.fn,h=b.inverse,i=0,j="";if(b.data&&b.ids&&(d=f.appendContextPath(b.data.contextPath,b.ids[0])+"."),l(a)&&(a=a.call(this)),b.data&&(c=q(b.data)),a&&"object"==typeof a)if(k(a))for(var m=a.length;m>i;i++)c&&(c.index=i,c.first=0===i,c.last=i===a.length-1,d&&(c.contextPath=d+i)),j+=e(a[i],{data:c});else for(var n in a)a.hasOwnProperty(n)&&(c&&(c.key=n,c.index=i,c.first=0===i,d&&(c.contextPath=d+n)),j+=e(a[n],{data:c}),i++);return 0===i&&(j=h(this)),j}),a.registerHelper("if",function(a,b){return l(a)&&(a=a.call(this)),!b.hash.includeZero&&!a||f.isEmpty(a)?b.inverse(this):b.fn(this)}),a.registerHelper("unless",function(b,c){return a.helpers["if"].call(this,b,{fn:c.inverse,inverse:c.fn,hash:c.hash})}),a.registerHelper("with",function(a,b){l(a)&&(a=a.call(this));var c=b.fn;if(f.isEmpty(a))return b.inverse(this);if(b.data&&b.ids){var d=q(b.data);d.contextPath=f.appendContextPath(b.data.contextPath,b.ids[0]),b={data:d}}return c(a,b)}),a.registerHelper("log",function(b,c){var d=c.data&&null!=c.data.level?parseInt(c.data.level,10):1;a.log(d,b)}),a.registerHelper("lookup",function(a,b){return a&&a[b]})}var e={},f=a,g=b,h="2.0.0";e.VERSION=h;var i=6;e.COMPILER_REVISION=i;var j={1:"<= 1.0.rc.2",2:"== 1.0.0-rc.3",3:"== 1.0.0-rc.4",4:"== 1.x.x",5:"== 2.0.0-alpha.x",6:">= 2.0.0-beta.1"};e.REVISION_CHANGES=j;var k=f.isArray,l=f.isFunction,m=f.toString,n="[object Object]";e.HandlebarsEnvironment=c,c.prototype={constructor:c,logger:o,log:p,registerHelper:function(a,b){if(m.call(a)===n){if(b)throw new g("Arg not supported with multiple helpers");f.extend(this.helpers,a)}else this.helpers[a]=b},unregisterHelper:function(a){delete this.helpers[a]},registerPartial:function(a,b){m.call(a)===n?f.extend(this.partials,a):this.partials[a]=b},unregisterPartial:function(a){delete this.partials[a]}};var o={methodMap:{0:"debug",1:"info",2:"warn",3:"error"},DEBUG:0,INFO:1,WARN:2,ERROR:3,level:3,log:function(a,b){if(o.level<=a){var c=o.methodMap[a];"undefined"!=typeof console&&console[c]&&console[c].call(console,b)}}};e.logger=o;var p=o.log;e.log=p;var q=function(a){var b=f.extend({},a);return b._parent=a,b};return e.createFrame=q,e}(b,c),e=function(a,b,c){"use strict";function d(a){var b=a&&a[0]||1,c=m;if(b!==c){if(c>b){var d=n[c],e=n[b];throw new l("Template was precompiled with an older version of Handlebars than the current runtime. Please update your precompiler to a newer version ("+d+") or downgrade your runtime to an older version ("+e+").")}throw new l("Template was precompiled with a newer version of Handlebars than the current runtime. Please update your runtime to a newer version ("+a[1]+").")}}function e(a,b){if(!b)throw new l("No environment passed to template");if(!a||!a.main)throw new l("Unknown template object: "+typeof a);b.VM.checkRevision(a.compiler);var c=function(c,d,e,f,g,h,i,j,m){g&&(f=k.extend({},f,g));var n=b.VM.invokePartial.call(this,c,e,f,h,i,j,m);if(null==n&&b.compile){var o={helpers:h,partials:i,data:j,depths:m};i[e]=b.compile(c,{data:void 0!==j,compat:a.compat},b),n=i[e](f,o)}if(null!=n){if(d){for(var p=n.split("\n"),q=0,r=p.length;r>q&&(p[q]||q+1!==r);q++)p[q]=d+p[q];n=p.join("\n")}return n}throw new l("The partial "+e+" could not be compiled when running in runtime-only mode")},d={lookup:function(a,b){for(var c=a.length,d=0;c>d;d++)if(a[d]&&null!=a[d][b])return a[d][b]},lambda:function(a,b){return"function"==typeof a?a.call(b):a},escapeExpression:k.escapeExpression,invokePartial:c,fn:function(b){return a[b]},programs:[],program:function(a,b,c){var d=this.programs[a],e=this.fn(a);return b||c?d=f(this,a,e,b,c):d||(d=this.programs[a]=f(this,a,e)),d},data:function(a,b){for(;a&&b--;)a=a._parent;return a},merge:function(a,b){var c=a||b;return a&&b&&a!==b&&(c=k.extend({},b,a)),c},noop:b.VM.noop,compilerInfo:a.compiler},e=function(b,c){c=c||{};var f=c.data;e._setup(c),!c.partial&&a.useData&&(f=i(b,f));var g;return a.useDepths&&(g=c.depths?[b].concat(c.depths):[b]),a.main.call(d,b,d.helpers,d.partials,f,g)};return e.isTop=!0,e._setup=function(c){c.partial?(d.helpers=c.helpers,d.partials=c.partials):(d.helpers=d.merge(c.helpers,b.helpers),a.usePartial&&(d.partials=d.merge(c.partials,b.partials)))},e._child=function(b,c,e){if(a.useDepths&&!e)throw new l("must pass parent depths");return f(d,b,a[b],c,e)},e}function f(a,b,c,d,e){var f=function(b,f){return f=f||{},c.call(a,b,a.helpers,a.partials,f.data||d,e&&[b].concat(e))};return f.program=b,f.depth=e?e.length:0,f}function g(a,b,c,d,e,f,g){var h={partial:!0,helpers:d,partials:e,data:f,depths:g};if(void 0===a)throw new l("The partial "+b+" could not be found");return a instanceof Function?a(c,h):void 0}function h(){return""}function i(a,b){return b&&"root"in b||(b=b?o(b):{},b.root=a),b}var j={},k=a,l=b,m=c.COMPILER_REVISION,n=c.REVISION_CHANGES,o=c.createFrame;return j.checkRevision=d,j.template=e,j.program=f,j.invokePartial=g,j.noop=h,j}(b,c,d),f=function(a,b,c,d,e){"use strict";var f,g=a,h=b,i=c,j=d,k=e,l=function(){var a=new g.HandlebarsEnvironment;return j.extend(a,g),a.SafeString=h,a.Exception=i,a.Utils=j,a.escapeExpression=j.escapeExpression,a.VM=k,a.template=function(b){return k.template(b,a)},a},m=l();return m.create=l,m["default"]=m,f=m}(d,a,c,b,e),g=function(a){"use strict";function b(a){a=a||{},this.firstLine=a.first_line,this.firstColumn=a.first_column,this.lastColumn=a.last_column,this.lastLine=a.last_line}var c,d=a,e={ProgramNode:function(a,c,d){b.call(this,d),this.type="program",this.statements=a,this.strip=c},MustacheNode:function(a,c,d,f,g){if(b.call(this,g),this.type="mustache",this.strip=f,null!=d&&d.charAt){var h=d.charAt(3)||d.charAt(2);this.escaped="{"!==h&&"&"!==h}else this.escaped=!!d;this.sexpr=a instanceof e.SexprNode?a:new e.SexprNode(a,c),this.id=this.sexpr.id,this.params=this.sexpr.params,this.hash=this.sexpr.hash,this.eligibleHelper=this.sexpr.eligibleHelper,this.isHelper=this.sexpr.isHelper},SexprNode:function(a,c,d){b.call(this,d),this.type="sexpr",this.hash=c;var e=this.id=a[0],f=this.params=a.slice(1);this.isHelper=!(!f.length&&!c),this.eligibleHelper=this.isHelper||e.isSimple},PartialNode:function(a,c,d,e,f){b.call(this,f),this.type="partial",this.partialName=a,this.context=c,this.hash=d,this.strip=e,this.strip.inlineStandalone=!0},BlockNode:function(a,c,d,e,f){b.call(this,f),this.type="block",this.mustache=a,this.program=c,this.inverse=d,this.strip=e,d&&!c&&(this.isInverse=!0)},RawBlockNode:function(a,c,f,g){if(b.call(this,g),a.sexpr.id.original!==f)throw new d(a.sexpr.id.original+" doesn't match "+f,this);c=new e.ContentNode(c,g),this.type="block",this.mustache=a,this.program=new e.ProgramNode([c],{},g)},ContentNode:function(a,c){b.call(this,c),this.type="content",this.original=this.string=a},HashNode:function(a,c){b.call(this,c),this.type="hash",this.pairs=a},IdNode:function(a,c){b.call(this,c),this.type="ID";for(var e="",f=[],g=0,h="",i=0,j=a.length;j>i;i++){var k=a[i].part;if(e+=(a[i].separator||"")+k,".."===k||"."===k||"this"===k){if(f.length>0)throw new d("Invalid path: "+e,this);".."===k?(g++,h+="../"):this.isScoped=!0}else f.push(k)}this.original=e,this.parts=f,this.string=f.join("."),this.depth=g,this.idName=h+this.string,this.isSimple=1===a.length&&!this.isScoped&&0===g,this.stringModeValue=this.string},PartialNameNode:function(a,c){b.call(this,c),this.type="PARTIAL_NAME",this.name=a.original},DataNode:function(a,c){b.call(this,c),this.type="DATA",this.id=a,this.stringModeValue=a.stringModeValue,this.idName="@"+a.stringModeValue},StringNode:function(a,c){b.call(this,c),this.type="STRING",this.original=this.string=this.stringModeValue=a},NumberNode:function(a,c){b.call(this,c),this.type="NUMBER",this.original=this.number=a,this.stringModeValue=Number(a)},BooleanNode:function(a,c){b.call(this,c),this.type="BOOLEAN",this.bool=a,this.stringModeValue="true"===a},CommentNode:function(a,c){b.call(this,c),this.type="comment",this.comment=a,this.strip={inlineStandalone:!0}}};return c=e}(c),h=function(){"use strict";var a,b=function(){function a(){this.yy={}}var b={trace:function(){},yy:{},symbols_:{error:2,root:3,program:4,EOF:5,program_repetition0:6,statement:7,mustache:8,block:9,rawBlock:10,partial:11,CONTENT:12,COMMENT:13,openRawBlock:14,END_RAW_BLOCK:15,OPEN_RAW_BLOCK:16,sexpr:17,CLOSE_RAW_BLOCK:18,openBlock:19,block_option0:20,closeBlock:21,openInverse:22,block_option1:23,OPEN_BLOCK:24,CLOSE:25,OPEN_INVERSE:26,inverseAndProgram:27,INVERSE:28,OPEN_ENDBLOCK:29,path:30,OPEN:31,OPEN_UNESCAPED:32,CLOSE_UNESCAPED:33,OPEN_PARTIAL:34,partialName:35,param:36,partial_option0:37,partial_option1:38,sexpr_repetition0:39,sexpr_option0:40,dataName:41,STRING:42,NUMBER:43,BOOLEAN:44,OPEN_SEXPR:45,CLOSE_SEXPR:46,hash:47,hash_repetition_plus0:48,hashSegment:49,ID:50,EQUALS:51,DATA:52,pathSegments:53,SEP:54,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"},productions_:[0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]],performAction:function(a,b,c,d,e,f){var g=f.length-1;switch(e){case 1:return d.prepareProgram(f[g-1].statements,!0),f[g-1];case 2:this.$=new d.ProgramNode(d.prepareProgram(f[g]),{},this._$);break;case 3:this.$=f[g];break;case 4:this.$=f[g];break;case 5:this.$=f[g];break;case 6:this.$=f[g];break;case 7:this.$=new d.ContentNode(f[g],this._$);break;case 8:this.$=new d.CommentNode(f[g],this._$);break;case 9:this.$=new d.RawBlockNode(f[g-2],f[g-1],f[g],this._$);break;case 10:this.$=new d.MustacheNode(f[g-1],null,"","",this._$);break;case 11:this.$=d.prepareBlock(f[g-3],f[g-2],f[g-1],f[g],!1,this._$);break;case 12:this.$=d.prepareBlock(f[g-3],f[g-2],f[g-1],f[g],!0,this._$);break;case 13:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 14:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 15:this.$={strip:d.stripFlags(f[g-1],f[g-1]),program:f[g]};break;case 16:this.$={path:f[g-1],strip:d.stripFlags(f[g-2],f[g])};break;case 17:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 18:this.$=new d.MustacheNode(f[g-1],null,f[g-2],d.stripFlags(f[g-2],f[g]),this._$);break;case 19:this.$=new d.PartialNode(f[g-3],f[g-2],f[g-1],d.stripFlags(f[g-4],f[g]),this._$);break;case 20:this.$=new d.PartialNode(f[g-2],void 0,f[g-1],d.stripFlags(f[g-3],f[g]),this._$);break;case 21:this.$=new d.SexprNode([f[g-2]].concat(f[g-1]),f[g],this._$);break;case 22:this.$=new d.SexprNode([f[g]],null,this._$);break;case 23:this.$=f[g];break;case 24:this.$=new d.StringNode(f[g],this._$);break;case 25:this.$=new d.NumberNode(f[g],this._$);break;case 26:this.$=new d.BooleanNode(f[g],this._$);break;case 27:this.$=f[g];break;case 28:f[g-1].isHelper=!0,this.$=f[g-1];break;case 29:this.$=new d.HashNode(f[g],this._$);break;case 30:this.$=[f[g-2],f[g]];break;case 31:this.$=new d.PartialNameNode(f[g],this._$);break;case 32:this.$=new d.PartialNameNode(new d.StringNode(f[g],this._$),this._$);break;case 33:this.$=new d.PartialNameNode(new d.NumberNode(f[g],this._$));break;case 34:this.$=new d.DataNode(f[g],this._$);break;case 35:this.$=new d.IdNode(f[g],this._$);break;case 36:f[g-2].push({part:f[g],separator:f[g-1]}),this.$=f[g-2];break;case 37:this.$=[{part:f[g]}];break;case 38:this.$=[];break;case 39:f[g-1].push(f[g]);break;case 48:this.$=[];break;case 49:f[g-1].push(f[g]);break;case 52:this.$=[f[g]];break;case 53:f[g-1].push(f[g])}},table:[{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}],defaultActions:{4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]},parseError:function(a){throw new Error(a)},parse:function(a){function b(){var a;return a=c.lexer.lex()||1,"number"!=typeof a&&(a=c.symbols_[a]||a),a}var c=this,d=[0],e=[null],f=[],g=this.table,h="",i=0,j=0,k=0;this.lexer.setInput(a),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,this.yy.parser=this,"undefined"==typeof this.lexer.yylloc&&(this.lexer.yylloc={});var l=this.lexer.yylloc;f.push(l);var m=this.lexer.options&&this.lexer.options.ranges;"function"==typeof this.yy.parseError&&(this.parseError=this.yy.parseError);for(var n,o,p,q,r,s,t,u,v,w={};;){if(p=d[d.length-1],this.defaultActions[p]?q=this.defaultActions[p]:((null===n||"undefined"==typeof n)&&(n=b()),q=g[p]&&g[p][n]),"undefined"==typeof q||!q.length||!q[0]){var x="";if(!k){v=[];for(s in g[p])this.terminals_[s]&&s>2&&v.push("'"+this.terminals_[s]+"'");x=this.lexer.showPosition?"Parse error on line "+(i+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+v.join(", ")+", got '"+(this.terminals_[n]||n)+"'":"Parse error on line "+(i+1)+": Unexpected "+(1==n?"end of input":"'"+(this.terminals_[n]||n)+"'"),this.parseError(x,{text:this.lexer.match,token:this.terminals_[n]||n,line:this.lexer.yylineno,loc:l,expected:v})}}if(q[0]instanceof Array&&q.length>1)throw new Error("Parse Error: multiple actions possible at state: "+p+", token: "+n);switch(q[0]){case 1:d.push(n),e.push(this.lexer.yytext),f.push(this.lexer.yylloc),d.push(q[1]),n=null,o?(n=o,o=null):(j=this.lexer.yyleng,h=this.lexer.yytext,i=this.lexer.yylineno,l=this.lexer.yylloc,k>0&&k--);break;case 2:if(t=this.productions_[q[1]][1],w.$=e[e.length-t],w._$={first_line:f[f.length-(t||1)].first_line,last_line:f[f.length-1].last_line,first_column:f[f.length-(t||1)].first_column,last_column:f[f.length-1].last_column},m&&(w._$.range=[f[f.length-(t||1)].range[0],f[f.length-1].range[1]]),r=this.performAction.call(w,h,j,i,this.yy,q[1],e,f),"undefined"!=typeof r)return r;t&&(d=d.slice(0,-1*t*2),e=e.slice(0,-1*t),f=f.slice(0,-1*t)),d.push(this.productions_[q[1]][0]),e.push(w.$),f.push(w._$),u=g[d[d.length-2]][d[d.length-1]],d.push(u);break;case 3:return!0}}return!0}},c=function(){var a={EOF:1,parseError:function(a,b){if(!this.yy.parser)throw new Error(a);this.yy.parser.parseError(a,b)},setInput:function(a){return this._input=a,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this.options.ranges&&(this.yylloc.range=[0,0]),this.offset=0,this},input:function(){var a=this._input[0];this.yytext+=a,this.yyleng++,this.offset++,this.match+=a,this.matched+=a;var b=a.match(/(?:\r\n?|\n).*/g);return b?(this.yylineno++,this.yylloc.last_line++):this.yylloc.last_column++,this.options.ranges&&this.yylloc.range[1]++,this._input=this._input.slice(1),a},unput:function(a){var b=a.length,c=a.split(/(?:\r\n?|\n)/g);this._input=a+this._input,this.yytext=this.yytext.substr(0,this.yytext.length-b-1),this.offset-=b;var d=this.match.split(/(?:\r\n?|\n)/g);this.match=this.match.substr(0,this.match.length-1),this.matched=this.matched.substr(0,this.matched.length-1),c.length-1&&(this.yylineno-=c.length-1);var e=this.yylloc.range;return this.yylloc={first_line:this.yylloc.first_line,last_line:this.yylineno+1,first_column:this.yylloc.first_column,last_column:c?(c.length===d.length?this.yylloc.first_column:0)+d[d.length-c.length].length-c[0].length:this.yylloc.first_column-b},this.options.ranges&&(this.yylloc.range=[e[0],e[0]+this.yyleng-b]),this},more:function(){return this._more=!0,this},less:function(a){this.unput(this.match.slice(a))},pastInput:function(){var a=this.matched.substr(0,this.matched.length-this.match.length);return(a.length>20?"...":"")+a.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var a=this.match;return a.length<20&&(a+=this._input.substr(0,20-a.length)),(a.substr(0,20)+(a.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var a=this.pastInput(),b=new Array(a.length+1).join("-");return a+this.upcomingInput()+"\n"+b+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var a,b,c,d,e;this._more||(this.yytext="",this.match="");for(var f=this._currentRules(),g=0;g<f.length&&(c=this._input.match(this.rules[f[g]]),!c||b&&!(c[0].length>b[0].length)||(b=c,d=g,this.options.flex));g++);return b?(e=b[0].match(/(?:\r\n?|\n).*/g),e&&(this.yylineno+=e.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:e?e[e.length-1].length-e[e.length-1].match(/\r?\n?/)[0].length:this.yylloc.last_column+b[0].length},this.yytext+=b[0],this.match+=b[0],this.matches=b,this.yyleng=this.yytext.length,this.options.ranges&&(this.yylloc.range=[this.offset,this.offset+=this.yyleng]),this._more=!1,this._input=this._input.slice(b[0].length),this.matched+=b[0],a=this.performAction.call(this,this.yy,this,f[d],this.conditionStack[this.conditionStack.length-1]),this.done&&this._input&&(this.done=!1),a?a:void 0):""===this._input?this.EOF:this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var a=this.next();return"undefined"!=typeof a?a:this.lex()},begin:function(a){this.conditionStack.push(a)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(a){this.begin(a)}};return a.options={},a.performAction=function(a,b,c,d){function e(a,c){return b.yytext=b.yytext.substr(a,b.yyleng-c)}switch(c){case 0:if("\\\\"===b.yytext.slice(-2)?(e(0,1),this.begin("mu")):"\\"===b.yytext.slice(-1)?(e(0,1),this.begin("emu")):this.begin("mu"),b.yytext)return 12;break;case 1:return 12;case 2:return this.popState(),12;case 3:return b.yytext=b.yytext.substr(5,b.yyleng-9),this.popState(),15;case 4:return 12;case 5:return e(0,4),this.popState(),13;case 6:return 45;case 7:return 46;case 8:return 16;case 9:return this.popState(),this.begin("raw"),18;case 10:return 34;case 11:return 24;case 12:return 29;case 13:return this.popState(),28;case 14:return this.popState(),28;case 15:return 26;case 16:return 26;case 17:return 32;case 18:return 31;case 19:this.popState(),this.begin("com");break;case 20:return e(3,5),this.popState(),13;case 21:return 31;case 22:return 51;case 23:return 50;case 24:return 50;case 25:return 54;case 26:break;case 27:return this.popState(),33;case 28:return this.popState(),25;case 29:return b.yytext=e(1,2).replace(/\\"/g,'"'),42;case 30:return b.yytext=e(1,2).replace(/\\'/g,"'"),42;case 31:return 52;case 32:return 44;case 33:return 44;case 34:return 43;case 35:return 50;case 36:return b.yytext=e(1,2),50;case 37:return"INVALID";case 38:return 5}},a.rules=[/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/],a.conditions={mu:{rules:[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],inclusive:!1},emu:{rules:[2],inclusive:!1},com:{rules:[5],inclusive:!1},raw:{rules:[3,4],inclusive:!1},INITIAL:{rules:[0,1,38],inclusive:!0}},a}();return b.lexer=c,a.prototype=b,b.Parser=a,new a}();return a=b}(),i=function(a){"use strict";function b(a,b){return{left:"~"===a.charAt(2),right:"~"===b.charAt(b.length-3)}}function c(a,b,c,d,i,k){if(a.sexpr.id.original!==d.path.original)throw new j(a.sexpr.id.original+" doesn't match "+d.path.original,a);var l=c&&c.program,m={left:a.strip.left,right:d.strip.right,openStandalone:f(b.statements),closeStandalone:e((l||b).statements)};if(a.strip.right&&g(b.statements,null,!0),l){var n=c.strip;n.left&&h(b.statements,null,!0),n.right&&g(l.statements,null,!0),d.strip.left&&h(l.statements,null,!0),e(b.statements)&&f(l.statements)&&(h(b.statements),g(l.statements))}else d.strip.left&&h(b.statements,null,!0);return i?new this.BlockNode(a,l,b,m,k):new this.BlockNode(a,b,l,m,k)}function d(a,b){for(var c=0,d=a.length;d>c;c++){var i=a[c],j=i.strip;if(j){var k=e(a,c,b,"partial"===i.type),l=f(a,c,b),m=j.openStandalone&&k,n=j.closeStandalone&&l,o=j.inlineStandalone&&k&&l;j.right&&g(a,c,!0),j.left&&h(a,c,!0),o&&(g(a,c),h(a,c)&&"partial"===i.type&&(i.indent=/([ \t]+$)/.exec(a[c-1].original)?RegExp.$1:"")),m&&(g((i.program||i.inverse).statements),h(a,c)),n&&(g(a,c),h((i.inverse||i.program).statements))}}return a}function e(a,b,c){void 0===b&&(b=a.length);var d=a[b-1],e=a[b-2];return d?"content"===d.type?(e||!c?/\r?\n\s*?$/:/(^|\r?\n)\s*?$/).test(d.original):void 0:c}function f(a,b,c){void 0===b&&(b=-1);var d=a[b+1],e=a[b+2];return d?"content"===d.type?(e||!c?/^\s*?\r?\n/:/^\s*?(\r?\n|$)/).test(d.original):void 0:c}function g(a,b,c){var d=a[null==b?0:b+1];if(d&&"content"===d.type&&(c||!d.rightStripped)){var e=d.string;d.string=d.string.replace(c?/^\s+/:/^[ \t]*\r?\n?/,""),d.rightStripped=d.string!==e}}function h(a,b,c){var d=a[null==b?a.length-1:b-1];if(d&&"content"===d.type&&(c||!d.leftStripped)){var e=d.string;return d.string=d.string.replace(c?/\s+$/:/[ \t]+$/,""),d.leftStripped=d.string!==e,d.leftStripped}}var i={},j=a;return i.stripFlags=b,i.prepareBlock=c,i.prepareProgram=d,i}(c),j=function(a,b,c,d){"use strict";function e(a){return a.constructor===h.ProgramNode?a:(g.yy=k,g.parse(a))}var f={},g=a,h=b,i=c,j=d.extend;f.parser=g;var k={};return j(k,i,h),f.parse=e,f}(h,g,i,b),k=function(a,b){"use strict";function c(){}function d(a,b,c){if(null==a||"string"!=typeof a&&a.constructor!==c.AST.ProgramNode)throw new h("You must pass a string or Handlebars AST to Handlebars.precompile. You passed "+a);b=b||{},"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var d=c.parse(a),e=(new c.Compiler).compile(d,b);return(new c.JavaScriptCompiler).compile(e,b)}function e(a,b,c){function d(){var d=c.parse(a),e=(new c.Compiler).compile(d,b),f=(new c.JavaScriptCompiler).compile(e,b,void 0,!0);return c.template(f)}if(null==a||"string"!=typeof a&&a.constructor!==c.AST.ProgramNode)throw new h("You must pass a string or Handlebars AST to Handlebars.compile. You passed "+a);b=b||{},"data"in b||(b.data=!0),b.compat&&(b.useDepths=!0);var e,f=function(a,b){return e||(e=d()),e.call(this,a,b)};return f._setup=function(a){return e||(e=d()),e._setup(a)},f._child=function(a,b,c){return e||(e=d()),e._child(a,b,c)},f}function f(a,b){if(a===b)return!0;if(i(a)&&i(b)&&a.length===b.length){for(var c=0;c<a.length;c++)if(!f(a[c],b[c]))return!1;return!0}}var g={},h=a,i=b.isArray,j=[].slice;return g.Compiler=c,c.prototype={compiler:c,equals:function(a){var b=this.opcodes.length;if(a.opcodes.length!==b)return!1;for(var c=0;b>c;c++){var d=this.opcodes[c],e=a.opcodes[c];if(d.opcode!==e.opcode||!f(d.args,e.args))return!1}for(b=this.children.length,c=0;b>c;c++)if(!this.children[c].equals(a.children[c]))return!1;return!0},guid:0,compile:function(a,b){this.opcodes=[],this.children=[],this.depths={list:[]},this.options=b,this.stringParams=b.stringParams,this.trackIds=b.trackIds;var c=this.options.knownHelpers;if(this.options.knownHelpers={helperMissing:!0,blockHelperMissing:!0,each:!0,"if":!0,unless:!0,"with":!0,log:!0,lookup:!0},c)for(var d in c)this.options.knownHelpers[d]=c[d];return this.accept(a)},accept:function(a){return this[a.type](a)},program:function(a){for(var b=a.statements,c=0,d=b.length;d>c;c++)this.accept(b[c]);return this.isSimple=1===d,this.depths.list=this.depths.list.sort(function(a,b){return a-b}),this},compileProgram:function(a){var b,c=(new this.compiler).compile(a,this.options),d=this.guid++;
+this.usePartial=this.usePartial||c.usePartial,this.children[d]=c;for(var e=0,f=c.depths.list.length;f>e;e++)b=c.depths.list[e],2>b||this.addDepth(b-1);return d},block:function(a){var b=a.mustache,c=a.program,d=a.inverse;c&&(c=this.compileProgram(c)),d&&(d=this.compileProgram(d));var e=b.sexpr,f=this.classifySexpr(e);"helper"===f?this.helperSexpr(e,c,d):"simple"===f?(this.simpleSexpr(e),this.opcode("pushProgram",c),this.opcode("pushProgram",d),this.opcode("emptyHash"),this.opcode("blockValue",e.id.original)):(this.ambiguousSexpr(e,c,d),this.opcode("pushProgram",c),this.opcode("pushProgram",d),this.opcode("emptyHash"),this.opcode("ambiguousBlockValue")),this.opcode("append")},hash:function(a){var b,c,d=a.pairs;for(this.opcode("pushHash"),b=0,c=d.length;c>b;b++)this.pushParam(d[b][1]);for(;b--;)this.opcode("assignToHash",d[b][0]);this.opcode("popHash")},partial:function(a){var b=a.partialName;this.usePartial=!0,a.hash?this.accept(a.hash):this.opcode("push","undefined"),a.context?this.accept(a.context):(this.opcode("getContext",0),this.opcode("pushContext")),this.opcode("invokePartial",b.name,a.indent||""),this.opcode("append")},content:function(a){a.string&&this.opcode("appendContent",a.string)},mustache:function(a){this.sexpr(a.sexpr),a.escaped&&!this.options.noEscape?this.opcode("appendEscaped"):this.opcode("append")},ambiguousSexpr:function(a,b,c){var d=a.id,e=d.parts[0],f=null!=b||null!=c;this.opcode("getContext",d.depth),this.opcode("pushProgram",b),this.opcode("pushProgram",c),this.ID(d),this.opcode("invokeAmbiguous",e,f)},simpleSexpr:function(a){var b=a.id;"DATA"===b.type?this.DATA(b):b.parts.length?this.ID(b):(this.addDepth(b.depth),this.opcode("getContext",b.depth),this.opcode("pushContext")),this.opcode("resolvePossibleLambda")},helperSexpr:function(a,b,c){var d=this.setupFullMustacheParams(a,b,c),e=a.id,f=e.parts[0];if(this.options.knownHelpers[f])this.opcode("invokeKnownHelper",d.length,f);else{if(this.options.knownHelpersOnly)throw new h("You specified knownHelpersOnly, but used the unknown helper "+f,a);e.falsy=!0,this.ID(e),this.opcode("invokeHelper",d.length,e.original,e.isSimple)}},sexpr:function(a){var b=this.classifySexpr(a);"simple"===b?this.simpleSexpr(a):"helper"===b?this.helperSexpr(a):this.ambiguousSexpr(a)},ID:function(a){this.addDepth(a.depth),this.opcode("getContext",a.depth);var b=a.parts[0];b?this.opcode("lookupOnContext",a.parts,a.falsy,a.isScoped):this.opcode("pushContext")},DATA:function(a){this.options.data=!0,this.opcode("lookupData",a.id.depth,a.id.parts)},STRING:function(a){this.opcode("pushString",a.string)},NUMBER:function(a){this.opcode("pushLiteral",a.number)},BOOLEAN:function(a){this.opcode("pushLiteral",a.bool)},comment:function(){},opcode:function(a){this.opcodes.push({opcode:a,args:j.call(arguments,1)})},addDepth:function(a){0!==a&&(this.depths[a]||(this.depths[a]=!0,this.depths.list.push(a)))},classifySexpr:function(a){var b=a.isHelper,c=a.eligibleHelper,d=this.options;if(c&&!b){var e=a.id.parts[0];d.knownHelpers[e]?b=!0:d.knownHelpersOnly&&(c=!1)}return b?"helper":c?"ambiguous":"simple"},pushParams:function(a){for(var b=0,c=a.length;c>b;b++)this.pushParam(a[b])},pushParam:function(a){this.stringParams?(a.depth&&this.addDepth(a.depth),this.opcode("getContext",a.depth||0),this.opcode("pushStringParam",a.stringModeValue,a.type),"sexpr"===a.type&&this.sexpr(a)):(this.trackIds&&this.opcode("pushId",a.type,a.idName||a.stringModeValue),this.accept(a))},setupFullMustacheParams:function(a,b,c){var d=a.params;return this.pushParams(d),this.opcode("pushProgram",b),this.opcode("pushProgram",c),a.hash?this.hash(a.hash):this.opcode("emptyHash"),d}},g.precompile=d,g.compile=e,g}(c,b),l=function(a,b){"use strict";function c(a){this.value=a}function d(){}var e,f=a.COMPILER_REVISION,g=a.REVISION_CHANGES,h=b;d.prototype={nameLookup:function(a,b){return d.isValidJavaScriptVariableName(b)?a+"."+b:a+"['"+b+"']"},depthedLookup:function(a){return this.aliases.lookup="this.lookup",'lookup(depths, "'+a+'")'},compilerInfo:function(){var a=f,b=g[a];return[a,b]},appendToBuffer:function(a){return this.environment.isSimple?"return "+a+";":{appendToBuffer:!0,content:a,toString:function(){return"buffer += "+a+";"}}},initializeBuffer:function(){return this.quotedString("")},namespace:"Handlebars",compile:function(a,b,c,d){this.environment=a,this.options=b,this.stringParams=this.options.stringParams,this.trackIds=this.options.trackIds,this.precompile=!d,this.name=this.environment.name,this.isChild=!!c,this.context=c||{programs:[],environments:[]},this.preamble(),this.stackSlot=0,this.stackVars=[],this.aliases={},this.registers={list:[]},this.hashes=[],this.compileStack=[],this.inlineStack=[],this.compileChildren(a,b),this.useDepths=this.useDepths||a.depths.list.length||this.options.compat;var e,f,g,i=a.opcodes;for(f=0,g=i.length;g>f;f++)e=i[f],this[e.opcode].apply(this,e.args);if(this.pushSource(""),this.stackSlot||this.inlineStack.length||this.compileStack.length)throw new h("Compile completed with content left on stack");var j=this.createFunctionContext(d);if(this.isChild)return j;var k={compiler:this.compilerInfo(),main:j},l=this.context.programs;for(f=0,g=l.length;g>f;f++)l[f]&&(k[f]=l[f]);return this.environment.usePartial&&(k.usePartial=!0),this.options.data&&(k.useData=!0),this.useDepths&&(k.useDepths=!0),this.options.compat&&(k.compat=!0),d||(k.compiler=JSON.stringify(k.compiler),k=this.objectLiteral(k)),k},preamble:function(){this.lastContext=0,this.source=[]},createFunctionContext:function(a){var b="",c=this.stackVars.concat(this.registers.list);c.length>0&&(b+=", "+c.join(", "));for(var d in this.aliases)this.aliases.hasOwnProperty(d)&&(b+=", "+d+"="+this.aliases[d]);var e=["depth0","helpers","partials","data"];this.useDepths&&e.push("depths");var f=this.mergeSource(b);return a?(e.push(f),Function.apply(this,e)):"function("+e.join(",")+") {\n  "+f+"}"},mergeSource:function(a){for(var b,c,d="",e=!this.forceBuffer,f=0,g=this.source.length;g>f;f++){var h=this.source[f];h.appendToBuffer?b=b?b+"\n    + "+h.content:h.content:(b&&(d?d+="buffer += "+b+";\n  ":(c=!0,d=b+";\n  "),b=void 0),d+=h+"\n  ",this.environment.isSimple||(e=!1))}return e?(b||!d)&&(d+="return "+(b||'""')+";\n"):(a+=", buffer = "+(c?"":this.initializeBuffer()),d+=b?"return buffer + "+b+";\n":"return buffer;\n"),a&&(d="var "+a.substring(2)+(c?"":";\n  ")+d),d},blockValue:function(a){this.aliases.blockHelperMissing="helpers.blockHelperMissing";var b=[this.contextName(0)];this.setupParams(a,0,b);var c=this.popStack();b.splice(1,0,c),this.push("blockHelperMissing.call("+b.join(", ")+")")},ambiguousBlockValue:function(){this.aliases.blockHelperMissing="helpers.blockHelperMissing";var a=[this.contextName(0)];this.setupParams("",0,a,!0),this.flushInline();var b=this.topStack();a.splice(1,0,b),this.pushSource("if (!"+this.lastHelper+") { "+b+" = blockHelperMissing.call("+a.join(", ")+"); }")},appendContent:function(a){this.pendingContent&&(a=this.pendingContent+a),this.pendingContent=a},append:function(){this.flushInline();var a=this.popStack();this.pushSource("if ("+a+" != null) { "+this.appendToBuffer(a)+" }"),this.environment.isSimple&&this.pushSource("else { "+this.appendToBuffer("''")+" }")},appendEscaped:function(){this.aliases.escapeExpression="this.escapeExpression",this.pushSource(this.appendToBuffer("escapeExpression("+this.popStack()+")"))},getContext:function(a){this.lastContext=a},pushContext:function(){this.pushStackLiteral(this.contextName(this.lastContext))},lookupOnContext:function(a,b,c){var d=0,e=a.length;for(c||!this.options.compat||this.lastContext?this.pushContext():this.push(this.depthedLookup(a[d++]));e>d;d++)this.replaceStack(function(c){var e=this.nameLookup(c,a[d],"context");return b?" && "+e:" != null ? "+e+" : "+c})},lookupData:function(a,b){a?this.pushStackLiteral("this.data(data, "+a+")"):this.pushStackLiteral("data");for(var c=b.length,d=0;c>d;d++)this.replaceStack(function(a){return" && "+this.nameLookup(a,b[d],"data")})},resolvePossibleLambda:function(){this.aliases.lambda="this.lambda",this.push("lambda("+this.popStack()+", "+this.contextName(0)+")")},pushStringParam:function(a,b){this.pushContext(),this.pushString(b),"sexpr"!==b&&("string"==typeof a?this.pushString(a):this.pushStackLiteral(a))},emptyHash:function(){this.pushStackLiteral("{}"),this.trackIds&&this.push("{}"),this.stringParams&&(this.push("{}"),this.push("{}"))},pushHash:function(){this.hash&&this.hashes.push(this.hash),this.hash={values:[],types:[],contexts:[],ids:[]}},popHash:function(){var a=this.hash;this.hash=this.hashes.pop(),this.trackIds&&this.push("{"+a.ids.join(",")+"}"),this.stringParams&&(this.push("{"+a.contexts.join(",")+"}"),this.push("{"+a.types.join(",")+"}")),this.push("{\n    "+a.values.join(",\n    ")+"\n  }")},pushString:function(a){this.pushStackLiteral(this.quotedString(a))},push:function(a){return this.inlineStack.push(a),a},pushLiteral:function(a){this.pushStackLiteral(a)},pushProgram:function(a){null!=a?this.pushStackLiteral(this.programExpression(a)):this.pushStackLiteral(null)},invokeHelper:function(a,b,c){this.aliases.helperMissing="helpers.helperMissing";var d=this.popStack(),e=this.setupHelper(a,b),f=(c?e.name+" || ":"")+d+" || helperMissing";this.push("(("+f+").call("+e.callParams+"))")},invokeKnownHelper:function(a,b){var c=this.setupHelper(a,b);this.push(c.name+".call("+c.callParams+")")},invokeAmbiguous:function(a,b){this.aliases.functionType='"function"',this.aliases.helperMissing="helpers.helperMissing",this.useRegister("helper");var c=this.popStack();this.emptyHash();var d=this.setupHelper(0,a,b),e=this.lastHelper=this.nameLookup("helpers",a,"helper");this.push("((helper = (helper = "+e+" || "+c+") != null ? helper : helperMissing"+(d.paramsInit?"),("+d.paramsInit:"")+"),(typeof helper === functionType ? helper.call("+d.callParams+") : helper))")},invokePartial:function(a,b){var c=[this.nameLookup("partials",a,"partial"),"'"+b+"'","'"+a+"'",this.popStack(),this.popStack(),"helpers","partials"];this.options.data?c.push("data"):this.options.compat&&c.push("undefined"),this.options.compat&&c.push("depths"),this.push("this.invokePartial("+c.join(", ")+")")},assignToHash:function(a){var b,c,d,e=this.popStack();this.trackIds&&(d=this.popStack()),this.stringParams&&(c=this.popStack(),b=this.popStack());var f=this.hash;b&&f.contexts.push("'"+a+"': "+b),c&&f.types.push("'"+a+"': "+c),d&&f.ids.push("'"+a+"': "+d),f.values.push("'"+a+"': ("+e+")")},pushId:function(a,b){"ID"===a||"DATA"===a?this.pushString(b):"sexpr"===a?this.pushStackLiteral("true"):this.pushStackLiteral("null")},compiler:d,compileChildren:function(a,b){for(var c,d,e=a.children,f=0,g=e.length;g>f;f++){c=e[f],d=new this.compiler;var h=this.matchExistingProgram(c);null==h?(this.context.programs.push(""),h=this.context.programs.length,c.index=h,c.name="program"+h,this.context.programs[h]=d.compile(c,b,this.context,!this.precompile),this.context.environments[h]=c,this.useDepths=this.useDepths||d.useDepths):(c.index=h,c.name="program"+h)}},matchExistingProgram:function(a){for(var b=0,c=this.context.environments.length;c>b;b++){var d=this.context.environments[b];if(d&&d.equals(a))return b}},programExpression:function(a){var b=this.environment.children[a],c=(b.depths.list,this.useDepths),d=[b.index,"data"];return c&&d.push("depths"),"this.program("+d.join(", ")+")"},useRegister:function(a){this.registers[a]||(this.registers[a]=!0,this.registers.list.push(a))},pushStackLiteral:function(a){return this.push(new c(a))},pushSource:function(a){this.pendingContent&&(this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent))),this.pendingContent=void 0),a&&this.source.push(a)},pushStack:function(a){this.flushInline();var b=this.incrStack();return this.pushSource(b+" = "+a+";"),this.compileStack.push(b),b},replaceStack:function(a){{var b,d,e,f="";this.isInline()}if(!this.isInline())throw new h("replaceStack on non-inline");var g=this.popStack(!0);if(g instanceof c)f=b=g.value,e=!0;else{d=!this.stackSlot;var i=d?this.incrStack():this.topStackName();f="("+this.push(i)+" = "+g+")",b=this.topStack()}var j=a.call(this,b);e||this.popStack(),d&&this.stackSlot--,this.push("("+f+j+")")},incrStack:function(){return this.stackSlot++,this.stackSlot>this.stackVars.length&&this.stackVars.push("stack"+this.stackSlot),this.topStackName()},topStackName:function(){return"stack"+this.stackSlot},flushInline:function(){var a=this.inlineStack;if(a.length){this.inlineStack=[];for(var b=0,d=a.length;d>b;b++){var e=a[b];e instanceof c?this.compileStack.push(e):this.pushStack(e)}}},isInline:function(){return this.inlineStack.length},popStack:function(a){var b=this.isInline(),d=(b?this.inlineStack:this.compileStack).pop();if(!a&&d instanceof c)return d.value;if(!b){if(!this.stackSlot)throw new h("Invalid stack pop");this.stackSlot--}return d},topStack:function(){var a=this.isInline()?this.inlineStack:this.compileStack,b=a[a.length-1];return b instanceof c?b.value:b},contextName:function(a){return this.useDepths&&a?"depths["+a+"]":"depth"+a},quotedString:function(a){return'"'+a.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")+'"'},objectLiteral:function(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(this.quotedString(c)+":"+a[c]);return"{"+b.join(",")+"}"},setupHelper:function(a,b,c){var d=[],e=this.setupParams(b,a,d,c),f=this.nameLookup("helpers",b,"helper");return{params:d,paramsInit:e,name:f,callParams:[this.contextName(0)].concat(d).join(", ")}},setupOptions:function(a,b,c){var d,e,f,g={},h=[],i=[],j=[];g.name=this.quotedString(a),g.hash=this.popStack(),this.trackIds&&(g.hashIds=this.popStack()),this.stringParams&&(g.hashTypes=this.popStack(),g.hashContexts=this.popStack()),e=this.popStack(),f=this.popStack(),(f||e)&&(f||(f="this.noop"),e||(e="this.noop"),g.fn=f,g.inverse=e);for(var k=b;k--;)d=this.popStack(),c[k]=d,this.trackIds&&(j[k]=this.popStack()),this.stringParams&&(i[k]=this.popStack(),h[k]=this.popStack());return this.trackIds&&(g.ids="["+j.join(",")+"]"),this.stringParams&&(g.types="["+i.join(",")+"]",g.contexts="["+h.join(",")+"]"),this.options.data&&(g.data="data"),g},setupParams:function(a,b,c,d){var e=this.objectLiteral(this.setupOptions(a,b,c));return d?(this.useRegister("options"),c.push("options"),"options="+e):(c.push(e),"")}};for(var i="break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws const goto private transient debugger implements protected volatile double import public let yield".split(" "),j=d.RESERVED_WORDS={},k=0,l=i.length;l>k;k++)j[i[k]]=!0;return d.isValidJavaScriptVariableName=function(a){return!d.RESERVED_WORDS[a]&&/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(a)},e=d}(d,c),m=function(a,b,c,d,e){"use strict";var f,g=a,h=b,i=c.parser,j=c.parse,k=d.Compiler,l=d.compile,m=d.precompile,n=e,o=g.create,p=function(){var a=o();return a.compile=function(b,c){return l(b,c,a)},a.precompile=function(b,c){return m(b,c,a)},a.AST=h,a.Compiler=k,a.JavaScriptCompiler=n,a.Parser=i,a.parse=j,a};return g=p(),g.create=p,g["default"]=g,f=g}(f,g,j,k,l);return m});
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/highlight.7.3.pack.js b/src/main/webapp/api-docs/lib/highlight.7.3.pack.js
new file mode 100644
index 00000000..9a95a75e
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/highlight.7.3.pack.js
@@ -0,0 +1 @@
+var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/jquery-1.8.0.min.js b/src/main/webapp/api-docs/lib/jquery-1.8.0.min.js
new file mode 100644
index 00000000..f121291c
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/jquery-1.8.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
+(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test(" ")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,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(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0].replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}function bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!==1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compareDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSelector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.oMatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={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,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.propHooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cY.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cN&&(cN=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cN),cN=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c$=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j,k,l,m=this[0],n=m&&m.ownerDocument;if(!n)return;return(e=n.body)===m?p.offset.bodyOffset(m):(d=n.documentElement,p.contains(d,m)?(c=m.getBoundingClientRect(),f=c_(n),g=d.clientTop||e.clientTop||0,h=d.clientLeft||e.clientLeft||0,i=f.pageYOffset||d.scrollTop,j=f.pageXOffset||d.scrollLeft,k=c.top+i-g,l=c.left+j-h,{top:k,left:l}):{top:0,left:0})},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c$.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c$.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=c_(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/jquery.ba-bbq.min.js b/src/main/webapp/api-docs/lib/jquery.ba-bbq.min.js
new file mode 100644
index 00000000..bcbf2483
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/jquery.ba-bbq.min.js
@@ -0,0 +1,18 @@
+/*
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this),J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
+/*
+ * jQuery hashchange event - v1.2 - 2/11/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/jquery.slideto.min.js b/src/main/webapp/api-docs/lib/jquery.slideto.min.js
new file mode 100644
index 00000000..ba32cff3
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/jquery.slideto.min.js
@@ -0,0 +1 @@
+(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
diff --git a/src/main/webapp/api-docs/lib/jquery.wiggle.min.js b/src/main/webapp/api-docs/lib/jquery.wiggle.min.js
new file mode 100644
index 00000000..2adb0d6d
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/jquery.wiggle.min.js
@@ -0,0 +1,8 @@
+/*
+jQuery Wiggle
+Author: WonderGroup, Jordan Thomas
+URL: http://labs.wondergroup.com/demos/mini-ui/index.html
+License: MIT (http://en.wikipedia.org/wiki/MIT_License)
+*/
+jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
+if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/marked.js b/src/main/webapp/api-docs/lib/marked.js
new file mode 100644
index 00000000..c2a678d5
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/marked.js
@@ -0,0 +1,1272 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/chjj/marked
+ */
+
+;(function() {
+
+/**
+ * Block-Level Grammar
+ */
+
+var block = {
+  newline: /^\n+/,
+  code: /^( {4}[^\n]+\n*)+/,
+  fences: noop,
+  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
+  heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
+  nptable: noop,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
+  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
+  html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,
+  def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
+  table: noop,
+  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
+  text: /^[^\n]+/
+};
+
+block.bullet = /(?:[*+-]|\d+\.)/;
+block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
+block.item = replace(block.item, 'gm')
+  (/bull/g, block.bullet)
+  ();
+
+block.list = replace(block.list)
+  (/bull/g, block.bullet)
+  ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
+  ('def', '\\n+(?=' + block.def.source + ')')
+  ();
+
+block.blockquote = replace(block.blockquote)
+  ('def', block.def)
+  ();
+
+block._tag = '(?!(?:'
+  + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
+  + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
+  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
+
+block.html = replace(block.html)
+  ('comment', /<!--[\s\S]*?-->/)
+  ('closed', /<(tag)[\s\S]+?<\/\1>/)
+  ('closing', /<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)
+  (/tag/g, block._tag)
+  ();
+
+block.paragraph = replace(block.paragraph)
+  ('hr', block.hr)
+  ('heading', block.heading)
+  ('lheading', block.lheading)
+  ('blockquote', block.blockquote)
+  ('tag', '<' + block._tag)
+  ('def', block.def)
+  ();
+
+/**
+ * Normal Block Grammar
+ */
+
+block.normal = merge({}, block);
+
+/**
+ * GFM Block Grammar
+ */
+
+block.gfm = merge({}, block.normal, {
+  fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
+  paragraph: /^/
+});
+
+block.gfm.paragraph = replace(block.paragraph)
+  ('(?!', '(?!'
+    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
+    + block.list.source.replace('\\1', '\\3') + '|')
+  ();
+
+/**
+ * GFM + Tables Block Grammar
+ */
+
+block.tables = merge({}, block.gfm, {
+  nptable: /^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,
+  table: /^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/
+});
+
+/**
+ * Block Lexer
+ */
+
+function Lexer(options) {
+  this.tokens = [];
+  this.tokens.links = {};
+  this.options = options || marked.defaults;
+  this.rules = block.normal;
+
+  if (this.options.gfm) {
+    if (this.options.tables) {
+      this.rules = block.tables;
+    } else {
+      this.rules = block.gfm;
+    }
+  }
+}
+
+/**
+ * Expose Block Rules
+ */
+
+Lexer.rules = block;
+
+/**
+ * Static Lex Method
+ */
+
+Lexer.lex = function(src, options) {
+  var lexer = new Lexer(options);
+  return lexer.lex(src);
+};
+
+/**
+ * Preprocessing
+ */
+
+Lexer.prototype.lex = function(src) {
+  src = src
+    .replace(/\r\n|\r/g, '\n')
+    .replace(/\t/g, '    ')
+    .replace(/\u00a0/g, ' ')
+    .replace(/\u2424/g, '\n');
+
+  return this.token(src, true);
+};
+
+/**
+ * Lexing
+ */
+
+Lexer.prototype.token = function(src, top, bq) {
+  var src = src.replace(/^ +$/gm, '')
+    , next
+    , loose
+    , cap
+    , bull
+    , b
+    , item
+    , space
+    , i
+    , l;
+
+  while (src) {
+    // newline
+    if (cap = this.rules.newline.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[0].length > 1) {
+        this.tokens.push({
+          type: 'space'
+        });
+      }
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      cap = cap[0].replace(/^ {4}/gm, '');
+      this.tokens.push({
+        type: 'code',
+        text: !this.options.pedantic
+          ? cap.replace(/\n+$/, '')
+          : cap
+      });
+      continue;
+    }
+
+    // fences (gfm)
+    if (cap = this.rules.fences.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'code',
+        lang: cap[2],
+        text: cap[3]
+      });
+      continue;
+    }
+
+    // heading
+    if (cap = this.rules.heading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[1].length,
+        text: cap[2]
+      });
+      continue;
+    }
+
+    // table no leading pipe (gfm)
+    if (top && (cap = this.rules.nptable.exec(src))) {
+      src = src.substring(cap[0].length);
+
+      item = {
+        type: 'table',
+        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3].replace(/\n$/, '').split('\n')
+      };
+
+      for (i = 0; i < item.align.length; i++) {
+        if (/^ *-+: *$/.test(item.align[i])) {
+          item.align[i] = 'right';
+        } else if (/^ *:-+: *$/.test(item.align[i])) {
+          item.align[i] = 'center';
+        } else if (/^ *:-+ *$/.test(item.align[i])) {
+          item.align[i] = 'left';
+        } else {
+          item.align[i] = null;
+        }
+      }
+
+      for (i = 0; i < item.cells.length; i++) {
+        item.cells[i] = item.cells[i].split(/ *\| */);
+      }
+
+      this.tokens.push(item);
+
+      continue;
+    }
+
+    // lheading
+    if (cap = this.rules.lheading.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'heading',
+        depth: cap[2] === '=' ? 1 : 2,
+        text: cap[1]
+      });
+      continue;
+    }
+
+    // hr
+    if (cap = this.rules.hr.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'hr'
+      });
+      continue;
+    }
+
+    // blockquote
+    if (cap = this.rules.blockquote.exec(src)) {
+      src = src.substring(cap[0].length);
+
+      this.tokens.push({
+        type: 'blockquote_start'
+      });
+
+      cap = cap[0].replace(/^ *> ?/gm, '');
+
+      // Pass `top` to keep the current
+      // "toplevel" state. This is exactly
+      // how markdown.pl works.
+      this.token(cap, top, true);
+
+      this.tokens.push({
+        type: 'blockquote_end'
+      });
+
+      continue;
+    }
+
+    // list
+    if (cap = this.rules.list.exec(src)) {
+      src = src.substring(cap[0].length);
+      bull = cap[2];
+
+      this.tokens.push({
+        type: 'list_start',
+        ordered: bull.length > 1
+      });
+
+      // Get each top-level item.
+      cap = cap[0].match(this.rules.item);
+
+      next = false;
+      l = cap.length;
+      i = 0;
+
+      for (; i < l; i++) {
+        item = cap[i];
+
+        // Remove the list item's bullet
+        // so it is seen as the next token.
+        space = item.length;
+        item = item.replace(/^ *([*+-]|\d+\.) +/, '');
+
+        // Outdent whatever the
+        // list item contains. Hacky.
+        if (~item.indexOf('\n ')) {
+          space -= item.length;
+          item = !this.options.pedantic
+            ? item.replace(new RegExp('^ {1,' + space + '}', 'gm'), '')
+            : item.replace(/^ {1,4}/gm, '');
+        }
+
+        // Determine whether the next list item belongs here.
+        // Backpedal if it does not belong in this list.
+        if (this.options.smartLists && i !== l - 1) {
+          b = block.bullet.exec(cap[i + 1])[0];
+          if (bull !== b && !(bull.length > 1 && b.length > 1)) {
+            src = cap.slice(i + 1).join('\n') + src;
+            i = l - 1;
+          }
+        }
+
+        // Determine whether item is loose or not.
+        // Use: /(^|\n)(?! )[^\n]+\n\n(?!\s*$)/
+        // for discount behavior.
+        loose = next || /\n\n(?!\s*$)/.test(item);
+        if (i !== l - 1) {
+          next = item.charAt(item.length - 1) === '\n';
+          if (!loose) loose = next;
+        }
+
+        this.tokens.push({
+          type: loose
+            ? 'loose_item_start'
+            : 'list_item_start'
+        });
+
+        // Recurse.
+        this.token(item, false, bq);
+
+        this.tokens.push({
+          type: 'list_item_end'
+        });
+      }
+
+      this.tokens.push({
+        type: 'list_end'
+      });
+
+      continue;
+    }
+
+    // html
+    if (cap = this.rules.html.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: this.options.sanitize
+          ? 'paragraph'
+          : 'html',
+        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
+        text: cap[0]
+      });
+      continue;
+    }
+
+    // def
+    if ((!bq && top) && (cap = this.rules.def.exec(src))) {
+      src = src.substring(cap[0].length);
+      this.tokens.links[cap[1].toLowerCase()] = {
+        href: cap[2],
+        title: cap[3]
+      };
+      continue;
+    }
+
+    // table (gfm)
+    if (top && (cap = this.rules.table.exec(src))) {
+      src = src.substring(cap[0].length);
+
+      item = {
+        type: 'table',
+        header: cap[1].replace(/^ *| *\| *$/g, '').split(/ *\| */),
+        align: cap[2].replace(/^ *|\| *$/g, '').split(/ *\| */),
+        cells: cap[3].replace(/(?: *\| *)?\n$/, '').split('\n')
+      };
+
+      for (i = 0; i < item.align.length; i++) {
+        if (/^ *-+: *$/.test(item.align[i])) {
+          item.align[i] = 'right';
+        } else if (/^ *:-+: *$/.test(item.align[i])) {
+          item.align[i] = 'center';
+        } else if (/^ *:-+ *$/.test(item.align[i])) {
+          item.align[i] = 'left';
+        } else {
+          item.align[i] = null;
+        }
+      }
+
+      for (i = 0; i < item.cells.length; i++) {
+        item.cells[i] = item.cells[i]
+          .replace(/^ *\| *| *\| *$/g, '')
+          .split(/ *\| */);
+      }
+
+      this.tokens.push(item);
+
+      continue;
+    }
+
+    // top-level paragraph
+    if (top && (cap = this.rules.paragraph.exec(src))) {
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'paragraph',
+        text: cap[1].charAt(cap[1].length - 1) === '\n'
+          ? cap[1].slice(0, -1)
+          : cap[1]
+      });
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      // Top-level should never reach here.
+      src = src.substring(cap[0].length);
+      this.tokens.push({
+        type: 'text',
+        text: cap[0]
+      });
+      continue;
+    }
+
+    if (src) {
+      throw new
+        Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return this.tokens;
+};
+
+/**
+ * Inline-Level Grammar
+ */
+
+var inline = {
+  escape: /^\\([\\`*{}\[\]()#+\-.!_>])/,
+  autolink: /^<([^ >]+(@|:\/)[^ >]+)>/,
+  url: noop,
+  tag: /^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,
+  link: /^!?\[(inside)\]\(href\)/,
+  reflink: /^!?\[(inside)\]\s*\[([^\]]*)\]/,
+  nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
+  strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
+  em: /^\b_((?:__|[\s\S])+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
+  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
+  br: /^ {2,}\n(?!\s*$)/,
+  del: noop,
+  text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
+};
+
+inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
+inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
+
+inline.link = replace(inline.link)
+  ('inside', inline._inside)
+  ('href', inline._href)
+  ();
+
+inline.reflink = replace(inline.reflink)
+  ('inside', inline._inside)
+  ();
+
+/**
+ * Normal Inline Grammar
+ */
+
+inline.normal = merge({}, inline);
+
+/**
+ * Pedantic Inline Grammar
+ */
+
+inline.pedantic = merge({}, inline.normal, {
+  strong: /^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,
+  em: /^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/
+});
+
+/**
+ * GFM Inline Grammar
+ */
+
+inline.gfm = merge({}, inline.normal, {
+  escape: replace(inline.escape)('])', '~|])')(),
+  url: /^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,
+  del: /^~~(?=\S)([\s\S]*?\S)~~/,
+  text: replace(inline.text)
+    (']|', '~]|')
+    ('|', '|https?://|')
+    ()
+});
+
+/**
+ * GFM + Line Breaks Inline Grammar
+ */
+
+inline.breaks = merge({}, inline.gfm, {
+  br: replace(inline.br)('{2,}', '*')(),
+  text: replace(inline.gfm.text)('{2,}', '*')()
+});
+
+/**
+ * Inline Lexer & Compiler
+ */
+
+function InlineLexer(links, options) {
+  this.options = options || marked.defaults;
+  this.links = links;
+  this.rules = inline.normal;
+  this.renderer = this.options.renderer || new Renderer;
+  this.renderer.options = this.options;
+
+  if (!this.links) {
+    throw new
+      Error('Tokens array requires a `links` property.');
+  }
+
+  if (this.options.gfm) {
+    if (this.options.breaks) {
+      this.rules = inline.breaks;
+    } else {
+      this.rules = inline.gfm;
+    }
+  } else if (this.options.pedantic) {
+    this.rules = inline.pedantic;
+  }
+}
+
+/**
+ * Expose Inline Rules
+ */
+
+InlineLexer.rules = inline;
+
+/**
+ * Static Lexing/Compiling Method
+ */
+
+InlineLexer.output = function(src, links, options) {
+  var inline = new InlineLexer(links, options);
+  return inline.output(src);
+};
+
+/**
+ * Lexing/Compiling
+ */
+
+InlineLexer.prototype.output = function(src) {
+  var out = ''
+    , link
+    , text
+    , href
+    , cap;
+
+  while (src) {
+    // escape
+    if (cap = this.rules.escape.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += cap[1];
+      continue;
+    }
+
+    // autolink
+    if (cap = this.rules.autolink.exec(src)) {
+      src = src.substring(cap[0].length);
+      if (cap[2] === '@') {
+        text = cap[1].charAt(6) === ':'
+          ? this.mangle(cap[1].substring(7))
+          : this.mangle(cap[1]);
+        href = this.mangle('mailto:') + text;
+      } else {
+        text = escape(cap[1]);
+        href = text;
+      }
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // url (gfm)
+    if (!this.inLink && (cap = this.rules.url.exec(src))) {
+      src = src.substring(cap[0].length);
+      text = escape(cap[1]);
+      href = text;
+      out += this.renderer.link(href, null, text);
+      continue;
+    }
+
+    // tag
+    if (cap = this.rules.tag.exec(src)) {
+      if (!this.inLink && /^<a /i.test(cap[0])) {
+        this.inLink = true;
+      } else if (this.inLink && /^<\/a>/i.test(cap[0])) {
+        this.inLink = false;
+      }
+      src = src.substring(cap[0].length);
+      out += this.options.sanitize
+        ? escape(cap[0])
+        : cap[0];
+      continue;
+    }
+
+    // link
+    if (cap = this.rules.link.exec(src)) {
+      src = src.substring(cap[0].length);
+      this.inLink = true;
+      out += this.outputLink(cap, {
+        href: cap[2],
+        title: cap[3]
+      });
+      this.inLink = false;
+      continue;
+    }
+
+    // reflink, nolink
+    if ((cap = this.rules.reflink.exec(src))
+        || (cap = this.rules.nolink.exec(src))) {
+      src = src.substring(cap[0].length);
+      link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+      link = this.links[link.toLowerCase()];
+      if (!link || !link.href) {
+        out += cap[0].charAt(0);
+        src = cap[0].substring(1) + src;
+        continue;
+      }
+      this.inLink = true;
+      out += this.outputLink(cap, link);
+      this.inLink = false;
+      continue;
+    }
+
+    // strong
+    if (cap = this.rules.strong.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.strong(this.output(cap[2] || cap[1]));
+      continue;
+    }
+
+    // em
+    if (cap = this.rules.em.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.em(this.output(cap[2] || cap[1]));
+      continue;
+    }
+
+    // code
+    if (cap = this.rules.code.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.codespan(escape(cap[2], true));
+      continue;
+    }
+
+    // br
+    if (cap = this.rules.br.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.br();
+      continue;
+    }
+
+    // del (gfm)
+    if (cap = this.rules.del.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += this.renderer.del(this.output(cap[1]));
+      continue;
+    }
+
+    // text
+    if (cap = this.rules.text.exec(src)) {
+      src = src.substring(cap[0].length);
+      out += escape(this.smartypants(cap[0]));
+      continue;
+    }
+
+    if (src) {
+      throw new
+        Error('Infinite loop on byte: ' + src.charCodeAt(0));
+    }
+  }
+
+  return out;
+};
+
+/**
+ * Compile Link
+ */
+
+InlineLexer.prototype.outputLink = function(cap, link) {
+  var href = escape(link.href)
+    , title = link.title ? escape(link.title) : null;
+
+  return cap[0].charAt(0) !== '!'
+    ? this.renderer.link(href, title, this.output(cap[1]))
+    : this.renderer.image(href, title, escape(cap[1]));
+};
+
+/**
+ * Smartypants Transformations
+ */
+
+InlineLexer.prototype.smartypants = function(text) {
+  if (!this.options.smartypants) return text;
+  return text
+    // em-dashes
+    .replace(/--/g, '\u2014')
+    // opening singles
+    .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
+    // closing singles & apostrophes
+    .replace(/'/g, '\u2019')
+    // opening doubles
+    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
+    // closing doubles
+    .replace(/"/g, '\u201d')
+    // ellipses
+    .replace(/\.{3}/g, '\u2026');
+};
+
+/**
+ * Mangle Links
+ */
+
+InlineLexer.prototype.mangle = function(text) {
+  var out = ''
+    , l = text.length
+    , i = 0
+    , ch;
+
+  for (; i < l; i++) {
+    ch = text.charCodeAt(i);
+    if (Math.random() > 0.5) {
+      ch = 'x' + ch.toString(16);
+    }
+    out += '&#' + ch + ';';
+  }
+
+  return out;
+};
+
+/**
+ * Renderer
+ */
+
+function Renderer(options) {
+  this.options = options || {};
+}
+
+Renderer.prototype.code = function(code, lang, escaped) {
+  if (this.options.highlight) {
+    var out = this.options.highlight(code, lang);
+    if (out != null && out !== code) {
+      escaped = true;
+      code = out;
+    }
+  }
+
+  if (!lang) {
+    return '<pre><code>'
+      + (escaped ? code : escape(code, true))
+      + '\n</code></pre>';
+  }
+
+  return '<pre><code class="'
+    + this.options.langPrefix
+    + escape(lang, true)
+    + '">'
+    + (escaped ? code : escape(code, true))
+    + '\n</code></pre>\n';
+};
+
+Renderer.prototype.blockquote = function(quote) {
+  return '<blockquote>\n' + quote + '</blockquote>\n';
+};
+
+Renderer.prototype.html = function(html) {
+  return html;
+};
+
+Renderer.prototype.heading = function(text, level, raw) {
+  return '<h'
+    + level
+    + ' id="'
+    + this.options.headerPrefix
+    + raw.toLowerCase().replace(/[^\w]+/g, '-')
+    + '">'
+    + text
+    + '</h'
+    + level
+    + '>\n';
+};
+
+Renderer.prototype.hr = function() {
+  return this.options.xhtml ? '<hr/>\n' : '<hr>\n';
+};
+
+Renderer.prototype.list = function(body, ordered) {
+  var type = ordered ? 'ol' : 'ul';
+  return '<' + type + '>\n' + body + '</' + type + '>\n';
+};
+
+Renderer.prototype.listitem = function(text) {
+  return '<li>' + text + '</li>\n';
+};
+
+Renderer.prototype.paragraph = function(text) {
+  return '<p>' + text + '</p>\n';
+};
+
+Renderer.prototype.table = function(header, body) {
+  return '<table>\n'
+    + '<thead>\n'
+    + header
+    + '</thead>\n'
+    + '<tbody>\n'
+    + body
+    + '</tbody>\n'
+    + '</table>\n';
+};
+
+Renderer.prototype.tablerow = function(content) {
+  return '<tr>\n' + content + '</tr>\n';
+};
+
+Renderer.prototype.tablecell = function(content, flags) {
+  var type = flags.header ? 'th' : 'td';
+  var tag = flags.align
+    ? '<' + type + ' style="text-align:' + flags.align + '">'
+    : '<' + type + '>';
+  return tag + content + '</' + type + '>\n';
+};
+
+// span level renderer
+Renderer.prototype.strong = function(text) {
+  return '<strong>' + text + '</strong>';
+};
+
+Renderer.prototype.em = function(text) {
+  return '<em>' + text + '</em>';
+};
+
+Renderer.prototype.codespan = function(text) {
+  return '<code>' + text + '</code>';
+};
+
+Renderer.prototype.br = function() {
+  return this.options.xhtml ? '<br/>' : '<br>';
+};
+
+Renderer.prototype.del = function(text) {
+  return '<del>' + text + '</del>';
+};
+
+Renderer.prototype.link = function(href, title, text) {
+  if (this.options.sanitize) {
+    try {
+      var prot = decodeURIComponent(unescape(href))
+        .replace(/[^\w:]/g, '')
+        .toLowerCase();
+    } catch (e) {
+      return '';
+    }
+    if (prot.indexOf('javascript:') === 0) {
+      return '';
+    }
+  }
+  var out = '<a href="' + href + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += '>' + text + '</a>';
+  return out;
+};
+
+Renderer.prototype.image = function(href, title, text) {
+  var out = '<img src="' + href + '" alt="' + text + '"';
+  if (title) {
+    out += ' title="' + title + '"';
+  }
+  out += this.options.xhtml ? '/>' : '>';
+  return out;
+};
+
+/**
+ * Parsing & Compiling
+ */
+
+function Parser(options) {
+  this.tokens = [];
+  this.token = null;
+  this.options = options || marked.defaults;
+  this.options.renderer = this.options.renderer || new Renderer;
+  this.renderer = this.options.renderer;
+  this.renderer.options = this.options;
+}
+
+/**
+ * Static Parse Method
+ */
+
+Parser.parse = function(src, options, renderer) {
+  var parser = new Parser(options, renderer);
+  return parser.parse(src);
+};
+
+/**
+ * Parse Loop
+ */
+
+Parser.prototype.parse = function(src) {
+  this.inline = new InlineLexer(src.links, this.options, this.renderer);
+  this.tokens = src.reverse();
+
+  var out = '';
+  while (this.next()) {
+    out += this.tok();
+  }
+
+  return out;
+};
+
+/**
+ * Next Token
+ */
+
+Parser.prototype.next = function() {
+  return this.token = this.tokens.pop();
+};
+
+/**
+ * Preview Next Token
+ */
+
+Parser.prototype.peek = function() {
+  return this.tokens[this.tokens.length - 1] || 0;
+};
+
+/**
+ * Parse Text Tokens
+ */
+
+Parser.prototype.parseText = function() {
+  var body = this.token.text;
+
+  while (this.peek().type === 'text') {
+    body += '\n' + this.next().text;
+  }
+
+  return this.inline.output(body);
+};
+
+/**
+ * Parse Current Token
+ */
+
+Parser.prototype.tok = function() {
+  switch (this.token.type) {
+    case 'space': {
+      return '';
+    }
+    case 'hr': {
+      return this.renderer.hr();
+    }
+    case 'heading': {
+      return this.renderer.heading(
+        this.inline.output(this.token.text),
+        this.token.depth,
+        this.token.text);
+    }
+    case 'code': {
+      return this.renderer.code(this.token.text,
+        this.token.lang,
+        this.token.escaped);
+    }
+    case 'table': {
+      var header = ''
+        , body = ''
+        , i
+        , row
+        , cell
+        , flags
+        , j;
+
+      // header
+      cell = '';
+      for (i = 0; i < this.token.header.length; i++) {
+        flags = { header: true, align: this.token.align[i] };
+        cell += this.renderer.tablecell(
+          this.inline.output(this.token.header[i]),
+          { header: true, align: this.token.align[i] }
+        );
+      }
+      header += this.renderer.tablerow(cell);
+
+      for (i = 0; i < this.token.cells.length; i++) {
+        row = this.token.cells[i];
+
+        cell = '';
+        for (j = 0; j < row.length; j++) {
+          cell += this.renderer.tablecell(
+            this.inline.output(row[j]),
+            { header: false, align: this.token.align[j] }
+          );
+        }
+
+        body += this.renderer.tablerow(cell);
+      }
+      return this.renderer.table(header, body);
+    }
+    case 'blockquote_start': {
+      var body = '';
+
+      while (this.next().type !== 'blockquote_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.blockquote(body);
+    }
+    case 'list_start': {
+      var body = ''
+        , ordered = this.token.ordered;
+
+      while (this.next().type !== 'list_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.list(body, ordered);
+    }
+    case 'list_item_start': {
+      var body = '';
+
+      while (this.next().type !== 'list_item_end') {
+        body += this.token.type === 'text'
+          ? this.parseText()
+          : this.tok();
+      }
+
+      return this.renderer.listitem(body);
+    }
+    case 'loose_item_start': {
+      var body = '';
+
+      while (this.next().type !== 'list_item_end') {
+        body += this.tok();
+      }
+
+      return this.renderer.listitem(body);
+    }
+    case 'html': {
+      var html = !this.token.pre && !this.options.pedantic
+        ? this.inline.output(this.token.text)
+        : this.token.text;
+      return this.renderer.html(html);
+    }
+    case 'paragraph': {
+      return this.renderer.paragraph(this.inline.output(this.token.text));
+    }
+    case 'text': {
+      return this.renderer.paragraph(this.parseText());
+    }
+  }
+};
+
+/**
+ * Helpers
+ */
+
+function escape(html, encode) {
+  return html
+    .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;');
+}
+
+function unescape(html) {
+  return html.replace(/&([#\w]+);/g, function(_, n) {
+    n = n.toLowerCase();
+    if (n === 'colon') return ':';
+    if (n.charAt(0) === '#') {
+      return n.charAt(1) === 'x'
+        ? String.fromCharCode(parseInt(n.substring(2), 16))
+        : String.fromCharCode(+n.substring(1));
+    }
+    return '';
+  });
+}
+
+function replace(regex, opt) {
+  regex = regex.source;
+  opt = opt || '';
+  return function self(name, val) {
+    if (!name) return new RegExp(regex, opt);
+    val = val.source || val;
+    val = val.replace(/(^|[^\[])\^/g, '$1');
+    regex = regex.replace(name, val);
+    return self;
+  };
+}
+
+function noop() {}
+noop.exec = noop;
+
+function merge(obj) {
+  var i = 1
+    , target
+    , key;
+
+  for (; i < arguments.length; i++) {
+    target = arguments[i];
+    for (key in target) {
+      if (Object.prototype.hasOwnProperty.call(target, key)) {
+        obj[key] = target[key];
+      }
+    }
+  }
+
+  return obj;
+}
+
+
+/**
+ * Marked
+ */
+
+function marked(src, opt, callback) {
+  if (callback || typeof opt === 'function') {
+    if (!callback) {
+      callback = opt;
+      opt = null;
+    }
+
+    opt = merge({}, marked.defaults, opt || {});
+
+    var highlight = opt.highlight
+      , tokens
+      , pending
+      , i = 0;
+
+    try {
+      tokens = Lexer.lex(src, opt)
+    } catch (e) {
+      return callback(e);
+    }
+
+    pending = tokens.length;
+
+    var done = function(err) {
+      if (err) {
+        opt.highlight = highlight;
+        return callback(err);
+      }
+
+      var out;
+
+      try {
+        out = Parser.parse(tokens, opt);
+      } catch (e) {
+        err = e;
+      }
+
+      opt.highlight = highlight;
+
+      return err
+        ? callback(err)
+        : callback(null, out);
+    };
+
+    if (!highlight || highlight.length < 3) {
+      return done();
+    }
+
+    delete opt.highlight;
+
+    if (!pending) return done();
+
+    for (; i < tokens.length; i++) {
+      (function(token) {
+        if (token.type !== 'code') {
+          return --pending || done();
+        }
+        return highlight(token.text, token.lang, function(err, code) {
+          if (err) return done(err);
+          if (code == null || code === token.text) {
+            return --pending || done();
+          }
+          token.text = code;
+          token.escaped = true;
+          --pending || done();
+        });
+      })(tokens[i]);
+    }
+
+    return;
+  }
+  try {
+    if (opt) opt = merge({}, marked.defaults, opt);
+    return Parser.parse(Lexer.lex(src, opt), opt);
+  } catch (e) {
+    e.message += '\nPlease report this to https://github.com/chjj/marked.';
+    if ((opt || marked.defaults).silent) {
+      return '<p>An error occured:</p><pre>'
+        + escape(e.message + '', true)
+        + '</pre>';
+    }
+    throw e;
+  }
+}
+
+/**
+ * Options
+ */
+
+marked.options =
+marked.setOptions = function(opt) {
+  merge(marked.defaults, opt);
+  return marked;
+};
+
+marked.defaults = {
+  gfm: true,
+  tables: true,
+  breaks: false,
+  pedantic: false,
+  sanitize: false,
+  smartLists: false,
+  silent: false,
+  highlight: null,
+  langPrefix: 'lang-',
+  smartypants: false,
+  headerPrefix: '',
+  renderer: new Renderer,
+  xhtml: false
+};
+
+/**
+ * Expose
+ */
+
+marked.Parser = Parser;
+marked.parser = Parser.parse;
+
+marked.Renderer = Renderer;
+
+marked.Lexer = Lexer;
+marked.lexer = Lexer.lex;
+
+marked.InlineLexer = InlineLexer;
+marked.inlineLexer = InlineLexer.output;
+
+marked.parse = marked;
+
+if (typeof module !== 'undefined' && typeof exports === 'object') {
+  module.exports = marked;
+} else if (typeof define === 'function' && define.amd) {
+  define(function() { return marked; });
+} else {
+  this.marked = marked;
+}
+
+}).call(function() {
+  return this || (typeof window !== 'undefined' ? window : global);
+}());
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/shred.bundle.js b/src/main/webapp/api-docs/lib/shred.bundle.js
new file mode 100644
index 00000000..22ea396d
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/shred.bundle.js
@@ -0,0 +1,2765 @@
+var require = function (file, cwd) {
+    var resolved = require.resolve(file, cwd || '/');
+    var mod = require.modules[resolved];
+    if (!mod) throw new Error(
+        'Failed to resolve module ' + file + ', tried ' + resolved
+    );
+    var res = mod._cached ? mod._cached : mod();
+    return res;
+}
+
+require.paths = [];
+require.modules = {};
+require.extensions = [".js",".coffee"];
+
+require._core = {
+    'assert': true,
+    'events': true,
+    'fs': true,
+    'path': true,
+    'vm': true
+};
+
+require.resolve = (function () {
+    return function (x, cwd) {
+        if (!cwd) cwd = '/';
+        
+        if (require._core[x]) return x;
+        var path = require.modules.path();
+        var y = cwd || '.';
+        
+        if (x.match(/^(?:\.\.?\/|\/)/)) {
+            var m = loadAsFileSync(path.resolve(y, x))
+                || loadAsDirectorySync(path.resolve(y, x));
+            if (m) return m;
+        }
+        
+        var n = loadNodeModulesSync(x, y);
+        if (n) return n;
+        
+        throw new Error("Cannot find module '" + x + "'");
+        
+        function loadAsFileSync (x) {
+            if (require.modules[x]) {
+                return x;
+            }
+            
+            for (var i = 0; i < require.extensions.length; i++) {
+                var ext = require.extensions[i];
+                if (require.modules[x + ext]) return x + ext;
+            }
+        }
+        
+        function loadAsDirectorySync (x) {
+            x = x.replace(/\/+$/, '');
+            var pkgfile = x + '/package.json';
+            if (require.modules[pkgfile]) {
+                var pkg = require.modules[pkgfile]();
+                var b = pkg.browserify;
+                if (typeof b === 'object' && b.main) {
+                    var m = loadAsFileSync(path.resolve(x, b.main));
+                    if (m) return m;
+                }
+                else if (typeof b === 'string') {
+                    var m = loadAsFileSync(path.resolve(x, b));
+                    if (m) return m;
+                }
+                else if (pkg.main) {
+                    var m = loadAsFileSync(path.resolve(x, pkg.main));
+                    if (m) return m;
+                }
+            }
+            
+            return loadAsFileSync(x + '/index');
+        }
+        
+        function loadNodeModulesSync (x, start) {
+            var dirs = nodeModulesPathsSync(start);
+            for (var i = 0; i < dirs.length; i++) {
+                var dir = dirs[i];
+                var m = loadAsFileSync(dir + '/' + x);
+                if (m) return m;
+                var n = loadAsDirectorySync(dir + '/' + x);
+                if (n) return n;
+            }
+            
+            var m = loadAsFileSync(x);
+            if (m) return m;
+        }
+        
+        function nodeModulesPathsSync (start) {
+            var parts;
+            if (start === '/') parts = [ '' ];
+            else parts = path.normalize(start).split('/');
+            
+            var dirs = [];
+            for (var i = parts.length - 1; i >= 0; i--) {
+                if (parts[i] === 'node_modules') continue;
+                var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
+                dirs.push(dir);
+            }
+            
+            return dirs;
+        }
+    };
+})();
+
+require.alias = function (from, to) {
+    var path = require.modules.path();
+    var res = null;
+    try {
+        res = require.resolve(from + '/package.json', '/');
+    }
+    catch (err) {
+        res = require.resolve(from, '/');
+    }
+    var basedir = path.dirname(res);
+    
+    var keys = (Object.keys || function (obj) {
+        var res = [];
+        for (var key in obj) res.push(key)
+        return res;
+    })(require.modules);
+    
+    for (var i = 0; i < keys.length; i++) {
+        var key = keys[i];
+        if (key.slice(0, basedir.length + 1) === basedir + '/') {
+            var f = key.slice(basedir.length);
+            require.modules[to + f] = require.modules[basedir + f];
+        }
+        else if (key === basedir) {
+            require.modules[to] = require.modules[basedir];
+        }
+    }
+};
+
+require.define = function (filename, fn) {
+    var dirname = require._core[filename]
+        ? ''
+        : require.modules.path().dirname(filename)
+    ;
+    
+    var require_ = function (file) {
+        return require(file, dirname)
+    };
+    require_.resolve = function (name) {
+        return require.resolve(name, dirname);
+    };
+    require_.modules = require.modules;
+    require_.define = require.define;
+    var module_ = { exports : {} };
+    
+    require.modules[filename] = function () {
+        require.modules[filename]._cached = module_.exports;
+        fn.call(
+            module_.exports,
+            require_,
+            module_,
+            module_.exports,
+            dirname,
+            filename
+        );
+        require.modules[filename]._cached = module_.exports;
+        return module_.exports;
+    };
+};
+
+if (typeof process === 'undefined') process = {};
+
+if (!process.nextTick) process.nextTick = (function () {
+    var queue = [];
+    var canPost = typeof window !== 'undefined'
+        && window.postMessage && window.addEventListener
+    ;
+    
+    if (canPost) {
+        window.addEventListener('message', function (ev) {
+            if (ev.source === window && ev.data === 'browserify-tick') {
+                ev.stopPropagation();
+                if (queue.length > 0) {
+                    var fn = queue.shift();
+                    fn();
+                }
+            }
+        }, true);
+    }
+    
+    return function (fn) {
+        if (canPost) {
+            queue.push(fn);
+            window.postMessage('browserify-tick', '*');
+        }
+        else setTimeout(fn, 0);
+    };
+})();
+
+if (!process.title) process.title = 'browser';
+
+if (!process.binding) process.binding = function (name) {
+    if (name === 'evals') return require('vm')
+    else throw new Error('No such module')
+};
+
+if (!process.cwd) process.cwd = function () { return '.' };
+
+require.define("path", function (require, module, exports, __dirname, __filename) {
+    function filter (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        if (fn(xs[i], i, xs)) res.push(xs[i]);
+    }
+    return res;
+}
+
+// resolves . and .. elements in a path array with directory names there
+// must be no slashes, empty elements, or device names (c:\) in the array
+// (so also no leading and trailing slashes - it does not distinguish
+// relative and absolute paths)
+function normalizeArray(parts, allowAboveRoot) {
+  // if the path tries to go above the root, `up` ends up > 0
+  var up = 0;
+  for (var i = parts.length; i >= 0; i--) {
+    var last = parts[i];
+    if (last == '.') {
+      parts.splice(i, 1);
+    } else if (last === '..') {
+      parts.splice(i, 1);
+      up++;
+    } else if (up) {
+      parts.splice(i, 1);
+      up--;
+    }
+  }
+
+  // if the path is allowed to go above the root, restore leading ..s
+  if (allowAboveRoot) {
+    for (; up--; up) {
+      parts.unshift('..');
+    }
+  }
+
+  return parts;
+}
+
+// Regex to split a filename into [*, dir, basename, ext]
+// posix version
+var splitPathRe = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/;
+
+// path.resolve([from ...], to)
+// posix version
+exports.resolve = function() {
+var resolvedPath = '',
+    resolvedAbsolute = false;
+
+for (var i = arguments.length; i >= -1 && !resolvedAbsolute; i--) {
+  var path = (i >= 0)
+      ? arguments[i]
+      : process.cwd();
+
+  // Skip empty and invalid entries
+  if (typeof path !== 'string' || !path) {
+    continue;
+  }
+
+  resolvedPath = path + '/' + resolvedPath;
+  resolvedAbsolute = path.charAt(0) === '/';
+}
+
+// At this point the path should be resolved to a full absolute path, but
+// handle relative paths to be safe (might happen when process.cwd() fails)
+
+// Normalize the path
+resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
+    return !!p;
+  }), !resolvedAbsolute).join('/');
+
+  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
+};
+
+// path.normalize(path)
+// posix version
+exports.normalize = function(path) {
+var isAbsolute = path.charAt(0) === '/',
+    trailingSlash = path.slice(-1) === '/';
+
+// Normalize the path
+path = normalizeArray(filter(path.split('/'), function(p) {
+    return !!p;
+  }), !isAbsolute).join('/');
+
+  if (!path && !isAbsolute) {
+    path = '.';
+  }
+  if (path && trailingSlash) {
+    path += '/';
+  }
+  
+  return (isAbsolute ? '/' : '') + path;
+};
+
+
+// posix version
+exports.join = function() {
+  var paths = Array.prototype.slice.call(arguments, 0);
+  return exports.normalize(filter(paths, function(p, index) {
+    return p && typeof p === 'string';
+  }).join('/'));
+};
+
+
+exports.dirname = function(path) {
+  var dir = splitPathRe.exec(path)[1] || '';
+  var isWindows = false;
+  if (!dir) {
+    // No dirname
+    return '.';
+  } else if (dir.length === 1 ||
+      (isWindows && dir.length <= 3 && dir.charAt(1) === ':')) {
+    // It is just a slash or a drive letter with a slash
+    return dir;
+  } else {
+    // It is a full dirname, strip trailing slash
+    return dir.substring(0, dir.length - 1);
+  }
+};
+
+
+exports.basename = function(path, ext) {
+  var f = splitPathRe.exec(path)[2] || '';
+  // TODO: make this comparison case-insensitive on windows?
+  if (ext && f.substr(-1 * ext.length) === ext) {
+    f = f.substr(0, f.length - ext.length);
+  }
+  return f;
+};
+
+
+exports.extname = function(path) {
+  return splitPathRe.exec(path)[3] || '';
+};
+
+});
+
+require.define("/shred.js", function (require, module, exports, __dirname, __filename) {
+    // Shred is an HTTP client library intended to simplify the use of Node's
+// built-in HTTP library. In particular, we wanted to make it easier to interact
+// with HTTP-based APIs.
+// 
+// See the [examples](./examples.html) for more details.
+
+// Ax is a nice logging library we wrote. You can use any logger, providing it
+// has `info`, `warn`, `debug`, and `error` methods that take a string.
+var Ax = require("ax")
+  , CookieJarLib = require( "cookiejar" )
+  , CookieJar = CookieJarLib.CookieJar
+;
+
+// Shred takes some options, including a logger and request defaults.
+
+var Shred = function(options) {
+  options = (options||{});
+  this.agent = options.agent;
+  this.defaults = options.defaults||{};
+  this.log = options.logger||(new Ax({ level: "info" }));
+  this._sharedCookieJar = new CookieJar();
+  this.logCurl = options.logCurl || false;
+};
+
+// Most of the real work is done in the request and reponse classes.
+ 
+Shred.Request = require("./shred/request");
+Shred.Response = require("./shred/response");
+
+// The `request` method kicks off a new request, instantiating a new `Request`
+// object and passing along whatever default options we were given.
+
+Shred.prototype = {
+  request: function(options) {
+    options.logger = this.log;
+    options.logCurl = options.logCurl || this.logCurl;
+    options.cookieJar = ( 'cookieJar' in options ) ? options.cookieJar : this._sharedCookieJar; // let them set cookieJar = null
+    options.agent = options.agent || this.agent;
+    // fill in default options
+    for (var key in this.defaults) {
+      if (this.defaults.hasOwnProperty(key) && !options[key]) {
+        options[key] = this.defaults[key]
+      }
+    }
+    return new Shred.Request(options);
+  }
+};
+
+// Define a bunch of convenience methods so that you don't have to include
+// a `method` property in your request options.
+
+"get put post delete".split(" ").forEach(function(method) {
+  Shred.prototype[method] = function(options) {
+    options.method = method;
+    return this.request(options);
+  };
+});
+
+
+module.exports = Shred;
+
+});
+
+require.define("/node_modules/ax/package.json", function (require, module, exports, __dirname, __filename) {
+    module.exports = {"main":"./lib/ax.js"}
+});
+
+require.define("/node_modules/ax/lib/ax.js", function (require, module, exports, __dirname, __filename) {
+    var inspect = require("util").inspect
+  , fs = require("fs")
+;
+
+
+// this is a quick-and-dirty logger. there are other nicer loggers out there
+// but the ones i found were also somewhat involved. this one has a Ruby
+// logger type interface
+//
+// we can easily replace this, provide the info, debug, etc. methods are the
+// same. or, we can change Haiku to use a more standard node.js interface
+
+var format = function(level,message) {
+  var debug = (level=="debug"||level=="error");
+  if (!message) { return message.toString(); }
+  if (typeof(message) == "object") {
+    if (message instanceof Error && debug) {
+      return message.stack;
+    } else {
+      return inspect(message);
+    }
+  } else {
+    return message.toString();
+  }
+};
+
+var noOp = function(message) { return this; }
+var makeLogger = function(level,fn) {
+  return function(message) { 
+    this.stream.write(this.format(level, message)+"\n");
+    return this;
+  }
+};
+
+var Logger = function(options) {
+  var logger = this;
+  var options = options||{};
+
+  // Default options
+  options.level = options.level || "info";
+  options.timestamp = options.timestamp || true;
+  options.prefix = options.prefix || "";
+  logger.options = options;
+
+  // Allows a prefix to be added to the message.
+  //
+  //    var logger = new Ax({ module: 'Haiku' })
+  //    logger.warn('this is going to be awesome!');
+  //    //=> Haiku: this is going to be awesome!
+  //
+  if (logger.options.module){
+    logger.options.prefix = logger.options.module;
+  }
+
+  // Write to stderr or a file
+  if (logger.options.file){
+    logger.stream = fs.createWriteStream(logger.options.file, {"flags": "a"});
+  } else {
+      if(process.title === "node")
+    logger.stream = process.stderr;
+      else if(process.title === "browser")
+    logger.stream = function () {
+      // Work around weird console context issue: http://code.google.com/p/chromium/issues/detail?id=48662
+      return console[logger.options.level].apply(console, arguments);
+    };
+  }
+
+  switch(logger.options.level){
+    case 'debug':
+      ['debug', 'info', 'warn'].forEach(function (level) {
+        logger[level] = Logger.writer(level);
+      });
+    case 'info':
+      ['info', 'warn'].forEach(function (level) {
+        logger[level] = Logger.writer(level);
+      });
+    case 'warn':
+      logger.warn = Logger.writer('warn');
+  }
+}
+
+// Used to define logger methods
+Logger.writer = function(level){
+  return function(message){
+    var logger = this;
+
+    if(process.title === "node")
+  logger.stream.write(logger.format(level, message) + '\n');
+    else if(process.title === "browser")
+  logger.stream(logger.format(level, message) + '\n');
+
+  };
+}
+
+
+Logger.prototype = {
+  info: function(){},
+  debug: function(){},
+  warn: function(){},
+  error: Logger.writer('error'),
+  format: function(level, message){
+    if (! message) return '';
+
+    var logger = this
+      , prefix = logger.options.prefix
+      , timestamp = logger.options.timestamp ? " " + (new Date().toISOString()) : ""
+    ;
+
+    return (prefix + timestamp + ": " + message);
+  }
+};
+
+module.exports = Logger;
+
+});
+
+require.define("util", function (require, module, exports, __dirname, __filename) {
+    // todo
+
+});
+
+require.define("fs", function (require, module, exports, __dirname, __filename) {
+    // nothing to see here... no file methods for the browser
+
+});
+
+require.define("/node_modules/cookiejar/package.json", function (require, module, exports, __dirname, __filename) {
+    module.exports = {"main":"cookiejar.js"}
+});
+
+require.define("/node_modules/cookiejar/cookiejar.js", function (require, module, exports, __dirname, __filename) {
+    exports.CookieAccessInfo=CookieAccessInfo=function CookieAccessInfo(domain,path,secure,script) {
+    if(this instanceof CookieAccessInfo) {
+      this.domain=domain||undefined;
+      this.path=path||"/";
+      this.secure=!!secure;
+      this.script=!!script;
+      return this;
+    }
+    else {
+        return new CookieAccessInfo(domain,path,secure,script)    
+    }
+}
+
+exports.Cookie=Cookie=function Cookie(cookiestr) {
+  if(cookiestr instanceof Cookie) {
+    return cookiestr;
+  }
+    else {
+        if(this instanceof Cookie) {
+          this.name = null;
+          this.value = null;
+          this.expiration_date = Infinity;
+          this.path = "/";
+          this.domain = null;
+          this.secure = false; //how to define?
+          this.noscript = false; //httponly
+          if(cookiestr) {
+            this.parse(cookiestr)
+          }
+          return this;
+        }
+        return new Cookie(cookiestr)
+    }
+}
+
+Cookie.prototype.toString = function toString() {
+  var str=[this.name+"="+this.value];
+  if(this.expiration_date !== Infinity) {
+    str.push("expires="+(new Date(this.expiration_date)).toGMTString());
+  }
+  if(this.domain) {
+    str.push("domain="+this.domain);
+  }
+  if(this.path) {
+    str.push("path="+this.path);
+  }
+  if(this.secure) {
+    str.push("secure");
+  }
+  if(this.noscript) {
+    str.push("httponly");
+  }
+  return str.join("; ");
+}
+
+Cookie.prototype.toValueString = function toValueString() {
+  return this.name+"="+this.value;
+}
+
+var cookie_str_splitter=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g
+Cookie.prototype.parse = function parse(str) {
+  if(this instanceof Cookie) {
+      var parts=str.split(";")
+      , pair=parts[0].match(/([^=]+)=((?:.|\n)*)/)
+      , key=pair[1]
+      , value=pair[2];
+      this.name = key;
+      this.value = value;
+    
+      for(var i=1;i<parts.length;i++) {
+        pair=parts[i].match(/([^=]+)(?:=((?:.|\n)*))?/)
+        , key=pair[1].trim().toLowerCase()
+        , value=pair[2];
+        switch(key) {
+          case "httponly":
+            this.noscript = true;
+          break;
+          case "expires":
+            this.expiration_date = value
+              ? Number(Date.parse(value))
+              : Infinity;
+          break;
+          case "path":
+            this.path = value
+              ? value.trim()
+              : "";
+          break;
+          case "domain":
+            this.domain = value
+              ? value.trim()
+              : "";
+          break;
+          case "secure":
+            this.secure = true;
+          break
+        }
+      }
+    
+      return this;
+  }
+    return new Cookie().parse(str)
+}
+
+Cookie.prototype.matches = function matches(access_info) {
+  if(this.noscript && access_info.script
+  || this.secure && !access_info.secure
+  || !this.collidesWith(access_info)) {
+    return false
+  }
+  return true;
+}
+
+Cookie.prototype.collidesWith = function collidesWith(access_info) {
+  if((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
+    return false
+  }
+  if(this.path && access_info.path.indexOf(this.path) !== 0) {
+    return false;
+  }
+  if (this.domain===access_info.domain) {
+    return true;
+  }
+  else if(this.domain && this.domain.charAt(0)===".")
+  {
+    var wildcard=access_info.domain.indexOf(this.domain.slice(1))
+    if(wildcard===-1 || wildcard!==access_info.domain.length-this.domain.length+1) {
+      return false;
+    }
+  }
+  else if(this.domain){
+    return false
+  }
+  return true;
+}
+
+exports.CookieJar=CookieJar=function CookieJar() {
+  if(this instanceof CookieJar) {
+      var cookies = {} //name: [Cookie]
+    
+      this.setCookie = function setCookie(cookie) {
+        cookie = Cookie(cookie);
+        //Delete the cookie if the set is past the current time
+        var remove = cookie.expiration_date <= Date.now();
+        if(cookie.name in cookies) {
+          var cookies_list = cookies[cookie.name];
+          for(var i=0;i<cookies_list.length;i++) {
+            var collidable_cookie = cookies_list[i];
+            if(collidable_cookie.collidesWith(cookie)) {
+              if(remove) {
+                cookies_list.splice(i,1);
+                if(cookies_list.length===0) {
+                  delete cookies[cookie.name]
+                }
+                return false;
+              }
+              else {
+                return cookies_list[i]=cookie;
+              }
+            }
+          }
+          if(remove) {
+            return false;
+          }
+          cookies_list.push(cookie);
+          return cookie;
+        }
+        else if(remove){
+          return false;
+        }
+        else {
+          return cookies[cookie.name]=[cookie];
+        }
+      }
+      //returns a cookie
+      this.getCookie = function getCookie(cookie_name,access_info) {
+        var cookies_list = cookies[cookie_name];
+        for(var i=0;i<cookies_list.length;i++) {
+          var cookie = cookies_list[i];
+          if(cookie.expiration_date <= Date.now()) {
+            if(cookies_list.length===0) {
+              delete cookies[cookie.name]
+            }
+            continue;
+          }
+          if(cookie.matches(access_info)) {
+            return cookie;
+          }
+        }
+      }
+      //returns a list of cookies
+      this.getCookies = function getCookies(access_info) {
+        var matches=[];
+        for(var cookie_name in cookies) {
+          var cookie=this.getCookie(cookie_name,access_info);
+          if (cookie) {
+            matches.push(cookie);
+          }
+        }
+        matches.toString=function toString(){return matches.join(":");}
+            matches.toValueString=function() {return matches.map(function(c){return c.toValueString();}).join(';');}
+        return matches;
+      }
+    
+      return this;
+  }
+    return new CookieJar()
+}
+
+
+//returns list of cookies that were set correctly
+CookieJar.prototype.setCookies = function setCookies(cookies) {
+  cookies=Array.isArray(cookies)
+    ?cookies
+    :cookies.split(cookie_str_splitter);
+  var successful=[]
+  for(var i=0;i<cookies.length;i++) {
+    var cookie = Cookie(cookies[i]);
+    if(this.setCookie(cookie)) {
+      successful.push(cookie);
+    }
+  }
+  return successful;
+}
+
+});
+
+require.define("/shred/request.js", function (require, module, exports, __dirname, __filename) {
+    // The request object encapsulates a request, creating a Node.js HTTP request and
+// then handling the response.
+
+var HTTP = require("http")
+  , HTTPS = require("https")
+  , parseUri = require("./parseUri")
+  , Emitter = require('events').EventEmitter
+  , sprintf = require("sprintf").sprintf
+  , Response = require("./response")
+  , HeaderMixins = require("./mixins/headers")
+  , Content = require("./content")
+;
+
+var STATUS_CODES = HTTP.STATUS_CODES || {
+    100 : 'Continue',
+    101 : 'Switching Protocols',
+    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
+    200 : 'OK',
+    201 : 'Created',
+    202 : 'Accepted',
+    203 : 'Non-Authoritative Information',
+    204 : 'No Content',
+    205 : 'Reset Content',
+    206 : 'Partial Content',
+    207 : 'Multi-Status', // RFC 4918
+    300 : 'Multiple Choices',
+    301 : 'Moved Permanently',
+    302 : 'Moved Temporarily',
+    303 : 'See Other',
+    304 : 'Not Modified',
+    305 : 'Use Proxy',
+    307 : 'Temporary Redirect',
+    400 : 'Bad Request',
+    401 : 'Unauthorized',
+    402 : 'Payment Required',
+    403 : 'Forbidden',
+    404 : 'Not Found',
+    405 : 'Method Not Allowed',
+    406 : 'Not Acceptable',
+    407 : 'Proxy Authentication Required',
+    408 : 'Request Time-out',
+    409 : 'Conflict',
+    410 : 'Gone',
+    411 : 'Length Required',
+    412 : 'Precondition Failed',
+    413 : 'Request Entity Too Large',
+    414 : 'Request-URI Too Large',
+    415 : 'Unsupported Media Type',
+    416 : 'Requested Range Not Satisfiable',
+    417 : 'Expectation Failed',
+    418 : 'I\'m a teapot', // RFC 2324
+    422 : 'Unprocessable Entity', // RFC 4918
+    423 : 'Locked', // RFC 4918
+    424 : 'Failed Dependency', // RFC 4918
+    425 : 'Unordered Collection', // RFC 4918
+    426 : 'Upgrade Required', // RFC 2817
+    500 : 'Internal Server Error',
+    501 : 'Not Implemented',
+    502 : 'Bad Gateway',
+    503 : 'Service Unavailable',
+    504 : 'Gateway Time-out',
+    505 : 'HTTP Version not supported',
+    506 : 'Variant Also Negotiates', // RFC 2295
+    507 : 'Insufficient Storage', // RFC 4918
+    509 : 'Bandwidth Limit Exceeded',
+    510 : 'Not Extended' // RFC 2774
+};
+
+// The Shred object itself constructs the `Request` object. You should rarely
+// need to do this directly.
+
+var Request = function(options) {
+  this.log = options.logger;
+  this.cookieJar = options.cookieJar;
+  this.encoding = options.encoding;
+  this.logCurl = options.logCurl;
+  processOptions(this,options||{});
+  createRequest(this);
+};
+
+// A `Request` has a number of properties, many of which help with details like
+// URL parsing or defaulting the port for the request.
+
+Object.defineProperties(Request.prototype, {
+
+// - **url**. You can set the `url` property with a valid URL string and all the
+//   URL-related properties (host, port, etc.) will be automatically set on the
+//   request object.
+
+  url: {
+    get: function() {
+      if (!this.scheme) { return null; }
+      return sprintf("%s://%s:%s%s",
+          this.scheme, this.host, this.port,
+          (this.proxy ? "/" : this.path) +
+          (this.query ? ("?" + this.query) : ""));
+    },
+    set: function(_url) {
+      _url = parseUri(_url);
+      this.scheme = _url.protocol;
+      this.host = _url.host;
+      this.port = _url.port;
+      this.path = _url.path;
+      this.query = _url.query;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **headers**. Returns a hash representing the request headers. You can't set
+//   this directly, only get it. You can add or modify headers by using the
+//   `setHeader` or `setHeaders` method. This ensures that the headers are
+//   normalized - that is, you don't accidentally send `Content-Type` and
+//   `content-type` headers. Keep in mind that if you modify the returned hash,
+//   it will *not* modify the request headers.
+
+  headers: {
+    get: function() {
+      return this.getHeaders();
+    },
+    enumerable: true
+  },
+
+// - **port**. Unless you set the `port` explicitly or include it in the URL, it
+//   will default based on the scheme.
+
+  port: {
+    get: function() {
+      if (!this._port) {
+        switch(this.scheme) {
+          case "https": return this._port = 443;
+          case "http":
+          default: return this._port = 80;
+        }
+      }
+      return this._port;
+    },
+    set: function(value) { this._port = value; return this; },
+    enumerable: true
+  },
+
+// - **method**. The request method - `get`, `put`, `post`, etc. that will be
+//   used to make the request. Defaults to `get`.
+
+  method: {
+    get: function() {
+      return this._method = (this._method||"GET");
+    },
+    set: function(value) {
+      this._method = value; return this;
+    },
+    enumerable: true
+  },
+
+// - **query**. Can be set either with a query string or a hash (object). Get
+//   will always return a properly escaped query string or null if there is no
+//   query component for the request.
+
+  query: {
+    get: function() {return this._query;},
+    set: function(value) {
+      var stringify = function (hash) {
+        var query = "";
+        for (var key in hash) {
+          query += encodeURIComponent(key) + '=' + encodeURIComponent(hash[key]) + '&';
+        }
+        // Remove the last '&'
+        query = query.slice(0, -1);
+        return query;
+      }
+
+      if (value) {
+        if (typeof value === 'object') {
+          value = stringify(value);
+        }
+        this._query = value;
+      } else {
+        this._query = "";
+      }
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **parameters**. This will return the query parameters in the form of a hash
+//   (object).
+
+  parameters: {
+    get: function() { return QueryString.parse(this._query||""); },
+    enumerable: true
+  },
+
+// - **content**. (Aliased as `body`.) Set this to add a content entity to the
+//   request. Attempts to use the `content-type` header to determine what to do
+//   with the content value. Get this to get back a [`Content`
+//   object](./content.html).
+
+  body: {
+    get: function() { return this._body; },
+    set: function(value) {
+      this._body = new Content({
+        data: value,
+        type: this.getHeader("Content-Type")
+      });
+      this.setHeader("Content-Type",this.content.type);
+      this.setHeader("Content-Length",this.content.length);
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **timeout**. Used to determine how long to wait for a response. Does not
+//   distinguish between connect timeouts versus request timeouts. Set either in
+//   milliseconds or with an object with temporal attributes (hours, minutes,
+//   seconds) and convert it into milliseconds. Get will always return
+//   milliseconds.
+
+  timeout: {
+    get: function() { return this._timeout; }, // in milliseconds
+    set: function(timeout) {
+      var request = this
+        , milliseconds = 0;
+      ;
+      if (!timeout) return this;
+      if (typeof timeout==="number") { milliseconds = timeout; }
+      else {
+        milliseconds = (timeout.milliseconds||0) +
+          (1000 * ((timeout.seconds||0) +
+              (60 * ((timeout.minutes||0) +
+                (60 * (timeout.hours||0))))));
+      }
+      this._timeout = milliseconds;
+      return this;
+    },
+    enumerable: true
+  }
+});
+
+// Alias `body` property to `content`. Since the [content object](./content.html)
+// has a `body` attribute, it's preferable to use `content` since you can then
+// access the raw content data using `content.body`.
+
+Object.defineProperty(Request.prototype,"content",
+    Object.getOwnPropertyDescriptor(Request.prototype, "body"));
+
+// The `Request` object can be pretty overwhelming to view using the built-in
+// Node.js inspect method. We want to make it a bit more manageable. This
+// probably goes [too far in the other
+// direction](https://github.com/spire-io/shred/issues/2).
+
+Request.prototype.inspect = function () {
+  var request = this;
+  var headers = this.format_headers();
+  var summary = ["<Shred Request> ", request.method.toUpperCase(),
+      request.url].join(" ")
+  return [ summary, "- Headers:", headers].join("\n");
+};
+
+Request.prototype.format_headers = function () {
+  var array = []
+  var headers = this._headers
+  for (var key in headers) {
+    if (headers.hasOwnProperty(key)) {
+      var value = headers[key]
+      array.push("\t" + key + ": " + value);
+    }
+  }
+  return array.join("\n");
+};
+
+// Allow chainable 'on's:  shred.get({ ... }).on( ... ).  You can pass in a
+// single function, a pair (event, function), or a hash:
+// { event: function, event: function }
+Request.prototype.on = function (eventOrHash, listener) {
+  var emitter = this.emitter;
+  // Pass in a single argument as a function then make it the default response handler
+  if (arguments.length === 1 && typeof(eventOrHash) === 'function') {
+    emitter.on('response', eventOrHash);
+  } else if (arguments.length === 1 && typeof(eventOrHash) === 'object') {
+    for (var key in eventOrHash) {
+      if (eventOrHash.hasOwnProperty(key)) {
+        emitter.on(key, eventOrHash[key]);
+      }
+    }
+  } else {
+    emitter.on(eventOrHash, listener);
+  }
+  return this;
+};
+
+// Add in the header methods. Again, these ensure we don't get the same header
+// multiple times with different case conventions.
+HeaderMixins.gettersAndSetters(Request);
+
+// `processOptions` is called from the constructor to handle all the work
+// associated with making sure we do our best to ensure we have a valid request.
+
+var processOptions = function(request,options) {
+
+  request.log.debug("Processing request options ..");
+
+  // We'll use `request.emitter` to manage the `on` event handlers.
+  request.emitter = (new Emitter);
+
+  request.agent = options.agent;
+
+  // Set up the handlers ...
+  if (options.on) {
+    for (var key in options.on) {
+      if (options.on.hasOwnProperty(key)) {
+        request.emitter.on(key, options.on[key]);
+      }
+    }
+  }
+
+  // Make sure we were give a URL or a host
+  if (!options.url && !options.host) {
+    request.emitter.emit("request_error",
+        new Error("No url or url options (host, port, etc.)"));
+    return;
+  }
+
+  // Allow for the [use of a proxy](http://www.jmarshall.com/easy/http/#proxies).
+
+  if (options.url) {
+    if (options.proxy) {
+      request.url = options.proxy;
+      request.path = options.url;
+    } else {
+      request.url = options.url;
+    }
+  }
+
+  // Set the remaining options.
+  request.query = options.query||options.parameters||request.query ;
+  request.method = options.method;
+  request.setHeader("user-agent",options.agent||"Shred");
+  request.setHeaders(options.headers);
+
+  if (request.cookieJar) {
+    var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
+    if (cookies.length) {
+      var cookieString = request.getHeader('cookie')||'';
+      for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
+          if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
+          {
+              cookieString += ';';
+          }
+          cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
+      }
+      request.setHeader("cookie", cookieString);
+    }
+  }
+  
+  // The content entity can be set either using the `body` or `content` attributes.
+  if (options.body||options.content) {
+    request.content = options.body||options.content;
+  }
+  request.timeout = options.timeout;
+
+};
+
+// `createRequest` is also called by the constructor, after `processOptions`.
+// This actually makes the request and processes the response, so `createRequest`
+// is a bit of a misnomer.
+
+var createRequest = function(request) {
+  var timeout ;
+
+  request.log.debug("Creating request ..");
+  request.log.debug(request);
+
+  var reqParams = {
+    host: request.host,
+    port: request.port,
+    method: request.method,
+    path: request.path + (request.query ? '?'+request.query : ""),
+    headers: request.getHeaders(),
+    // Node's HTTP/S modules will ignore this, but we are using the
+    // browserify-http module in the browser for both HTTP and HTTPS, and this
+    // is how you differentiate the two.
+    scheme: request.scheme,
+    // Use a provided agent.  'Undefined' is the default, which uses a global
+    // agent.
+    agent: request.agent
+  };
+
+  if (request.logCurl) {
+    logCurl(request);
+  }
+
+  var http = request.scheme == "http" ? HTTP : HTTPS;
+
+  // Set up the real request using the selected library. The request won't be
+  // sent until we call `.end()`.
+  request._raw = http.request(reqParams, function(response) {
+    request.log.debug("Received response ..");
+
+    // We haven't timed out and we have a response, so make sure we clear the
+    // timeout so it doesn't fire while we're processing the response.
+    clearTimeout(timeout);
+
+    // Construct a Shred `Response` object from the response. This will stream
+    // the response, thus the need for the callback. We can access the response
+    // entity safely once we're in the callback.
+    response = new Response(response, request, function(response) {
+
+      // Set up some event magic. The precedence is given first to
+      // status-specific handlers, then to responses for a given event, and then
+      // finally to the more general `response` handler. In the last case, we
+      // need to first make sure we're not dealing with a a redirect.
+      var emit = function(event) {
+        var emitter = request.emitter;
+        var textStatus = STATUS_CODES[response.status] ? STATUS_CODES[response.status].toLowerCase() : null;
+        if (emitter.listeners(response.status).length > 0 || emitter.listeners(textStatus).length > 0) {
+          emitter.emit(response.status, response);
+          emitter.emit(textStatus, response);
+        } else {
+          if (emitter.listeners(event).length>0) {
+            emitter.emit(event, response);
+          } else if (!response.isRedirect) {
+            emitter.emit("response", response);
+            //console.warn("Request has no event listener for status code " + response.status);
+          }
+        }
+      };
+
+      // Next, check for a redirect. We simply repeat the request with the URL
+      // given in the `Location` header. We fire a `redirect` event.
+      if (response.isRedirect) {
+        request.log.debug("Redirecting to "
+            + response.getHeader("Location"));
+        request.url = response.getHeader("Location");
+        emit("redirect");
+        createRequest(request);
+
+      // Okay, it's not a redirect. Is it an error of some kind?
+      } else if (response.isError) {
+        emit("error");
+      } else {
+      // It looks like we're good shape. Trigger the `success` event.
+        emit("success");
+      }
+    });
+  });
+
+  // We're still setting up the request. Next, we're going to handle error cases
+  // where we have no response. We don't emit an error event because that event
+  // takes a response. We don't response handlers to have to check for a null
+  // value. However, we [should introduce a different event
+  // type](https://github.com/spire-io/shred/issues/3) for this type of error.
+  request._raw.on("error", function(error) {
+    request.emitter.emit("request_error", error);
+  });
+
+  request._raw.on("socket", function(socket) {
+    request.emitter.emit("socket", socket);
+  });
+
+  // TCP timeouts should also trigger the "response_error" event.
+  request._raw.on('socket', function () {
+    request._raw.socket.on('timeout', function () {
+      // This should trigger the "error" event on the raw request, which will
+      // trigger the "response_error" on the shred request.
+      request._raw.abort();
+    });
+  });
+
+
+  // We're almost there. Next, we need to write the request entity to the
+  // underlying request object.
+  if (request.content) {
+    request.log.debug("Streaming body: '" +
+        request.content.data.slice(0,59) + "' ... ");
+    request._raw.write(request.content.data);
+  }
+
+  // Finally, we need to set up the timeout. We do this last so that we don't
+  // start the clock ticking until the last possible moment.
+  if (request.timeout) {
+    timeout = setTimeout(function() {
+      request.log.debug("Timeout fired, aborting request ...");
+      request._raw.abort();
+      request.emitter.emit("timeout", request);
+    },request.timeout);
+  }
+
+  // The `.end()` method will cause the request to fire. Technically, it might
+  // have already sent the headers and body.
+  request.log.debug("Sending request ...");
+  request._raw.end();
+};
+
+// Logs the curl command for the request.
+var logCurl = function (req) {
+  var headers = req.getHeaders();
+  var headerString = "";
+
+  for (var key in headers) {
+    headerString += '-H "' + key + ": " + headers[key] + '" ';
+  }
+
+  var bodyString = ""
+
+  if (req.content) {
+    bodyString += "-d '" + req.content.body + "' ";
+  }
+
+  var query = req.query ? '?' + req.query : "";
+
+  console.log("curl " +
+    "-X " + req.method.toUpperCase() + " " +
+    req.scheme + "://" + req.host + ":" + req.port + req.path + query + " " +
+    headerString +
+    bodyString
+  );
+};
+
+
+module.exports = Request;
+
+});
+
+require.define("http", function (require, module, exports, __dirname, __filename) {
+    // todo
+
+});
+
+require.define("https", function (require, module, exports, __dirname, __filename) {
+    // todo
+
+});
+
+require.define("/shred/parseUri.js", function (require, module, exports, __dirname, __filename) {
+    // parseUri 1.2.2
+// (c) Steven Levithan <stevenlevithan.com>
+// MIT License
+
+function parseUri (str) {
+  var o   = parseUri.options,
+    m   = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
+    uri = {},
+    i   = 14;
+
+  while (i--) uri[o.key[i]] = m[i] || "";
+
+  uri[o.q.name] = {};
+  uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
+    if ($1) uri[o.q.name][$1] = $2;
+  });
+
+  return uri;
+};
+
+parseUri.options = {
+  strictMode: false,
+  key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
+  q:   {
+    name:   "queryKey",
+    parser: /(?:^|&)([^&=]*)=?([^&]*)/g
+  },
+  parser: {
+    strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
+    loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
+  }
+};
+
+module.exports = parseUri;
+
+});
+
+require.define("events", function (require, module, exports, __dirname, __filename) {
+    if (!process.EventEmitter) process.EventEmitter = function () {};
+
+var EventEmitter = exports.EventEmitter = process.EventEmitter;
+var isArray = typeof Array.isArray === 'function'
+    ? Array.isArray
+    : function (xs) {
+        return Object.toString.call(xs) === '[object Array]'
+    }
+;
+
+// By default EventEmitters will print a warning if more than
+// 10 listeners are added to it. This is a useful default which
+// helps finding memory leaks.
+//
+// Obviously not all Emitters should be limited to 10. This function allows
+// that to be increased. Set to zero for unlimited.
+var defaultMaxListeners = 10;
+EventEmitter.prototype.setMaxListeners = function(n) {
+  if (!this._events) this._events = {};
+  this._events.maxListeners = n;
+};
+
+
+EventEmitter.prototype.emit = function(type) {
+  // If there is no 'error' event listener then throw.
+  if (type === 'error') {
+    if (!this._events || !this._events.error ||
+        (isArray(this._events.error) && !this._events.error.length))
+    {
+      if (arguments[1] instanceof Error) {
+        throw arguments[1]; // Unhandled 'error' event
+      } else {
+        throw new Error("Uncaught, unspecified 'error' event.");
+      }
+      return false;
+    }
+  }
+
+  if (!this._events) return false;
+  var handler = this._events[type];
+  if (!handler) return false;
+
+  if (typeof handler == 'function') {
+    switch (arguments.length) {
+      // fast cases
+      case 1:
+        handler.call(this);
+        break;
+      case 2:
+        handler.call(this, arguments[1]);
+        break;
+      case 3:
+        handler.call(this, arguments[1], arguments[2]);
+        break;
+      // slower
+      default:
+        var args = Array.prototype.slice.call(arguments, 1);
+        handler.apply(this, args);
+    }
+    return true;
+
+  } else if (isArray(handler)) {
+    var args = Array.prototype.slice.call(arguments, 1);
+
+    var listeners = handler.slice();
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i].apply(this, args);
+    }
+    return true;
+
+  } else {
+    return false;
+  }
+};
+
+// EventEmitter is defined in src/node_events.cc
+// EventEmitter.prototype.emit() is also defined there.
+EventEmitter.prototype.addListener = function(type, listener) {
+  if ('function' !== typeof listener) {
+    throw new Error('addListener only takes instances of Function');
+  }
+
+  if (!this._events) this._events = {};
+
+  // To avoid recursion in the case that type == "newListeners"! Before
+  // adding it to the listeners, first emit "newListeners".
+  this.emit('newListener', type, listener);
+
+  if (!this._events[type]) {
+    // Optimize the case of one listener. Don't need the extra array object.
+    this._events[type] = listener;
+  } else if (isArray(this._events[type])) {
+
+    // Check for listener leak
+    if (!this._events[type].warned) {
+      var m;
+      if (this._events.maxListeners !== undefined) {
+        m = this._events.maxListeners;
+      } else {
+        m = defaultMaxListeners;
+      }
+
+      if (m && m > 0 && this._events[type].length > m) {
+        this._events[type].warned = true;
+        console.error('(node) warning: possible EventEmitter memory ' +
+                      'leak detected. %d listeners added. ' +
+                      'Use emitter.setMaxListeners() to increase limit.',
+                      this._events[type].length);
+        console.trace();
+      }
+    }
+
+    // If we've already got an array, just append.
+    this._events[type].push(listener);
+  } else {
+    // Adding the second element, need to change to array.
+    this._events[type] = [this._events[type], listener];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.on = EventEmitter.prototype.addListener;
+
+EventEmitter.prototype.once = function(type, listener) {
+  var self = this;
+  self.on(type, function g() {
+    self.removeListener(type, g);
+    listener.apply(this, arguments);
+  });
+
+  return this;
+};
+
+EventEmitter.prototype.removeListener = function(type, listener) {
+  if ('function' !== typeof listener) {
+    throw new Error('removeListener only takes instances of Function');
+  }
+
+  // does not use listeners(), so no side effect of creating _events[type]
+  if (!this._events || !this._events[type]) return this;
+
+  var list = this._events[type];
+
+  if (isArray(list)) {
+    var i = list.indexOf(listener);
+    if (i < 0) return this;
+    list.splice(i, 1);
+    if (list.length == 0)
+      delete this._events[type];
+  } else if (this._events[type] === listener) {
+    delete this._events[type];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.removeAllListeners = function(type) {
+  // does not use listeners(), so no side effect of creating _events[type]
+  if (type && this._events && this._events[type]) this._events[type] = null;
+  return this;
+};
+
+EventEmitter.prototype.listeners = function(type) {
+  if (!this._events) this._events = {};
+  if (!this._events[type]) this._events[type] = [];
+  if (!isArray(this._events[type])) {
+    this._events[type] = [this._events[type]];
+  }
+  return this._events[type];
+};
+
+});
+
+require.define("/node_modules/sprintf/package.json", function (require, module, exports, __dirname, __filename) {
+    module.exports = {"main":"./lib/sprintf"}
+});
+
+require.define("/node_modules/sprintf/lib/sprintf.js", function (require, module, exports, __dirname, __filename) {
+    /**
+sprintf() for JavaScript 0.7-beta1
+http://www.diveintojavascript.com/projects/javascript-sprintf
+
+Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
+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 sprintf() for JavaScript 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 Alexandru Marasteanu 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.
+
+
+Changelog:
+2010.11.07 - 0.7-beta1-node
+  - converted it to a node.js compatible module
+
+2010.09.06 - 0.7-beta1
+  - features: vsprintf, support for named placeholders
+  - enhancements: format cache, reduced global namespace pollution
+
+2010.05.22 - 0.6:
+ - reverted to 0.4 and fixed the bug regarding the sign of the number 0
+ Note:
+ Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
+ who warned me about a bug in 0.5, I discovered that the last update was
+ a regress. I appologize for that.
+
+2010.05.09 - 0.5:
+ - bug fix: 0 is now preceeded with a + sign
+ - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
+ - switched from GPL to BSD license
+
+2007.10.21 - 0.4:
+ - unit test and patch (David Baird)
+
+2007.09.17 - 0.3:
+ - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
+
+2007.09.11 - 0.2:
+ - feature: added argument swapping
+
+2007.04.03 - 0.1:
+ - initial release
+**/
+
+var sprintf = (function() {
+  function get_type(variable) {
+    return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
+  }
+  function str_repeat(input, multiplier) {
+    for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
+    return output.join('');
+  }
+
+  var str_format = function() {
+    if (!str_format.cache.hasOwnProperty(arguments[0])) {
+      str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
+    }
+    return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
+  };
+
+  str_format.format = function(parse_tree, argv) {
+    var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
+    for (i = 0; i < tree_length; i++) {
+      node_type = get_type(parse_tree[i]);
+      if (node_type === 'string') {
+        output.push(parse_tree[i]);
+      }
+      else if (node_type === 'array') {
+        match = parse_tree[i]; // convenience purposes only
+        if (match[2]) { // keyword argument
+          arg = argv[cursor];
+          for (k = 0; k < match[2].length; k++) {
+            if (!arg.hasOwnProperty(match[2][k])) {
+              throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
+            }
+            arg = arg[match[2][k]];
+          }
+        }
+        else if (match[1]) { // positional argument (explicit)
+          arg = argv[match[1]];
+        }
+        else { // positional argument (implicit)
+          arg = argv[cursor++];
+        }
+
+        if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
+          throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
+        }
+        switch (match[8]) {
+          case 'b': arg = arg.toString(2); break;
+          case 'c': arg = String.fromCharCode(arg); break;
+          case 'd': arg = parseInt(arg, 10); break;
+          case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
+          case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
+          case 'o': arg = arg.toString(8); break;
+          case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
+          case 'u': arg = Math.abs(arg); break;
+          case 'x': arg = arg.toString(16); break;
+          case 'X': arg = arg.toString(16).toUpperCase(); break;
+        }
+        arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
+        pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
+        pad_length = match[6] - String(arg).length;
+        pad = match[6] ? str_repeat(pad_character, pad_length) : '';
+        output.push(match[5] ? arg + pad : pad + arg);
+      }
+    }
+    return output.join('');
+  };
+
+  str_format.cache = {};
+
+  str_format.parse = function(fmt) {
+    var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
+    while (_fmt) {
+      if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
+        parse_tree.push(match[0]);
+      }
+      else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
+        parse_tree.push('%');
+      }
+      else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
+        if (match[2]) {
+          arg_names |= 1;
+          var field_list = [], replacement_field = match[2], field_match = [];
+          if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
+            field_list.push(field_match[1]);
+            while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
+              if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
+                field_list.push(field_match[1]);
+              }
+              else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
+                field_list.push(field_match[1]);
+              }
+              else {
+                throw('[sprintf] huh?');
+              }
+            }
+          }
+          else {
+            throw('[sprintf] huh?');
+          }
+          match[2] = field_list;
+        }
+        else {
+          arg_names |= 2;
+        }
+        if (arg_names === 3) {
+          throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
+        }
+        parse_tree.push(match);
+      }
+      else {
+        throw('[sprintf] huh?');
+      }
+      _fmt = _fmt.substring(match[0].length);
+    }
+    return parse_tree;
+  };
+
+  return str_format;
+})();
+
+var vsprintf = function(fmt, argv) {
+  argv.unshift(fmt);
+  return sprintf.apply(null, argv);
+};
+
+exports.sprintf = sprintf;
+exports.vsprintf = vsprintf;
+});
+
+require.define("/shred/response.js", function (require, module, exports, __dirname, __filename) {
+    // The `Response object` encapsulates a Node.js HTTP response.
+
+var Content = require("./content")
+  , HeaderMixins = require("./mixins/headers")
+  , CookieJarLib = require( "cookiejar" )
+  , Cookie = CookieJarLib.Cookie
+;
+
+// Browser doesn't have zlib.
+var zlib = null;
+try {
+  zlib = require('zlib');
+} catch (e) {
+  // console.warn("no zlib library");
+}
+
+// Iconv doesn't work in browser
+var Iconv = null;
+try {
+  Iconv = require('iconv-lite');
+} catch (e) {
+  // console.warn("no iconv library");
+}
+
+// Construct a `Response` object. You should never have to do this directly. The
+// `Request` object handles this, getting the raw response object and passing it
+// in here, along with the request. The callback allows us to stream the response
+// and then use the callback to let the request know when it's ready.
+var Response = function(raw, request, callback) { 
+  var response = this;
+  this._raw = raw;
+
+  // The `._setHeaders` method is "private"; you can't otherwise set headers on
+  // the response.
+  this._setHeaders.call(this,raw.headers);
+  
+  // store any cookies
+  if (request.cookieJar && this.getHeader('set-cookie')) {
+    var cookieStrings = this.getHeader('set-cookie');
+    var cookieObjs = []
+      , cookie;
+
+    for (var i = 0; i < cookieStrings.length; i++) {
+      var cookieString = cookieStrings[i];
+      if (!cookieString) {
+        continue;
+      }
+
+      if (!cookieString.match(/domain\=/i)) {
+        cookieString += '; domain=' + request.host;
+      }
+
+      if (!cookieString.match(/path\=/i)) {
+        cookieString += '; path=' + request.path;
+      }
+
+      try {
+        cookie = new Cookie(cookieString);
+        if (cookie) {
+          cookieObjs.push(cookie);
+        }
+      } catch (e) {
+        console.warn("Tried to set bad cookie: " + cookieString);
+      }
+    }
+
+    request.cookieJar.setCookies(cookieObjs);
+  }
+
+  this.request = request;
+  this.client = request.client;
+  this.log = this.request.log;
+
+  // Stream the response content entity and fire the callback when we're done.
+  // Store the incoming data in a array of Buffers which we concatinate into one
+  // buffer at the end.  We need to use buffers instead of strings here in order
+  // to preserve binary data.
+  var chunkBuffers = [];
+  var dataLength = 0;
+  raw.on("data", function(chunk) {
+    chunkBuffers.push(chunk);
+    dataLength += chunk.length;
+  });
+  raw.on("end", function() {
+    var body;
+    if (typeof Buffer === 'undefined') {
+      // Just concatinate into a string
+      body = chunkBuffers.join('');
+    } else {
+      // Initialize new buffer and add the chunks one-at-a-time.
+      body = new Buffer(dataLength);
+      for (var i = 0, pos = 0; i < chunkBuffers.length; i++) {
+        chunkBuffers[i].copy(body, pos);
+        pos += chunkBuffers[i].length;
+      }
+    }
+
+    var setBodyAndFinish = function (body) {
+      response._body = new Content({ 
+        body: body,
+        type: response.getHeader("Content-Type")
+      });
+      callback(response);
+    }
+
+    if (zlib && response.getHeader("Content-Encoding") === 'gzip'){
+      zlib.gunzip(body, function (err, gunzippedBody) {
+        if (Iconv && response.request.encoding){
+          body = Iconv.fromEncoding(gunzippedBody,response.request.encoding);
+        } else {
+          body = gunzippedBody.toString();
+        }
+        setBodyAndFinish(body);
+      })
+    }
+    else{
+       if (response.request.encoding){
+            body = Iconv.fromEncoding(body,response.request.encoding);
+        }        
+      setBodyAndFinish(body);
+    }
+  });
+};
+
+// The `Response` object can be pretty overwhelming to view using the built-in
+// Node.js inspect method. We want to make it a bit more manageable. This
+// probably goes [too far in the other
+// direction](https://github.com/spire-io/shred/issues/2).
+
+Response.prototype = {
+  inspect: function() {
+    var response = this;
+    var headers = this.format_headers();
+    var summary = ["<Shred Response> ", response.status].join(" ")
+    return [ summary, "- Headers:", headers].join("\n");
+  },
+  format_headers: function () {
+    var array = []
+    var headers = this._headers
+    for (var key in headers) {
+      if (headers.hasOwnProperty(key)) {
+        var value = headers[key]
+        array.push("\t" + key + ": " + value);
+      }
+    }
+    return array.join("\n");
+  }
+};
+
+// `Response` object properties, all of which are read-only:
+Object.defineProperties(Response.prototype, {
+  
+// - **status**. The HTTP status code for the response. 
+  status: {
+    get: function() { return this._raw.statusCode; },
+    enumerable: true
+  },
+
+// - **content**. The HTTP content entity, if any. Provided as a [content
+//   object](./content.html), which will attempt to convert the entity based upon
+//   the `content-type` header. The converted value is available as
+//   `content.data`. The original raw content entity is available as
+//   `content.body`.
+  body: {
+    get: function() { return this._body; }
+  },
+  content: {
+    get: function() { return this.body; },
+    enumerable: true
+  },
+
+// - **isRedirect**. Is the response a redirect? These are responses with 3xx
+//   status and a `Location` header.
+  isRedirect: {
+    get: function() {
+      return (this.status>299
+          &&this.status<400
+          &&this.getHeader("Location"));
+    },
+    enumerable: true
+  },
+
+// - **isError**. Is the response an error? These are responses with status of
+//   400 or greater.
+  isError: {
+    get: function() {
+      return (this.status === 0 || this.status > 399)
+    },
+    enumerable: true
+  }
+});
+
+// Add in the [getters for accessing the normalized headers](./headers.js).
+HeaderMixins.getters(Response);
+HeaderMixins.privateSetters(Response);
+
+// Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
+// getAllResponseHeaders() to return {} if the response is a CORS request.
+// xhr.getHeader still works correctly.
+var getHeader = Response.prototype.getHeader;
+Response.prototype.getHeader = function (name) {
+  return (getHeader.call(this,name) ||
+    (typeof this._raw.getHeader === 'function' && this._raw.getHeader(name)));
+};
+
+module.exports = Response;
+
+});
+
+require.define("/shred/content.js", function (require, module, exports, __dirname, __filename) {
+    
+// The purpose of the `Content` object is to abstract away the data conversions
+// to and from raw content entities as strings. For example, you want to be able
+// to pass in a Javascript object and have it be automatically converted into a
+// JSON string if the `content-type` is set to a JSON-based media type.
+// Conversely, you want to be able to transparently get back a Javascript object
+// in the response if the `content-type` is a JSON-based media-type.
+
+// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
+
+// The `Content` constructor takes an options object, which *must* have either a
+// `body` or `data` property and *may* have a `type` property indicating the
+// media type. If there is no `type` attribute, a default will be inferred.
+var Content = function(options) {
+  this.body = options.body;
+  this.data = options.data;
+  this.type = options.type;
+};
+
+Content.prototype = {
+  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
+  //
+  //     toString: function() { return this.body; }
+  //
+  // Commented out, but I've forgotten why. :/
+};
+
+
+// `Content` objects have the following attributes:
+Object.defineProperties(Content.prototype,{
+  
+// - **type**. Typically accessed as `content.type`, reflects the `content-type`
+//   header associated with the request or response. If not passed as an options
+//   to the constructor or set explicitly, it will infer the type the `data`
+//   attribute, if possible, and, failing that, will default to `text/plain`.
+  type: {
+    get: function() {
+      if (this._type) {
+        return this._type;
+      } else {
+        if (this._data) {
+          switch(typeof this._data) {
+            case "string": return "text/plain";
+            case "object": return "application/json";
+          }
+        }
+      }
+      return "text/plain";
+    },
+    set: function(value) {
+      this._type = value;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **data**. Typically accessed as `content.data`, reflects the content entity
+//   converted into Javascript data. This can be a string, if the `type` is, say,
+//   `text/plain`, but can also be a Javascript object. The conversion applied is
+//   based on the `processor` attribute. The `data` attribute can also be set
+//   directly, in which case the conversion will be done the other way, to infer
+//   the `body` attribute.
+  data: {
+    get: function() {
+      if (this._body) {
+        return this.processor.parser(this._body);
+      } else {
+        return this._data;
+      }
+    },
+    set: function(data) {
+      if (this._body&&data) Errors.setDataWithBody(this);
+      this._data = data;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **body**. Typically accessed as `content.body`, reflects the content entity
+//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
+//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
+//   you attempt to set both, an exception is raised.
+  body: {
+    get: function() {
+      if (this._data) {
+        return this.processor.stringify(this._data);
+      } else {
+        return this.processor.stringify(this._body);
+      }
+    },
+    set: function(body) {
+      if (this._data&&body) Errors.setBodyWithData(this);
+      this._body = body;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **processor**. The functions that will be used to convert to/from `data` and
+//   `body` attributes. You can add processors. The two that are built-in are for
+//   `text/plain`, which is basically an identity transformation and
+//   `application/json` and other JSON-based media types (including custom media
+//   types with `+json`). You can add your own processors. See below.
+  processor: {
+    get: function() {
+      var processor = Content.processors[this.type];
+      if (processor) {
+        return processor;
+      } else {
+        // Return the first processor that matches any part of the
+        // content type. ex: application/vnd.foobar.baz+json will match json.
+        var main = this.type.split(";")[0];
+        var parts = main.split(/\+|\//);
+        for (var i=0, l=parts.length; i < l; i++) {
+          processor = Content.processors[parts[i]]
+        }
+        return processor || {parser:identity,stringify:toString};
+      }
+    },
+    enumerable: true
+  },
+
+// - **length**. Typically accessed as `content.length`, returns the length in
+//   bytes of the raw content entity.
+  length: {
+    get: function() {
+      if (typeof Buffer !== 'undefined') {
+        return Buffer.byteLength(this.body);
+      }
+      return this.body.length;
+    }
+  }
+});
+
+Content.processors = {};
+
+// The `registerProcessor` function allows you to add your own processors to
+// convert content entities. Each processor consists of a Javascript object with
+// two properties:
+// - **parser**. The function used to parse a raw content entity and convert it
+//   into a Javascript data type.
+// - **stringify**. The function used to convert a Javascript data type into a
+//   raw content entity.
+Content.registerProcessor = function(types,processor) {
+  
+// You can pass an array of types that will trigger this processor, or just one.
+// We determine the array via duck-typing here.
+  if (types.forEach) {
+    types.forEach(function(type) {
+      Content.processors[type] = processor;
+    });
+  } else {
+    // If you didn't pass an array, we just use what you pass in.
+    Content.processors[types] = processor;
+  }
+};
+
+// Register the identity processor, which is used for text-based media types.
+var identity = function(x) { return x; }
+  , toString = function(x) { return x.toString(); }
+Content.registerProcessor(
+  ["text/html","text/plain","text"],
+  { parser: identity, stringify: toString });
+
+// Register the JSON processor, which is used for JSON-based media types.
+Content.registerProcessor(
+  ["application/json; charset=utf-8","application/json","json"],
+  {
+    parser: function(string) {
+      return JSON.parse(string);
+    },
+    stringify: function(data) {
+      return JSON.stringify(data); }});
+
+// Error functions are defined separately here in an attempt to make the code
+// easier to read.
+var Errors = {
+  setDataWithBody: function(object) {
+    throw new Error("Attempt to set data attribute of a content object " +
+        "when the body attributes was already set.");
+  },
+  setBodyWithData: function(object) {
+    throw new Error("Attempt to set body attribute of a content object " +
+        "when the data attributes was already set.");
+  }
+}
+module.exports = Content;
+
+});
+
+require.define("/shred/mixins/headers.js", function (require, module, exports, __dirname, __filename) {
+    // The header mixins allow you to add HTTP header support to any object. This
+// might seem pointless: why not simply use a hash? The main reason is that, per
+// the [HTTP spec](http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2),
+// headers are case-insensitive. So, for example, `content-type` is the same as
+// `CONTENT-TYPE` which is the same as `Content-Type`. Since there is no way to
+// overload the index operator in Javascript, using a hash to represent the
+// headers means it's possible to have two conflicting values for a single
+// header.
+// 
+// The solution to this is to provide explicit methods to set or get headers.
+// This also has the benefit of allowing us to introduce additional variations,
+// including snake case, which we automatically convert to what Matthew King has
+// dubbed "corset case" - the hyphen-separated names with initial caps:
+// `Content-Type`. We use corset-case just in case we're dealing with servers
+// that haven't properly implemented the spec.
+
+// Convert headers to corset-case. **Example:** `CONTENT-TYPE` will be converted
+// to `Content-Type`.
+
+var corsetCase = function(string) {
+  return string;//.toLowerCase()
+      //.replace("_","-")
+      // .replace(/(^|-)(\w)/g, 
+          // function(s) { return s.toUpperCase(); });
+};
+
+// We suspect that `initializeHeaders` was once more complicated ...
+var initializeHeaders = function(object) {
+  return {};
+};
+
+// Access the `_headers` property using lazy initialization. **Warning:** If you
+// mix this into an object that is using the `_headers` property already, you're
+// going to have trouble.
+var $H = function(object) {
+  return object._headers||(object._headers=initializeHeaders(object));
+};
+
+// Hide the implementations as private functions, separate from how we expose them.
+
+// The "real" `getHeader` function: get the header after normalizing the name.
+var getHeader = function(object,name) {
+  return $H(object)[corsetCase(name)];
+};
+
+// The "real" `getHeader` function: get one or more headers, or all of them
+// if you don't ask for any specifics. 
+var getHeaders = function(object,names) {
+  var keys = (names && names.length>0) ? names : Object.keys($H(object));
+  var hash = keys.reduce(function(hash,key) {
+    hash[key] = getHeader(object,key);
+    return hash;
+  },{});
+  // Freeze the resulting hash so you don't mistakenly think you're modifying
+  // the real headers.
+  Object.freeze(hash);
+  return hash;
+};
+
+// The "real" `setHeader` function: set a header, after normalizing the name.
+var setHeader = function(object,name,value) {
+  $H(object)[corsetCase(name)] = value;
+  return object;
+};
+
+// The "real" `setHeaders` function: set multiple headers based on a hash.
+var setHeaders = function(object,hash) {
+  for( var key in hash ) { setHeader(object,key,hash[key]); };
+  return this;
+};
+
+// Here's where we actually bind the functionality to an object. These mixins work by
+// exposing mixin functions. Each function mixes in a specific batch of features.
+module.exports = {
+  
+  // Add getters.
+  getters: function(constructor) {
+    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
+    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
+  },
+  // Add setters but as "private" methods.
+  privateSetters: function(constructor) {
+    constructor.prototype._setHeader = function(key,value) { return setHeader(this,key,value); };
+    constructor.prototype._setHeaders = function(hash) { return setHeaders(this,hash); };
+  },
+  // Add setters.
+  setters: function(constructor) {
+    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
+    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
+  },
+  // Add both getters and setters.
+  gettersAndSetters: function(constructor) {
+    constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
+    constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
+    constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
+    constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
+  }
+};
+
+});
+
+require.define("/node_modules/iconv-lite/package.json", function (require, module, exports, __dirname, __filename) {
+    module.exports = {}
+});
+
+require.define("/node_modules/iconv-lite/index.js", function (require, module, exports, __dirname, __filename) {
+    // Module exports
+var iconv = module.exports = {
+    toEncoding: function(str, encoding) {
+        return iconv.getCodec(encoding).toEncoding(str);
+    },
+    fromEncoding: function(buf, encoding) {
+        return iconv.getCodec(encoding).fromEncoding(buf);
+    },
+    
+    defaultCharUnicode: '�',
+    defaultCharSingleByte: '?',
+    
+    // Get correct codec for given encoding.
+    getCodec: function(encoding) {
+        var enc = encoding || "utf8";
+        var codecOptions = undefined;
+        while (1) {
+            if (getType(enc) === "String")
+                enc = enc.replace(/[- ]/g, "").toLowerCase();
+            var codec = iconv.encodings[enc];
+            var type = getType(codec);
+            if (type === "String") {
+                // Link to other encoding.
+                codecOptions = {originalEncoding: enc};
+                enc = codec;
+            }
+            else if (type === "Object" && codec.type != undefined) {
+                // Options for other encoding.
+                codecOptions = codec;
+                enc = codec.type;
+            } 
+            else if (type === "Function")
+                // Codec itself.
+                return codec(codecOptions);
+            else
+                throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
+        }
+    },
+    
+    // Define basic encodings
+    encodings: {
+        internal: function(options) {
+            return {
+                toEncoding: function(str) {
+                    return new Buffer(ensureString(str), options.originalEncoding);
+                },
+                fromEncoding: function(buf) {
+                    return ensureBuffer(buf).toString(options.originalEncoding);
+                }
+            };
+        },
+        utf8: "internal",
+        ucs2: "internal",
+        binary: "internal",
+        ascii: "internal",
+        base64: "internal",
+        
+        // Codepage single-byte encodings.
+        singlebyte: function(options) {
+            // Prepare chars if needed
+            if (!options.chars || (options.chars.length !== 128 && options.chars.length !== 256))
+                throw new Error("Encoding '"+options.type+"' has incorrect 'chars' (must be of len 128 or 256)");
+            
+            if (options.chars.length === 128)
+                options.chars = asciiString + options.chars;
+            
+            if (!options.charsBuf) {
+                options.charsBuf = new Buffer(options.chars, 'ucs2');
+            }
+            
+            if (!options.revCharsBuf) {
+                options.revCharsBuf = new Buffer(65536);
+                var defChar = iconv.defaultCharSingleByte.charCodeAt(0);
+                for (var i = 0; i < options.revCharsBuf.length; i++)
+                    options.revCharsBuf[i] = defChar;
+                for (var i = 0; i < options.chars.length; i++)
+                    options.revCharsBuf[options.chars.charCodeAt(i)] = i;
+            }
+            
+            return {
+                toEncoding: function(str) {
+                    str = ensureString(str);
+                    
+                    var buf = new Buffer(str.length);
+                    var revCharsBuf = options.revCharsBuf;
+                    for (var i = 0; i < str.length; i++)
+                        buf[i] = revCharsBuf[str.charCodeAt(i)];
+                    
+                    return buf;
+                },
+                fromEncoding: function(buf) {
+                    buf = ensureBuffer(buf);
+                    
+                    // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
+                    var charsBuf = options.charsBuf;
+                    var newBuf = new Buffer(buf.length*2);
+                    var idx1 = 0, idx2 = 0;
+                    for (var i = 0, _len = buf.length; i < _len; i++) {
+                        idx1 = buf[i]*2; idx2 = i*2;
+                        newBuf[idx2] = charsBuf[idx1];
+                        newBuf[idx2+1] = charsBuf[idx1+1];
+                    }
+                    return newBuf.toString('ucs2');
+                }
+            };
+        },
+
+        // Codepage double-byte encodings.
+        table: function(options) {
+            var table = options.table, key, revCharsTable = options.revCharsTable;
+            if (!table) {
+                throw new Error("Encoding '" + options.type +"' has incorect 'table' option");
+            }
+            if(!revCharsTable) {
+                revCharsTable = options.revCharsTable = {};
+                for (key in table) {
+                    revCharsTable[table[key]] = parseInt(key);
+                }
+            }
+            
+            return {
+                toEncoding: function(str) {
+                    str = ensureString(str);
+                    var strLen = str.length;
+                    var bufLen = strLen;
+                    for (var i = 0; i < strLen; i++)
+                        if (str.charCodeAt(i) >> 7)
+                            bufLen++;
+
+                    var newBuf = new Buffer(bufLen), gbkcode, unicode, 
+                        defaultChar = revCharsTable[iconv.defaultCharUnicode.charCodeAt(0)];
+
+                    for (var i = 0, j = 0; i < strLen; i++) {
+                        unicode = str.charCodeAt(i);
+                        if (unicode >> 7) {
+                            gbkcode = revCharsTable[unicode] || defaultChar;
+                            newBuf[j++] = gbkcode >> 8; //high byte;
+                            newBuf[j++] = gbkcode & 0xFF; //low byte
+                        } else {//ascii
+                            newBuf[j++] = unicode;
+                        }
+                    }
+                    return newBuf;
+                },
+                fromEncoding: function(buf) {
+                    buf = ensureBuffer(buf);
+                    var bufLen = buf.length, strLen = 0;
+                    for (var i = 0; i < bufLen; i++) {
+                        strLen++;
+                        if (buf[i] & 0x80) //the high bit is 1, so this byte is gbkcode's high byte.skip next byte
+                            i++;
+                    }
+                    var newBuf = new Buffer(strLen*2), unicode, gbkcode,
+                        defaultChar = iconv.defaultCharUnicode.charCodeAt(0);
+                    
+                    for (var i = 0, j = 0; i < bufLen; i++, j+=2) {
+                        gbkcode = buf[i];
+                        if (gbkcode & 0x80) {
+                            gbkcode = (gbkcode << 8) + buf[++i];
+                            unicode = table[gbkcode] || defaultChar;
+                        } else {
+                            unicode = gbkcode;
+                        }
+                        newBuf[j] = unicode & 0xFF; //low byte
+                        newBuf[j+1] = unicode >> 8; //high byte
+                    }
+                    return newBuf.toString('ucs2');
+                }
+            }
+        }
+    }
+};
+
+// Add aliases to convert functions
+iconv.encode = iconv.toEncoding;
+iconv.decode = iconv.fromEncoding;
+
+// Load other encodings from files in /encodings dir.
+var encodingsDir = __dirname+"/encodings/",
+    fs = require('fs');
+fs.readdirSync(encodingsDir).forEach(function(file) {
+    if(fs.statSync(encodingsDir + file).isDirectory()) return;
+    var encodings = require(encodingsDir + file)
+    for (var key in encodings)
+        iconv.encodings[key] = encodings[key]
+});
+
+// Utilities
+var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+
+              ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f';
+
+var ensureBuffer = function(buf) {
+    buf = buf || new Buffer(0);
+    return (buf instanceof Buffer) ? buf : new Buffer(buf.toString(), "utf8");
+}
+
+var ensureString = function(str) {
+    str = str || "";
+    return (str instanceof String) ? str : str.toString((str instanceof Buffer) ? 'utf8' : undefined);
+}
+
+var getType = function(obj) {
+    return Object.prototype.toString.call(obj).slice(8, -1);
+}
+
+
+});
+
+require.define("/node_modules/http-browserify/package.json", function (require, module, exports, __dirname, __filename) {
+    module.exports = {"main":"index.js","browserify":"browser.js"}
+});
+
+require.define("/node_modules/http-browserify/browser.js", function (require, module, exports, __dirname, __filename) {
+    var http = module.exports;
+var EventEmitter = require('events').EventEmitter;
+var Request = require('./lib/request');
+
+http.request = function (params, cb) {
+    if (!params) params = {};
+    if (!params.host) params.host = window.location.host.split(':')[0];
+    if (!params.port) params.port = window.location.port;
+    
+    var req = new Request(new xhrHttp, params);
+    if (cb) req.on('response', cb);
+    return req;
+};
+
+http.get = function (params, cb) {
+    params.method = 'GET';
+    var req = http.request(params, cb);
+    req.end();
+    return req;
+};
+
+var xhrHttp = (function () {
+    if (typeof window === 'undefined') {
+        throw new Error('no window object present');
+    }
+    else if (window.XMLHttpRequest) {
+        return window.XMLHttpRequest;
+    }
+    else if (window.ActiveXObject) {
+        var axs = [
+            'Msxml2.XMLHTTP.6.0',
+            'Msxml2.XMLHTTP.3.0',
+            'Microsoft.XMLHTTP'
+        ];
+        for (var i = 0; i < axs.length; i++) {
+            try {
+                var ax = new(window.ActiveXObject)(axs[i]);
+                return function () {
+                    if (ax) {
+                        var ax_ = ax;
+                        ax = null;
+                        return ax_;
+                    }
+                    else {
+                        return new(window.ActiveXObject)(axs[i]);
+                    }
+                };
+            }
+            catch (e) {}
+        }
+        throw new Error('ajax not supported in this browser')
+    }
+    else {
+        throw new Error('ajax not supported in this browser');
+    }
+})();
+
+http.STATUS_CODES = {
+    100 : 'Continue',
+    101 : 'Switching Protocols',
+    102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
+    200 : 'OK',
+    201 : 'Created',
+    202 : 'Accepted',
+    203 : 'Non-Authoritative Information',
+    204 : 'No Content',
+    205 : 'Reset Content',
+    206 : 'Partial Content',
+    207 : 'Multi-Status', // RFC 4918
+    300 : 'Multiple Choices',
+    301 : 'Moved Permanently',
+    302 : 'Moved Temporarily',
+    303 : 'See Other',
+    304 : 'Not Modified',
+    305 : 'Use Proxy',
+    307 : 'Temporary Redirect',
+    400 : 'Bad Request',
+    401 : 'Unauthorized',
+    402 : 'Payment Required',
+    403 : 'Forbidden',
+    404 : 'Not Found',
+    405 : 'Method Not Allowed',
+    406 : 'Not Acceptable',
+    407 : 'Proxy Authentication Required',
+    408 : 'Request Time-out',
+    409 : 'Conflict',
+    410 : 'Gone',
+    411 : 'Length Required',
+    412 : 'Precondition Failed',
+    413 : 'Request Entity Too Large',
+    414 : 'Request-URI Too Large',
+    415 : 'Unsupported Media Type',
+    416 : 'Requested Range Not Satisfiable',
+    417 : 'Expectation Failed',
+    418 : 'I\'m a teapot', // RFC 2324
+    422 : 'Unprocessable Entity', // RFC 4918
+    423 : 'Locked', // RFC 4918
+    424 : 'Failed Dependency', // RFC 4918
+    425 : 'Unordered Collection', // RFC 4918
+    426 : 'Upgrade Required', // RFC 2817
+    500 : 'Internal Server Error',
+    501 : 'Not Implemented',
+    502 : 'Bad Gateway',
+    503 : 'Service Unavailable',
+    504 : 'Gateway Time-out',
+    505 : 'HTTP Version not supported',
+    506 : 'Variant Also Negotiates', // RFC 2295
+    507 : 'Insufficient Storage', // RFC 4918
+    509 : 'Bandwidth Limit Exceeded',
+    510 : 'Not Extended' // RFC 2774
+};
+
+});
+
+require.define("/node_modules/http-browserify/lib/request.js", function (require, module, exports, __dirname, __filename) {
+    var EventEmitter = require('events').EventEmitter;
+var Response = require('./response');
+var isSafeHeader = require('./isSafeHeader');
+
+var Request = module.exports = function (xhr, params) {
+    var self = this;
+    self.xhr = xhr;
+    self.body = '';
+    
+    var uri = params.host + ':' + params.port + (params.path || '/');
+    
+    xhr.open(
+        params.method || 'GET',
+        (params.scheme || 'http') + '://' + uri,
+        true
+    );
+    
+    if (params.headers) {
+        Object.keys(params.headers).forEach(function (key) {
+            if (!isSafeHeader(key)) return;
+            var value = params.headers[key];
+            if (Array.isArray(value)) {
+                value.forEach(function (v) {
+                    xhr.setRequestHeader(key, v);
+                });
+            }
+            else xhr.setRequestHeader(key, value)
+        });
+    }
+    
+    var res = new Response(xhr);
+    res.on('ready', function () {
+        self.emit('response', res);
+    });
+    
+    xhr.onreadystatechange = function () {
+        res.handle(xhr);
+    };
+};
+
+Request.prototype = new EventEmitter;
+
+Request.prototype.setHeader = function (key, value) {
+    if ((Array.isArray && Array.isArray(value))
+    || value instanceof Array) {
+        for (var i = 0; i < value.length; i++) {
+            this.xhr.setRequestHeader(key, value[i]);
+        }
+    }
+    else {
+        this.xhr.setRequestHeader(key, value);
+    }
+};
+
+Request.prototype.write = function (s) {
+    this.body += s;
+};
+
+Request.prototype.end = function (s) {
+    if (s !== undefined) this.write(s);
+    this.xhr.send(this.body);
+};
+
+});
+
+require.define("/node_modules/http-browserify/lib/response.js", function (require, module, exports, __dirname, __filename) {
+    var EventEmitter = require('events').EventEmitter;
+var isSafeHeader = require('./isSafeHeader');
+
+var Response = module.exports = function (xhr) {
+    this.xhr = xhr;
+    this.offset = 0;
+};
+
+Response.prototype = new EventEmitter;
+
+var capable = {
+    streaming : true,
+    status2 : true
+};
+
+function parseHeaders (xhr) {
+    var lines = xhr.getAllResponseHeaders().split(/\r?\n/);
+    var headers = {};
+    for (var i = 0; i < lines.length; i++) {
+        var line = lines[i];
+        if (line === '') continue;
+        
+        var m = line.match(/^([^:]+):\s*(.*)/);
+        if (m) {
+            var key = m[1].toLowerCase(), value = m[2];
+            
+            if (headers[key] !== undefined) {
+                if ((Array.isArray && Array.isArray(headers[key]))
+                || headers[key] instanceof Array) {
+                    headers[key].push(value);
+                }
+                else {
+                    headers[key] = [ headers[key], value ];
+                }
+            }
+            else {
+                headers[key] = value;
+            }
+        }
+        else {
+            headers[line] = true;
+        }
+    }
+    return headers;
+}
+
+Response.prototype.getHeader = function (key) {
+    var header = this.headers ? this.headers[key.toLowerCase()] : null;
+    if (header) return header;
+
+    // Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
+    // getAllResponseHeaders() to return {} if the response is a CORS request.
+    // xhr.getHeader still works correctly.
+    if (isSafeHeader(key)) {
+      return this.xhr.getResponseHeader(key);
+    }
+    return null;
+};
+
+Response.prototype.handle = function () {
+    var xhr = this.xhr;
+    if (xhr.readyState === 2 && capable.status2) {
+        try {
+            this.statusCode = xhr.status;
+            this.headers = parseHeaders(xhr);
+        }
+        catch (err) {
+            capable.status2 = false;
+        }
+        
+        if (capable.status2) {
+            this.emit('ready');
+        }
+    }
+    else if (capable.streaming && xhr.readyState === 3) {
+        try {
+            if (!this.statusCode) {
+                this.statusCode = xhr.status;
+                this.headers = parseHeaders(xhr);
+                this.emit('ready');
+            }
+        }
+        catch (err) {}
+        
+        try {
+            this.write();
+        }
+        catch (err) {
+            capable.streaming = false;
+        }
+    }
+    else if (xhr.readyState === 4) {
+        if (!this.statusCode) {
+            this.statusCode = xhr.status;
+            this.emit('ready');
+        }
+        this.write();
+        
+        if (xhr.error) {
+            this.emit('error', xhr.responseText);
+        }
+        else this.emit('end');
+    }
+};
+
+Response.prototype.write = function () {
+    var xhr = this.xhr;
+    if (xhr.responseText.length > this.offset) {
+        this.emit('data', xhr.responseText.slice(this.offset));
+        this.offset = xhr.responseText.length;
+    }
+};
+
+});
+
+require.define("/node_modules/http-browserify/lib/isSafeHeader.js", function (require, module, exports, __dirname, __filename) {
+    // Taken from http://dxr.mozilla.org/mozilla/mozilla-central/content/base/src/nsXMLHttpRequest.cpp.html
+var unsafeHeaders = [
+    "accept-charset",
+    "accept-encoding",
+    "access-control-request-headers",
+    "access-control-request-method",
+    "connection",
+    "content-length",
+    "cookie",
+    "cookie2",
+    "content-transfer-encoding",
+    "date",
+    "expect",
+    "host",
+    "keep-alive",
+    "origin",
+    "referer",
+    "set-cookie",
+    "te",
+    "trailer",
+    "transfer-encoding",
+    "upgrade",
+    "user-agent",
+    "via"
+];
+
+module.exports = function (headerName) {
+    if (!headerName) return false;
+    return (unsafeHeaders.indexOf(headerName.toLowerCase()) === -1)
+};
+
+});
+
+require.alias("http-browserify", "/node_modules/http");
+
+require.alias("http-browserify", "/node_modules/https");
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/shred/content.js b/src/main/webapp/api-docs/lib/shred/content.js
new file mode 100644
index 00000000..b8051fed
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/shred/content.js
@@ -0,0 +1,193 @@
+
+// The purpose of the `Content` object is to abstract away the data conversions
+// to and from raw content entities as strings. For example, you want to be able
+// to pass in a Javascript object and have it be automatically converted into a
+// JSON string if the `content-type` is set to a JSON-based media type.
+// Conversely, you want to be able to transparently get back a Javascript object
+// in the response if the `content-type` is a JSON-based media-type.
+
+// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
+
+// The `Content` constructor takes an options object, which *must* have either a
+// `body` or `data` property and *may* have a `type` property indicating the
+// media type. If there is no `type` attribute, a default will be inferred.
+var Content = function(options) {
+  this.body = options.body;
+  this.data = options.data;
+  this.type = options.type;
+};
+
+Content.prototype = {
+  // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
+  //
+  //     toString: function() { return this.body; }
+  //
+  // Commented out, but I've forgotten why. :/
+};
+
+
+// `Content` objects have the following attributes:
+Object.defineProperties(Content.prototype,{
+  
+// - **type**. Typically accessed as `content.type`, reflects the `content-type`
+//   header associated with the request or response. If not passed as an options
+//   to the constructor or set explicitly, it will infer the type the `data`
+//   attribute, if possible, and, failing that, will default to `text/plain`.
+  type: {
+    get: function() {
+      if (this._type) {
+        return this._type;
+      } else {
+        if (this._data) {
+          switch(typeof this._data) {
+            case "string": return "text/plain";
+            case "object": return "application/json";
+          }
+        }
+      }
+      return "text/plain";
+    },
+    set: function(value) {
+      this._type = value;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **data**. Typically accessed as `content.data`, reflects the content entity
+//   converted into Javascript data. This can be a string, if the `type` is, say,
+//   `text/plain`, but can also be a Javascript object. The conversion applied is
+//   based on the `processor` attribute. The `data` attribute can also be set
+//   directly, in which case the conversion will be done the other way, to infer
+//   the `body` attribute.
+  data: {
+    get: function() {
+      if (this._body) {
+        return this.processor.parser(this._body);
+      } else {
+        return this._data;
+      }
+    },
+    set: function(data) {
+      if (this._body&&data) Errors.setDataWithBody(this);
+      this._data = data;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **body**. Typically accessed as `content.body`, reflects the content entity
+//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
+//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
+//   you attempt to set both, an exception is raised.
+  body: {
+    get: function() {
+      if (this._data) {
+        return this.processor.stringify(this._data);
+      } else {
+        return this._body.toString();
+      }
+    },
+    set: function(body) {
+      if (this._data&&body) Errors.setBodyWithData(this);
+      this._body = body;
+      return this;
+    },
+    enumerable: true
+  },
+
+// - **processor**. The functions that will be used to convert to/from `data` and
+//   `body` attributes. You can add processors. The two that are built-in are for
+//   `text/plain`, which is basically an identity transformation and
+//   `application/json` and other JSON-based media types (including custom media
+//   types with `+json`). You can add your own processors. See below.
+  processor: {
+    get: function() {
+      var processor = Content.processors[this.type];
+      if (processor) {
+        return processor;
+      } else {
+        // Return the first processor that matches any part of the
+        // content type. ex: application/vnd.foobar.baz+json will match json.
+        var main = this.type.split(";")[0];
+        var parts = main.split(/\+|\//);
+        for (var i=0, l=parts.length; i < l; i++) {
+          processor = Content.processors[parts[i]]
+        }
+        return processor || {parser:identity,stringify:toString};
+      }
+    },
+    enumerable: true
+  },
+
+// - **length**. Typically accessed as `content.length`, returns the length in
+//   bytes of the raw content entity.
+  length: {
+    get: function() {
+      if (typeof Buffer !== 'undefined') {
+        return Buffer.byteLength(this.body);
+      }
+      return this.body.length;
+    }
+  }
+});
+
+Content.processors = {};
+
+// The `registerProcessor` function allows you to add your own processors to
+// convert content entities. Each processor consists of a Javascript object with
+// two properties:
+// - **parser**. The function used to parse a raw content entity and convert it
+//   into a Javascript data type.
+// - **stringify**. The function used to convert a Javascript data type into a
+//   raw content entity.
+Content.registerProcessor = function(types,processor) {
+  
+// You can pass an array of types that will trigger this processor, or just one.
+// We determine the array via duck-typing here.
+  if (types.forEach) {
+    types.forEach(function(type) {
+      Content.processors[type] = processor;
+    });
+  } else {
+    // If you didn't pass an array, we just use what you pass in.
+    Content.processors[types] = processor;
+  }
+};
+
+// Register the identity processor, which is used for text-based media types.
+var identity = function(x) { return x; }
+  , toString = function(x) { return x.toString(); }
+Content.registerProcessor(
+  ["text/html","text/plain","text"],
+  { parser: identity, stringify: toString });
+
+// Register the JSON processor, which is used for JSON-based media types.
+Content.registerProcessor(
+  ["application/json; charset=utf-8","application/json","json"],
+  {
+    parser: function(string) {
+      return JSON.parse(string);
+    },
+    stringify: function(data) {
+      return JSON.stringify(data); }});
+
+var qs = require('querystring');
+// Register the post processor, which is used for JSON-based media types.
+Content.registerProcessor(
+  ["application/x-www-form-urlencoded"],
+  { parser : qs.parse, stringify : qs.stringify });
+
+// Error functions are defined separately here in an attempt to make the code
+// easier to read.
+var Errors = {
+  setDataWithBody: function(object) {
+    throw new Error("Attempt to set data attribute of a content object " +
+        "when the body attributes was already set.");
+  },
+  setBodyWithData: function(object) {
+    throw new Error("Attempt to set body attribute of a content object " +
+        "when the data attributes was already set.");
+  }
+}
+module.exports = Content;
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/swagger-client.js b/src/main/webapp/api-docs/lib/swagger-client.js
new file mode 100644
index 00000000..5be9552b
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/swagger-client.js
@@ -0,0 +1,3294 @@
+/**
+ * swagger-client - swagger.js is a javascript client for use with swaggering APIs.
+ * @version v2.1.9-M1
+ * @link http://swagger.io
+ * @license apache 2.0
+ */
+(function(){
+var ArrayModel = function(definition) {
+  this.name = "arrayModel";
+  this.definition = definition || {};
+  this.properties = [];
+  
+  var requiredFields = definition.enum || [];
+  var innerType = definition.items;
+  if(innerType) {
+    if(innerType.type) {
+      this.type = typeFromJsonSchema(innerType.type, innerType.format);
+    }
+    else {
+      this.ref = innerType.$ref;
+    }
+  }
+  return this;
+};
+
+ArrayModel.prototype.createJSONSample = function(modelsToIgnore) {
+  var result;
+  modelsToIgnore = (modelsToIgnore||{});
+  if(this.type) {
+    result = this.type;
+  }
+  else if (this.ref) {
+    var name = simpleRef(this.ref);
+    if(typeof modelsToIgnore[name] === 'undefined') {
+      modelsToIgnore[name] = this;
+      result = models[name].createJSONSample(modelsToIgnore);
+    }
+    else {
+      return name;
+    }
+  }
+  return [ result ];
+};
+
+ArrayModel.prototype.getSampleValue = function(modelsToIgnore) {
+  var result;
+  modelsToIgnore = (modelsToIgnore || {});
+  if(this.type) {
+    result = type;
+  }
+  else if (this.ref) {
+    var name = simpleRef(this.ref);
+    result = models[name].getSampleValue(modelsToIgnore);
+  }
+  return [ result ];
+};
+
+ArrayModel.prototype.getMockSignature = function(modelsToIgnore) {
+  var propertiesStr = [];
+  var i, prop;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    propertiesStr.push(prop.toString());
+  }
+
+  var strong = '<span class="strong">';
+  var stronger = '<span class="stronger">';
+  var strongClose = '</span>';
+  var classOpen = strong + 'array' + ' {' + strongClose;
+  var classClose = strong + '}' + strongClose;
+  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
+
+  if (!modelsToIgnore)
+    modelsToIgnore = {};
+  modelsToIgnore[this.name] = this;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    var ref = prop.$ref;
+    var model = models[ref];
+    if (model && typeof modelsToIgnore[ref] === 'undefined') {
+      returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
+    }
+  }
+  return returnVal;
+};
+
+
+/**
+ * SwaggerAuthorizations applys the correct authorization to an operation being executed
+ */
+var SwaggerAuthorizations = function() {
+  this.authz = {};
+};
+
+SwaggerAuthorizations.prototype.add = function(name, auth) {
+  this.authz[name] = auth;
+  return auth;
+};
+
+SwaggerAuthorizations.prototype.remove = function(name) {
+  return delete this.authz[name];
+};
+
+SwaggerAuthorizations.prototype.apply = function (obj, authorizations) {
+  var status = null;
+  var key, name, value, result;
+
+  // if the "authorizations" key is undefined, or has an empty array, add all keys
+  if (typeof authorizations === 'undefined' || Object.keys(authorizations).length === 0) {
+    for (key in this.authz) {
+      value = this.authz[key];
+      result = value.apply(obj, authorizations);
+      if (result === true)
+        status = true;
+    }
+  }
+  else {
+    // 2.0 support
+    if (Array.isArray(authorizations)) {
+
+      for (var i = 0; i < authorizations.length; i++) {
+        var auth = authorizations[i];
+        for (name in auth) {
+          for (key in this.authz) {
+            if (key == name) {
+              value = this.authz[key];
+              result = value.apply(obj, authorizations);
+              if (result === true)
+                status = true;
+            }
+          }
+        }
+      }
+    }
+    else {
+      // 1.2 support
+      for (name in authorizations) {
+        for (key in this.authz) {
+          if (key == name) {
+            value = this.authz[key];
+            result = value.apply(obj, authorizations);
+            if (result === true)
+              status = true;
+          }
+        }
+      }
+    }
+  }
+
+  return status;
+};
+
+/**
+ * ApiKeyAuthorization allows a query param or header to be injected
+ */
+var ApiKeyAuthorization = function(name, value, type) {
+  this.name = name;
+  this.value = value;
+  this.type = type;
+};
+
+ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
+  if (this.type === "query") {
+    if (obj.url.indexOf('?') > 0)
+      obj.url = obj.url + "&" + this.name + "=" + this.value;
+    else
+      obj.url = obj.url + "?" + this.name + "=" + this.value;
+    return true;
+  } else if (this.type === "header") {
+    obj.headers[this.name] = this.value;
+    return true;
+  }
+};
+
+var CookieAuthorization = function(cookie) {
+  this.cookie = cookie;
+};
+
+CookieAuthorization.prototype.apply = function(obj, authorizations) {
+  obj.cookieJar = obj.cookieJar || CookieJar();
+  obj.cookieJar.setCookie(this.cookie);
+  return true;
+};
+
+/**
+ * Password Authorization is a basic auth implementation
+ */
+var PasswordAuthorization = function(name, username, password) {
+  this.name = name;
+  this.username = username;
+  this.password = password;
+  this._btoa = null;
+  if (typeof window !== 'undefined')
+    this._btoa = btoa;
+  else
+    this._btoa = require("btoa");
+};
+
+PasswordAuthorization.prototype.apply = function(obj, authorizations) {
+  var base64encoder = this._btoa;
+  obj.headers.Authorization = "Basic " + base64encoder(this.username + ":" + this.password);
+  return true;
+};
+var __bind = function(fn, me){
+  return function(){
+    return fn.apply(me, arguments);
+  };
+};
+
+fail = function(message) {
+  log(message);
+};
+
+log = function(){
+  log.history = log.history || [];
+  log.history.push(arguments);
+  if(this.console){
+    console.log( Array.prototype.slice.call(arguments)[0] );
+  }
+};
+
+if (!Array.prototype.indexOf) {
+  Array.prototype.indexOf = function(obj, start) {
+    for (var i = (start || 0), j = this.length; i < j; i++) {
+      if (this[i] === obj) { return i; }
+    }
+    return -1;
+  };
+}
+
+/**
+ * allows override of the default value based on the parameter being
+ * supplied
+ **/
+var applyParameterMacro = function (operation, parameter) {
+  var e = (typeof window !== 'undefined' ? window : exports);
+  if(e.parameterMacro)
+    return e.parameterMacro(operation, parameter);
+  else
+    return parameter.defaultValue;
+};
+
+/**
+ * allows overriding the default value of an model property
+ **/
+var applyModelPropertyMacro = function (model, property) {
+  var e = (typeof window !== 'undefined' ? window : exports);
+  if(e.modelPropertyMacro)
+    return e.modelPropertyMacro(model, property);
+  else
+    return property.defaultValue;
+};
+
+/**
+ * PrimitiveModel
+ **/
+var PrimitiveModel = function(definition) {
+  this.name = "name";
+  this.definition = definition || {};
+  this.properties = [];
+
+  var requiredFields = definition.enum || [];
+  this.type = typeFromJsonSchema(definition.type, definition.format);
+};
+
+PrimitiveModel.prototype.createJSONSample = function(modelsToIgnore) {
+  var result = this.type;
+  return result;
+};
+
+PrimitiveModel.prototype.getSampleValue = function() {
+  var result = this.type;
+  return null;
+};
+
+PrimitiveModel.prototype.getMockSignature = function(modelsToIgnore) {
+  var propertiesStr = [];
+  var i, prop;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    propertiesStr.push(prop.toString());
+  }
+
+  var strong = '<span class="strong">';
+  var stronger = '<span class="stronger">';
+  var strongClose = '</span>';
+  var classOpen = strong + this.name + ' {' + strongClose;
+  var classClose = strong + '}' + strongClose;
+  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
+
+  if (!modelsToIgnore)
+    modelsToIgnore = {};
+  modelsToIgnore[this.name] = this;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    var ref = prop.$ref;
+    var model = models[ref];
+    if (model && typeof modelsToIgnore[ref] === 'undefined') {
+      returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
+    }
+  }
+  return returnVal;
+};
+/** 
+ * Resolves a spec's remote references
+ */
+var Resolver = function (){};
+
+Resolver.prototype.resolve = function(spec, callback, scope) {
+  this.scope = (scope || this);
+  var host, name, path, property, propertyName, type;
+  var processedCalls = 0, resolvedRefs = {}, unresolvedRefs = {};
+
+  // store objects for dereferencing
+  var resolutionTable = {};
+
+  // models
+  for(name in spec.definitions) {
+    var model = spec.definitions[name];
+    for(propertyName in model.properties) {
+      property = model.properties[propertyName];
+      this.resolveTo(property, resolutionTable);
+    }
+  }
+  // operations
+  for(name in spec.paths) {
+    var method, operation, responseCode;
+    path = spec.paths[name];
+    for(method in path) {
+      operation = path[method];
+      var i, parameters = operation.parameters;
+      for(i in parameters) {
+        var parameter = parameters[i];
+        if(parameter.in === 'body' && parameter.schema) {
+          this.resolveTo(parameter.schema, resolutionTable);
+        }
+        if(parameter.$ref) {
+          this.resolveInline(spec, parameter, resolutionTable, unresolvedRefs);
+        }
+      }
+      for(responseCode in operation.responses) {
+        var response = operation.responses[responseCode];
+        if(response.schema) {
+          this.resolveTo(response.schema, resolutionTable);
+        }
+      }
+    }
+  }
+  // get hosts
+  var opts = {}, expectedCalls = 0;
+  for(name in resolutionTable) {
+    var parts = name.split('#');
+    if(parts.length == 2) {
+      host = parts[0]; path = parts[1];
+      if(!Array.isArray(opts[host])) {
+        opts[host] = [];
+        expectedCalls += 1;
+      }
+      opts[host].push(path);
+    }
+  }
+
+  for(name in opts) {
+    var self = this, opt = opts[name];
+    host = name;
+
+    var obj = {
+      useJQuery: false,  // TODO
+      url: host,
+      method: "get",
+      headers: {
+        accept: this.scope.swaggerRequestHeaders || 'application/json'
+      },
+      on: {
+        error: function(response) {
+          processedCalls += 1;
+          var i;
+          for(i = 0; i < opt.length; i++) {
+            // fail all of these
+            var resolved = host + '#' + opt[i];
+            unresolvedRefs[resolved] = null;
+          }
+          if(processedCalls === expectedCalls)
+            self.finish(spec, resolutionTable, resolvedRefs, unresolvedRefs, callback);
+        },
+        response: function(response) {
+          var i, j, swagger = response.obj;
+          processedCalls += 1;
+          for(i = 0; i < opt.length; i++) {
+            var location = swagger, path = opt[i], parts = path.split('/');
+            for(j = 0; j < parts.length; j++) {
+              var segment = parts[j];
+              if(typeof location === 'undefined')
+                break;
+              if(segment.length > 0)
+                location = location[segment];
+            }
+            var resolved = host + '#' + path, resolvedName = parts[j-1];
+            if(typeof location !== 'undefined') {
+              resolvedRefs[resolved] = {
+                name: resolvedName,
+                obj: location
+              };
+            }
+            else unresolvedRefs[resolved] = null;
+          }
+          if(processedCalls === expectedCalls)
+            self.finish(spec, resolutionTable, resolvedRefs, unresolvedRefs, callback);
+        }
+      }
+    };
+    authorizations.apply(obj);
+    new SwaggerHttp().execute(obj);
+  }
+  if(Object.keys(opts).length === 0)
+    callback.call(this.scope, spec, unresolvedRefs);
+};
+
+Resolver.prototype.finish = function(spec, resolutionTable, resolvedRefs, unresolvedRefs, callback) {
+  // walk resolution table and replace with resolved refs
+  var ref;
+  for(ref in resolutionTable) {
+    var i, locations = resolutionTable[ref];
+    for(i = 0; i < locations.length; i++) {
+      var resolvedTo = resolvedRefs[locations[i].obj.$ref];
+      if(resolvedTo) {
+        if(!spec.definitions)
+          spec.definitions = {};
+        if(locations[i].resolveAs === '$ref') {
+          spec.definitions[resolvedTo.name] = resolvedTo.obj;
+          locations[i].obj.$ref = '#/definitions/' + resolvedTo.name;
+        }
+        else if (locations[i].resolveAs === 'inline') {
+          var key;
+          var targetObj = locations[i].obj;
+          delete targetObj.$ref;
+          for(key in resolvedTo.obj) {
+            targetObj[key] = resolvedTo.obj[key];
+          }
+        }
+      }
+    }
+  }
+  callback.call(this.scope, spec, unresolvedRefs);
+};
+
+/**
+ * immediately in-lines local refs, queues remote refs
+ * for inline resolution
+ */
+Resolver.prototype.resolveInline = function (spec, property, objs, unresolvedRefs) {
+  var ref = property.$ref;
+  if(ref) {
+    if(ref.indexOf('http') === 0) {
+      if(Array.isArray(objs[ref])) {
+        objs[ref].push({obj: property, resolveAs: 'inline'});
+      }
+      else {
+        objs[ref] = [{obj: property, resolveAs: 'inline'}];
+      }
+    }
+    else if (ref.indexOf('#') === 0) {
+      // local resolve
+      var shortenedRef = ref.substring(1);
+      var i, parts = shortenedRef.split('/'), location = spec;
+      for(i = 0; i < parts.length; i++) {
+        var part = parts[i];
+        if(part.length > 0) {
+          location = location[part];
+        }
+      }
+      if(location) {
+        delete property.$ref;
+        var key;
+        for(key in location) {
+          property[key] = location[key];
+        }
+      }
+      else unresolvedRefs[ref] = null;
+    }
+  }
+  else if(property.type === 'array') {
+    this.resolveTo(property.items, objs);
+  }
+};
+
+Resolver.prototype.resolveTo = function (property, objs) {
+  var ref = property.$ref;
+  if(ref) {
+    if(ref.indexOf('http') === 0) {
+      if(Array.isArray(objs[ref])) {
+        objs[ref].push({obj: property, resolveAs: '$ref'});
+      }
+      else {
+        objs[ref] = [{obj: property, resolveAs: '$ref'}];
+      }
+    }
+  }
+  else if(property.type === 'array') {
+    var items = property.items;
+    this.resolveTo(items, objs);
+  }
+};
+var addModel = function(name, model) {
+  models[name] = model;
+};
+
+var SwaggerClient = function(url, options) {
+  this.isBuilt = false;
+  this.url = null;
+  this.debug = false;
+  this.basePath = null;
+  this.modelsArray = [];
+  this.authorizations = null;
+  this.authorizationScheme = null;
+  this.isValid = false;
+  this.info = null;
+  this.useJQuery = false;
+  this.resourceCount = 0;
+
+  if(typeof url !== 'undefined')
+    return this.initialize(url, options);
+};
+
+SwaggerClient.prototype.initialize = function (url, options) {
+  this.models = models = {};
+
+  options = (options||{});
+
+  if(typeof url === 'string')
+    this.url = url;
+  else if(typeof url === 'object') {
+    options = url;
+    this.url = options.url;
+  }
+  this.swaggerRequstHeaders = options.swaggerRequstHeaders || 'application/json;charset=utf-8,*/*';
+  this.defaultSuccessCallback = options.defaultSuccessCallback || null;
+  this.defaultErrorCallback = options.defaultErrorCallback || null;
+
+  if (typeof options.success === 'function')
+    this.success = options.success;
+
+  if (options.useJQuery)
+    this.useJQuery = options.useJQuery;
+
+  if (options.authorizations) {
+    this.clientAuthorizations = options.authorizations;
+  } else {
+    this.clientAuthorizations = authorizations;
+  }
+
+  this.supportedSubmitMethods = options.supportedSubmitMethods || [];
+  this.failure = options.failure || function() {};
+  this.progress = options.progress || function() {};
+  this.spec = options.spec;
+  this.options = options;
+
+  if (typeof options.success === 'function') {
+    this.ready = true;
+    this.build();
+  }
+};
+
+SwaggerClient.prototype.build = function(mock) {
+  if (this.isBuilt) return this;
+  var self = this;
+  this.progress('fetching resource list: ' + this.url);
+  var obj = {
+    useJQuery: this.useJQuery,
+    url: this.url,
+    method: "get",
+    headers: {
+      accept: this.swaggerRequstHeaders
+    },
+    on: {
+      error: function(response) {
+        if (self.url.substring(0, 4) !== 'http')
+          return self.fail('Please specify the protocol for ' + self.url);
+        else if (response.status === 0)
+          return self.fail('Can\'t read from server.  It may not have the appropriate access-control-origin settings.');
+        else if (response.status === 404)
+          return self.fail('Can\'t read swagger JSON from ' + self.url);
+        else
+          return self.fail(response.status + ' : ' + response.statusText + ' ' + self.url);
+      },
+      response: function(resp) {
+        var responseObj = resp.obj || JSON.parse(resp.data);
+        self.swaggerVersion = responseObj.swaggerVersion;
+
+        if(responseObj.swagger && parseInt(responseObj.swagger) === 2) {
+          self.swaggerVersion = responseObj.swagger;
+          new Resolver().resolve(responseObj, self.buildFromSpec, self);
+          self.isValid = true;
+        }
+        else {
+          if (self.swaggerVersion === '1.2') {
+            return self.buildFrom1_2Spec(responseObj);
+          } else {
+            return self.buildFrom1_1Spec(responseObj);
+          }
+        }
+      }
+    }
+  };
+  if(this.spec) {
+    setTimeout(function() {
+      new Resolver().resolve(self.spec, self.buildFromSpec, self);
+   }, 10);
+  }
+  else {
+    authorizations.apply(obj);
+    if(mock)
+      return obj;
+    new SwaggerHttp().execute(obj);
+  }
+  return this;
+};
+
+SwaggerClient.prototype.buildFromSpec = function(response) {
+  if(this.isBuilt) return this;
+
+  this.info = response.info || {};
+  this.title = response.title || '';
+  this.host = response.host || '';
+  this.schemes = response.schemes || [];
+  this.basePath = response.basePath || '';
+  this.apis = {};
+  this.apisArray = [];
+  this.consumes = response.consumes;
+  this.produces = response.produces;
+  this.securityDefinitions = response.securityDefinitions;
+
+  // legacy support
+  this.authSchemes = response.securityDefinitions;
+
+  var definedTags = {};
+  if(Array.isArray(response.tags)) {
+    definedTags = {};
+    for(k = 0; k < response.tags.length; k++) {
+      var t = response.tags[k];
+      definedTags[t.name] = t;
+    }
+  }
+
+  var location;
+  if(typeof this.url === 'string') {
+    location = this.parseUri(this.url);
+  }
+
+  if(typeof this.schemes === 'undefined' || this.schemes.length === 0) {
+    this.scheme = location.scheme || 'http';
+  }
+  else {
+    this.scheme = this.schemes[0];
+  }
+
+  if(typeof this.host === 'undefined' || this.host === '') {
+    this.host = location.host;
+    if (location.port) {
+      this.host = this.host + ':' + location.port;
+    }
+  }
+
+  this.definitions = response.definitions;
+  var key;
+  for(key in this.definitions) {
+    var model = new Model(key, this.definitions[key]);
+    if(model) {
+      models[key] = model;
+    }
+  }
+
+  // get paths, create functions for each operationId
+  var path;
+  var operations = [];
+  for(path in response.paths) {
+    if(typeof response.paths[path] === 'object') {
+      var httpMethod;
+      for(httpMethod in response.paths[path]) {
+        if(['delete', 'get', 'head', 'options', 'patch', 'post', 'put'].indexOf(httpMethod) === -1) {
+          continue;
+        }
+        var operation = response.paths[path][httpMethod];
+        var tags = operation.tags;
+        if(typeof tags === 'undefined') {
+          operation.tags = [ 'default' ];
+          tags = operation.tags;
+        }
+        var operationId = this.idFromOp(path, httpMethod, operation);
+        var operationObject = new Operation (
+          this,
+          operation.scheme,
+          operationId,
+          httpMethod,
+          path,
+          operation,
+          this.definitions
+        );
+        // bind this operation's execute command to the api
+        if(tags.length > 0) {
+          var i;
+          for(i = 0; i < tags.length; i++) {
+            var tag = this.tagFromLabel(tags[i]);
+            var operationGroup = this[tag];
+            if(typeof this.apis[tag] === 'undefined')
+              this.apis[tag] = {};
+            if(typeof operationGroup === 'undefined') {
+              this[tag] = [];
+              operationGroup = this[tag];
+              operationGroup.operations = {};
+              operationGroup.label = tag;
+              operationGroup.apis = [];
+              var tagObject = definedTags[tag];
+              if(typeof tagObject === 'object') {
+                operationGroup.description = tagObject.description;
+                operationGroup.externalDocs = tagObject.externalDocs;
+              }
+              this[tag].help = this.help.bind(operationGroup);
+              this.apisArray.push(new OperationGroup(tag, operationGroup.description, operationGroup.externalDocs, operationObject));
+            }
+            if(typeof this.apis[tag].help !== 'function')
+              this.apis[tag].help = this.help.bind(operationGroup);
+            // bind to the apis object
+            this.apis[tag][operationId] = operationObject.execute.bind(operationObject);
+            this.apis[tag][operationId].help = operationObject.help.bind(operationObject);
+            this.apis[tag][operationId].asCurl = operationObject.asCurl.bind(operationObject);
+            operationGroup[operationId] = operationObject.execute.bind(operationObject);
+            operationGroup[operationId].help = operationObject.help.bind(operationObject);
+            operationGroup[operationId].asCurl = operationObject.asCurl.bind(operationObject);
+
+            operationGroup.apis.push(operationObject);
+            operationGroup.operations[operationId] = operationObject;
+
+            // legacy UI feature
+            var j;
+            var api;
+            for(j = 0; j < this.apisArray.length; j++) {
+              if(this.apisArray[j].tag === tag) {
+                api = this.apisArray[j];
+              }
+            }
+            if(api) {
+              api.operationsArray.push(operationObject);
+            }
+          }
+        }
+        else {
+          log('no group to bind to');
+        }
+      }
+    }
+  }
+  this.isBuilt = true;
+  if (this.success) {
+    this.isValid = true;
+    this.isBuilt = true;
+    this.success();
+  }
+  return this;
+};
+
+SwaggerClient.prototype.parseUri = function(uri) {
+  var urlParseRE = /^(((([^:\/#\?]+:)?(?:(\/\/)((?:(([^:@\/#\?]+)(?:\:([^:@\/#\?]+))?)@)?(([^:\/#\?\]\[]+|\[[^\/\]@#?]+\])(?:\:([0-9]+))?))?)?)?((\/?(?:[^\/\?#]+\/+)*)([^\?#]*)))?(\?[^#]+)?)(#.*)?/;
+  var parts = urlParseRE.exec(uri);
+  return {
+    scheme: parts[4].replace(':',''),
+    host: parts[11],
+    port: parts[12],
+    path: parts[15]
+  };
+};
+
+SwaggerClient.prototype.help = function(dontPrint) {
+  var i;
+  var output = 'operations for the "' + this.label + '" tag';
+  for(i = 0; i < this.apis.length; i++) {
+    var api = this.apis[i];
+    output += '\n  * ' + api.nickname + ': ' + api.operation.summary;
+  }
+  if(dontPrint)
+    return output;
+  else {
+    log(output);
+    return output;
+  }
+};
+
+SwaggerClient.prototype.tagFromLabel = function(label) {
+  return label;
+};
+
+SwaggerClient.prototype.idFromOp = function(path, httpMethod, op) {
+  var opId = op.operationId || (path.substring(1) + '_' + httpMethod);
+  return opId.replace(/[\.,-\/#!$%\^&\*;:{}=\-_`~()\+\s]/g,'_');
+};
+
+SwaggerClient.prototype.fail = function(message) {
+  this.failure(message);
+  throw message;
+};
+
+var OperationGroup = function(tag, description, externalDocs, operation) {
+  this.tag = tag;
+  this.path = tag;
+  this.description = description;
+  this.externalDocs = externalDocs;
+  this.name = tag;
+  this.operation = operation;
+  this.operationsArray = [];
+};
+
+var Operation = function(parent, scheme, operationId, httpMethod, path, args, definitions) {
+  var errors = [];
+  parent = parent||{};
+  args = args||{};
+
+  this.operations = {};
+  this.operation = args;
+  this.deprecated = args.deprecated;
+  this.consumes = args.consumes;
+  this.produces = args.produces;
+  this.parent = parent;
+  this.host = parent.host || 'localhost';
+  this.schemes = parent.schemes;
+  this.scheme = scheme || parent.scheme || 'http';
+  this.basePath = parent.basePath || '/';
+  this.nickname = (operationId||errors.push('Operations must have a nickname.'));
+  this.method = (httpMethod||errors.push('Operation ' + operationId + ' is missing method.'));
+  this.path = (path||errors.push('Operation ' + this.nickname + ' is missing path.'));
+  this.parameters = args !== null ? (args.parameters||[]) : {};
+  this.summary = args.summary || '';
+  this.responses = (args.responses||{});
+  this.type = null;
+  this.security = args.security;
+  this.authorizations = args.security;
+  this.description = args.description;
+  this.useJQuery = parent.useJQuery;
+
+  if(typeof this.deprecated === 'string') {
+    switch(this.deprecated.toLowerCase()) {
+      case 'true': case 'yes': case '1': {
+        this.deprecated = true;
+        break;
+      }
+      case 'false': case 'no': case '0': case null: {
+        this.deprecated = false;
+        break;
+      }
+      default: this.deprecated = Boolean(this.deprecated);
+    }
+  }
+
+  var i, model;
+
+  if(definitions) {
+    // add to global models
+    var key;
+    for(key in this.definitions) {
+      model = new Model(key, definitions[key]);
+      if(model) {
+        models[key] = model;
+      }
+    }
+  }
+  for(i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(param.type === 'array') {
+      param.isList = true;
+      param.allowMultiple = true;
+    }
+    var innerType = this.getType(param);
+    if(innerType && innerType.toString().toLowerCase() === 'boolean') {
+      param.allowableValues = {};
+      param.isList = true;
+      param['enum'] = ["true", "false"];
+    }
+    if(typeof param['enum'] !== 'undefined') {
+      var id;
+      param.allowableValues = {};
+      param.allowableValues.values = [];
+      param.allowableValues.descriptiveValues = [];
+      for(id = 0; id < param['enum'].length; id++) {
+        var value = param['enum'][id];
+        var isDefault = (value === param.default) ? true : false;
+        param.allowableValues.values.push(value);
+        param.allowableValues.descriptiveValues.push({value : value, isDefault: isDefault});
+      }
+    }
+    if(param.type === 'array') {
+      innerType = [innerType];
+      if(typeof param.allowableValues === 'undefined') {
+        // can't show as a list if no values to select from
+        delete param.isList;
+        delete param.allowMultiple;
+      }
+    }
+    param.signature = this.getModelSignature(innerType, models).toString();
+    param.sampleJSON = this.getModelSampleJSON(innerType, models);
+    param.responseClassSignature = param.signature;
+  }
+
+  var defaultResponseCode, response, responses = this.responses;
+
+  if(responses['200']) {
+    response = responses['200'];
+    defaultResponseCode = '200';
+  }
+  else if(responses['201']) {
+    response = responses['201'];
+    defaultResponseCode = '201';
+  }
+  else if(responses['202']) {
+    response = responses['202'];
+    defaultResponseCode = '202';
+  }
+  else if(responses['203']) {
+    response = responses['203'];
+    defaultResponseCode = '203';
+  }
+  else if(responses['204']) {
+    response = responses['204'];
+    defaultResponseCode = '204';
+  }
+  else if(responses['205']) {
+    response = responses['205'];
+    defaultResponseCode = '205';
+  }
+  else if(responses['206']) {
+    response = responses['206'];
+    defaultResponseCode = '206';
+  }
+  else if(responses['default']) {
+    response = responses['default'];
+    defaultResponseCode = 'default';
+  }
+
+  if(response && response.schema) {
+    var resolvedModel = this.resolveModel(response.schema, definitions);
+    delete responses[defaultResponseCode];
+    if(resolvedModel) {
+      this.successResponse = {};
+      this.successResponse[defaultResponseCode] = resolvedModel;
+    }
+    else {
+      this.successResponse = {};
+      this.successResponse[defaultResponseCode] = response.schema.type;
+    }
+    this.type = response;
+  }
+
+  if (errors.length > 0) {
+    if(this.resource && this.resource.api && this.resource.api.fail)
+      this.resource.api.fail(errors);
+  }
+
+  return this;
+};
+
+OperationGroup.prototype.sort = function(sorter) {
+
+};
+
+Operation.prototype.getType = function (param) {
+  var type = param.type;
+  var format = param.format;
+  var isArray = false;
+  var str;
+  if(type === 'integer' && format === 'int32')
+    str = 'integer';
+  else if(type === 'integer' && format === 'int64')
+    str = 'long';
+  else if(type === 'integer')
+    str = 'integer';
+  else if(type === 'string') {
+    if(format === 'date-time')
+      str = 'date-time';
+    else if(format === 'date')
+      str = 'date';
+    else
+      str = 'string';
+  }
+  else if(type === 'number' && format === 'float')
+    str = 'float';
+  else if(type === 'number' && format === 'double')
+    str = 'double';
+  else if(type === 'number')
+    str = 'double';
+  else if(type === 'boolean')
+    str = 'boolean';
+  else if(type === 'array') {
+    isArray = true;
+    if(param.items)
+      str = this.getType(param.items);
+  }
+  if(param.$ref)
+    str = param.$ref;
+
+  var schema = param.schema;
+  if(schema) {
+    var ref = schema.$ref;
+    if(ref) {
+      ref = simpleRef(ref);
+      if(isArray)
+        return [ ref ];
+      else
+        return ref;
+    }
+    else
+      return this.getType(schema);
+  }
+  if(isArray)
+    return [ str ];
+  else
+    return str;
+};
+
+Operation.prototype.resolveModel = function (schema, definitions) {
+  if(typeof schema.$ref !== 'undefined') {
+    var ref = schema.$ref;
+    if(ref.indexOf('#/definitions/') === 0)
+      ref = ref.substring('#/definitions/'.length);
+    if(definitions[ref]) {
+      return new Model(ref, definitions[ref]);
+    }
+  }
+  if(schema.type === 'array')
+    return new ArrayModel(schema);
+  else
+    return null;
+};
+
+Operation.prototype.help = function(dontPrint) {
+  var out = this.nickname + ': ' + this.summary + '\n';
+  for(var i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    var typeInfo = param.signature;
+    out += '\n  * ' + param.name + ' (' + typeInfo + '): ' + param.description;
+  }
+  if(typeof dontPrint === 'undefined')
+    log(out);
+  return out;
+};
+
+Operation.prototype.getModelSignature = function(type, definitions) {
+  var isPrimitive, listType;
+
+  if(type instanceof Array) {
+    listType = true;
+    type = type[0];
+  }
+  else if(typeof type === 'undefined')
+    type = 'undefined';
+
+  if(type === 'string')
+    isPrimitive = true;
+  else
+    isPrimitive = (listType && definitions[listType]) || (definitions[type]) ? false : true;
+  if (isPrimitive) {
+    if(listType)
+      return 'Array[' + type + ']';
+    else
+      return type.toString();
+  } else {
+    if (listType)
+      return 'Array[' + definitions[type].getMockSignature() + ']';
+    else
+      return definitions[type].getMockSignature();
+  }
+};
+
+Operation.prototype.supportHeaderParams = function () {
+  return true;
+};
+
+Operation.prototype.supportedSubmitMethods = function () {
+  return this.parent.supportedSubmitMethods;
+};
+
+Operation.prototype.getHeaderParams = function (args) {
+  var headers = this.setContentTypes(args, {});
+  for(var i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(typeof args[param.name] !== 'undefined') {
+      if (param.in === 'header') {
+        var value = args[param.name];
+        if(Array.isArray(value))
+          value = value.toString();
+        headers[param.name] = value;
+      }
+    }
+  }
+  return headers;
+};
+
+Operation.prototype.urlify = function (args) {
+  var formParams = {};
+  var requestUrl = this.path;
+
+  // grab params from the args, build the querystring along the way
+  var querystring = '';
+  for(var i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(typeof args[param.name] !== 'undefined') {
+      if(param.in === 'path') {
+        var reg = new RegExp('\{' + param.name + '\}', 'gi');
+        var value = args[param.name];
+        if(Array.isArray(value))
+          value = this.encodePathCollection(param.collectionFormat, param.name, value);
+        else
+          value = this.encodePathParam(value);
+        requestUrl = requestUrl.replace(reg, value);
+      }
+      else if (param.in === 'query' && typeof args[param.name] !== 'undefined') {
+        if(querystring === '')
+          querystring += '?';
+        else
+          querystring += '&';
+        if(typeof param.collectionFormat !== 'undefined') {
+          var qp = args[param.name];
+          if(Array.isArray(qp))
+            querystring += this.encodeQueryCollection(param.collectionFormat, param.name, qp);
+          else
+            querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
+        }
+        else
+          querystring += this.encodeQueryParam(param.name) + '=' + this.encodeQueryParam(args[param.name]);
+      }
+      else if (param.in === 'formData')
+        formParams[param.name] = args[param.name];
+    }
+  }
+  var url = this.scheme + '://' + this.host;
+
+  if(this.basePath !== '/')
+    url += this.basePath;
+
+  return url + requestUrl + querystring;
+};
+
+Operation.prototype.getMissingParams = function(args) {
+  var missingParams = [];
+  // check required params, track the ones that are missing
+  var i;
+  for(i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(param.required === true) {
+      if(typeof args[param.name] === 'undefined')
+        missingParams = param.name;
+    }
+  }
+  return missingParams;
+};
+
+Operation.prototype.getBody = function(headers, args, opts) {
+  var formParams = {}, body, key;
+
+  for(var i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(typeof args[param.name] !== 'undefined') {
+      if (param.in === 'body') {
+        body = args[param.name];
+      } else if(param.in === 'formData') {
+        formParams[param.name] = args[param.name];
+      }
+    }
+  }
+
+  // handle form params
+  if(headers['Content-Type'] === 'application/x-www-form-urlencoded') {
+    var encoded = "";
+    for(key in formParams) {
+      value = formParams[key];
+      if(typeof value !== 'undefined'){
+        if(encoded !== "")
+          encoded += "&";
+        encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+      }
+    }
+    body = encoded;
+  }
+  else if (headers['Content-Type'] && headers['Content-Type'].indexOf('multipart/form-data') >= 0) {
+    if(opts.useJQuery) {
+      var bodyParam = new FormData();
+      bodyParam.type = 'formData';
+      for (key in formParams) {
+        value = args[key];
+        if (typeof value !== 'undefined') {
+          // required for jquery file upload
+          if(value.type === 'file' && value.value) {
+            delete headers['Content-Type'];
+            bodyParam.append(key, value.value);
+          }
+          else
+            bodyParam.append(key, value);
+        }
+      }
+      body = bodyParam;
+    }
+  }
+
+  return body;
+};
+
+/**
+ * gets sample response for a single operation
+ **/
+Operation.prototype.getModelSampleJSON = function(type, models) {
+  var isPrimitive, listType, sampleJson;
+
+  listType = (type instanceof Array);
+  isPrimitive = models[type] ? false : true;
+  sampleJson = isPrimitive ? void 0 : models[type].createJSONSample();
+  if (sampleJson) {
+    sampleJson = listType ? [sampleJson] : sampleJson;
+    if(typeof sampleJson == 'string')
+      return sampleJson;
+    else if(typeof sampleJson === 'object') {
+      var t = sampleJson;
+      if(sampleJson instanceof Array && sampleJson.length > 0) {
+        t = sampleJson[0];
+      }
+      if(t.nodeName) {
+        var xmlString = new XMLSerializer().serializeToString(t);
+        return this.formatXml(xmlString);
+      }
+      else
+        return JSON.stringify(sampleJson, null, 2);
+    }
+    else
+      return sampleJson;
+  }
+};
+
+/**
+ * legacy binding
+ **/
+Operation.prototype["do"] = function(args, opts, callback, error, parent) {
+  return this.execute(args, opts, callback, error, parent);
+};
+
+
+/**
+ * executes an operation
+ **/
+Operation.prototype.execute = function(arg1, arg2, arg3, arg4, parent) {
+  var args = arg1 || {};
+  var opts = {}, success, error;
+  if(typeof arg2 === 'object') {
+    opts = arg2;
+    success = arg3;
+    error = arg4;
+  }
+
+  if(typeof arg2 === 'function') {
+    success = arg2;
+    error = arg3;
+  }
+
+  success = (success||log);
+  error = (error||log);
+
+  if(opts.useJQuery)
+    this.useJQuery = opts.useJQuery;
+
+  var missingParams = this.getMissingParams(args);
+  if(missingParams.length > 0) {
+    var message = 'missing required params: ' + missingParams;
+    fail(message);
+    return;
+  }
+  var allHeaders = this.getHeaderParams(args);
+  var contentTypeHeaders = this.setContentTypes(args, opts);
+
+  var headers = {}, attrname;
+  for (attrname in allHeaders) { headers[attrname] = allHeaders[attrname]; }
+  for (attrname in contentTypeHeaders) { headers[attrname] = contentTypeHeaders[attrname]; }
+
+  var body = this.getBody(headers, args, opts);
+  var url = this.urlify(args);
+
+  var obj = {
+    url: url,
+    method: this.method.toUpperCase(),
+    body: body,
+    useJQuery: this.useJQuery,
+    headers: headers,
+    on: {
+      response: function(response) {
+        return success(response, parent);
+      },
+      error: function(response) {
+        return error(response, parent);
+      }
+    }
+  };
+  var status = authorizations.apply(obj, this.operation.security);
+  if(opts.mock === true)
+    return obj;
+  else
+    new SwaggerHttp().execute(obj, opts);
+};
+
+Operation.prototype.setContentTypes = function(args, opts) {
+  // default type
+  var accepts = 'application/json';
+  var consumes = args.parameterContentType || 'application/json';
+  var allDefinedParams = this.parameters;
+  var definedFormParams = [];
+  var definedFileParams = [];
+  var body;
+  var headers = {};
+
+  // get params from the operation and set them in definedFileParams, definedFormParams, headers
+  var i;
+  for(i = 0; i < allDefinedParams.length; i++) {
+    var param = allDefinedParams[i];
+    if(param.in === 'formData') {
+      if(param.type === 'file')
+        definedFileParams.push(param);
+      else
+        definedFormParams.push(param);
+    }
+    else if(param.in === 'header' && opts) {
+      var key = param.name;
+      var headerValue = opts[param.name];
+      if(typeof opts[param.name] !== 'undefined')
+        headers[key] = headerValue;
+    }
+    else if(param.in === 'body' && typeof args[param.name] !== 'undefined') {
+      body = args[param.name];
+    }
+  }
+
+  // if there's a body, need to set the consumes header via requestContentType
+  if (body && (this.method === 'post' || this.method === 'put' || this.method === 'patch' || this.method === 'delete')) {
+    if (opts.requestContentType)
+      consumes = opts.requestContentType;
+  } else {
+    // if any form params, content type must be set
+    if(definedFormParams.length > 0) {
+      if(opts.requestContentType)           // override if set
+        consumes = opts.requestContentType;
+      else if(definedFileParams.length > 0) // if a file, must be multipart/form-data
+        consumes = 'multipart/form-data';
+      else                                  // default to x-www-from-urlencoded
+        consumes = 'application/x-www-form-urlencoded';
+    }
+    else if (this.type == 'DELETE')
+      body = '{}';
+    else if (this.type != 'DELETE')
+      consumes = null;
+  }
+
+  if (consumes && this.consumes) {
+    if (this.consumes.indexOf(consumes) === -1) {
+      log('server doesn\'t consume ' + consumes + ', try ' + JSON.stringify(this.consumes));
+    }
+  }
+
+  if (opts.responseContentType) {
+    accepts = opts.responseContentType;
+  } else {
+    accepts = 'application/json';
+  }
+  if (accepts && this.produces) {
+    if (this.produces.indexOf(accepts) === -1) {
+      log('server can\'t produce ' + accepts);
+    }
+  }
+
+  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded'))
+    headers['Content-Type'] = consumes;
+  if (accepts)
+    headers.Accept = accepts;
+  return headers;
+};
+
+Operation.prototype.asCurl = function (args) {
+  var obj = this.execute(args, {mock: true});
+  authorizations.apply(obj);
+  var results = [];
+  results.push('-X ' + this.method.toUpperCase());
+  if (obj.headers) {
+    var key;
+    for (key in obj.headers)
+      results.push('--header "' + key + ': ' + obj.headers[key] + '"');
+  }
+  if(obj.body) {
+    var body;
+    if(typeof obj.body === 'object')
+      body = JSON.stringify(obj.body);
+    else
+      body = obj.body;
+    results.push('-d "' + body.replace(/"/g, '\\"') + '"');
+  }
+  return 'curl ' + (results.join(' ')) + ' "' + obj.url + '"';
+};
+
+Operation.prototype.encodePathCollection = function(type, name, value) {
+  var encoded = '';
+  var i;
+  var separator = '';
+  if(type === 'ssv')
+    separator = '%20';
+  else if(type === 'tsv')
+    separator = '\\t';
+  else if(type === 'pipes')
+    separator = '|';
+  else
+    separator = ',';
+
+  for(i = 0; i < value.length; i++) {
+    if(i === 0)
+      encoded = this.encodeQueryParam(value[i]);
+    else
+      encoded += separator + this.encodeQueryParam(value[i]);
+  }
+  return encoded;
+};
+
+Operation.prototype.encodeQueryCollection = function(type, name, value) {
+  var encoded = '';
+  var i;
+  if(type === 'default' || type === 'multi') {
+    for(i = 0; i < value.length; i++) {
+      if(i > 0) encoded += '&';
+      encoded += this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
+    }
+  }
+  else {
+    var separator = '';
+    if(type === 'csv')
+      separator = ',';
+    else if(type === 'ssv')
+      separator = '%20';
+    else if(type === 'tsv')
+      separator = '\\t';
+    else if(type === 'pipes')
+      separator = '|';
+    else if(type === 'brackets') {
+      for(i = 0; i < value.length; i++) {
+        if(i !== 0)
+          encoded += '&';
+        encoded += this.encodeQueryParam(name) + '[]=' + this.encodeQueryParam(value[i]);
+      }
+    }
+    if(separator !== '') {
+      for(i = 0; i < value.length; i++) {
+        if(i === 0)
+          encoded = this.encodeQueryParam(name) + '=' + this.encodeQueryParam(value[i]);
+        else
+          encoded += separator + this.encodeQueryParam(value[i]);
+      }
+    }
+  }
+  return encoded;
+};
+
+Operation.prototype.encodeQueryParam = function(arg) {
+  return encodeURIComponent(arg);
+};
+
+/**
+ * TODO revisit, might not want to leave '/'
+ **/
+Operation.prototype.encodePathParam = function(pathParam) {
+  var encParts, part, parts, i, len;
+  pathParam = pathParam.toString();
+  if (pathParam.indexOf('/') === -1) {
+    return encodeURIComponent(pathParam);
+  } else {
+    parts = pathParam.split('/');
+    encParts = [];
+    for (i = 0, len = parts.length; i < len; i++) {
+      encParts.push(encodeURIComponent(parts[i]));
+    }
+    return encParts.join('/');
+  }
+};
+
+var Model = function(name, definition) {
+  this.name = name;
+  this.definition = definition || {};
+  this.properties = [];
+  var requiredFields = definition.required || [];
+  if(definition.type === 'array') {
+    var out = new ArrayModel(definition);
+    return out;
+  }
+  var key;
+  var props = definition.properties;
+  if(props) {
+    for(key in props) {
+      var required = false;
+      var property = props[key];
+      if(requiredFields.indexOf(key) >= 0)
+        required = true;
+      this.properties.push(new Property(key, property, required));
+    }
+  }
+};
+
+Model.prototype.createJSONSample = function(modelsToIgnore) {
+  var i, result = {}, representations = {};
+  modelsToIgnore = (modelsToIgnore||{});
+  modelsToIgnore[this.name] = this;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    var sample = prop.getSampleValue(modelsToIgnore, representations);
+    result[prop.name] = sample;
+  }
+  delete modelsToIgnore[this.name];
+  return result;
+};
+
+Model.prototype.getSampleValue = function(modelsToIgnore) {
+  var i, obj = {}, representations = {};
+  for(i = 0; i < this.properties.length; i++ ) {
+    var property = this.properties[i];
+    obj[property.name] = property.sampleValue(false, modelsToIgnore, representations);
+  }
+  return obj;
+};
+
+Model.prototype.getMockSignature = function(modelsToIgnore) {
+  var i, prop, propertiesStr = [];
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    propertiesStr.push(prop.toString());
+  }
+  var strong = '<span class="strong">';
+  var stronger = '<span class="stronger">';
+  var strongClose = '</span>';
+  var classOpen = strong + this.name + ' {' + strongClose;
+  var classClose = strong + '}' + strongClose;
+  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
+  if (!modelsToIgnore)
+    modelsToIgnore = {};
+
+  modelsToIgnore[this.name] = this;
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    var ref = prop.$ref;
+    var model = models[ref];
+    if (model && typeof modelsToIgnore[model.name] === 'undefined') {
+      returnVal = returnVal + ('<br>' + model.getMockSignature(modelsToIgnore));
+    }
+  }
+  return returnVal;
+};
+
+var Property = function(name, obj, required) {
+  this.schema = obj;
+  this.required = required;
+  if(obj.$ref)
+    this.$ref = simpleRef(obj.$ref);
+  else if (obj.type === 'array' && obj.items) {
+    if(obj.items.$ref)
+      this.$ref = simpleRef(obj.items.$ref);
+    else
+      obj = obj.items;
+  }
+  this.name = name;
+  this.description = obj.description;
+  this.obj = obj;
+  this.optional = true;
+  this.optional = !required;
+  this.default = obj.default || null;
+  this.example = obj.example !== undefined ? obj.example : null;
+  this.collectionFormat = obj.collectionFormat || null;
+  this.maximum = obj.maximum || null;
+  this.exclusiveMaximum = obj.exclusiveMaximum || null;
+  this.minimum = obj.minimum || null;
+  this.exclusiveMinimum = obj.exclusiveMinimum || null;
+  this.maxLength = obj.maxLength || null;
+  this.minLength = obj.minLength || null;
+  this.pattern = obj.pattern || null;
+  this.maxItems = obj.maxItems || null;
+  this.minItems = obj.minItems || null;
+  this.uniqueItems = obj.uniqueItems || null;
+  this['enum'] = obj['enum'] || null;
+  this.multipleOf = obj.multipleOf || null;
+};
+
+Property.prototype.getSampleValue = function (modelsToIgnore, representations) {
+  return this.sampleValue(false, modelsToIgnore, representations);
+};
+
+Property.prototype.isArray = function () {
+  var schema = this.schema;
+  if(schema.type === 'array')
+    return true;
+  else
+    return false;
+};
+
+Property.prototype.sampleValue = function(isArray, ignoredModels, representations) {
+  isArray = (isArray || this.isArray());
+  ignoredModels = (ignoredModels || {});
+  // representations = (representations || {});
+
+  var type = getStringSignature(this.obj, true);
+  var output;
+
+  if(this.$ref) {
+    var refModelName = simpleRef(this.$ref);
+    var refModel = models[refModelName];
+    if(typeof representations[type] !== 'undefined') {
+      return representations[type];
+    }
+    else
+
+    if(refModel && typeof ignoredModels[type] === 'undefined') {
+      ignoredModels[type] = this;
+      output = refModel.getSampleValue(ignoredModels, representations);
+      representations[type] = output;
+    }
+    else {
+      output = (representations[type] || refModelName);
+    }
+  }
+  else if(this.example)
+    output = this.example;
+  else if(this.default)
+    output = this.default;
+  else if(type === 'date-time')
+    output = new Date().toISOString();
+  else if(type === 'date')
+    output = new Date().toISOString().split("T")[0];
+  else if(type === 'string')
+    output = 'string';
+  else if(type === 'integer')
+    output = 0;
+  else if(type === 'long')
+    output = 0;
+  else if(type === 'float')
+    output = 0.0;
+  else if(type === 'double')
+    output = 0.0;
+  else if(type === 'boolean')
+    output = true;
+  else
+    output = {};
+  ignoredModels[type] = output;
+  if(isArray)
+    return [output];
+  else
+    return output;
+};
+
+getStringSignature = function(obj, baseComponent) {
+  var str = '';
+  if(typeof obj.$ref !== 'undefined')
+    str += simpleRef(obj.$ref);
+  else if(typeof obj.type === 'undefined')
+    str += 'object';
+  else if(obj.type === 'array') {
+    if(baseComponent)
+      str += getStringSignature((obj.items || obj.$ref || {}));
+    else {
+      str += 'Array[';
+      str += getStringSignature((obj.items || obj.$ref || {}));
+      str += ']';
+    }
+  }
+  else if(obj.type === 'integer' && obj.format === 'int32')
+    str += 'integer';
+  else if(obj.type === 'integer' && obj.format === 'int64')
+    str += 'long';
+  else if(obj.type === 'integer' && typeof obj.format === 'undefined')
+    str += 'long';
+  else if(obj.type === 'string' && obj.format === 'date-time')
+    str += 'date-time';
+  else if(obj.type === 'string' && obj.format === 'date')
+    str += 'date';
+  else if(obj.type === 'string' && typeof obj.format === 'undefined')
+    str += 'string';
+  else if(obj.type === 'number' && obj.format === 'float')
+    str += 'float';
+  else if(obj.type === 'number' && obj.format === 'double')
+    str += 'double';
+  else if(obj.type === 'number' && typeof obj.format === 'undefined')
+    str += 'double';
+  else if(obj.type === 'boolean')
+    str += 'boolean';
+  else if(obj.$ref)
+    str += simpleRef(obj.$ref);
+  else
+    str += obj.type;
+  return str;
+};
+
+simpleRef = function(name) {
+  if(typeof name === 'undefined')
+    return null;
+  if(name.indexOf("#/definitions/") === 0)
+    return name.substring('#/definitions/'.length);
+  else
+    return name;
+};
+
+Property.prototype.toString = function() {
+  var str = getStringSignature(this.obj);
+  if(str !== '') {
+    str = '<span class="propName ' + this.required + '">' + this.name + '</span> (<span class="propType">' + str + '</span>';
+    if(!this.required)
+      str += ', <span class="propOptKey">optional</span>';
+    str += ')';
+  }
+  else
+    str = this.name + ' (' + JSON.stringify(this.obj) + ')';
+
+  if(typeof this.description !== 'undefined')
+    str += ': ' + this.description;
+
+  if (this['enum']) {
+    str += ' = <span class="propVals">[\'' + this['enum'].join('\' or \'') + '\']</span>';
+  }
+  if (this.descr) {
+    str += ': <span class="propDesc">' + this.descr + '</span>';
+  }
+
+
+  var options = ''; 
+  var isArray = this.schema.type === 'array';
+  var type;
+
+  if(isArray) {
+    if(this.schema.items)
+      type = this.schema.items.type;
+    else
+      type = '';
+  }
+  else {
+    type = this.schema.type;
+  }
+
+  if (this.default)
+    options += optionHtml('Default', this.default);
+
+  switch (type) {
+    case 'string':
+      if (this.minLength)
+        options += optionHtml('Min. Length', this.minLength);
+      if (this.maxLength)
+        options += optionHtml('Max. Length', this.maxLength);
+      if (this.pattern)
+        options += optionHtml('Reg. Exp.', this.pattern);
+      break;
+    case 'integer':
+    case 'number':
+      if (this.minimum)
+        options += optionHtml('Min. Value', this.minimum);
+      if (this.exclusiveMinimum)
+        options += optionHtml('Exclusive Min.', "true");
+      if (this.maximum)
+        options += optionHtml('Max. Value', this.maximum);
+      if (this.exclusiveMaximum)
+        options += optionHtml('Exclusive Max.', "true");
+      if (this.multipleOf)
+        options += optionHtml('Multiple Of', this.multipleOf);
+      break;
+  }
+
+  if (isArray) {
+    if (this.minItems)
+      options += optionHtml('Min. Items', this.minItems);
+    if (this.maxItems)
+      options += optionHtml('Max. Items', this.maxItems);
+    if (this.uniqueItems)
+      options += optionHtml('Unique Items', "true");
+    if (this.collectionFormat)
+      options += optionHtml('Coll. Format', this.collectionFormat);
+  }
+
+  if (this['enum']) {
+    var enumString;
+
+    if (type === 'number' || type === 'integer')
+      enumString = this['enum'].join(', ');
+    else {
+      enumString = '"' + this['enum'].join('", "') + '"';
+    }
+
+    options += optionHtml('Enum', enumString);
+  }     
+
+  if (options.length > 0)
+    str = '<span class="propWrap">' + str + '<table class="optionsWrapper"><tr><th colspan="2">' + this.name + '</th></tr>' + options + '</table></span>';
+  
+  return str;
+};
+
+optionHtml = function(label, value) {
+  return '<tr><td class="optionName">' + label + ':</td><td>' + value + '</td></tr>';
+};
+
+typeFromJsonSchema = function(type, format) {
+  var str;
+  if(type === 'integer' && format === 'int32')
+    str = 'integer';
+  else if(type === 'integer' && format === 'int64')
+    str = 'long';
+  else if(type === 'integer' && typeof format === 'undefined')
+    str = 'long';
+  else if(type === 'string' && format === 'date-time')
+    str = 'date-time';
+  else if(type === 'string' && format === 'date')
+    str = 'date';
+  else if(type === 'number' && format === 'float')
+    str = 'float';
+  else if(type === 'number' && format === 'double')
+    str = 'double';
+  else if(type === 'number' && typeof format === 'undefined')
+    str = 'double';
+  else if(type === 'boolean')
+    str = 'boolean';
+  else if(type === 'string')
+    str = 'string';
+
+  return str;
+};
+
+var sampleModels = {};
+var cookies = {};
+var models = {};
+
+SwaggerClient.prototype.buildFrom1_2Spec = function (response) {
+  if (response.apiVersion !== null) {
+    this.apiVersion = response.apiVersion;
+  }
+  this.apis = {};
+  this.apisArray = [];
+  this.consumes = response.consumes;
+  this.produces = response.produces;
+  this.authSchemes = response.authorizations;
+  this.info = this.convertInfo(response.info);
+
+  var isApi = false, i, res;
+  for (i = 0; i < response.apis.length; i++) {
+    var api = response.apis[i];
+    if (api.operations) {
+      var j;
+      for (j = 0; j < api.operations.length; j++) {
+        operation = api.operations[j];
+        isApi = true;
+      }
+    }
+  }
+  if (response.basePath)
+    this.basePath = response.basePath;
+  else if (this.url.indexOf('?') > 0)
+    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
+  else
+    this.basePath = this.url;
+
+  if (isApi) {
+    var newName = response.resourcePath.replace(/\//g, '');
+    this.resourcePath = response.resourcePath;
+    res = new SwaggerResource(response, this);
+    this.apis[newName] = res;
+    this.apisArray.push(res);
+    this.finish();
+  } else {
+    var k;
+    this.expectedResourceCount = response.apis.length;
+    for (k = 0; k < response.apis.length; k++) {
+      var resource = response.apis[k];
+      res = new SwaggerResource(resource, this);
+      this.apis[res.name] = res;
+      this.apisArray.push(res);
+    }
+  }
+  this.isValid = true;
+  return this;
+};
+
+SwaggerClient.prototype.finish = function() {
+  if (typeof this.success === 'function') {
+    this.isValid = true;
+    this.ready = true;
+    this.isBuilt = true;
+    this.selfReflect();
+    this.success();
+  }  
+};
+
+SwaggerClient.prototype.buildFrom1_1Spec = function (response) {
+  log('This API is using a deprecated version of Swagger!  Please see http://github.com/wordnik/swagger-core/wiki for more info');
+  if (response.apiVersion !== null)
+    this.apiVersion = response.apiVersion;
+  this.apis = {};
+  this.apisArray = [];
+  this.produces = response.produces;
+  this.info = this.convertInfo(response.info);
+  var isApi = false, res;
+  for (var i = 0; i < response.apis.length; i++) {
+    var api = response.apis[i];
+    if (api.operations) {
+      for (var j = 0; j < api.operations.length; j++) {
+        operation = api.operations[j];
+        isApi = true;
+      }
+    }
+  }
+  if (response.basePath) {
+    this.basePath = response.basePath;
+  } else if (this.url.indexOf('?') > 0) {
+    this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
+  } else {
+    this.basePath = this.url;
+  }
+  if (isApi) {
+    var newName = response.resourcePath.replace(/\//g, '');
+    this.resourcePath = response.resourcePath;
+    res = new SwaggerResource(response, this);
+    this.apis[newName] = res;
+    this.apisArray.push(res);
+    this.finish();
+  } else {
+    this.expectedResourceCount = response.apis.length;
+    for (k = 0; k < response.apis.length; k++) {
+      resource = response.apis[k];
+      res = new SwaggerResource(resource, this);
+      this.apis[res.name] = res;
+      this.apisArray.push(res);
+    }
+  }
+  this.isValid = true;
+  return this;
+};
+
+SwaggerClient.prototype.convertInfo = function (resp) {
+  if(typeof resp == 'object') {
+    var info = {};
+
+    info.title = resp.title;
+    info.description = resp.description;
+    info.termsOfService = resp.termsOfServiceUrl;
+    info.contact = {};
+    info.contact.name = resp.contact;
+    info.license = {};
+    info.license.name = resp.license;
+    info.license.url = resp.licenseUrl;
+
+    return info;
+  }
+};
+
+SwaggerClient.prototype.selfReflect = function () {
+  var resource, tag, ref;
+  if (this.apis === null) {
+    return false;
+  }
+  ref = this.apis;
+  for (tag in ref) {
+    api = ref[tag];
+    if (api.ready === null) {
+      return false;
+    }
+    this[tag] = api;
+    this[tag].help = __bind(api.help, api);
+  }
+  this.setConsolidatedModels();
+  this.ready = true;
+};
+
+SwaggerClient.prototype.setConsolidatedModels = function () {
+  var model, modelName, resource, resource_name, i, apis, models, results;
+  this.models = {};
+  apis = this.apis;
+  for (resource_name in apis) {
+    resource = apis[resource_name];
+    for (modelName in resource.models) {
+      if (typeof this.models[modelName] === 'undefined') {
+        this.models[modelName] = resource.models[modelName];
+        this.modelsArray.push(resource.models[modelName]);
+      }
+    }
+  }
+  models = this.modelsArray;
+  results = [];
+  for (i = 0; i < models.length; i++) {
+    model = models[i];
+    results.push(model.setReferencedModels(this.models));
+  }
+  return results;
+};
+
+var SwaggerResource = function (resourceObj, api) {
+  var _this = this;
+  this.api = api;
+  this.swaggerRequstHeaders = api.swaggerRequstHeaders;
+  this.path = (typeof this.api.resourcePath === 'string') ? this.api.resourcePath : resourceObj.path;
+  this.description = resourceObj.description;
+  this.authorizations = (resourceObj.authorizations || {});
+
+  var parts = this.path.split('/');
+  this.name = parts[parts.length - 1].replace('.{format}', '');
+  this.basePath = this.api.basePath;
+  this.operations = {};
+  this.operationsArray = [];
+  this.modelsArray = [];
+  this.models = api.models || {};
+  this.rawModels = {};
+  this.useJQuery = (typeof api.useJQuery !== 'undefined') ? api.useJQuery : null;
+
+  if ((resourceObj.apis) && this.api.resourcePath) {
+    this.addApiDeclaration(resourceObj);
+  } else {
+    if (typeof this.path === 'undefined') {
+      this.api.fail('SwaggerResources must have a path.');
+    }
+    if (this.path.substring(0, 4) === 'http') {
+      this.url = this.path.replace('{format}', 'json');
+    } else {
+      this.url = this.api.basePath + this.path.replace('{format}', 'json');
+    }
+    this.api.progress('fetching resource ' + this.name + ': ' + this.url);
+    var obj = {
+      url: this.url,
+      method: 'GET',
+      useJQuery: this.useJQuery,
+      headers: {
+        accept: this.swaggerRequstHeaders
+      },
+      on: {
+        response: function (resp) {
+          var responseObj = resp.obj || JSON.parse(resp.data);
+          _this.api.resourceCount += 1;
+          return _this.addApiDeclaration(responseObj);
+        },
+        error: function (response) {
+          _this.api.resourceCount += 1;
+          return _this.api.fail('Unable to read api \'' +
+          _this.name + '\' from path ' + _this.url + ' (server returned ' + response.statusText + ')');
+        }
+      }
+    };
+    var e = typeof window !== 'undefined' ? window : exports;
+    e.authorizations.apply(obj);
+    new SwaggerHttp().execute(obj);
+  }
+};
+
+SwaggerResource.prototype.help = function (dontPrint) {
+  var i;
+  var output = 'operations for the "' + this.name + '" tag';
+  for(i = 0; i < this.operationsArray.length; i++) {
+    var api = this.operationsArray[i];
+    output += '\n  * ' + api.nickname + ': ' + api.description;
+  }
+  if(dontPrint)
+    return output;
+  else {
+    log(output);
+    return output;
+  }
+};
+
+SwaggerResource.prototype.getAbsoluteBasePath = function (relativeBasePath) {
+  var pos, url;
+  url = this.api.basePath;
+  pos = url.lastIndexOf(relativeBasePath);
+  var parts = url.split('/');
+  var rootUrl = parts[0] + '//' + parts[2];
+
+  if (relativeBasePath.indexOf('http') === 0)
+    return relativeBasePath;
+  if (relativeBasePath === '/')
+    return rootUrl;
+  if (relativeBasePath.substring(0, 1) == '/') {
+    // use root + relative
+    return rootUrl + relativeBasePath;
+  }
+  else {
+    pos = this.basePath.lastIndexOf('/');
+    var base = this.basePath.substring(0, pos);
+    if (base.substring(base.length - 1) == '/')
+      return base + relativeBasePath;
+    else
+      return base + '/' + relativeBasePath;
+  }
+};
+
+SwaggerResource.prototype.addApiDeclaration = function (response) {
+  if (typeof response.produces === 'string')
+    this.produces = response.produces;
+  if (typeof response.consumes === 'string')
+    this.consumes = response.consumes;
+  if ((typeof response.basePath === 'string') && response.basePath.replace(/\s/g, '').length > 0)
+    this.basePath = response.basePath.indexOf('http') === -1 ? this.getAbsoluteBasePath(response.basePath) : response.basePath;
+  this.resourcePath = response.resourcePath;
+  this.addModels(response.models);
+  if (response.apis) {
+    for (var i = 0 ; i < response.apis.length; i++) {
+      var endpoint = response.apis[i];
+      this.addOperations(endpoint.path, endpoint.operations, response.consumes, response.produces);
+    }
+  }
+  this.api[this.name] = this;
+  this.ready = true;
+  if(this.api.resourceCount === this.api.expectedResourceCount)
+    this.api.finish();
+  return this;
+};
+
+SwaggerResource.prototype.addModels = function (models) {
+  if (typeof models === 'object') {
+    var modelName;
+    for (modelName in models) {
+      if (typeof this.models[modelName] === 'undefined') {
+        var swaggerModel = new SwaggerModel(modelName, models[modelName]);
+        this.modelsArray.push(swaggerModel);
+        this.models[modelName] = swaggerModel;
+        this.rawModels[modelName] = models[modelName];
+      }
+    }
+    var output = [];
+    for (var i = 0; i < this.modelsArray.length; i++) {
+      var model = this.modelsArray[i];
+      output.push(model.setReferencedModels(this.models));
+    }
+    return output;
+  }
+};
+
+SwaggerResource.prototype.addOperations = function (resource_path, ops, consumes, produces) {
+  if (ops) {
+    var output = [];
+    for (var i = 0; i < ops.length; i++) {
+      var o = ops[i];
+      consumes = this.consumes;
+      produces = this.produces;
+      if (typeof o.consumes !== 'undefined')
+        consumes = o.consumes;
+      else
+        consumes = this.consumes;
+
+      if (typeof o.produces !== 'undefined')
+        produces = o.produces;
+      else
+        produces = this.produces;
+      var type = (o.type || o.responseClass);
+
+      if (type === 'array') {
+        ref = null;
+        if (o.items)
+          ref = o.items.type || o.items.$ref;
+        type = 'array[' + ref + ']';
+      }
+      var responseMessages = o.responseMessages;
+      var method = o.method;
+      if (o.httpMethod) {
+        method = o.httpMethod;
+      }
+      if (o.supportedContentTypes) {
+        consumes = o.supportedContentTypes;
+      }
+      if (o.errorResponses) {
+        responseMessages = o.errorResponses;
+        for (var j = 0; j < responseMessages.length; j++) {
+          r = responseMessages[j];
+          r.message = r.reason;
+          r.reason = null;
+        }
+      }
+      o.nickname = this.sanitize(o.nickname);
+      var op = new SwaggerOperation(o.nickname,
+          resource_path,
+          method,
+          o.parameters,
+          o.summary,
+          o.notes,
+          type,
+          responseMessages, 
+          this, 
+          consumes, 
+          produces, 
+          o.authorizations, 
+          o.deprecated);
+
+      this.operations[op.nickname] = op;
+      output.push(this.operationsArray.push(op));
+    }
+    return output;
+  }
+};
+
+SwaggerResource.prototype.sanitize = function (nickname) {
+  var op;
+  op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|.\/?,\\'""-]/g, '_');
+  op = op.replace(/((_){2,})/g, '_');
+  op = op.replace(/^(_)*/g, '');
+  op = op.replace(/([_])*$/g, '');
+  return op;
+};
+
+var SwaggerModel = function (modelName, obj) {
+  this.name = typeof obj.id !== 'undefined' ? obj.id : modelName;
+  this.properties = [];
+  var propertyName;
+  for (propertyName in obj.properties) {
+    if (obj.required) {
+      var value;
+      for (value in obj.required) {
+        if (propertyName === obj.required[value]) {
+          obj.properties[propertyName].required = true;
+        }
+      }
+    }
+    var prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName], this);
+    this.properties.push(prop);
+  }
+};
+
+SwaggerModel.prototype.setReferencedModels = function (allModels) {
+  var results = [];
+  for (var i = 0; i < this.properties.length; i++) {
+    var property = this.properties[i];
+    var type = property.type || property.dataType;
+    if (allModels[type])
+      results.push(property.refModel = allModels[type]);
+    else if ((property.refDataType) && (allModels[property.refDataType]))
+      results.push(property.refModel = allModels[property.refDataType]);
+    else
+      results.push(void 0);
+  }
+  return results;
+};
+
+SwaggerModel.prototype.getMockSignature = function (modelsToIgnore) {
+  var i, prop, propertiesStr = [];
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    propertiesStr.push(prop.toString());
+  }
+
+  var strong = '<span class="strong">';
+  var strongClose = '</span>';
+  var classOpen = strong + this.name + ' {' + strongClose;
+  var classClose = strong + '}' + strongClose;
+  var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
+  if (!modelsToIgnore)
+    modelsToIgnore = [];
+  modelsToIgnore.push(this.name);
+
+  for (i = 0; i < this.properties.length; i++) {
+    prop = this.properties[i];
+    if ((prop.refModel) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
+      returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
+    }
+  }
+  return returnVal;
+};
+
+SwaggerModel.prototype.createJSONSample = function (modelsToIgnore) {
+  if (sampleModels[this.name]) {
+    return sampleModels[this.name];
+  }
+  else {
+    var result = {};
+    modelsToIgnore = (modelsToIgnore || []);
+    modelsToIgnore.push(this.name);
+    for (var i = 0; i < this.properties.length; i++) {
+      var prop = this.properties[i];
+      result[prop.name] = prop.getSampleValue(modelsToIgnore);
+    }
+    modelsToIgnore.pop(this.name);
+    return result;
+  }
+};
+
+var SwaggerModelProperty = function (name, obj, model) {
+  this.name = name;
+  this.dataType = obj.type || obj.dataType || obj.$ref;
+  this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
+  this.descr = obj.description;
+  this.required = obj.required;
+  this.defaultValue = applyModelPropertyMacro(obj, model);
+  if (obj.items) {
+    if (obj.items.type) {
+      this.refDataType = obj.items.type;
+    }
+    if (obj.items.$ref) {
+      this.refDataType = obj.items.$ref;
+    }
+  }
+  this.dataTypeWithRef = this.refDataType ? (this.dataType + '[' + this.refDataType + ']') : this.dataType;
+  if (obj.allowableValues) {
+    this.valueType = obj.allowableValues.valueType;
+    this.values = obj.allowableValues.values;
+    if (this.values) {
+      this.valuesString = '\'' + this.values.join('\' or \'') + '\'';
+    }
+  }
+  if (obj['enum']) {
+    this.valueType = 'string';
+    this.values = obj['enum'];
+    if (this.values) {
+      this.valueString = '\'' + this.values.join('\' or \'') + '\'';
+    }
+  }
+};
+
+SwaggerModelProperty.prototype.getSampleValue = function (modelsToIgnore) {
+  var result;
+  if ((this.refModel) && (modelsToIgnore.indexOf(this.refModel.name) === -1)) {
+    result = this.refModel.createJSONSample(modelsToIgnore);
+  } else {
+    if (this.isCollection) {
+      result = this.toSampleValue(this.refDataType);
+    } else {
+      result = this.toSampleValue(this.dataType);
+    }
+  }
+  if (this.isCollection) {
+    return [result];
+  } else {
+    return result;
+  }
+};
+
+SwaggerModelProperty.prototype.toSampleValue = function (value) {
+  var result;
+  if ((typeof this.defaultValue !== 'undefined') && this.defaultValue) {
+    result = this.defaultValue;
+  } else if (value === 'integer') {
+    result = 0;
+  } else if (value === 'boolean') {
+    result = false;
+  } else if (value === 'double' || value === 'number') {
+    result = 0.0;
+  } else if (value === 'string') {
+    result = '';
+  } else {
+    result = value;
+  }
+  return result;
+};
+
+SwaggerModelProperty.prototype.toString = function () {
+  var req = this.required ? 'propReq' : 'propOpt';
+  var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
+  if (!this.required) {
+    str += ', <span class="propOptKey">optional</span>';
+  }
+  str += ')';
+  if (this.values) {
+    str += ' = <span class="propVals">[\'' + this.values.join('\' or \'') + '\']</span>';
+  }
+  if (this.descr) {
+    str += ': <span class="propDesc">' + this.descr + '</span>';
+  }
+  return str;
+};
+
+var SwaggerOperation = function (nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations, deprecated) {
+  var _this = this;
+
+  var errors = [];
+  this.nickname = (nickname || errors.push('SwaggerOperations must have a nickname.'));
+  this.path = (path || errors.push('SwaggerOperation ' + nickname + ' is missing path.'));
+  this.method = (method || errors.push('SwaggerOperation ' + nickname + ' is missing method.'));
+  this.parameters = parameters ? parameters : [];
+  this.summary = summary;
+  this.notes = notes;
+  this.type = type;
+  this.responseMessages = (responseMessages || []);
+  this.resource = (resource || errors.push('Resource is required'));
+  this.consumes = consumes;
+  this.produces = produces;
+  this.authorizations = typeof authorizations !== 'undefined' ? authorizations : resource.authorizations;
+  this.deprecated = deprecated;
+  this['do'] = __bind(this['do'], this);
+
+
+  if(typeof this.deprecated === 'string') {
+    switch(this.deprecated.toLowerCase()) {
+      case 'true': case 'yes': case '1': {
+        this.deprecated = true;
+        break;
+      }
+      case 'false': case 'no': case '0': case null: {
+        this.deprecated = false;
+        break;
+      }
+      default: this.deprecated = Boolean(this.deprecated);
+    }
+  }
+
+  if (errors.length > 0) {
+    console.error('SwaggerOperation errors', errors, arguments);
+    this.resource.api.fail(errors);
+  }
+
+  this.path = this.path.replace('{format}', 'json');
+  this.method = this.method.toLowerCase();
+  this.isGetMethod = this.method === 'get';
+
+  var i, j, v;
+  this.resourceName = this.resource.name;
+  if (typeof this.type !== 'undefined' && this.type === 'void')
+    this.type = null;
+  else {
+    this.responseClassSignature = this.getSignature(this.type, this.resource.models);
+    this.responseSampleJSON = this.getSampleJSON(this.type, this.resource.models);
+  }
+
+  for (i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    // might take this away
+    param.name = param.name || param.type || param.dataType;
+    // for 1.1 compatibility
+    type = param.type || param.dataType;
+    if (type === 'array') {
+      type = 'array[' + (param.items.$ref ? param.items.$ref : param.items.type) + ']';
+    }
+    param.type = type;
+
+    if (type && type.toLowerCase() === 'boolean') {
+      param.allowableValues = {};
+      param.allowableValues.values = ['true', 'false'];
+    }
+    param.signature = this.getSignature(type, this.resource.models);
+    param.sampleJSON = this.getSampleJSON(type, this.resource.models);
+
+    var enumValue = param['enum'];
+    if (typeof enumValue !== 'undefined') {
+      param.isList = true;
+      param.allowableValues = {};
+      param.allowableValues.descriptiveValues = [];
+
+      for (j = 0; j < enumValue.length; j++) {
+        v = enumValue[j];
+        if (param.defaultValue) {
+          param.allowableValues.descriptiveValues.push({
+            value: String(v),
+            isDefault: (v === param.defaultValue)
+          });
+        }
+        else {
+          param.allowableValues.descriptiveValues.push({
+            value: String(v),
+            isDefault: false
+          });
+        }
+      }
+    }
+    else if (param.allowableValues) {
+      if (param.allowableValues.valueType === 'RANGE')
+        param.isRange = true;
+      else
+        param.isList = true;
+      if (param.allowableValues) {
+        param.allowableValues.descriptiveValues = [];
+        if (param.allowableValues.values) {
+          for (j = 0; j < param.allowableValues.values.length; j++) {
+            v = param.allowableValues.values[j];
+            if (param.defaultValue !== null) {
+              param.allowableValues.descriptiveValues.push({
+                value: String(v),
+                isDefault: (v === param.defaultValue)
+              });
+            }
+            else {
+              param.allowableValues.descriptiveValues.push({
+                value: String(v),
+                isDefault: false
+              });
+            }
+          }
+        }
+      }
+    }
+    param.defaultValue = applyParameterMacro(this, param);
+  }
+  var defaultSuccessCallback = this.resource.api.defaultSuccessCallback || null;
+  var defaultErrorCallback = this.resource.api.defaultErrorCallback || null;
+
+  this.resource[this.nickname] = function (args, opts, callback, error) {
+    var arg1, arg2, arg3, arg4;
+    if(typeof args === 'function') {  // right shift 3
+      arg1 = {}; arg2 = {}; arg3 = args; arg4 = opts;
+    }
+    else if(typeof args === 'object' && typeof opts === 'function') { // right shift 2
+      arg1 = args; arg2 = {}; arg3 = opts; arg4 = callback;
+    }
+    else {
+      arg1 = args; arg2 = opts; arg3 = callback; arg4 = error;
+    }
+    return _this['do'](arg1 || {}, arg2 || {}, arg3 || defaultSuccessCallback, arg4 || defaultErrorCallback);
+  };
+
+  this.resource[this.nickname].help = function (dontPrint) {
+    return _this.help(dontPrint);
+  };
+  this.resource[this.nickname].asCurl = function (args) {
+    return _this.asCurl(args);
+  };
+};
+
+SwaggerOperation.prototype.isListType = function (type) {
+  if (type && type.indexOf('[') >= 0) {
+    return type.substring(type.indexOf('[') + 1, type.indexOf(']'));
+  } else {
+    return void 0;
+  }
+};
+
+SwaggerOperation.prototype.getSignature = function (type, models) {
+  var isPrimitive, listType;
+  listType = this.isListType(type);
+  isPrimitive = ((typeof listType !== 'undefined') && models[listType]) || (typeof models[type] !== 'undefined') ? false : true;
+  if (isPrimitive) {
+    return type;
+  } else {
+    if (typeof listType !== 'undefined') {
+      return models[listType].getMockSignature();
+    } else {
+      return models[type].getMockSignature();
+    }
+  }
+};
+
+SwaggerOperation.prototype.getSampleJSON = function (type, models) {
+  var isPrimitive, listType, val;
+  listType = this.isListType(type);
+  isPrimitive = ((typeof listType !== 'undefined') && models[listType]) || (typeof models[type] !== 'undefined') ? false : true;
+  val = isPrimitive ? void 0 : (listType ? models[listType].createJSONSample() : models[type].createJSONSample());
+  if (val) {
+    val = listType ? [val] : val;
+    if (typeof val == 'string')
+      return val;
+    else if (typeof val === 'object') {
+      var t = val;
+      if (val instanceof Array && val.length > 0) {
+        t = val[0];
+      }
+      if (t.nodeName) {
+        var xmlString = new XMLSerializer().serializeToString(t);
+        return this.formatXml(xmlString);
+      }
+      else
+        return JSON.stringify(val, null, 2);
+    }
+    else
+      return val;
+  }
+};
+
+SwaggerOperation.prototype['do'] = function (args, opts, callback, error) {
+  var key, param, params, possibleParams = [], req, value;
+
+  if (typeof error !== 'function') {
+    error = function (xhr, textStatus, error) {
+      return log(xhr, textStatus, error);
+    };
+  }
+
+  if (typeof callback !== 'function') {
+    callback = function (response) {
+      var content;
+      content = null;
+      if (response !== null) {
+        content = response.data;
+      } else {
+        content = 'no data';
+      }
+      return log('default callback: ' + content);
+    };
+  }
+
+  params = {};
+  params.headers = [];
+  if (args.headers) {
+    params.headers = args.headers;
+    delete args.headers;
+  }
+  // allow override from the opts
+  if(opts && opts.responseContentType) {
+    params.headers['Content-Type'] = opts.responseContentType;
+  }
+  if(opts && opts.requestContentType) {
+    params.headers.Accept = opts.requestContentType;
+  }
+
+  for (var i = 0; i < this.parameters.length; i++) {
+    param = this.parameters[i];
+    if (param.paramType === 'header') {
+      if (typeof args[param.name] !== 'undefined')
+        params.headers[param.name] = args[param.name];
+    }
+    else if (param.paramType === 'form' || param.paramType.toLowerCase() === 'file')
+      possibleParams.push(param);
+    else if (param.paramType === 'body' && param.name !== 'body' && typeof args[param.name] !== 'undefined') {
+      if (args.body) {
+        throw new Error('Saw two body params in an API listing; expecting a max of one.');
+      }
+      args.body = args[param.name];
+    }
+  }
+
+  if (typeof args.body !== 'undefined') {
+    params.body = args.body;
+    delete args.body;
+  }
+
+  if (possibleParams) {
+    for (key in possibleParams) {
+      value = possibleParams[key];
+      if (args[value.name]) {
+        params[value.name] = args[value.name];
+      }
+    }
+  }
+
+  req = new SwaggerRequest(this.method, this.urlify(args), params, opts, callback, error, this);
+  if (opts.mock) {
+    return req;
+  } else {
+    return true;
+  }
+};
+
+SwaggerOperation.prototype.pathJson = function () {
+  return this.path.replace('{format}', 'json');
+};
+
+SwaggerOperation.prototype.pathXml = function () {
+  return this.path.replace('{format}', 'xml');
+};
+
+SwaggerOperation.prototype.encodePathParam = function (pathParam) {
+  var encParts, part, parts, _i, _len;
+  pathParam = pathParam.toString();
+  if (pathParam.indexOf('/') === -1) {
+    return encodeURIComponent(pathParam);
+  } else {
+    parts = pathParam.split('/');
+    encParts = [];
+    for (_i = 0, _len = parts.length; _i < _len; _i++) {
+      part = parts[_i];
+      encParts.push(encodeURIComponent(part));
+    }
+    return encParts.join('/');
+  }
+};
+
+SwaggerOperation.prototype.urlify = function (args) {
+  var i, j, param, url;
+  // ensure no double slashing...
+  if(this.resource.basePath.length > 1 && this.resource.basePath.slice(-1) === '/' && this.pathJson().charAt(0) === '/')
+    url = this.resource.basePath + this.pathJson().substring(1);
+  else
+    url = this.resource.basePath + this.pathJson();
+  var params = this.parameters;
+  for (i = 0; i < params.length; i++) {
+    param = params[i];
+    if (param.paramType === 'path') {
+      if (typeof args[param.name] !== 'undefined') {
+        // apply path params and remove from args
+        var reg = new RegExp('\\{\\s*?' + param.name + '[^\\{\\}\\/]*(?:\\{.*?\\}[^\\{\\}\\/]*)*\\}(?=(\\/?|$))', 'gi');
+        url = url.replace(reg, this.encodePathParam(args[param.name]));
+        delete args[param.name];
+      }
+      else
+        throw '' + param.name + ' is a required path param.';
+    }
+  }
+
+  var queryParams = '';
+  for (i = 0; i < params.length; i++) {
+    param = params[i];
+    if(param.paramType === 'query') {
+      if (queryParams !== '')
+        queryParams += '&';    
+      if (Array.isArray(param)) {
+        var output = '';   
+        for(j = 0; j < param.length; j++) {    
+          if(j > 0)    
+            output += ',';   
+          output += encodeURIComponent(param[j]);    
+        }    
+        queryParams += encodeURIComponent(param.name) + '=' + output;    
+      }
+      else {
+        if (typeof args[param.name] !== 'undefined') {
+          queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
+        } else {
+          if (param.required)
+            throw '' + param.name + ' is a required query param.';
+        }
+      }
+    }
+  }
+  if ((queryParams) && queryParams.length > 0)
+    url += '?' + queryParams;
+  return url;
+};
+
+SwaggerOperation.prototype.supportHeaderParams = function () {
+  return this.resource.api.supportHeaderParams;
+};
+
+SwaggerOperation.prototype.supportedSubmitMethods = function () {
+  return this.resource.api.supportedSubmitMethods;
+};
+
+SwaggerOperation.prototype.getQueryParams = function (args) {
+  return this.getMatchingParams(['query'], args);
+};
+
+SwaggerOperation.prototype.getHeaderParams = function (args) {
+  return this.getMatchingParams(['header'], args);
+};
+
+SwaggerOperation.prototype.getMatchingParams = function (paramTypes, args) {
+  var matchingParams = {};
+  var params = this.parameters;
+  for (var i = 0; i < params.length; i++) {
+    param = params[i];
+    if (args && args[param.name])
+      matchingParams[param.name] = args[param.name];
+  }
+  var headers = this.resource.api.headers;
+  var name;
+  for (name in headers) {
+    var value = headers[name];
+    matchingParams[name] = value;
+  }
+  return matchingParams;
+};
+
+SwaggerOperation.prototype.help = function (dontPrint) {
+  var msg = this.nickname + ': ' + this.summary;
+  var params = this.parameters;
+  for (var i = 0; i < params.length; i++) {
+    var param = params[i];
+    msg += '\n* ' + param.name + (param.required ? ' (required)' : '') + " - " + param.description;
+  }
+  if(dontPrint)
+    return msg;
+  else {
+    console.log(msg);
+    return msg;
+  }
+};
+
+SwaggerOperation.prototype.asCurl = function (args) {
+  var results = [];
+  var i;
+
+  var headers = SwaggerRequest.prototype.setHeaders(args, {}, this);    
+  for(i = 0; i < this.parameters.length; i++) {
+    var param = this.parameters[i];
+    if(param.paramType && param.paramType === 'header' && args[param.name]) {
+      headers[param.name] = args[param.name];
+    }
+  }
+
+  var key;
+  for (key in headers) {
+    results.push('--header "' + key + ': ' + headers[key] + '"');
+  }
+  return 'curl ' + (results.join(' ')) + ' ' + this.urlify(args);
+};
+
+SwaggerOperation.prototype.formatXml = function (xml) {
+  var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
+  reg = /(>)(<)(\/*)/g;
+  wsexp = /[ ]*(.*)[ ]+\n/g;
+  contexp = /(<.+>)(.+\n)/g;
+  xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
+  pad = 0;
+  formatted = '';
+  lines = xml.split('\n');
+  indent = 0;
+  lastType = 'other';
+  transitions = {
+    'single->single': 0,
+    'single->closing': -1,
+    'single->opening': 0,
+    'single->other': 0,
+    'closing->single': 0,
+    'closing->closing': -1,
+    'closing->opening': 0,
+    'closing->other': 0,
+    'opening->single': 1,
+    'opening->closing': 0,
+    'opening->opening': 1,
+    'opening->other': 1,
+    'other->single': 0,
+    'other->closing': -1,
+    'other->opening': 0,
+    'other->other': 0
+  };
+  _fn = function (ln) {
+    var fromTo, j, key, padding, type, types, value;
+    types = {
+      single: Boolean(ln.match(/<.+\/>/)),
+      closing: Boolean(ln.match(/<\/.+>/)),
+      opening: Boolean(ln.match(/<[^!?].*>/))
+    };
+    type = ((function () {
+      var _results;
+      _results = [];
+      for (key in types) {
+        value = types[key];
+        if (value) {
+          _results.push(key);
+        }
+      }
+      return _results;
+    })())[0];
+    type = type === void 0 ? 'other' : type;
+    fromTo = lastType + '->' + type;
+    lastType = type;
+    padding = '';
+    indent += transitions[fromTo];
+    padding = ((function () {
+      var _j, _ref5, _results;
+      _results = [];
+      for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
+        _results.push('  ');
+      }
+      return _results;
+    })()).join('');
+    if (fromTo === 'opening->closing') {
+      formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
+    } else {
+      formatted += padding + ln + '\n';
+    }
+  };
+  for (_i = 0, _len = lines.length; _i < _len; _i++) {
+    ln = lines[_i];
+    _fn(ln);
+  }
+  return formatted;
+};
+
+var SwaggerRequest = function (type, url, params, opts, successCallback, errorCallback, operation, execution) {
+  var _this = this;
+  var errors = [];
+
+  this.useJQuery = (typeof operation.resource.useJQuery !== 'undefined' ? operation.resource.useJQuery : null);
+  this.type = (type || errors.push('SwaggerRequest type is required (get/post/put/delete/patch/options).'));
+  this.url = (url || errors.push('SwaggerRequest url is required.'));
+  this.params = params;
+  this.opts = opts;
+  this.successCallback = (successCallback || errors.push('SwaggerRequest successCallback is required.'));
+  this.errorCallback = (errorCallback || errors.push('SwaggerRequest error callback is required.'));
+  this.operation = (operation || errors.push('SwaggerRequest operation is required.'));
+  this.execution = execution;
+  this.headers = (params.headers || {});
+
+  if (errors.length > 0) {
+    throw errors;
+  }
+
+  this.type = this.type.toUpperCase();
+
+  // set request, response content type headers
+  var headers = this.setHeaders(params, opts, this.operation);
+  var body = params.body;
+
+  // encode the body for form submits
+  if (headers['Content-Type']) {
+    var key, value, values = {}, i;
+    var operationParams = this.operation.parameters;
+    for (i = 0; i < operationParams.length; i++) {
+      var param = operationParams[i];
+      if (param.paramType === 'form')
+        values[param.name] = param;
+    }
+
+    if (headers['Content-Type'].indexOf('application/x-www-form-urlencoded') === 0) {
+      var encoded = '';
+      for (key in values) {
+        value = this.params[key];
+        if (typeof value !== 'undefined') {
+          if (encoded !== '')
+            encoded += '&';
+          encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
+        }
+      }
+      body = encoded;
+    }
+    else if (headers['Content-Type'].indexOf('multipart/form-data') === 0) {
+      // encode the body for form submits
+      var data = '';
+      var boundary = '----SwaggerFormBoundary' + Date.now();
+      for (key in values) {
+        value = this.params[key];
+        if (typeof value !== 'undefined') {
+          data += '--' + boundary + '\n';
+          data += 'Content-Disposition: form-data; name="' + key + '"';
+          data += '\n\n';
+          data += value + '\n';
+        }
+      }
+      data += '--' + boundary + '--\n';
+      headers['Content-Type'] = 'multipart/form-data; boundary=' + boundary;
+      body = data;
+    }
+  }
+
+  var obj;
+  if (!((this.headers) && (this.headers.mock))) {
+    obj = {
+      url: this.url,
+      method: this.type,
+      headers: headers,
+      body: body,
+      useJQuery: this.useJQuery,
+      on: {
+        error: function (response) {
+          return _this.errorCallback(response, _this.opts.parent);
+        },
+        redirect: function (response) {
+          return _this.successCallback(response, _this.opts.parent);
+        },
+        307: function (response) {
+          return _this.successCallback(response, _this.opts.parent);
+        },
+        response: function (response) {
+          return _this.successCallback(response, _this.opts.parent);
+        }
+      }
+    };
+
+    var status = false;
+    if (this.operation.resource && this.operation.resource.api && this.operation.resource.api.clientAuthorizations) {
+      // Get the client authorizations from the resource declaration
+      status = this.operation.resource.api.clientAuthorizations.apply(obj, this.operation.authorizations);
+    } else {
+      // Get the client authorization from the default authorization declaration
+      var e;
+      if (typeof window !== 'undefined') {
+        e = window;
+      } else {
+        e = exports;
+      }
+      status = e.authorizations.apply(obj, this.operation.authorizations);
+    }
+
+    if (!opts.mock) {
+      if (status !== false) {
+        new SwaggerHttp().execute(obj);
+      } else {
+        obj.canceled = true;
+      }
+    } else {
+      return obj;
+    }
+  }
+  return obj;
+};
+
+SwaggerRequest.prototype.setHeaders = function (params, opts, operation) {
+  // default type
+  var accepts = opts.responseContentType || 'application/json';
+  var consumes = opts.requestContentType || 'application/json';
+
+  var allDefinedParams = operation.parameters;
+  var definedFormParams = [];
+  var definedFileParams = [];
+  var body = params.body;
+  var headers = {};
+
+  // get params from the operation and set them in definedFileParams, definedFormParams, headers
+  var i;
+  for (i = 0; i < allDefinedParams.length; i++) {
+    var param = allDefinedParams[i];
+    if (param.paramType === 'form')
+      definedFormParams.push(param);
+    else if (param.paramType === 'file')
+      definedFileParams.push(param);
+    else if (param.paramType === 'header' && this.params.headers) {
+      var key = param.name;
+      var headerValue = this.params.headers[param.name];
+      if (typeof this.params.headers[param.name] !== 'undefined')
+        headers[key] = headerValue;
+    }
+  }
+
+  // if there's a body, need to set the accepts header via requestContentType
+  if (body && (this.type === 'POST' || this.type === 'PUT' || this.type === 'PATCH' || this.type === 'DELETE')) {
+    if (this.opts.requestContentType)
+      consumes = this.opts.requestContentType;
+  } else {
+    // if any form params, content type must be set
+    if (definedFormParams.length > 0) {
+      if (definedFileParams.length > 0)
+        consumes = 'multipart/form-data';
+      else
+        consumes = 'application/x-www-form-urlencoded';
+    }
+    else if (this.type === 'DELETE')
+      body = '{}';
+    else if (this.type != 'DELETE')
+      consumes = null;
+  }
+
+  if (consumes && this.operation.consumes) {
+    if (this.operation.consumes.indexOf(consumes) === -1) {
+      log('server doesn\'t consume ' + consumes + ', try ' + JSON.stringify(this.operation.consumes));
+    }
+  }
+
+  if (this.opts && this.opts.responseContentType) {
+    accepts = this.opts.responseContentType;
+  } else {
+    accepts = 'application/json';
+  }
+  if (accepts && operation.produces) {
+    if (operation.produces.indexOf(accepts) === -1) {
+      log('server can\'t produce ' + accepts);
+    }
+  }
+
+  if ((consumes && body !== '') || (consumes === 'application/x-www-form-urlencoded'))
+    headers['Content-Type'] = consumes;
+  if (accepts)
+    headers.Accept = accepts;
+  return headers;
+};
+
+/**
+ * SwaggerHttp is a wrapper for executing requests
+ */
+var SwaggerHttp = function() {};
+
+SwaggerHttp.prototype.execute = function(obj, opts) {
+  if(obj && (typeof obj.useJQuery === 'boolean'))
+    this.useJQuery = obj.useJQuery;
+  else
+    this.useJQuery = this.isIE8();
+
+  if(obj && typeof obj.body === 'object') {
+    if(obj.body.type && obj.body.type !== 'formData')
+      obj.body = JSON.stringify(obj.body);
+    else {
+      obj.contentType = false;
+      obj.processData = false;
+      // delete obj.cache;
+      delete obj.headers['Content-Type'];
+    }
+  }
+
+  if(this.useJQuery)
+    return new JQueryHttpClient(opts).execute(obj);
+  else
+    return new ShredHttpClient(opts).execute(obj);
+};
+
+SwaggerHttp.prototype.isIE8 = function() {
+  var detectedIE = false;
+  if (typeof navigator !== 'undefined' && navigator.userAgent) {
+    nav = navigator.userAgent.toLowerCase();
+    if (nav.indexOf('msie') !== -1) {
+      var version = parseInt(nav.split('msie')[1]);
+      if (version <= 8) {
+        detectedIE = true;
+      }
+    }
+  }
+  return detectedIE;
+};
+
+/*
+ * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic.
+ * NOTE: when jQuery is available it will export both '$' and 'jQuery' to the global space.
+ *       Since we are using closures here we need to alias it for internal use.
+ */
+var JQueryHttpClient = function(options) {
+  "use strict";
+  if(!jQuery){
+    var jQuery = window.jQuery;
+  }
+};
+
+JQueryHttpClient.prototype.execute = function(obj) {
+  var cb = obj.on;
+  var request = obj;
+
+  obj.type = obj.method;
+  obj.cache = false;
+  delete obj.useJQuery;
+
+  /*
+  obj.beforeSend = function(xhr) {
+    var key, results;
+    if (obj.headers) {
+      results = [];
+      for (key in obj.headers) {
+        if (key.toLowerCase() === "content-type") {
+          results.push(obj.contentType = obj.headers[key]);
+        } else if (key.toLowerCase() === "accept") {
+          results.push(obj.accepts = obj.headers[key]);
+        } else {
+          results.push(xhr.setRequestHeader(key, obj.headers[key]));
+        }
+      }
+      return results;
+    }
+  };*/
+
+  obj.data = obj.body;
+  delete obj.body;
+  obj.complete = function(response, textStatus, opts) {
+    var headers = {},
+      headerArray = response.getAllResponseHeaders().split("\n");
+
+    for(var i = 0; i < headerArray.length; i++) {
+      var toSplit = headerArray[i].trim();
+      if(toSplit.length === 0)
+        continue;
+      var separator = toSplit.indexOf(":");
+      if(separator === -1) {
+        // Name but no value in the header
+        headers[toSplit] = null;
+        continue;
+      }
+      var name = toSplit.substring(0, separator).trim(),
+        value = toSplit.substring(separator + 1).trim();
+      headers[name] = value;
+    }
+
+    var out = {
+      url: request.url,
+      method: request.method,
+      status: response.status,
+      statusText: response.statusText,
+      data: response.responseText,
+      headers: headers
+    };
+
+    var contentType = (headers["content-type"]||headers["Content-Type"]||null);
+    if(contentType) {
+      if(contentType.indexOf("application/json") === 0 || contentType.indexOf("+json") > 0) {
+        try {
+          out.obj = response.responseJSON || JSON.parse(out.data) || {};
+        } catch (ex) {
+          // do not set out.obj
+          log("unable to parse JSON content");
+        }
+      }
+    }
+
+    if(response.status >= 200 && response.status < 300)
+      cb.response(out);
+    else if(response.status === 0 || (response.status >= 400 && response.status < 599))
+      cb.error(out);
+    else
+      return cb.response(out);
+  };
+
+  jQuery.support.cors = true;
+  return jQuery.ajax(obj);
+};
+
+/*
+ * ShredHttpClient is a light-weight, node or browser HTTP client
+ */
+var ShredHttpClient = function(opts) {
+  this.opts = (opts||{});
+  this.isInitialized = false;
+
+  var identity, toString;
+
+  if (typeof window !== 'undefined') {
+    this.Shred = require("./shred");
+    this.content = require("./shred/content");
+  }
+  else
+    this.Shred = require("shred");
+  this.shred = new this.Shred(opts);
+};
+
+ShredHttpClient.prototype.initShred = function () {
+  this.isInitialized = true;
+  this.registerProcessors(this.shred);
+};
+
+ShredHttpClient.prototype.registerProcessors = function(shred) {
+  var identity = function(x) {
+    return x;
+  };
+  var toString = function(x) {
+    return x.toString();
+  };
+
+  if (typeof window !== 'undefined') {
+    this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
+      parser: identity,
+      stringify: toString
+    });
+  } else {
+    this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
+      parser: identity,
+      stringify: toString
+    });
+  }
+};
+
+ShredHttpClient.prototype.execute = function(obj) {
+  if(!this.isInitialized)
+    this.initShred();
+
+  var cb = obj.on, res;
+  var transform = function(response) {
+    var out = {
+      headers: response._headers,
+      url: response.request.url,
+      method: response.request.method,
+      status: response.status,
+      data: response.content.data
+    };
+
+    var headers = response._headers.normalized || response._headers;
+    var contentType = (headers["content-type"]||headers["Content-Type"]||null);
+
+    if(contentType) {
+      if(contentType.indexOf("application/json") === 0 || contentType.indexOf("+json") > 0) {
+        if(response.content.data && response.content.data !== "")
+          try{
+            out.obj = JSON.parse(response.content.data);
+          }
+          catch (e) {
+            // unable to parse
+          }
+        else
+          out.obj = {};
+      }
+    }
+    return out;
+  };
+
+  // Transform an error into a usable response-like object
+  var transformError = function (error) {
+    var out = {
+      // Default to a status of 0 - The client will treat this as a generic permissions sort of error
+      status: 0,
+      data: error.message || error
+    };
+
+    if (error.code) {
+      out.obj = error;
+
+      if (error.code === 'ENOTFOUND' || error.code === 'ECONNREFUSED') {
+        // We can tell the client that this should be treated as a missing resource and not as a permissions thing
+        out.status = 404;
+      }
+    }
+    return out;
+  };
+
+  res = {
+    error: function (response) {
+      if (obj)
+        return cb.error(transform(response));
+    },
+    // Catch the Shred error raised when the request errors as it is made (i.e. No Response is coming)
+    request_error: function (err) {
+      if (obj)
+        return cb.error(transformError(err));
+    },
+    response: function (response) {
+      if (obj) {
+        return cb.response(transform(response));
+      }
+    }
+  };
+  if (obj) {
+    obj.on = res;
+  }
+  return this.shred.request(obj);
+};
+
+
+var e = (typeof window !== 'undefined' ? window : exports);
+
+e.authorizations = authorizations = new SwaggerAuthorizations();
+e.ApiKeyAuthorization = ApiKeyAuthorization;
+e.PasswordAuthorization = PasswordAuthorization;
+e.CookieAuthorization = CookieAuthorization;
+e.SwaggerClient = SwaggerClient;
+e.SwaggerApi = SwaggerClient;
+e.Operation = Operation;
+e.Model = Model;
+e.addModel = addModel;
+e.Resolver = Resolver;
+})();
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/swagger-oauth.js b/src/main/webapp/api-docs/lib/swagger-oauth.js
new file mode 100644
index 00000000..c4e144fa
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/swagger-oauth.js
@@ -0,0 +1,279 @@
+var appName;
+var popupMask;
+var popupDialog;
+var clientId;
+var realm;
+var oauth2KeyName;
+var redirect_uri;
+
+function handleLogin() {
+  var scopes = [];
+
+  var auths = window.swaggerUi.api.authSchemes || window.swaggerUi.api.securityDefinitions;
+  if(auths) {
+    var key;
+    var defs = auths;
+    for(key in defs) {
+      var auth = defs[key];
+      if(auth.type === 'oauth2' && auth.scopes) {
+        oauth2KeyName = key;
+        var scope;
+        if(Array.isArray(auth.scopes)) {
+          // 1.2 support
+          var i;
+          for(i = 0; i < auth.scopes.length; i++) {
+            scopes.push(auth.scopes[i]);
+          }
+        }
+        else {
+          // 2.0 support
+          for(scope in auth.scopes) {
+            scopes.push({scope: scope, description: auth.scopes[scope]});
+          }
+        }
+      }
+    }
+  }
+
+  if(window.swaggerUi.api
+    && window.swaggerUi.api.info) {
+    appName = window.swaggerUi.api.info.title;
+  }
+
+  popupDialog = $(
+    [
+      '<div class="api-popup-dialog">',
+      '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
+      '<div class="api-popup-content">',
+        '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
+          '<a href="#">Learn how to use</a>',
+        '</p>',
+        '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
+        '<ul class="api-popup-scopes">',
+        '</ul>',
+        '<p class="error-msg"></p>',
+        '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
+      '</div>',
+      '</div>'].join(''));
+  $(document.body).append(popupDialog);
+
+  popup = popupDialog.find('ul.api-popup-scopes').empty();
+  for (i = 0; i < scopes.length; i ++) {
+    scope = scopes[i];
+    str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"/>' + '<label for="scope_' + i + '">' + scope.scope;
+    if (scope.description) {
+      str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
+    }
+    str += '</label></li>';
+    popup.append(str);
+  }
+
+  var $win = $(window),
+    dw = $win.width(),
+    dh = $win.height(),
+    st = $win.scrollTop(),
+    dlgWd = popupDialog.outerWidth(),
+    dlgHt = popupDialog.outerHeight(),
+    top = (dh -dlgHt)/2 + st,
+    left = (dw - dlgWd)/2;
+
+  popupDialog.css({
+    top: (top < 0? 0 : top) + 'px',
+    left: (left < 0? 0 : left) + 'px'
+  });
+
+  popupDialog.find('button.api-popup-cancel').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
+    popupDialog.empty();
+    popupDialog = [];
+  });
+
+  $('button.api-popup-authbtn').unbind();
+  popupDialog.find('button.api-popup-authbtn').click(function() {
+    popupMask.hide();
+    popupDialog.hide();
+
+    var authSchemes = window.swaggerUi.api.authSchemes;
+    var host = window.location;
+    var pathname = location.pathname.substring(0, location.pathname.lastIndexOf("/"));
+    var redirectUrl = host.protocol + '//' + host.host + pathname + '/o2c.html';
+    var url = null;
+
+    for (var key in authSchemes) {
+      if (authSchemes.hasOwnProperty(key)) {
+        var flow = authSchemes[key].flow;
+        
+        if(authSchemes[key].type === 'oauth2' && flow && (flow === 'implicit' || flow === 'accessCode')) {
+          var dets = authSchemes[key];
+          url = dets.authorizationUrl + '?response_type=' + (flow === 'implicit' ? 'token' : 'code');
+          window.swaggerUi.tokenName = dets.tokenName || 'access_token';
+          window.swaggerUi.tokenUrl = (flow === 'accessCode' ? dets.tokenUrl : null);          
+        }
+        else if(authSchemes[key].grantTypes) {
+          // 1.2 support
+          var o = authSchemes[key].grantTypes;
+          for(var t in o) {
+            if(o.hasOwnProperty(t) && t === 'implicit') {
+              var dets = o[t];
+              var ep = dets.loginEndpoint.url;
+              url = dets.loginEndpoint.url + '?response_type=token';
+              window.swaggerUi.tokenName = dets.tokenName;
+            }
+            else if (o.hasOwnProperty(t) && t === 'accessCode') {
+              var dets = o[t];
+              var ep = dets.tokenRequestEndpoint.url;
+              url = dets.tokenRequestEndpoint.url + '?response_type=code';
+              window.swaggerUi.tokenName = dets.tokenName;
+            }
+          }
+        }
+      }
+    }
+    var scopes = []
+    var o = $('.api-popup-scopes').find('input:checked');
+
+    for(k =0; k < o.length; k++) {
+      var scope = $(o[k]).attr('scope');
+      
+      if (scopes.indexOf(scope) === -1)
+        scopes.push(scope);
+    }
+
+    window.enabledScopes=scopes;
+
+    redirect_uri = redirectUrl;
+
+    url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
+    url += '&realm=' + encodeURIComponent(realm);
+    url += '&client_id=' + encodeURIComponent(clientId);
+    url += '&scope=' + encodeURIComponent(scopes);
+
+    window.open(url);
+  });
+
+  popupMask.show();
+  popupDialog.show();
+  return;
+}
+
+
+function handleLogout() {
+  for(key in window.authorizations.authz){
+    window.authorizations.remove(key)
+  }
+  window.enabledScopes = null;
+  $('.api-ic.ic-on').addClass('ic-off');
+  $('.api-ic.ic-on').removeClass('ic-on');
+
+  // set the info box
+  $('.api-ic.ic-warning').addClass('ic-error');
+  $('.api-ic.ic-warning').removeClass('ic-warning');
+}
+
+function initOAuth(opts) {
+  var o = (opts||{});
+  var errors = [];
+
+  appName = (o.appName||errors.push('missing appName'));
+  popupMask = (o.popupMask||$('#api-common-mask'));
+  popupDialog = (o.popupDialog||$('.api-popup-dialog'));
+  clientId = (o.clientId||errors.push('missing client id'));
+  realm = (o.realm||errors.push('missing realm'));
+
+  if(errors.length > 0){
+    log('auth unable initialize oauth: ' + errors);
+    return;
+  }
+
+  $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
+  $('.api-ic').unbind();
+  $('.api-ic').click(function(s) {
+    if($(s.target).hasClass('ic-off'))
+      handleLogin();
+    else {
+      handleLogout();
+    }
+    false;
+  });
+}
+
+function processOAuthCode(data) {
+  var params = {
+    'client_id': clientId,
+    'code': data.code,
+    'grant_type': 'authorization_code',
+    'redirect_uri': redirect_uri
+  }
+  $.ajax(
+  {
+    url : window.swaggerUi.tokenUrl,
+    type: "POST",
+    data: params,
+    success:function(data, textStatus, jqXHR) 
+    {
+      onOAuthComplete(data);
+    },
+    error: function(jqXHR, textStatus, errorThrown) 
+    {
+      onOAuthComplete("");
+    }
+  });
+}
+
+function onOAuthComplete(token) {
+  if(token) {
+    if(token.error) {
+      var checkbox = $('input[type=checkbox],.secured')
+      checkbox.each(function(pos){
+        checkbox[pos].checked = false;
+      });
+      alert(token.error);
+    }
+    else {
+      var b = token[window.swaggerUi.tokenName];
+      if(b){
+        // if all roles are satisfied
+        var o = null;
+        $.each($('.auth #api_information_panel'), function(k, v) {
+          var children = v;
+          if(children && children.childNodes) {
+            var requiredScopes = [];
+            $.each((children.childNodes), function (k1, v1){
+              var inner = v1.innerHTML;
+              if(inner)
+                requiredScopes.push(inner);
+            });
+            var diff = [];
+            for(var i=0; i < requiredScopes.length; i++) {
+              var s = requiredScopes[i];
+              if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
+                diff.push(s);
+              }
+            }
+            if(diff.length > 0){
+              o = v.parentNode;
+              $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
+              $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
+
+              // sorry, not all scopes are satisfied
+              $(o).find('.api-ic').addClass('ic-warning');
+              $(o).find('.api-ic').removeClass('ic-error');
+            }
+            else {
+              o = v.parentNode;
+              $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
+              $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
+
+              // all scopes are satisfied
+              $(o).find('.api-ic').addClass('ic-info');
+              $(o).find('.api-ic').removeClass('ic-warning');
+              $(o).find('.api-ic').removeClass('ic-error');          
+            }
+          }
+        });
+        window.authorizations.add(oauth2KeyName, new ApiKeyAuthorization('Authorization', 'Bearer ' + b, 'header'));
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/lib/underscore-min.js b/src/main/webapp/api-docs/lib/underscore-min.js
new file mode 100644
index 00000000..11f1d96f
--- /dev/null
+++ b/src/main/webapp/api-docs/lib/underscore-min.js
@@ -0,0 +1,6 @@
+//     Underscore.js 1.7.0
+//     http://underscorejs.org
+//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Underscore may be freely distributed under the MIT license.
+(function(){var n=this,t=n._,r=Array.prototype,e=Object.prototype,u=Function.prototype,i=r.push,a=r.slice,o=r.concat,l=e.toString,c=e.hasOwnProperty,f=Array.isArray,s=Object.keys,p=u.bind,h=function(n){return n instanceof h?n:this instanceof h?void(this._wrapped=n):new h(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=h),exports._=h):n._=h,h.VERSION="1.7.0";var g=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}};h.iteratee=function(n,t,r){return null==n?h.identity:h.isFunction(n)?g(n,t,r):h.isObject(n)?h.matches(n):h.property(n)},h.each=h.forEach=function(n,t,r){if(null==n)return n;t=g(t,r);var e,u=n.length;if(u===+u)for(e=0;u>e;e++)t(n[e],e,n);else{var i=h.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},h.map=h.collect=function(n,t,r){if(null==n)return[];t=h.iteratee(t,r);for(var e,u=n.length!==+n.length&&h.keys(n),i=(u||n).length,a=Array(i),o=0;i>o;o++)e=u?u[o]:o,a[o]=t(n[e],e,n);return a};var v="Reduce of empty array with no initial value";h.reduce=h.foldl=h.inject=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length,o=0;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[o++]:o++]}for(;a>o;o++)u=i?i[o]:o,r=t(r,n[u],u,n);return r},h.reduceRight=h.foldr=function(n,t,r,e){null==n&&(n=[]),t=g(t,e,4);var u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;if(arguments.length<3){if(!a)throw new TypeError(v);r=n[i?i[--a]:--a]}for(;a--;)u=i?i[a]:a,r=t(r,n[u],u,n);return r},h.find=h.detect=function(n,t,r){var e;return t=h.iteratee(t,r),h.some(n,function(n,r,u){return t(n,r,u)?(e=n,!0):void 0}),e},h.filter=h.select=function(n,t,r){var e=[];return null==n?e:(t=h.iteratee(t,r),h.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e)},h.reject=function(n,t,r){return h.filter(n,h.negate(h.iteratee(t)),r)},h.every=h.all=function(n,t,r){if(null==n)return!0;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,!t(n[u],u,n))return!1;return!0},h.some=h.any=function(n,t,r){if(null==n)return!1;t=h.iteratee(t,r);var e,u,i=n.length!==+n.length&&h.keys(n),a=(i||n).length;for(e=0;a>e;e++)if(u=i?i[e]:e,t(n[u],u,n))return!0;return!1},h.contains=h.include=function(n,t){return null==n?!1:(n.length!==+n.length&&(n=h.values(n)),h.indexOf(n,t)>=0)},h.invoke=function(n,t){var r=a.call(arguments,2),e=h.isFunction(t);return h.map(n,function(n){return(e?t:n[t]).apply(n,r)})},h.pluck=function(n,t){return h.map(n,h.property(t))},h.where=function(n,t){return h.filter(n,h.matches(t))},h.findWhere=function(n,t){return h.find(n,h.matches(t))},h.max=function(n,t,r){var e,u,i=-1/0,a=-1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],e>i&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(u>a||u===-1/0&&i===-1/0)&&(i=n,a=u)});return i},h.min=function(n,t,r){var e,u,i=1/0,a=1/0;if(null==t&&null!=n){n=n.length===+n.length?n:h.values(n);for(var o=0,l=n.length;l>o;o++)e=n[o],i>e&&(i=e)}else t=h.iteratee(t,r),h.each(n,function(n,r,e){u=t(n,r,e),(a>u||1/0===u&&1/0===i)&&(i=n,a=u)});return i},h.shuffle=function(n){for(var t,r=n&&n.length===+n.length?n:h.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=h.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},h.sample=function(n,t,r){return null==t||r?(n.length!==+n.length&&(n=h.values(n)),n[h.random(n.length-1)]):h.shuffle(n).slice(0,Math.max(0,t))},h.sortBy=function(n,t,r){return t=h.iteratee(t,r),h.pluck(h.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var m=function(n){return function(t,r,e){var u={};return r=h.iteratee(r,e),h.each(t,function(e,i){var a=r(e,i,t);n(u,e,a)}),u}};h.groupBy=m(function(n,t,r){h.has(n,r)?n[r].push(t):n[r]=[t]}),h.indexBy=m(function(n,t,r){n[r]=t}),h.countBy=m(function(n,t,r){h.has(n,r)?n[r]++:n[r]=1}),h.sortedIndex=function(n,t,r,e){r=h.iteratee(r,e,1);for(var u=r(t),i=0,a=n.length;a>i;){var o=i+a>>>1;r(n[o])<u?i=o+1:a=o}return i},h.toArray=function(n){return n?h.isArray(n)?a.call(n):n.length===+n.length?h.map(n,h.identity):h.values(n):[]},h.size=function(n){return null==n?0:n.length===+n.length?n.length:h.keys(n).length},h.partition=function(n,t,r){t=h.iteratee(t,r);var e=[],u=[];return h.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},h.first=h.head=h.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:0>t?[]:a.call(n,0,t)},h.initial=function(n,t,r){return a.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},h.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:a.call(n,Math.max(n.length-t,0))},h.rest=h.tail=h.drop=function(n,t,r){return a.call(n,null==t||r?1:t)},h.compact=function(n){return h.filter(n,h.identity)};var y=function(n,t,r,e){if(t&&h.every(n,h.isArray))return o.apply(e,n);for(var u=0,a=n.length;a>u;u++){var l=n[u];h.isArray(l)||h.isArguments(l)?t?i.apply(e,l):y(l,t,r,e):r||e.push(l)}return e};h.flatten=function(n,t){return y(n,t,!1,[])},h.without=function(n){return h.difference(n,a.call(arguments,1))},h.uniq=h.unique=function(n,t,r,e){if(null==n)return[];h.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=h.iteratee(r,e));for(var u=[],i=[],a=0,o=n.length;o>a;a++){var l=n[a];if(t)a&&i===l||u.push(l),i=l;else if(r){var c=r(l,a,n);h.indexOf(i,c)<0&&(i.push(c),u.push(l))}else h.indexOf(u,l)<0&&u.push(l)}return u},h.union=function(){return h.uniq(y(arguments,!0,!0,[]))},h.intersection=function(n){if(null==n)return[];for(var t=[],r=arguments.length,e=0,u=n.length;u>e;e++){var i=n[e];if(!h.contains(t,i)){for(var a=1;r>a&&h.contains(arguments[a],i);a++);a===r&&t.push(i)}}return t},h.difference=function(n){var t=y(a.call(arguments,1),!0,!0,[]);return h.filter(n,function(n){return!h.contains(t,n)})},h.zip=function(n){if(null==n)return[];for(var t=h.max(arguments,"length").length,r=Array(t),e=0;t>e;e++)r[e]=h.pluck(arguments,e);return r},h.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},h.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=h.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}for(;u>e;e++)if(n[e]===t)return e;return-1},h.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=n.length;for("number"==typeof r&&(e=0>r?e+r+1:Math.min(e,r+1));--e>=0;)if(n[e]===t)return e;return-1},h.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=r||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=Array(e),i=0;e>i;i++,n+=r)u[i]=n;return u};var d=function(){};h.bind=function(n,t){var r,e;if(p&&n.bind===p)return p.apply(n,a.call(arguments,1));if(!h.isFunction(n))throw new TypeError("Bind must be called on a function");return r=a.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(a.call(arguments)));d.prototype=n.prototype;var u=new d;d.prototype=null;var i=n.apply(u,r.concat(a.call(arguments)));return h.isObject(i)?i:u}},h.partial=function(n){var t=a.call(arguments,1);return function(){for(var r=0,e=t.slice(),u=0,i=e.length;i>u;u++)e[u]===h&&(e[u]=arguments[r++]);for(;r<arguments.length;)e.push(arguments[r++]);return n.apply(this,e)}},h.bindAll=function(n){var t,r,e=arguments.length;if(1>=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=h.bind(n[r],n);return n},h.memoize=function(n,t){var r=function(e){var u=r.cache,i=t?t.apply(this,arguments):e;return h.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},h.delay=function(n,t){var r=a.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},h.defer=function(n){return h.delay.apply(h,[n,1].concat(a.call(arguments,1)))},h.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var l=function(){o=r.leading===!1?0:h.now(),a=null,i=n.apply(e,u),a||(e=u=null)};return function(){var c=h.now();o||r.leading!==!1||(o=c);var f=t-(c-o);return e=this,u=arguments,0>=f||f>t?(clearTimeout(a),a=null,o=c,i=n.apply(e,u),a||(e=u=null)):a||r.trailing===!1||(a=setTimeout(l,f)),i}},h.debounce=function(n,t,r){var e,u,i,a,o,l=function(){var c=h.now()-a;t>c&&c>0?e=setTimeout(l,t-c):(e=null,r||(o=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,a=h.now();var c=r&&!e;return e||(e=setTimeout(l,t)),c&&(o=n.apply(i,u),i=u=null),o}},h.wrap=function(n,t){return h.partial(t,n)},h.negate=function(n){return function(){return!n.apply(this,arguments)}},h.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},h.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},h.before=function(n,t){var r;return function(){return--n>0?r=t.apply(this,arguments):t=null,r}},h.once=h.partial(h.before,2),h.keys=function(n){if(!h.isObject(n))return[];if(s)return s(n);var t=[];for(var r in n)h.has(n,r)&&t.push(r);return t},h.values=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},h.pairs=function(n){for(var t=h.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},h.invert=function(n){for(var t={},r=h.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},h.functions=h.methods=function(n){var t=[];for(var r in n)h.isFunction(n[r])&&t.push(r);return t.sort()},h.extend=function(n){if(!h.isObject(n))return n;for(var t,r,e=1,u=arguments.length;u>e;e++){t=arguments[e];for(r in t)c.call(t,r)&&(n[r]=t[r])}return n},h.pick=function(n,t,r){var e,u={};if(null==n)return u;if(h.isFunction(t)){t=g(t,r);for(e in n){var i=n[e];t(i,e,n)&&(u[e]=i)}}else{var l=o.apply([],a.call(arguments,1));n=new Object(n);for(var c=0,f=l.length;f>c;c++)e=l[c],e in n&&(u[e]=n[e])}return u},h.omit=function(n,t,r){if(h.isFunction(t))t=h.negate(t);else{var e=h.map(o.apply([],a.call(arguments,1)),String);t=function(n,t){return!h.contains(e,t)}}return h.pick(n,t,r)},h.defaults=function(n){if(!h.isObject(n))return n;for(var t=1,r=arguments.length;r>t;t++){var e=arguments[t];for(var u in e)n[u]===void 0&&(n[u]=e[u])}return n},h.clone=function(n){return h.isObject(n)?h.isArray(n)?n.slice():h.extend({},n):n},h.tap=function(n,t){return t(n),n};var b=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof h&&(n=n._wrapped),t instanceof h&&(t=t._wrapped);var u=l.call(n);if(u!==l.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]===n)return e[i]===t;var a=n.constructor,o=t.constructor;if(a!==o&&"constructor"in n&&"constructor"in t&&!(h.isFunction(a)&&a instanceof a&&h.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c,f;if("[object Array]"===u){if(c=n.length,f=c===t.length)for(;c--&&(f=b(n[c],t[c],r,e)););}else{var s,p=h.keys(n);if(c=p.length,f=h.keys(t).length===c)for(;c--&&(s=p[c],f=h.has(t,s)&&b(n[s],t[s],r,e)););}return r.pop(),e.pop(),f};h.isEqual=function(n,t){return b(n,t,[],[])},h.isEmpty=function(n){if(null==n)return!0;if(h.isArray(n)||h.isString(n)||h.isArguments(n))return 0===n.length;for(var t in n)if(h.has(n,t))return!1;return!0},h.isElement=function(n){return!(!n||1!==n.nodeType)},h.isArray=f||function(n){return"[object Array]"===l.call(n)},h.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},h.each(["Arguments","Function","String","Number","Date","RegExp"],function(n){h["is"+n]=function(t){return l.call(t)==="[object "+n+"]"}}),h.isArguments(arguments)||(h.isArguments=function(n){return h.has(n,"callee")}),"function"!=typeof/./&&(h.isFunction=function(n){return"function"==typeof n||!1}),h.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},h.isNaN=function(n){return h.isNumber(n)&&n!==+n},h.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===l.call(n)},h.isNull=function(n){return null===n},h.isUndefined=function(n){return n===void 0},h.has=function(n,t){return null!=n&&c.call(n,t)},h.noConflict=function(){return n._=t,this},h.identity=function(n){return n},h.constant=function(n){return function(){return n}},h.noop=function(){},h.property=function(n){return function(t){return t[n]}},h.matches=function(n){var t=h.pairs(n),r=t.length;return function(n){if(null==n)return!r;n=new Object(n);for(var e=0;r>e;e++){var u=t[e],i=u[0];if(u[1]!==n[i]||!(i in n))return!1}return!0}},h.times=function(n,t,r){var e=Array(Math.max(0,n));t=g(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},h.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},h.now=Date.now||function(){return(new Date).getTime()};var _={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},w=h.invert(_),j=function(n){var t=function(t){return n[t]},r="(?:"+h.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};h.escape=j(_),h.unescape=j(w),h.result=function(n,t){if(null==n)return void 0;var r=n[t];return h.isFunction(r)?n[t]():r};var x=0;h.uniqueId=function(n){var t=++x+"";return n?n+t:t},h.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var A=/(.)^/,k={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},O=/\\|'|\r|\n|\u2028|\u2029/g,F=function(n){return"\\"+k[n]};h.template=function(n,t,r){!t&&r&&(t=r),t=h.defaults({},t,h.templateSettings);var e=RegExp([(t.escape||A).source,(t.interpolate||A).source,(t.evaluate||A).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,a,o){return i+=n.slice(u,o).replace(O,F),u=o+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":a&&(i+="';\n"+a+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var a=new Function(t.variable||"obj","_",i)}catch(o){throw o.source=i,o}var l=function(n){return a.call(this,n,h)},c=t.variable||"obj";return l.source="function("+c+"){\n"+i+"}",l},h.chain=function(n){var t=h(n);return t._chain=!0,t};var E=function(n){return this._chain?h(n).chain():n};h.mixin=function(n){h.each(h.functions(n),function(t){var r=h[t]=n[t];h.prototype[t]=function(){var n=[this._wrapped];return i.apply(n,arguments),E.call(this,r.apply(h,n))}})},h.mixin(h),h.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=r[n];h.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],E.call(this,r)}}),h.each(["concat","join","slice"],function(n){var t=r[n];h.prototype[n]=function(){return E.call(this,t.apply(this._wrapped,arguments))}}),h.prototype.value=function(){return this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return h})}).call(this);
+//# sourceMappingURL=underscore-min.map
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/o2c.html b/src/main/webapp/api-docs/o2c.html
new file mode 100644
index 00000000..88e8bf11
--- /dev/null
+++ b/src/main/webapp/api-docs/o2c.html
@@ -0,0 +1,20 @@
+<script>
+var qp = null;
+if(window.location.hash) {
+  qp = location.hash.substring(1);
+}
+else {
+  qp = location.search.substring(1);
+}
+qp = qp ? JSON.parse('{"' + qp.replace(/&/g, '","').replace(/=/g,'":"') + '"}',
+  function(key, value) {
+    return key===""?value:decodeURIComponent(value) }
+  ):{}
+
+if (window.opener.swaggerUi.tokenUrl)
+    window.opener.processOAuthCode(qp);
+else
+    window.opener.onOAuthComplete(qp);
+
+window.close();
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/swagger-ui.js b/src/main/webapp/api-docs/swagger-ui.js
new file mode 100644
index 00000000..c85636b7
--- /dev/null
+++ b/src/main/webapp/api-docs/swagger-ui.js
@@ -0,0 +1,2240 @@
+/**
+ * swagger-ui - Swagger UI is a dependency-free collection of HTML, Javascript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API
+ * @version v2.1.8-M1
+ * @link http://swagger.io
+ * @license Apache 2.0
+ */
+$(function() {
+
+	// Helper function for vertically aligning DOM elements
+	// http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
+	$.fn.vAlign = function() {
+		return this.each(function(i){
+		var ah = $(this).height();
+		var ph = $(this).parent().height();
+		var mh = (ph - ah) / 2;
+		$(this).css('margin-top', mh);
+		});
+	};
+
+	$.fn.stretchFormtasticInputWidthToParent = function() {
+		return this.each(function(i){
+		var p_width = $(this).closest("form").innerWidth();
+		var p_padding = parseInt($(this).closest("form").css('padding-left') ,10) + parseInt($(this).closest("form").css('padding-right'), 10);
+		var this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);
+		$(this).css('width', p_width - p_padding - this_padding);
+		});
+	};
+
+	$('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();
+
+	// Vertically center these paragraphs
+	// Parent may need a min-height for this to work..
+	$('ul.downplayed li div.content p').vAlign();
+
+	// When a sandbox form is submitted..
+	$("form.sandbox").submit(function(){
+
+		var error_free = true;
+
+		// Cycle through the forms required inputs
+ 		$(this).find("input.required").each(function() {
+
+			// Remove any existing error styles from the input
+			$(this).removeClass('error');
+
+			// Tack the error style on if the input is empty..
+			if ($(this).val() == '') {
+				$(this).addClass('error');
+				$(this).wiggle();
+				error_free = false;
+			}
+
+		});
+
+		return error_free;
+	});
+
+});
+
+function clippyCopiedCallback(a) {
+  $('#api_key_copied').fadeIn().delay(1000).fadeOut();
+
+  // var b = $("#clippy_tooltip_" + a);
+  // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), setTimeout(function() {
+  //   b.attr("title", "copy to clipboard")
+  // },
+  // 500))
+}
+
+// Logging function that accounts for browsers that don't have window.console
+log = function(){
+  log.history = log.history || [];
+  log.history.push(arguments);
+  if(this.console){
+    console.log( Array.prototype.slice.call(arguments)[0] );
+  }
+};
+
+// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)
+if (Function.prototype.bind && console && typeof console.log == "object") {
+    [
+      "log","info","warn","error","assert","dir","clear","profile","profileEnd"
+    ].forEach(function (method) {
+        console[method] = this.bind(console[method], console);
+    }, Function.prototype.call);
+}
+
+var Docs = {
+
+	shebang: function() {
+
+		// If shebang has an operation nickname in it..
+		// e.g. /docs/#!/words/get_search
+		var fragments = $.param.fragment().split('/');
+		fragments.shift(); // get rid of the bang
+
+		switch (fragments.length) {
+			case 1:
+				// Expand all operations for the resource and scroll to it
+				var dom_id = 'resource_' + fragments[0];
+
+				Docs.expandEndpointListForResource(fragments[0]);
+				$("#"+dom_id).slideto({highlight: false});
+				break;
+			case 2:
+				// Refer to the endpoint DOM element, e.g. #words_get_search
+
+        // Expand Resource
+        Docs.expandEndpointListForResource(fragments[0]);
+        $("#"+dom_id).slideto({highlight: false});
+
+        // Expand operation
+				var li_dom_id = fragments.join('_');
+				var li_content_dom_id = li_dom_id + "_content";
+
+
+				Docs.expandOperation($('#'+li_content_dom_id));
+				$('#'+li_dom_id).slideto({highlight: false});
+				break;
+		}
+
+	},
+
+	toggleEndpointListForResource: function(resource) {
+		var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
+		if (elem.is(':visible')) {
+			Docs.collapseEndpointListForResource(resource);
+		} else {
+			Docs.expandEndpointListForResource(resource);
+		}
+	},
+
+	// Expand resource
+	expandEndpointListForResource: function(resource) {
+		var resource = Docs.escapeResourceName(resource);
+		if (resource == '') {
+			$('.resource ul.endpoints').slideDown();
+			return;
+		}
+		
+		$('li#resource_' + resource).addClass('active');
+
+		var elem = $('li#resource_' + resource + ' ul.endpoints');
+		elem.slideDown();
+	},
+
+	// Collapse resource and mark as explicitly closed
+	collapseEndpointListForResource: function(resource) {
+		var resource = Docs.escapeResourceName(resource);
+		if (resource == '') {
+			$('.resource ul.endpoints').slideUp();
+			return;
+		}
+
+		$('li#resource_' + resource).removeClass('active');
+
+		var elem = $('li#resource_' + resource + ' ul.endpoints');
+		elem.slideUp();
+	},
+
+	expandOperationsForResource: function(resource) {
+		// Make sure the resource container is open..
+		Docs.expandEndpointListForResource(resource);
+		
+		if (resource == '') {
+			$('.resource ul.endpoints li.operation div.content').slideDown();
+			return;
+		}
+
+		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
+			Docs.expandOperation($(this));
+		});
+	},
+
+	collapseOperationsForResource: function(resource) {
+		// Make sure the resource container is open..
+		Docs.expandEndpointListForResource(resource);
+
+		if (resource == '') {
+			$('.resource ul.endpoints li.operation div.content').slideUp();
+			return;
+		}
+
+		$('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
+			Docs.collapseOperation($(this));
+		});
+	},
+
+	escapeResourceName: function(resource) {
+		return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
+	},
+
+	expandOperation: function(elem) {
+		elem.slideDown();
+	},
+
+	collapseOperation: function(elem) {
+		elem.slideUp();
+	}
+};
+
+this["Handlebars"] = this["Handlebars"] || {};
+this["Handlebars"]["templates"] = this["Handlebars"]["templates"] || {};
+this["Handlebars"]["templates"]["apikey_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "<!--div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div-->\n<div class='auth_container' id='apikey_container'>\n  <div class='key_input_container'>\n    <div class='auth_label'>"
+    + escapeExpression(((helper = (helper = helpers.keyName || (depth0 != null ? depth0.keyName : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"keyName","hash":{},"data":data}) : helper)))
+    + "</div>\n    <input placeholder=\"api_key\" class=\"auth_input\" id=\"input_apiKey_entry\" name=\"apiKey\" type=\"text\"/>\n    <div class='auth_submit'><a class='auth_submit_button' id=\"apply_api_key\" href=\"#\">apply</a></div>\n  </div>\n</div>\n\n";
+},"useData":true});
+var SwaggerUi,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+SwaggerUi = (function(_super) {
+  __extends(SwaggerUi, _super);
+
+  function SwaggerUi() {
+    return SwaggerUi.__super__.constructor.apply(this, arguments);
+  }
+
+  SwaggerUi.prototype.dom_id = "swagger_ui";
+
+  SwaggerUi.prototype.options = null;
+
+  SwaggerUi.prototype.api = null;
+
+  SwaggerUi.prototype.headerView = null;
+
+  SwaggerUi.prototype.mainView = null;
+
+  SwaggerUi.prototype.initialize = function(options) {
+    if (options == null) {
+      options = {};
+    }
+    if (options.dom_id != null) {
+      this.dom_id = options.dom_id;
+      delete options.dom_id;
+    }
+    if (options.supportedSubmitMethods == null) {
+      options.supportedSubmitMethods = ['get', 'put', 'post', 'delete', 'head', 'options', 'patch'];
+    }
+    if ($('#' + this.dom_id) == null) {
+      $('body').append('<div id="' + this.dom_id + '"></div>');
+    }
+    this.options = options;
+    this.options.success = (function(_this) {
+      return function() {
+        return _this.render();
+      };
+    })(this);
+    this.options.progress = (function(_this) {
+      return function(d) {
+        return _this.showMessage(d);
+      };
+    })(this);
+    this.options.failure = (function(_this) {
+      return function(d) {
+        return _this.onLoadFailure(d);
+      };
+    })(this);
+    this.headerView = new HeaderView({
+      el: $('#header')
+    });
+    return this.headerView.on('update-swagger-ui', (function(_this) {
+      return function(data) {
+        return _this.updateSwaggerUi(data);
+      };
+    })(this));
+  };
+
+  SwaggerUi.prototype.setOption = function(option, value) {
+    return this.options[option] = value;
+  };
+
+  SwaggerUi.prototype.getOption = function(option) {
+    return this.options[option];
+  };
+
+  SwaggerUi.prototype.updateSwaggerUi = function(data) {
+    this.options.url = data.url;
+    return this.load();
+  };
+
+  SwaggerUi.prototype.load = function() {
+    var url, _ref;
+    if ((_ref = this.mainView) != null) {
+      _ref.clear();
+    }
+    url = this.options.url;
+    if (url && url.indexOf("http") !== 0) {
+      url = this.buildUrl(window.location.href.toString(), url);
+    }
+    this.options.url = url;
+    this.headerView.update(url);
+    return this.api = new SwaggerClient(this.options);
+  };
+
+  SwaggerUi.prototype.collapseAll = function() {
+    return Docs.collapseEndpointListForResource('');
+  };
+
+  SwaggerUi.prototype.listAll = function() {
+    return Docs.collapseOperationsForResource('');
+  };
+
+  SwaggerUi.prototype.expandAll = function() {
+    return Docs.expandOperationsForResource('');
+  };
+
+  SwaggerUi.prototype.render = function() {
+    this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
+    this.mainView = new MainView({
+      model: this.api,
+      el: $('#' + this.dom_id),
+      swaggerOptions: this.options
+    }).render();
+    this.showMessage();
+    switch (this.options.docExpansion) {
+      case "full":
+        this.expandAll();
+        break;
+      case "list":
+        this.listAll();
+    }
+    this.renderGFM();
+    if (this.options.onComplete) {
+      this.options.onComplete(this.api, this);
+    }
+    return setTimeout((function(_this) {
+      return function() {
+        return Docs.shebang();
+      };
+    })(this), 100);
+  };
+
+  SwaggerUi.prototype.buildUrl = function(base, url) {
+    var endOfPath, parts;
+    if (url.indexOf("/") === 0) {
+      parts = base.split("/");
+      base = parts[0] + "//" + parts[2];
+      return base + url;
+    } else {
+      endOfPath = base.length;
+      if (base.indexOf("?") > -1) {
+        endOfPath = Math.min(endOfPath, base.indexOf("?"));
+      }
+      if (base.indexOf("#") > -1) {
+        endOfPath = Math.min(endOfPath, base.indexOf("#"));
+      }
+      base = base.substring(0, endOfPath);
+      if (base.indexOf("/", base.length - 1) !== -1) {
+        return base + url;
+      }
+      return base + "/" + url;
+    }
+  };
+
+  SwaggerUi.prototype.showMessage = function(data) {
+    if (data == null) {
+      data = '';
+    }
+    $('#message-bar').removeClass('message-fail');
+    $('#message-bar').addClass('message-success');
+    return $('#message-bar').html(data);
+  };
+
+  SwaggerUi.prototype.onLoadFailure = function(data) {
+    var val;
+    if (data == null) {
+      data = '';
+    }
+    $('#message-bar').removeClass('message-success');
+    $('#message-bar').addClass('message-fail');
+    val = $('#message-bar').html(data);
+    if (this.options.onFailure != null) {
+      this.options.onFailure(data);
+    }
+    return val;
+  };
+
+  SwaggerUi.prototype.renderGFM = function(data) {
+    if (data == null) {
+      data = '';
+    }
+    return $('.markdown').each(function(index) {
+      return $(this).html(marked($(this).html()));
+    });
+  };
+
+  return SwaggerUi;
+
+})(Backbone.Router);
+
+window.SwaggerUi = SwaggerUi;
+
+this["Handlebars"]["templates"]["basic_auth_button_view"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  return "<div class='auth_button' id='basic_auth_button'><img class='auth_icon' src='images/password.jpeg'></div>\n<div class='auth_container' id='basic_auth_container'>\n  <div class='key_input_container'>\n    <div class=\"auth_label\">Username</div>\n    <input placeholder=\"username\" class=\"auth_input\" id=\"input_username\" name=\"username\" type=\"text\"/>\n    <div class=\"auth_label\">Password</div>\n    <input placeholder=\"password\" class=\"auth_input\" id=\"input_password\" name=\"password\" type=\"password\"/>\n    <div class='auth_submit'><a class='auth_submit_button' id=\"apply_basic_auth\" href=\"#\">apply</a></div>\n  </div>\n</div>\n\n";
+  },"useData":true});
+Handlebars.registerHelper('sanitize', function(html) {
+  html = html.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
+  return new Handlebars.SafeString(html);
+});
+
+this["Handlebars"]["templates"]["content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"2":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, buffer = "	<option value=\"";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\">";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</option>\n";
+},"4":function(depth0,helpers,partials,data) {
+  return "  <option value=\"application/json\">application/json</option>\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "<label for=\"contentType\"></label>\n<select name=\"contentType\">\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</select>\n";
+},"useData":true});
+var ApiKeyButton,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ApiKeyButton = (function(_super) {
+  __extends(ApiKeyButton, _super);
+
+  function ApiKeyButton() {
+    return ApiKeyButton.__super__.constructor.apply(this, arguments);
+  }
+
+  ApiKeyButton.prototype.initialize = function() {};
+
+  ApiKeyButton.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    return this;
+  };
+
+  ApiKeyButton.prototype.events = {
+    "click #apikey_button": "toggleApiKeyContainer",
+    "click #apply_api_key": "applyApiKey"
+  };
+
+  ApiKeyButton.prototype.applyApiKey = function() {
+    var elem;
+    window.authorizations.add(this.model.name, new ApiKeyAuthorization(this.model.name, $("#input_apiKey_entry").val(), this.model["in"]));
+    window.swaggerUi.load();
+    return elem = $('#apikey_container').show();
+  };
+
+  ApiKeyButton.prototype.toggleApiKeyContainer = function() {
+    var elem;
+    if ($('#apikey_container').length > 0) {
+      elem = $('#apikey_container').first();
+      if (elem.is(':visible')) {
+        return elem.hide();
+      } else {
+        $('.auth_container').hide();
+        return elem.show();
+      }
+    }
+  };
+
+  ApiKeyButton.prototype.template = function() {
+    return Handlebars.templates.apikey_button_view;
+  };
+
+  return ApiKeyButton;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["main"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "  <div class=\"info_title\">"
+    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1), depth0))
+    + "</div>\n  <div class=\"info_description markdown\">";
+  stack1 = lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.description : stack1), depth0);
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</div>\n  ";
+  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n  ";
+  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n  ";
+  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), {"name":"if","hash":{},"fn":this.program(6, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n  ";
+  stack1 = helpers['if'].call(depth0, ((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1), {"name":"if","hash":{},"fn":this.program(8, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n  ";
+  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1), {"name":"if","hash":{},"fn":this.program(10, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "\n";
+},"2":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<div class=\"info_tos\"><a href=\""
+    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.termsOfServiceUrl : stack1), depth0))
+    + "\">Terms of service</a></div>";
+},"4":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<div class='info_name'>Created by "
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.name : stack1), depth0))
+    + "</div>";
+},"6":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<div class='info_url'>See more at <a href=\""
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), depth0))
+    + "\">"
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.url : stack1), depth0))
+    + "</a></div>";
+},"8":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<div class='info_email'><a href=\"mailto:"
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.contact : stack1)) != null ? stack1.email : stack1), depth0))
+    + "?subject="
+    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.title : stack1), depth0))
+    + "\">Contact the developer</a></div>";
+},"10":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "<div class='info_license'><a href='"
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.url : stack1), depth0))
+    + "'>"
+    + escapeExpression(lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.license : stack1)) != null ? stack1.name : stack1), depth0))
+    + "</a></div>";
+},"12":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression;
+  return "    , <span style=\"font-variant: small-caps\">api version</span>: "
+    + escapeExpression(lambda(((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1), depth0))
+    + "\n    ";
+},"14":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "    <span style=\"float:right\"><a href=\""
+    + escapeExpression(((helper = (helper = helpers.validatorUrl || (depth0 != null ? depth0.validatorUrl : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"validatorUrl","hash":{},"data":data}) : helper)))
+    + "/debug?url="
+    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
+    + "\"><img id=\"validator\" src=\""
+    + escapeExpression(((helper = (helper = helpers.validatorUrl || (depth0 != null ? depth0.validatorUrl : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"validatorUrl","hash":{},"data":data}) : helper)))
+    + "?url="
+    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
+    + "\"></a>\n    </span>\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div class='info' id='api_info'>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.info : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</div>\n<div class='container' id='resources_container'>\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <br>\n    <br>\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "
+    + escapeExpression(((helper = (helper = helpers.basePath || (depth0 != null ? depth0.basePath : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"basePath","hash":{},"data":data}) : helper)))
+    + "\n";
+  stack1 = helpers['if'].call(depth0, ((stack1 = (depth0 != null ? depth0.info : depth0)) != null ? stack1.version : stack1), {"name":"if","hash":{},"fn":this.program(12, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "]\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.validatorUrl : depth0), {"name":"if","hash":{},"fn":this.program(14, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "    </h4>\n    </div>\n</div>\n";
+},"useData":true});
+var BasicAuthButton,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+BasicAuthButton = (function(_super) {
+  __extends(BasicAuthButton, _super);
+
+  function BasicAuthButton() {
+    return BasicAuthButton.__super__.constructor.apply(this, arguments);
+  }
+
+  BasicAuthButton.prototype.initialize = function() {};
+
+  BasicAuthButton.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    return this;
+  };
+
+  BasicAuthButton.prototype.events = {
+    "click #basic_auth_button": "togglePasswordContainer",
+    "click #apply_basic_auth": "applyPassword"
+  };
+
+  BasicAuthButton.prototype.applyPassword = function() {
+    var elem, password, username;
+    username = $(".input_username").val();
+    password = $(".input_password").val();
+    window.authorizations.add(this.model.type, new PasswordAuthorization("basic", username, password));
+    window.swaggerUi.load();
+    return elem = $('#basic_auth_container').hide();
+  };
+
+  BasicAuthButton.prototype.togglePasswordContainer = function() {
+    var elem;
+    if ($('#basic_auth_container').length > 0) {
+      elem = $('#basic_auth_container').show();
+      if (elem.is(':visible')) {
+        return elem.slideUp();
+      } else {
+        $('.auth_container').hide();
+        return elem.show();
+      }
+    }
+  };
+
+  BasicAuthButton.prototype.template = function() {
+    return Handlebars.templates.basic_auth_button_view;
+  };
+
+  return BasicAuthButton;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["operation"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  return "deprecated";
+  },"3":function(depth0,helpers,partials,data) {
+  return "            <h4>Warning: Deprecated</h4>\n";
+  },"5":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, buffer = "        <h4>Implementation Notes</h4>\n        <p class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</p>\n";
+},"7":function(depth0,helpers,partials,data) {
+  return "        <div class=\"auth\">\n        <span class=\"api-ic ic-error\"></span>";
+  },"9":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "          <div id=\"api_information_panel\" style=\"top: 526px; left: 776px; display: none;\">\n";
+  stack1 = helpers.each.call(depth0, depth0, {"name":"each","hash":{},"fn":this.program(10, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "          </div>\n";
+},"10":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, escapeExpression=this.escapeExpression, buffer = "            <div title='";
+  stack1 = lambda((depth0 != null ? depth0.description : depth0), depth0);
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "'>"
+    + escapeExpression(lambda((depth0 != null ? depth0.scope : depth0), depth0))
+    + "</div>\n";
+},"12":function(depth0,helpers,partials,data) {
+  return "</div>";
+  },"14":function(depth0,helpers,partials,data) {
+  return "        <div class='access'>\n          <span class=\"api-ic ic-off\" title=\"click to authenticate\"></span>\n        </div>\n";
+  },"16":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "          <h4>Response Class (Status "
+    + escapeExpression(((helper = (helper = helpers.successCode || (depth0 != null ? depth0.successCode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"successCode","hash":{},"data":data}) : helper)))
+    + ")</h4>\n          <p><span class=\"model-signature\" /></p>\n          <br/>\n          <div class=\"response-content-type\" />\n";
+},"18":function(depth0,helpers,partials,data) {
+  return "          <h4>Parameters</h4>\n          <table class='fullwidth'>\n          <thead>\n            <tr>\n            <th style=\"width: 100px; max-width: 100px\">Parameter</th>\n            <th style=\"width: 310px; max-width: 310px\">Value</th>\n            <th style=\"width: 200px; max-width: 200px\">Description</th>\n            <th style=\"width: 100px; max-width: 100px\">Parameter Type</th>\n            <th style=\"width: 220px; max-width: 230px\">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class=\"operation-params\">\n\n          </tbody>\n          </table>\n";
+  },"20":function(depth0,helpers,partials,data) {
+  return "          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n";
+  },"22":function(depth0,helpers,partials,data) {
+  return "";
+},"24":function(depth0,helpers,partials,data) {
+  return "          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, blockHelperMissing=helpers.blockHelperMissing, buffer = "\n  <ul class='operations' >\n    <li class='"
+    + escapeExpression(((helper = (helper = helpers.method || (depth0 != null ? depth0.method : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"method","hash":{},"data":data}) : helper)))
+    + " operation' id='"
+    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
+    + "_"
+    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
+    + "'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"
+    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
+    + "/"
+    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
+    + "' class=\"toggleOperation\">"
+    + escapeExpression(((helper = (helper = helpers.method || (depth0 != null ? depth0.method : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"method","hash":{},"data":data}) : helper)))
+    + "</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"
+    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
+    + "/"
+    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
+    + "' class=\"toggleOperation ";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.deprecated : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\">"
+    + escapeExpression(((helper = (helper = helpers.path || (depth0 != null ? depth0.path : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"path","hash":{},"data":data}) : helper)))
+    + "</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"
+    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
+    + "/"
+    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
+    + "' class=\"toggleOperation\">";
+  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"summary","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"
+    + escapeExpression(((helper = (helper = helpers.parentId || (depth0 != null ? depth0.parentId : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"parentId","hash":{},"data":data}) : helper)))
+    + "_"
+    + escapeExpression(((helper = (helper = helpers.nickname || (depth0 != null ? depth0.nickname : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"nickname","hash":{},"data":data}) : helper)))
+    + "_content' style='display:none'>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.deprecated : depth0), {"name":"if","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.description : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(7, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
+  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n";
+  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.oauth : depth0), {"name":"each","hash":{},"fn":this.program(9, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "        ";
+  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(12, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
+  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n";
+  stack1 = ((helper = (helper = helpers.oauth || (depth0 != null ? depth0.oauth : depth0)) != null ? helper : helperMissing),(options={"name":"oauth","hash":{},"fn":this.program(14, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
+  if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.type : depth0), {"name":"if","hash":{},"fn":this.program(16, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.parameters : depth0), {"name":"if","hash":{},"fn":this.program(18, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.responseMessages : depth0), {"name":"if","hash":{},"fn":this.program(20, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isReadOnly : depth0), {"name":"if","hash":{},"fn":this.program(22, data),"inverse":this.program(24, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n";
+},"useData":true});
+var ContentTypeView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ContentTypeView = (function(_super) {
+  __extends(ContentTypeView, _super);
+
+  function ContentTypeView() {
+    return ContentTypeView.__super__.constructor.apply(this, arguments);
+  }
+
+  ContentTypeView.prototype.initialize = function() {};
+
+  ContentTypeView.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    $('label[for=contentType]', $(this.el)).text('Response Content Type');
+    return this;
+  };
+
+  ContentTypeView.prototype.template = function() {
+    return Handlebars.templates.content_type;
+  };
+
+  return ContentTypeView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["param"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"2":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "			<input type=\"file\" name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'/>\n			<div class=\"parameter-content-type\" />\n";
+},"4":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"5":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<textarea class='body-textarea' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
+},"7":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<textarea class='body-textarea' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
+},"9":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(10, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"10":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(11, data),"inverse":this.program(13, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"11":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<input class='parameter' minlength='0' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "' placeholder='' type='text' value='"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "'/>\n";
+},"13":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<input class='parameter' minlength='0' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "' placeholder='' type='text' value=''/>\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'>"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>\n\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n</td>\n<td class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td>\n	<span class=\"model-signature\"></span>\n</td>\n";
+},"useData":true});
+var HeaderView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+HeaderView = (function(_super) {
+  __extends(HeaderView, _super);
+
+  function HeaderView() {
+    return HeaderView.__super__.constructor.apply(this, arguments);
+  }
+
+  HeaderView.prototype.events = {
+    'click #show-pet-store-icon': 'showPetStore',
+    'click #show-wordnik-dev-icon': 'showWordnikDev',
+    'click #explore': 'showCustom',
+    'keyup #input_baseUrl': 'showCustomOnKeyup',
+    'keyup #input_apiKey': 'showCustomOnKeyup'
+  };
+
+  HeaderView.prototype.initialize = function() {};
+
+  HeaderView.prototype.showPetStore = function(e) {
+    return this.trigger('update-swagger-ui', {
+      url: "http://petstore.swagger.wordnik.com/api/api-docs"
+    });
+  };
+
+  HeaderView.prototype.showWordnikDev = function(e) {
+    return this.trigger('update-swagger-ui', {
+      url: "http://api.wordnik.com/v4/resources.json"
+    });
+  };
+
+  HeaderView.prototype.showCustomOnKeyup = function(e) {
+    if (e.keyCode === 13) {
+      return this.showCustom();
+    }
+  };
+
+  HeaderView.prototype.showCustom = function(e) {
+    if (e != null) {
+      e.preventDefault();
+    }
+    return this.trigger('update-swagger-ui', {
+      url: $('#input_baseUrl').val(),
+      apiKey: $('#input_apiKey').val()
+    });
+  };
+
+  HeaderView.prototype.update = function(url, apiKey, trigger) {
+    if (trigger == null) {
+      trigger = false;
+    }
+    $('#input_baseUrl').val(url);
+    if (trigger) {
+      return this.trigger('update-swagger-ui', {
+        url: url
+      });
+    }
+  };
+
+  return HeaderView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["param_list"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  return " multiple='multiple'";
+  },"3":function(depth0,helpers,partials,data) {
+  return "";
+},"5":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(3, data),"inverse":this.program(6, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"6":function(depth0,helpers,partials,data) {
+  var stack1, helperMissing=helpers.helperMissing, buffer = "";
+  stack1 = ((helpers.isArray || (depth0 && depth0.isArray) || helperMissing).call(depth0, depth0, {"name":"isArray","hash":{},"fn":this.program(3, data),"inverse":this.program(7, data),"data":data}));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"7":function(depth0,helpers,partials,data) {
+  return "          <option selected=\"\" value=''></option>\n";
+  },"9":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isDefault : depth0), {"name":"if","hash":{},"fn":this.program(10, data),"inverse":this.program(12, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"10":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "        <option selected=\"\" value='"
+    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
+    + " (default)</option>\n";
+},"12":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "        <option value='"
+    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"value","hash":{},"data":data}) : helper)))
+    + "</option>\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'>"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>\n  <select ";
+  stack1 = ((helpers.isArray || (depth0 && depth0.isArray) || helperMissing).call(depth0, depth0, {"name":"isArray","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data}));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += " class='parameter' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.required : depth0), {"name":"if","hash":{},"fn":this.program(3, data),"inverse":this.program(5, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = helpers.each.call(depth0, ((stack1 = (depth0 != null ? depth0.allowableValues : depth0)) != null ? stack1.descriptiveValues : stack1), {"name":"each","hash":{},"fn":this.program(9, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "  </select>\n</td>\n<td class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>";
+},"useData":true});
+var MainView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+MainView = (function(_super) {
+  var sorters;
+
+  __extends(MainView, _super);
+
+  function MainView() {
+    return MainView.__super__.constructor.apply(this, arguments);
+  }
+
+  sorters = {
+    'alpha': function(a, b) {
+      return a.path.localeCompare(b.path);
+    },
+    'method': function(a, b) {
+      return a.method.localeCompare(b.method);
+    }
+  };
+
+  MainView.prototype.initialize = function(opts) {
+    var auth, key, value, _ref;
+    if (opts == null) {
+      opts = {};
+    }
+    this.model.auths = [];
+    _ref = this.model.securityDefinitions;
+    for (key in _ref) {
+      value = _ref[key];
+      auth = {
+        name: key,
+        type: value.type,
+        value: value
+      };
+      this.model.auths.push(auth);
+    }
+    if (this.model.swaggerVersion === "2.0") {
+      if ("validatorUrl" in opts.swaggerOptions) {
+        return this.model.validatorUrl = opts.swaggerOptions.validatorUrl;
+      } else if (this.model.url.indexOf("localhost") > 0) {
+        return this.model.validatorUrl = null;
+      } else {
+        return this.model.validatorUrl = "http://online.swagger.io/validator";
+      }
+    }
+  };
+
+  MainView.prototype.render = function() {
+    var auth, button, counter, id, name, resource, resources, _i, _len, _ref;
+    if (this.model.securityDefinitions) {
+      for (name in this.model.securityDefinitions) {
+        auth = this.model.securityDefinitions[name];
+        if (auth.type === "apiKey" && $("#apikey_button").length === 0) {
+          button = new ApiKeyButton({
+            model: auth
+          }).render().el;
+          $('.auth_main_container').append(button);
+        }
+        if (auth.type === "basicAuth" && $("#basic_auth_button").length === 0) {
+          button = new BasicAuthButton({
+            model: auth
+          }).render().el;
+          $('.auth_main_container').append(button);
+        }
+      }
+    }
+    $(this.el).html(Handlebars.templates.main(this.model));
+    resources = {};
+    counter = 0;
+    _ref = this.model.apisArray;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      resource = _ref[_i];
+      id = resource.name;
+      while (typeof resources[id] !== 'undefined') {
+        id = id + "_" + counter;
+        counter += 1;
+      }
+      resource.id = id;
+      resources[id] = resource;
+      this.addResource(resource, this.model.auths);
+    }
+    $('.propWrap').hover(function() {
+      return $('.optionsWrapper', $(this)).show();
+    }, function() {
+      return $('.optionsWrapper', $(this)).hide();
+    });
+    return this;
+  };
+
+  MainView.prototype.addResource = function(resource, auths) {
+    var resourceView;
+    resource.id = resource.id.replace(/\s/g, '_');
+    resourceView = new ResourceView({
+      model: resource,
+      tagName: 'li',
+      id: 'resource_' + resource.id,
+      className: 'resource',
+      auths: auths,
+      swaggerOptions: this.options.swaggerOptions
+    });
+    return $('#resources').append(resourceView.render().el);
+  };
+
+  MainView.prototype.clear = function() {
+    return $(this.el).html('');
+  };
+
+  return MainView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["param_readonly"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "        <textarea class='body-textarea' readonly='readonly' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "</textarea>\n";
+},"3":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.program(6, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"4":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "            "
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "\n";
+},"6":function(depth0,helpers,partials,data) {
+  return "            (empty)\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code'>"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+this["Handlebars"]["templates"]["param_readonly_required"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "</textarea>\n";
+},"3":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(4, data),"inverse":this.program(6, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"4":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "            "
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "\n";
+},"6":function(depth0,helpers,partials,data) {
+  return "            (empty)\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code required'>"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(3, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+var OperationView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+OperationView = (function(_super) {
+  __extends(OperationView, _super);
+
+  function OperationView() {
+    return OperationView.__super__.constructor.apply(this, arguments);
+  }
+
+  OperationView.prototype.invocationUrl = null;
+
+  OperationView.prototype.events = {
+    'submit .sandbox': 'submitOperation',
+    'click .submit': 'submitOperation',
+    'click .response_hider': 'hideResponse',
+    'click .toggleOperation': 'toggleOperationContent',
+    'mouseenter .api-ic': 'mouseEnter',
+    'mouseout .api-ic': 'mouseExit'
+  };
+
+  OperationView.prototype.initialize = function(opts) {
+    if (opts == null) {
+      opts = {};
+    }
+    this.auths = opts.auths;
+    this.parentId = this.model.parentId;
+    this.nickname = this.model.nickname;
+    return this;
+  };
+
+  OperationView.prototype.mouseEnter = function(e) {
+    var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
+    elem = $(this.el).find('.content');
+    x = e.pageX;
+    y = e.pageY;
+    scX = $(window).scrollLeft();
+    scY = $(window).scrollTop();
+    scMaxX = scX + $(window).width();
+    scMaxY = scY + $(window).height();
+    wd = elem.width();
+    hgh = elem.height();
+    if (x + wd > scMaxX) {
+      x = scMaxX - wd;
+    }
+    if (x < scX) {
+      x = scX;
+    }
+    if (y + hgh > scMaxY) {
+      y = scMaxY - hgh;
+    }
+    if (y < scY) {
+      y = scY;
+    }
+    pos = {};
+    pos.top = y;
+    pos.left = x;
+    elem.css(pos);
+    return $(e.currentTarget.parentNode).find('#api_information_panel').show();
+  };
+
+  OperationView.prototype.mouseExit = function(e) {
+    return $(e.currentTarget.parentNode).find('#api_information_panel').hide();
+  };
+
+  OperationView.prototype.render = function() {
+    var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, modelAuths, o, param, ref, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4;
+    isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;
+    if (!isMethodSubmissionSupported) {
+      this.model.isReadOnly = true;
+    }
+    this.model.description = this.model.description || this.model.notes;
+    if (this.model.description) {
+      this.model.description = this.model.description.replace(/(?:\r\n|\r|\n)/g, '<br />');
+    }
+    this.model.oauth = null;
+    modelAuths = this.model.authorizations || this.model.security;
+    if (modelAuths) {
+      if (Array.isArray(modelAuths)) {
+        for (_i = 0, _len = modelAuths.length; _i < _len; _i++) {
+          auths = modelAuths[_i];
+          for (key in auths) {
+            auth = auths[key];
+            for (a in this.auths) {
+              auth = this.auths[a];
+              if (auth.type === 'oauth2') {
+                this.model.oauth = {};
+                this.model.oauth.scopes = [];
+                _ref = auth.value.scopes;
+                for (k in _ref) {
+                  v = _ref[k];
+                  scopeIndex = auths[key].indexOf(k);
+                  if (scopeIndex >= 0) {
+                    o = {
+                      scope: k,
+                      description: v
+                    };
+                    this.model.oauth.scopes.push(o);
+                  }
+                }
+              }
+            }
+          }
+        }
+      } else {
+        for (k in modelAuths) {
+          v = modelAuths[k];
+          if (k === "oauth2") {
+            if (this.model.oauth === null) {
+              this.model.oauth = {};
+            }
+            if (this.model.oauth.scopes === void 0) {
+              this.model.oauth.scopes = [];
+            }
+            for (_j = 0, _len1 = v.length; _j < _len1; _j++) {
+              o = v[_j];
+              this.model.oauth.scopes.push(o);
+            }
+          }
+        }
+      }
+    }
+    if (typeof this.model.responses !== 'undefined') {
+      this.model.responseMessages = [];
+      _ref1 = this.model.responses;
+      for (code in _ref1) {
+        value = _ref1[code];
+        schema = null;
+        schemaObj = this.model.responses[code].schema;
+        if (schemaObj && schemaObj['$ref']) {
+          schema = schemaObj['$ref'];
+          if (schema.indexOf('#/definitions/') === 0) {
+            schema = schema.substring('#/definitions/'.length);
+          }
+        }
+        this.model.responseMessages.push({
+          code: code,
+          message: value.description,
+          responseModel: schema
+        });
+      }
+    }
+    if (typeof this.model.responseMessages === 'undefined') {
+      this.model.responseMessages = [];
+    }
+    signatureModel = null;
+    if (this.model.successResponse) {
+      successResponse = this.model.successResponse;
+      for (key in successResponse) {
+        value = successResponse[key];
+        this.model.successCode = key;
+        if (typeof value === 'object' && typeof value.createJSONSample === 'function') {
+          signatureModel = {
+            sampleJSON: JSON.stringify(value.createJSONSample(), void 0, 2),
+            isParam: false,
+            signature: value.getMockSignature()
+          };
+        }
+      }
+    } else if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {
+      signatureModel = {
+        sampleJSON: this.model.responseSampleJSON,
+        isParam: false,
+        signature: this.model.responseClassSignature
+      };
+    }
+    $(this.el).html(Handlebars.templates.operation(this.model));
+    if (signatureModel) {
+      responseSignatureView = new SignatureView({
+        model: signatureModel,
+        tagName: 'div'
+      });
+      $('.model-signature', $(this.el)).append(responseSignatureView.render().el);
+    } else {
+      this.model.responseClassSignature = 'string';
+      $('.model-signature', $(this.el)).html(this.model.type);
+    }
+    contentTypeModel = {
+      isParam: false
+    };
+    contentTypeModel.consumes = this.model.consumes;
+    contentTypeModel.produces = this.model.produces;
+    _ref2 = this.model.parameters;
+    for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+      param = _ref2[_k];
+      type = param.type || param.dataType || '';
+      if (typeof type === 'undefined') {
+        schema = param.schema;
+        if (schema && schema['$ref']) {
+          ref = schema['$ref'];
+          if (ref.indexOf('#/definitions/') === 0) {
+            type = ref.substring('#/definitions/'.length);
+          } else {
+            type = ref;
+          }
+        }
+      }
+      if (type && type.toLowerCase() === 'file') {
+        if (!contentTypeModel.consumes) {
+          contentTypeModel.consumes = 'multipart/form-data';
+        }
+      }
+      param.type = type;
+    }
+    responseContentTypeView = new ResponseContentTypeView({
+      model: contentTypeModel
+    });
+    $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
+    _ref3 = this.model.parameters;
+    for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+      param = _ref3[_l];
+      this.addParameter(param, contentTypeModel.consumes);
+    }
+    _ref4 = this.model.responseMessages;
+    for (_m = 0, _len4 = _ref4.length; _m < _len4; _m++) {
+      statusCode = _ref4[_m];
+      this.addStatusCode(statusCode);
+    }
+    return this;
+  };
+
+  OperationView.prototype.addParameter = function(param, consumes) {
+    var paramView;
+    param.consumes = consumes;
+    paramView = new ParameterView({
+      model: param,
+      tagName: 'tr',
+      readOnly: this.model.isReadOnly
+    });
+    return $('.operation-params', $(this.el)).append(paramView.render().el);
+  };
+
+  OperationView.prototype.addStatusCode = function(statusCode) {
+    var statusCodeView;
+    statusCodeView = new StatusCodeView({
+      model: statusCode,
+      tagName: 'tr'
+    });
+    return $('.operation-status', $(this.el)).append(statusCodeView.render().el);
+  };
+
+  OperationView.prototype.submitOperation = function(e) {
+    var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2;
+    if (e != null) {
+      e.preventDefault();
+    }
+    form = $('.sandbox', $(this.el));
+    error_free = true;
+    form.find("input.required").each(function() {
+      $(this).removeClass("error");
+      if (jQuery.trim($(this).val()) === "") {
+        $(this).addClass("error");
+        $(this).wiggle({
+          callback: (function(_this) {
+            return function() {
+              return $(_this).focus();
+            };
+          })(this)
+        });
+        return error_free = false;
+      }
+    });
+    form.find("textarea.required").each(function() {
+      $(this).removeClass("error");
+      if (jQuery.trim($(this).val()) === "") {
+        $(this).addClass("error");
+        $(this).wiggle({
+          callback: (function(_this) {
+            return function() {
+              return $(_this).focus();
+            };
+          })(this)
+        });
+        return error_free = false;
+      }
+    });
+    if (error_free) {
+      map = {};
+      opts = {
+        parent: this
+      };
+      isFileUpload = false;
+      _ref = form.find("input");
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        o = _ref[_i];
+        if ((o.value != null) && jQuery.trim(o.value).length > 0) {
+          map[o.name] = o.value;
+        }
+        if (o.type === "file") {
+          map[o.name] = o.files[0];
+          isFileUpload = true;
+        }
+      }
+      _ref1 = form.find("textarea");
+      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+        o = _ref1[_j];
+        if ((o.value != null) && jQuery.trim(o.value).length > 0) {
+          map[o.name] = o.value;
+        }
+      }
+      _ref2 = form.find("select");
+      for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+        o = _ref2[_k];
+        val = this.getSelectedValue(o);
+        if ((val != null) && jQuery.trim(val).length > 0) {
+          map[o.name] = val;
+        }
+      }
+      opts.responseContentType = $("div select[name=responseContentType]", $(this.el)).val();
+      opts.requestContentType = $("div select[name=parameterContentType]", $(this.el)).val();
+      $(".response_throbber", $(this.el)).show();
+      if (isFileUpload) {
+        return this.handleFileUpload(map, form);
+      } else {
+        return this.model["do"](map, opts, this.showCompleteStatus, this.showErrorStatus, this);
+      }
+    }
+  };
+
+  OperationView.prototype.success = function(response, parent) {
+    return parent.showCompleteStatus(response);
+  };
+
+  OperationView.prototype.handleFileUpload = function(map, form) {
+    var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3;
+    _ref = form.serializeArray();
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      o = _ref[_i];
+      if ((o.value != null) && jQuery.trim(o.value).length > 0) {
+        map[o.name] = o.value;
+      }
+    }
+    bodyParam = new FormData();
+    params = 0;
+    _ref1 = this.model.parameters;
+    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+      param = _ref1[_j];
+      if (param.paramType === 'form' || param["in"] === 'formData') {
+        if (param.type.toLowerCase() !== 'file' && map[param.name] !== void 0) {
+          bodyParam.append(param.name, map[param.name]);
+        }
+      }
+    }
+    headerParams = {};
+    _ref2 = this.model.parameters;
+    for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+      param = _ref2[_k];
+      if (param.paramType === 'header') {
+        headerParams[param.name] = map[param.name];
+      }
+    }
+    _ref3 = form.find('input[type~="file"]');
+    for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+      el = _ref3[_l];
+      if (typeof el.files[0] !== 'undefined') {
+        bodyParam.append($(el).attr('name'), el.files[0]);
+        params += 1;
+      }
+    }
+    this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), delete headerParams['Content-Type'], this.model.urlify(map, false)) : this.model.urlify(map, true);
+    $(".request_url", $(this.el)).html("<pre></pre>");
+    $(".request_url pre", $(this.el)).text(this.invocationUrl);
+    obj = {
+      type: this.model.method,
+      url: this.invocationUrl,
+      headers: headerParams,
+      data: bodyParam,
+      dataType: 'json',
+      contentType: false,
+      processData: false,
+      error: (function(_this) {
+        return function(data, textStatus, error) {
+          return _this.showErrorStatus(_this.wrap(data), _this);
+        };
+      })(this),
+      success: (function(_this) {
+        return function(data) {
+          return _this.showResponse(data, _this);
+        };
+      })(this),
+      complete: (function(_this) {
+        return function(data) {
+          return _this.showCompleteStatus(_this.wrap(data), _this);
+        };
+      })(this)
+    };
+    if (window.authorizations) {
+      window.authorizations.apply(obj);
+    }
+    if (params === 0) {
+      obj.data.append("fake", "true");
+    }
+    jQuery.ajax(obj);
+    return false;
+  };
+
+  OperationView.prototype.wrap = function(data) {
+    var h, headerArray, headers, i, o, _i, _len;
+    headers = {};
+    headerArray = data.getAllResponseHeaders().split("\r");
+    for (_i = 0, _len = headerArray.length; _i < _len; _i++) {
+      i = headerArray[_i];
+      h = i.match(/^([^:]*?):(.*)$/);
+      if (!h) {
+        h = [];
+      }
+      h.shift();
+      if (h[0] !== void 0 && h[1] !== void 0) {
+        headers[h[0].trim()] = h[1].trim();
+      }
+    }
+    o = {};
+    o.content = {};
+    o.content.data = data.responseText;
+    o.headers = headers;
+    o.request = {};
+    o.request.url = this.invocationUrl;
+    o.status = data.status;
+    return o;
+  };
+
+  OperationView.prototype.getSelectedValue = function(select) {
+    var opt, options, _i, _len, _ref;
+    if (!select.multiple) {
+      return select.value;
+    } else {
+      options = [];
+      _ref = select.options;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        opt = _ref[_i];
+        if (opt.selected) {
+          options.push(opt.value);
+        }
+      }
+      if (options.length > 0) {
+        return options;
+      } else {
+        return null;
+      }
+    }
+  };
+
+  OperationView.prototype.hideResponse = function(e) {
+    if (e != null) {
+      e.preventDefault();
+    }
+    $(".response", $(this.el)).slideUp();
+    return $(".response_hider", $(this.el)).fadeOut();
+  };
+
+  OperationView.prototype.showResponse = function(response) {
+    var prettyJson;
+    prettyJson = JSON.stringify(response, null, "\t").replace(/\n/g, "<br>");
+    return $(".response_body", $(this.el)).html(escape(prettyJson));
+  };
+
+  OperationView.prototype.showErrorStatus = function(data, parent) {
+    return parent.showStatus(data);
+  };
+
+  OperationView.prototype.showCompleteStatus = function(data, parent) {
+    return parent.showStatus(data);
+  };
+
+  OperationView.prototype.formatXml = function(xml) {
+    var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
+    reg = /(>)(<)(\/*)/g;
+    wsexp = /[ ]*(.*)[ ]+\n/g;
+    contexp = /(<.+>)(.+\n)/g;
+    xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
+    pad = 0;
+    formatted = '';
+    lines = xml.split('\n');
+    indent = 0;
+    lastType = 'other';
+    transitions = {
+      'single->single': 0,
+      'single->closing': -1,
+      'single->opening': 0,
+      'single->other': 0,
+      'closing->single': 0,
+      'closing->closing': -1,
+      'closing->opening': 0,
+      'closing->other': 0,
+      'opening->single': 1,
+      'opening->closing': 0,
+      'opening->opening': 1,
+      'opening->other': 1,
+      'other->single': 0,
+      'other->closing': -1,
+      'other->opening': 0,
+      'other->other': 0
+    };
+    _fn = function(ln) {
+      var fromTo, j, key, padding, type, types, value;
+      types = {
+        single: Boolean(ln.match(/<.+\/>/)),
+        closing: Boolean(ln.match(/<\/.+>/)),
+        opening: Boolean(ln.match(/<[^!?].*>/))
+      };
+      type = ((function() {
+        var _results;
+        _results = [];
+        for (key in types) {
+          value = types[key];
+          if (value) {
+            _results.push(key);
+          }
+        }
+        return _results;
+      })())[0];
+      type = type === void 0 ? 'other' : type;
+      fromTo = lastType + '->' + type;
+      lastType = type;
+      padding = '';
+      indent += transitions[fromTo];
+      padding = ((function() {
+        var _j, _ref, _results;
+        _results = [];
+        for (j = _j = 0, _ref = indent; 0 <= _ref ? _j < _ref : _j > _ref; j = 0 <= _ref ? ++_j : --_j) {
+          _results.push('  ');
+        }
+        return _results;
+      })()).join('');
+      if (fromTo === 'opening->closing') {
+        return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
+      } else {
+        return formatted += padding + ln + '\n';
+      }
+    };
+    for (_i = 0, _len = lines.length; _i < _len; _i++) {
+      ln = lines[_i];
+      _fn(ln);
+    }
+    return formatted;
+  };
+
+  OperationView.prototype.showStatus = function(response) {
+    var code, content, contentType, e, headers, json, opts, pre, response_body, response_body_el, url;
+    if (response.content === void 0) {
+      content = response.data;
+      url = response.url;
+    } else {
+      content = response.content.data;
+      url = response.request.url;
+    }
+    headers = response.headers;
+    contentType = null;
+    if (headers) {
+      contentType = headers["Content-Type"] || headers["content-type"];
+      if (contentType) {
+        contentType = contentType.split(";")[0].trim();
+      }
+    }
+    $(".response_body", $(this.el)).removeClass('json');
+    $(".response_body", $(this.el)).removeClass('xml');
+    if (!content) {
+      code = $('<code />').text("no content");
+      pre = $('<pre class="json" />').append(code);
+    } else if (contentType === "application/json" || /\+json$/.test(contentType)) {
+      json = null;
+      try {
+        json = JSON.stringify(JSON.parse(content), null, "  ");
+      } catch (_error) {
+        e = _error;
+        json = "can't parse JSON.  Raw result:\n\n" + content;
+      }
+      code = $('<code />').text(json);
+      pre = $('<pre class="json" />').append(code);
+    } else if (contentType === "application/xml" || /\+xml$/.test(contentType)) {
+      code = $('<code />').text(this.formatXml(content));
+      pre = $('<pre class="xml" />').append(code);
+    } else if (contentType === "text/html") {
+      code = $('<code />').html(_.escape(content));
+      pre = $('<pre class="xml" />').append(code);
+    } else if (/^image\//.test(contentType)) {
+      pre = $('<img>').attr('src', url);
+    } else {
+      code = $('<code />').text(content);
+      pre = $('<pre class="json" />').append(code);
+    }
+    response_body = pre;
+    $(".request_url", $(this.el)).html("<pre></pre>");
+    $(".request_url pre", $(this.el)).text(url);
+    $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
+    $(".response_body", $(this.el)).html(response_body);
+    $(".response_headers", $(this.el)).html("<pre>" + _.escape(JSON.stringify(response.headers, null, "  ")).replace(/\n/g, "<br>") + "</pre>");
+    $(".response", $(this.el)).slideDown();
+    $(".response_hider", $(this.el)).show();
+    $(".response_throbber", $(this.el)).hide();
+    response_body_el = $('.response_body', $(this.el))[0];
+    opts = this.options.swaggerOptions;
+    if (opts.highlightSizeThreshold && response.data.length > opts.highlightSizeThreshold) {
+      return response_body_el;
+    } else {
+      return hljs.highlightBlock(response_body_el);
+    }
+  };
+
+  OperationView.prototype.toggleOperationContent = function() {
+    var elem;
+    elem = $('#' + Docs.escapeResourceName(this.parentId + "_" + this.nickname + "_content"));
+    if (elem.is(':visible')) {
+      return Docs.collapseOperation(elem);
+    } else {
+      return Docs.expandOperation(elem);
+    }
+  };
+
+  return OperationView;
+
+})(Backbone.View);
+
+var ParameterContentTypeView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ParameterContentTypeView = (function(_super) {
+  __extends(ParameterContentTypeView, _super);
+
+  function ParameterContentTypeView() {
+    return ParameterContentTypeView.__super__.constructor.apply(this, arguments);
+  }
+
+  ParameterContentTypeView.prototype.initialize = function() {};
+
+  ParameterContentTypeView.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    $('label[for=parameterContentType]', $(this.el)).text('Parameter content type:');
+    return this;
+  };
+
+  ParameterContentTypeView.prototype.template = function() {
+    return Handlebars.templates.parameter_content_type;
+  };
+
+  return ParameterContentTypeView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["param_required"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(2, data),"inverse":this.program(4, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"2":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "			<input type=\"file\" name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'/>\n";
+},"4":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(5, data),"inverse":this.program(7, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"5":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<textarea class='body-textarea required' placeholder='(required)' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'>"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "</textarea>\n        <br />\n        <div class=\"parameter-content-type\" />\n";
+},"7":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<textarea class='body-textarea required' placeholder='(required)' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'></textarea>\n				<br />\n				<div class=\"parameter-content-type\" />\n";
+},"9":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isFile : depth0), {"name":"if","hash":{},"fn":this.program(10, data),"inverse":this.program(12, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"10":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "			<input class='parameter' class='required' type='file' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "'/>\n";
+},"12":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0['default'] : depth0), {"name":"if","hash":{},"fn":this.program(13, data),"inverse":this.program(15, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"13":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<input class='parameter required' minlength='1' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "' placeholder='(required)' type='text' value='"
+    + escapeExpression(((helper = (helper = helpers['default'] || (depth0 != null ? depth0['default'] : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"default","hash":{},"data":data}) : helper)))
+    + "'/>\n";
+},"15":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "				<input class='parameter required' minlength='1' name='"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "' placeholder='(required)' type='text' value=''/>\n";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td class='code required'>"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.isBody : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(9, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</td>\n<td>\n	<strong><span class=\"markdown\">";
+  stack1 = ((helper = (helper = helpers.description || (depth0 != null ? depth0.description : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"description","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "</span></strong>\n</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.paramType || (depth0 != null ? depth0.paramType : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"paramType","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td><span class=\"model-signature\"></span></td>\n";
+},"useData":true});
+this["Handlebars"]["templates"]["parameter_content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.consumes : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"2":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, buffer = "  <option value=\"";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\">";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</option>\n";
+},"4":function(depth0,helpers,partials,data) {
+  return "  <option value=\"application/json\">application/json</option>\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "<label for=\"parameterContentType\"></label>\n<select name=\"parameterContentType\">\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.consumes : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</select>\n";
+},"useData":true});
+var ParameterView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ParameterView = (function(_super) {
+  __extends(ParameterView, _super);
+
+  function ParameterView() {
+    return ParameterView.__super__.constructor.apply(this, arguments);
+  }
+
+  ParameterView.prototype.initialize = function() {
+    return Handlebars.registerHelper('isArray', function(param, opts) {
+      if (param.type.toLowerCase() === 'array' || param.allowMultiple) {
+        return opts.fn(this);
+      } else {
+        return opts.inverse(this);
+      }
+    });
+  };
+
+  ParameterView.prototype.render = function() {
+    var contentTypeModel, isParam, parameterContentTypeView, ref, responseContentTypeView, schema, signatureModel, signatureView, template, type;
+    type = this.model.type || this.model.dataType;
+    if (typeof type === 'undefined') {
+      schema = this.model.schema;
+      if (schema && schema['$ref']) {
+        ref = schema['$ref'];
+        if (ref.indexOf('#/definitions/') === 0) {
+          type = ref.substring('#/definitions/'.length);
+        } else {
+          type = ref;
+        }
+      }
+    }
+    this.model.type = type;
+    this.model.paramType = this.model["in"] || this.model.paramType;
+    if (this.model.paramType === 'body' || this.model["in"] === 'body') {
+      this.model.isBody = true;
+    }
+    if (type && type.toLowerCase() === 'file') {
+      this.model.isFile = true;
+    }
+    this.model["default"] = this.model["default"] || this.model.defaultValue;
+    if (this.model.allowableValues) {
+      this.model.isList = true;
+    }
+    template = this.template();
+    $(this.el).html(template(this.model));
+    signatureModel = {
+      sampleJSON: this.model.sampleJSON,
+      isParam: true,
+      signature: this.model.signature
+    };
+    if (this.model.sampleJSON) {
+      signatureView = new SignatureView({
+        model: signatureModel,
+        tagName: 'div'
+      });
+      $('.model-signature', $(this.el)).append(signatureView.render().el);
+    } else {
+      $('.model-signature', $(this.el)).html(this.model.signature);
+    }
+    isParam = false;
+    if (this.model.isBody) {
+      isParam = true;
+    }
+    contentTypeModel = {
+      isParam: isParam
+    };
+    contentTypeModel.consumes = this.model.consumes;
+    if (isParam) {
+      parameterContentTypeView = new ParameterContentTypeView({
+        model: contentTypeModel
+      });
+      $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
+    } else {
+      responseContentTypeView = new ResponseContentTypeView({
+        model: contentTypeModel
+      });
+      $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
+    }
+    return this;
+  };
+
+  ParameterView.prototype.template = function() {
+    if (this.model.isList) {
+      return Handlebars.templates.param_list;
+    } else {
+      if (this.options.readOnly) {
+        if (this.model.required) {
+          return Handlebars.templates.param_readonly_required;
+        } else {
+          return Handlebars.templates.param_readonly;
+        }
+      } else {
+        if (this.model.required) {
+          return Handlebars.templates.param_required;
+        } else {
+          return Handlebars.templates.param;
+        }
+      }
+    }
+  };
+
+  return ParameterView;
+
+})(Backbone.View);
+
+var ResourceView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ResourceView = (function(_super) {
+  __extends(ResourceView, _super);
+
+  function ResourceView() {
+    return ResourceView.__super__.constructor.apply(this, arguments);
+  }
+
+  ResourceView.prototype.initialize = function(opts) {
+    if (opts == null) {
+      opts = {};
+    }
+    this.auths = opts.auths;
+    if ("" === this.model.description) {
+      this.model.description = null;
+    }
+    if (this.model.description != null) {
+      return this.model.summary = this.model.description;
+    }
+  };
+
+  ResourceView.prototype.render = function() {
+    var counter, id, methods, operation, _i, _len, _ref;
+    methods = {};
+    $(this.el).html(Handlebars.templates.resource(this.model));
+    _ref = this.model.operationsArray;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      operation = _ref[_i];
+      counter = 0;
+      id = operation.nickname;
+      while (typeof methods[id] !== 'undefined') {
+        id = id + "_" + counter;
+        counter += 1;
+      }
+      methods[id] = operation;
+      operation.nickname = id;
+      operation.parentId = this.model.id;
+      this.addOperation(operation);
+    }
+    $('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
+    $('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
+    $('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
+    return this;
+  };
+
+  ResourceView.prototype.addOperation = function(operation) {
+    var operationView;
+    operation.number = this.number;
+    operationView = new OperationView({
+      model: operation,
+      tagName: 'li',
+      className: 'endpoint',
+      swaggerOptions: this.options.swaggerOptions,
+      auths: this.auths
+    });
+    $('.endpoints', $(this.el)).append(operationView.render().el);
+    return this.number++;
+  };
+
+  ResourceView.prototype.callDocs = function(fnName, e) {
+    e.preventDefault();
+    return Docs[fnName](e.currentTarget.getAttribute('data-id'));
+  };
+
+  return ResourceView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["resource"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  return " : ";
+  },"3":function(depth0,helpers,partials,data) {
+  var helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+  return "<li>\n      <a href='"
+    + escapeExpression(((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"url","hash":{},"data":data}) : helper)))
+    + "'>Raw</a>\n    </li>";
+},"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, blockHelperMissing=helpers.blockHelperMissing, buffer = "<div class='heading'>\n  <h2>\n    <a href='#!/"
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "' class=\"toggleEndpointList\" data-id=\""
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "\">"
+    + escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"name","hash":{},"data":data}) : helper)))
+    + "</a> ";
+  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(options={"name":"summary","hash":{},"fn":this.program(1, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
+  if (!helpers.summary) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
+  if (stack1 != null) { buffer += stack1; }
+  stack1 = ((helper = (helper = helpers.summary || (depth0 != null ? depth0.summary : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"summary","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "' id='endpointListTogger_"
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "' class=\"toggleEndpointList\" data-id=\""
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "\">Show/Hide</a>\n    </li>\n    <li>\n      <a href='#' class=\"collapseResource\" data-id=\""
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href='#' class=\"expandResource\" data-id=\""
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "\">\n        Expand Operations\n      </a>\n    </li>\n    ";
+  stack1 = ((helper = (helper = helpers.url || (depth0 != null ? depth0.url : depth0)) != null ? helper : helperMissing),(options={"name":"url","hash":{},"fn":this.program(3, data),"inverse":this.noop,"data":data}),(typeof helper === functionType ? helper.call(depth0, options) : helper));
+  if (!helpers.url) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "\n  </ul>\n</div>\n<ul class='endpoints' id='"
+    + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
+    + "_endpoint_list' style='display:none'>\n\n</ul>\n";
+},"useData":true});
+var ResponseContentTypeView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+ResponseContentTypeView = (function(_super) {
+  __extends(ResponseContentTypeView, _super);
+
+  function ResponseContentTypeView() {
+    return ResponseContentTypeView.__super__.constructor.apply(this, arguments);
+  }
+
+  ResponseContentTypeView.prototype.initialize = function() {};
+
+  ResponseContentTypeView.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    $('label[for=responseContentType]', $(this.el)).text('Response Content Type');
+    return this;
+  };
+
+  ResponseContentTypeView.prototype.template = function() {
+    return Handlebars.templates.response_content_type;
+  };
+
+  return ResponseContentTypeView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["response_content_type"] = Handlebars.template({"1":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "";
+  stack1 = helpers.each.call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"each","hash":{},"fn":this.program(2, data),"inverse":this.noop,"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer;
+},"2":function(depth0,helpers,partials,data) {
+  var stack1, lambda=this.lambda, buffer = "  <option value=\"";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  buffer += "\">";
+  stack1 = lambda(depth0, depth0);
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</option>\n";
+},"4":function(depth0,helpers,partials,data) {
+  return "  <option value=\"application/json\">application/json</option>\n";
+  },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, buffer = "<label for=\"responseContentType\"></label>\n<select name=\"responseContentType\">\n";
+  stack1 = helpers['if'].call(depth0, (depth0 != null ? depth0.produces : depth0), {"name":"if","hash":{},"fn":this.program(1, data),"inverse":this.program(4, data),"data":data});
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</select>\n";
+},"useData":true});
+var SignatureView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+SignatureView = (function(_super) {
+  __extends(SignatureView, _super);
+
+  function SignatureView() {
+    return SignatureView.__super__.constructor.apply(this, arguments);
+  }
+
+  SignatureView.prototype.events = {
+    'click a.description-link': 'switchToDescription',
+    'click a.snippet-link': 'switchToSnippet',
+    'mousedown .snippet': 'snippetToTextArea'
+  };
+
+  SignatureView.prototype.initialize = function() {};
+
+  SignatureView.prototype.render = function() {
+    var template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    this.switchToSnippet();
+    this.isParam = this.model.isParam;
+    if (this.isParam) {
+      $('.notice', $(this.el)).text('Click to set as parameter value');
+    }
+    return this;
+  };
+
+  SignatureView.prototype.template = function() {
+    return Handlebars.templates.signature;
+  };
+
+  SignatureView.prototype.switchToDescription = function(e) {
+    if (e != null) {
+      e.preventDefault();
+    }
+    $(".snippet", $(this.el)).hide();
+    $(".description", $(this.el)).show();
+    $('.description-link', $(this.el)).addClass('selected');
+    return $('.snippet-link', $(this.el)).removeClass('selected');
+  };
+
+  SignatureView.prototype.switchToSnippet = function(e) {
+    if (e != null) {
+      e.preventDefault();
+    }
+    $(".description", $(this.el)).hide();
+    $(".snippet", $(this.el)).show();
+    $('.snippet-link', $(this.el)).addClass('selected');
+    return $('.description-link', $(this.el)).removeClass('selected');
+  };
+
+  SignatureView.prototype.snippetToTextArea = function(e) {
+    var textArea;
+    if (this.isParam) {
+      if (e != null) {
+        e.preventDefault();
+      }
+      textArea = $('textarea', $(this.el.parentNode.parentNode.parentNode));
+      if ($.trim(textArea.val()) === '') {
+        return textArea.val(this.model.sampleJSON);
+      }
+    }
+  };
+
+  return SignatureView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["signature"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<div>\n<ul class=\"signature-nav\">\n  <li><a class=\"description-link\" href=\"#\">Model</a></li>\n  <li><a class=\"snippet-link\" href=\"#\">Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n  <div class=\"description\">\n    ";
+  stack1 = ((helper = (helper = helpers.signature || (depth0 != null ? depth0.signature : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"signature","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "\n  </div>\n\n  <div class=\"snippet\">\n    <pre><code>"
+    + escapeExpression(((helper = (helper = helpers.sampleJSON || (depth0 != null ? depth0.sampleJSON : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"sampleJSON","hash":{},"data":data}) : helper)))
+    + "</code></pre>\n    <small class=\"notice\"></small>\n  </div>\n</div>\n\n";
+},"useData":true});
+var StatusCodeView,
+  __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  __hasProp = {}.hasOwnProperty;
+
+StatusCodeView = (function(_super) {
+  __extends(StatusCodeView, _super);
+
+  function StatusCodeView() {
+    return StatusCodeView.__super__.constructor.apply(this, arguments);
+  }
+
+  StatusCodeView.prototype.initialize = function() {};
+
+  StatusCodeView.prototype.render = function() {
+    var responseModel, responseModelView, template;
+    template = this.template();
+    $(this.el).html(template(this.model));
+    if (swaggerUi.api.models.hasOwnProperty(this.model.responseModel)) {
+      responseModel = {
+        sampleJSON: JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(), null, 2),
+        isParam: false,
+        signature: swaggerUi.api.models[this.model.responseModel].getMockSignature()
+      };
+      responseModelView = new SignatureView({
+        model: responseModel,
+        tagName: 'div'
+      });
+      $('.model-signature', this.$el).append(responseModelView.render().el);
+    } else {
+      $('.model-signature', this.$el).html('');
+    }
+    return this;
+  };
+
+  StatusCodeView.prototype.template = function() {
+    return Handlebars.templates.status_code;
+  };
+
+  return StatusCodeView;
+
+})(Backbone.View);
+
+this["Handlebars"]["templates"]["status_code"] = Handlebars.template({"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+  var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "<td width='15%' class='code'>"
+    + escapeExpression(((helper = (helper = helpers.code || (depth0 != null ? depth0.code : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"code","hash":{},"data":data}) : helper)))
+    + "</td>\n<td>";
+  stack1 = ((helper = (helper = helpers.message || (depth0 != null ? depth0.message : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"message","hash":{},"data":data}) : helper));
+  if (stack1 != null) { buffer += stack1; }
+  return buffer + "</td>\n<td width='50%'><span class=\"model-signature\" /></td>";
+},"useData":true});
\ No newline at end of file
diff --git a/src/main/webapp/api-docs/swagger-ui.min.js b/src/main/webapp/api-docs/swagger-ui.min.js
new file mode 100644
index 00000000..e146e8d5
--- /dev/null
+++ b/src/main/webapp/api-docs/swagger-ui.min.js
@@ -0,0 +1,2 @@
+function clippyCopiedCallback(){$("#api_key_copied").fadeIn().delay(1e3).fadeOut()}$(function(){$.fn.vAlign=function(){return this.each(function(){var e=$(this).height(),t=$(this).parent().height(),n=(t-e)/2;$(this).css("margin-top",n)})},$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(){var e=$(this).closest("form").innerWidth(),t=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10),n=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",e-t-n)})},$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent(),$("ul.downplayed li div.content p").vAlign(),$("form.sandbox").submit(function(){var e=!0;return $(this).find("input.required").each(function(){$(this).removeClass("error"),""==$(this).val()&&($(this).addClass("error"),$(this).wiggle(),e=!1)}),e})}),log=function(){log.history=log.history||[],log.history.push(arguments),this.console&&console.log(Array.prototype.slice.call(arguments)[0])},Function.prototype.bind&&console&&"object"==typeof console.log&&["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(e){console[e]=this.bind(console[e],console)},Function.prototype.call);var Docs={shebang:function(){var e=$.param.fragment().split("/");switch(e.shift(),e.length){case 1:var t="resource_"+e[0];Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1});break;case 2:Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1});var n=e.join("_"),a=n+"_content";Docs.expandOperation($("#"+a)),$("#"+n).slideto({highlight:!1})}},toggleEndpointListForResource:function(e){var t=$("li#resource_"+Docs.escapeResourceName(e)+" ul.endpoints");t.is(":visible")?Docs.collapseEndpointListForResource(e):Docs.expandEndpointListForResource(e)},expandEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideDown();$("li#resource_"+e).addClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideDown()},collapseEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideUp();$("li#resource_"+e).removeClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideUp()},expandOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideDown():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideUp():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(e){return e.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(e){e.slideDown()},collapseOperation:function(e){e.slideUp()}};this.Handlebars=this.Handlebars||{},this.Handlebars.templates=this.Handlebars.templates||{},this.Handlebars.templates.apikey_button_view=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"<!--div class='auth_button' id='apikey_button'><img class='auth_icon' alt='apply api key' src='images/apikey.jpeg'></div-->\n<div class='auth_container' id='apikey_container'>\n  <div class='key_input_container'>\n    <div class='auth_label'>"+l((s=null!=(s=t.keyName||(null!=e?e.keyName:e))?s:r,typeof s===i?s.call(e,{name:"keyName",hash:{},data:a}):s))+'</div>\n    <input placeholder="api_key" class="auth_input" id="input_apiKey_entry" name="apiKey" type="text"/>\n    <div class=\'auth_submit\'><a class=\'auth_submit_button\' id="apply_api_key" href="#">apply</a></div>\n  </div>\n</div>\n\n'},useData:!0});var SwaggerUi,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;SwaggerUi=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.dom_id="swagger_ui",t.prototype.options=null,t.prototype.api=null,t.prototype.headerView=null,t.prototype.mainView=null,t.prototype.initialize=function(e){return null==e&&(e={}),null!=e.dom_id&&(this.dom_id=e.dom_id,delete e.dom_id),null==e.supportedSubmitMethods&&(e.supportedSubmitMethods=["get","put","post","delete","head","options","patch"]),null==$("#"+this.dom_id)&&$("body").append('<div id="'+this.dom_id+'"></div>'),this.options=e,this.options.success=function(e){return function(){return e.render()}}(this),this.options.progress=function(e){return function(t){return e.showMessage(t)}}(this),this.options.failure=function(e){return function(t){return e.onLoadFailure(t)}}(this),this.headerView=new HeaderView({el:$("#header")}),this.headerView.on("update-swagger-ui",function(e){return function(t){return e.updateSwaggerUi(t)}}(this))},t.prototype.setOption=function(e,t){return this.options[e]=t},t.prototype.getOption=function(e){return this.options[e]},t.prototype.updateSwaggerUi=function(e){return this.options.url=e.url,this.load()},t.prototype.load=function(){var e,t;return null!=(t=this.mainView)&&t.clear(),e=this.options.url,e&&0!==e.indexOf("http")&&(e=this.buildUrl(window.location.href.toString(),e)),this.options.url=e,this.headerView.update(e),this.api=new SwaggerClient(this.options)},t.prototype.collapseAll=function(){return Docs.collapseEndpointListForResource("")},t.prototype.listAll=function(){return Docs.collapseOperationsForResource("")},t.prototype.expandAll=function(){return Docs.expandOperationsForResource("")},t.prototype.render=function(){switch(this.showMessage("Finished Loading Resource Information. Rendering Swagger UI..."),this.mainView=new MainView({model:this.api,el:$("#"+this.dom_id),swaggerOptions:this.options}).render(),this.showMessage(),this.options.docExpansion){case"full":this.expandAll();break;case"list":this.listAll()}return this.renderGFM(),this.options.onComplete&&this.options.onComplete(this.api,this),setTimeout(function(){return function(){return Docs.shebang()}}(this),100)},t.prototype.buildUrl=function(e,t){var n,a;return 0===t.indexOf("/")?(a=e.split("/"),e=a[0]+"//"+a[2],e+t):(n=e.length,e.indexOf("?")>-1&&(n=Math.min(n,e.indexOf("?"))),e.indexOf("#")>-1&&(n=Math.min(n,e.indexOf("#"))),e=e.substring(0,n),-1!==e.indexOf("/",e.length-1)?e+t:e+"/"+t)},t.prototype.showMessage=function(e){return null==e&&(e=""),$("#message-bar").removeClass("message-fail"),$("#message-bar").addClass("message-success"),$("#message-bar").html(e)},t.prototype.onLoadFailure=function(e){var t;return null==e&&(e=""),$("#message-bar").removeClass("message-success"),$("#message-bar").addClass("message-fail"),t=$("#message-bar").html(e),null!=this.options.onFailure&&this.options.onFailure(e),t},t.prototype.renderGFM=function(e){return null==e&&(e=""),$(".markdown").each(function(){return $(this).html(marked($(this).html()))})},t}(Backbone.Router),window.SwaggerUi=SwaggerUi,this.Handlebars.templates.basic_auth_button_view=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(){return'<div class=\'auth_button\' id=\'basic_auth_button\'><img class=\'auth_icon\' src=\'images/password.jpeg\'></div>\n<div class=\'auth_container\' id=\'basic_auth_container\'>\n  <div class=\'key_input_container\'>\n    <div class="auth_label">Username</div>\n    <input placeholder="username" class="auth_input" id="input_username" name="username" type="text"/>\n    <div class="auth_label">Password</div>\n    <input placeholder="password" class="auth_input" id="input_password" name="password" type="password"/>\n    <div class=\'auth_submit\'><a class=\'auth_submit_button\' id="apply_basic_auth" href="#">apply</a></div>\n  </div>\n</div>\n\n'},useData:!0}),Handlebars.registerHelper("sanitize",function(e){return e=e.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,""),new Handlebars.SafeString(e)}),this.Handlebars.templates.content_type=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t.each.call(e,null!=e?e.produces:e,{name:"each",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i},2:function(e){var t,n=this.lambda,a='	<option value="';return t=n(e,e),null!=t&&(a+=t),a+='">',t=n(e,e),null!=t&&(a+=t),a+"</option>\n"},4:function(){return'  <option value="application/json">application/json</option>\n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i='<label for="contentType"></label>\n<select name="contentType">\n';return s=t["if"].call(e,null!=e?e.produces:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i+"</select>\n"},useData:!0});var ApiKeyButton,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ApiKeyButton=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),this},t.prototype.events={"click #apikey_button":"toggleApiKeyContainer","click #apply_api_key":"applyApiKey"},t.prototype.applyApiKey=function(){var e;return window.authorizations.add(this.model.name,new ApiKeyAuthorization(this.model.name,$("#input_apiKey_entry").val(),this.model["in"])),window.swaggerUi.load(),e=$("#apikey_container").show()},t.prototype.toggleApiKeyContainer=function(){var e;return $("#apikey_container").length>0?(e=$("#apikey_container").first(),e.is(":visible")?e.hide():($(".auth_container").hide(),e.show())):void 0},t.prototype.template=function(){return Handlebars.templates.apikey_button_view},t}(Backbone.View),this.Handlebars.templates.main=Handlebars.template({1:function(e,t,n,a){var s,i=this.lambda,r=this.escapeExpression,l='  <div class="info_title">'+r(i(null!=(s=null!=e?e.info:e)?s.title:s,e))+'</div>\n  <div class="info_description markdown">';return s=i(null!=(s=null!=e?e.info:e)?s.description:s,e),null!=s&&(l+=s),l+="</div>\n  ",s=t["if"].call(e,null!=(s=null!=e?e.info:e)?s.termsOfServiceUrl:s,{name:"if",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(l+=s),l+="\n  ",s=t["if"].call(e,null!=(s=null!=(s=null!=e?e.info:e)?s.contact:s)?s.name:s,{name:"if",hash:{},fn:this.program(4,a),inverse:this.noop,data:a}),null!=s&&(l+=s),l+="\n  ",s=t["if"].call(e,null!=(s=null!=(s=null!=e?e.info:e)?s.contact:s)?s.url:s,{name:"if",hash:{},fn:this.program(6,a),inverse:this.noop,data:a}),null!=s&&(l+=s),l+="\n  ",s=t["if"].call(e,null!=(s=null!=(s=null!=e?e.info:e)?s.contact:s)?s.email:s,{name:"if",hash:{},fn:this.program(8,a),inverse:this.noop,data:a}),null!=s&&(l+=s),l+="\n  ",s=t["if"].call(e,null!=(s=null!=e?e.info:e)?s.license:s,{name:"if",hash:{},fn:this.program(10,a),inverse:this.noop,data:a}),null!=s&&(l+=s),l+"\n"},2:function(e){var t,n=this.lambda,a=this.escapeExpression;return'<div class="info_tos"><a href="'+a(n(null!=(t=null!=e?e.info:e)?t.termsOfServiceUrl:t,e))+'">Terms of service</a></div>'},4:function(e){var t,n=this.lambda,a=this.escapeExpression;return"<div class='info_name'>Created by "+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.contact:t)?t.name:t,e))+"</div>"},6:function(e){var t,n=this.lambda,a=this.escapeExpression;return"<div class='info_url'>See more at <a href=\""+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.contact:t)?t.url:t,e))+'">'+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.contact:t)?t.url:t,e))+"</a></div>"},8:function(e){var t,n=this.lambda,a=this.escapeExpression;return"<div class='info_email'><a href=\"mailto:"+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.contact:t)?t.email:t,e))+"?subject="+a(n(null!=(t=null!=e?e.info:e)?t.title:t,e))+'">Contact the developer</a></div>'},10:function(e){var t,n=this.lambda,a=this.escapeExpression;return"<div class='info_license'><a href='"+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.license:t)?t.url:t,e))+"'>"+a(n(null!=(t=null!=(t=null!=e?e.info:e)?t.license:t)?t.name:t,e))+"</a></div>"},12:function(e){var t,n=this.lambda,a=this.escapeExpression;return'    , <span style="font-variant: small-caps">api version</span>: '+a(n(null!=(t=null!=e?e.info:e)?t.version:t,e))+"\n    "},14:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return'    <span style="float:right"><a href="'+l((s=null!=(s=t.validatorUrl||(null!=e?e.validatorUrl:e))?s:r,typeof s===i?s.call(e,{name:"validatorUrl",hash:{},data:a}):s))+"/debug?url="+l((s=null!=(s=t.url||(null!=e?e.url:e))?s:r,typeof s===i?s.call(e,{name:"url",hash:{},data:a}):s))+'"><img id="validator" src="'+l((s=null!=(s=t.validatorUrl||(null!=e?e.validatorUrl:e))?s:r,typeof s===i?s.call(e,{name:"validatorUrl",hash:{},data:a}):s))+"?url="+l((s=null!=(s=t.url||(null!=e?e.url:e))?s:r,typeof s===i?s.call(e,{name:"url",hash:{},data:a}):s))+'"></a>\n    </span>\n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<div class='info' id='api_info'>\n";return s=t["if"].call(e,null!=e?e.info:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.noop,data:a}),null!=s&&(p+=s),p+="</div>\n<div class='container' id='resources_container'>\n  <ul id='resources'></ul>\n\n  <div class=\"footer\">\n    <br>\n    <br>\n    <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: "+o((i=null!=(i=t.basePath||(null!=e?e.basePath:e))?i:l,typeof i===r?i.call(e,{name:"basePath",hash:{},data:a}):i))+"\n",s=t["if"].call(e,null!=(s=null!=e?e.info:e)?s.version:s,{name:"if",hash:{},fn:this.program(12,a),inverse:this.noop,data:a}),null!=s&&(p+=s),p+="]\n",s=t["if"].call(e,null!=e?e.validatorUrl:e,{name:"if",hash:{},fn:this.program(14,a),inverse:this.noop,data:a}),null!=s&&(p+=s),p+"    </h4>\n    </div>\n</div>\n"},useData:!0});var BasicAuthButton,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;BasicAuthButton=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),this},t.prototype.events={"click #basic_auth_button":"togglePasswordContainer","click #apply_basic_auth":"applyPassword"},t.prototype.applyPassword=function(){var e,t,n;return n=$(".input_username").val(),t=$(".input_password").val(),window.authorizations.add(this.model.type,new PasswordAuthorization("basic",n,t)),window.swaggerUi.load(),e=$("#basic_auth_container").hide()},t.prototype.togglePasswordContainer=function(){var e;return $("#basic_auth_container").length>0?(e=$("#basic_auth_container").show(),e.is(":visible")?e.slideUp():($(".auth_container").hide(),e.show())):void 0},t.prototype.template=function(){return Handlebars.templates.basic_auth_button_view},t}(Backbone.View),this.Handlebars.templates.operation=Handlebars.template({1:function(){return"deprecated"},3:function(){return"            <h4>Warning: Deprecated</h4>\n"},5:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o='        <h4>Implementation Notes</h4>\n        <p class="markdown">';return i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(o+=s),o+"</p>\n"},7:function(){return'        <div class="auth">\n        <span class="api-ic ic-error"></span>'},9:function(e,t,n,a){var s,i='          <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n';return s=t.each.call(e,e,{name:"each",hash:{},fn:this.program(10,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i+"          </div>\n"},10:function(e){var t,n=this.lambda,a=this.escapeExpression,s="            <div title='";return t=n(null!=e?e.description:e,e),null!=t&&(s+=t),s+"'>"+a(n(null!=e?e.scope:e,e))+"</div>\n"},12:function(){return"</div>"},14:function(){return'        <div class=\'access\'>\n          <span class="api-ic ic-off" title="click to authenticate"></span>\n        </div>\n'},16:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"          <h4>Response Class (Status "+l((s=null!=(s=t.successCode||(null!=e?e.successCode:e))?s:r,typeof s===i?s.call(e,{name:"successCode",hash:{},data:a}):s))+')</h4>\n          <p><span class="model-signature" /></p>\n          <br/>\n          <div class="response-content-type" />\n'},18:function(){return'          <h4>Parameters</h4>\n          <table class=\'fullwidth\'>\n          <thead>\n            <tr>\n            <th style="width: 100px; max-width: 100px">Parameter</th>\n            <th style="width: 310px; max-width: 310px">Value</th>\n            <th style="width: 200px; max-width: 200px">Description</th>\n            <th style="width: 100px; max-width: 100px">Parameter Type</th>\n            <th style="width: 220px; max-width: 230px">Data Type</th>\n            </tr>\n          </thead>\n          <tbody class="operation-params">\n\n          </tbody>\n          </table>\n'},20:function(){return"          <div style='margin:0;padding:0;display:inline'></div>\n          <h4>Response Messages</h4>\n          <table class='fullwidth'>\n            <thead>\n            <tr>\n              <th>HTTP Status Code</th>\n              <th>Reason</th>\n              <th>Response Model</th>\n            </tr>\n            </thead>\n            <tbody class=\"operation-status\">\n            \n            </tbody>\n          </table>\n"},22:function(){return""},24:function(){return"          <div class='sandbox_header'>\n            <input class='submit' name='commit' type='button' value='Try it out!' />\n            <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n            <span class='response_throbber' style='display:none'></span>\n          </div>\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r,l="function",o=t.helperMissing,p=this.escapeExpression,u=t.blockHelperMissing,h="\n  <ul class='operations' >\n    <li class='"+p((i=null!=(i=t.method||(null!=e?e.method:e))?i:o,typeof i===l?i.call(e,{name:"method",hash:{},data:a}):i))+" operation' id='"+p((i=null!=(i=t.parentId||(null!=e?e.parentId:e))?i:o,typeof i===l?i.call(e,{name:"parentId",hash:{},data:a}):i))+"_"+p((i=null!=(i=t.nickname||(null!=e?e.nickname:e))?i:o,typeof i===l?i.call(e,{name:"nickname",hash:{},data:a}):i))+"'>\n      <div class='heading'>\n        <h3>\n          <span class='http_method'>\n          <a href='#!/"+p((i=null!=(i=t.parentId||(null!=e?e.parentId:e))?i:o,typeof i===l?i.call(e,{name:"parentId",hash:{},data:a}):i))+"/"+p((i=null!=(i=t.nickname||(null!=e?e.nickname:e))?i:o,typeof i===l?i.call(e,{name:"nickname",hash:{},data:a}):i))+'\' class="toggleOperation">'+p((i=null!=(i=t.method||(null!=e?e.method:e))?i:o,typeof i===l?i.call(e,{name:"method",hash:{},data:a}):i))+"</a>\n          </span>\n          <span class='path'>\n          <a href='#!/"+p((i=null!=(i=t.parentId||(null!=e?e.parentId:e))?i:o,typeof i===l?i.call(e,{name:"parentId",hash:{},data:a}):i))+"/"+p((i=null!=(i=t.nickname||(null!=e?e.nickname:e))?i:o,typeof i===l?i.call(e,{name:"nickname",hash:{},data:a}):i))+"' class=\"toggleOperation ";return s=t["if"].call(e,null!=e?e.deprecated:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.noop,data:a}),null!=s&&(h+=s),h+='">'+p((i=null!=(i=t.path||(null!=e?e.path:e))?i:o,typeof i===l?i.call(e,{name:"path",hash:{},data:a}):i))+"</a>\n          </span>\n        </h3>\n        <ul class='options'>\n          <li>\n          <a href='#!/"+p((i=null!=(i=t.parentId||(null!=e?e.parentId:e))?i:o,typeof i===l?i.call(e,{name:"parentId",hash:{},data:a}):i))+"/"+p((i=null!=(i=t.nickname||(null!=e?e.nickname:e))?i:o,typeof i===l?i.call(e,{name:"nickname",hash:{},data:a}):i))+'\' class="toggleOperation">',i=null!=(i=t.summary||(null!=e?e.summary:e))?i:o,s=typeof i===l?i.call(e,{name:"summary",hash:{},data:a}):i,null!=s&&(h+=s),h+="</a>\n          </li>\n        </ul>\n      </div>\n      <div class='content' id='"+p((i=null!=(i=t.parentId||(null!=e?e.parentId:e))?i:o,typeof i===l?i.call(e,{name:"parentId",hash:{},data:a}):i))+"_"+p((i=null!=(i=t.nickname||(null!=e?e.nickname:e))?i:o,typeof i===l?i.call(e,{name:"nickname",hash:{},data:a}):i))+"_content' style='display:none'>\n",s=t["if"].call(e,null!=e?e.deprecated:e,{name:"if",hash:{},fn:this.program(3,a),inverse:this.noop,data:a}),null!=s&&(h+=s),s=t["if"].call(e,null!=e?e.description:e,{name:"if",hash:{},fn:this.program(5,a),inverse:this.noop,data:a}),null!=s&&(h+=s),i=null!=(i=t.oauth||(null!=e?e.oauth:e))?i:o,r={name:"oauth",hash:{},fn:this.program(7,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.oauth||(s=u.call(e,s,r)),null!=s&&(h+=s),h+="\n",s=t.each.call(e,null!=e?e.oauth:e,{name:"each",hash:{},fn:this.program(9,a),inverse:this.noop,data:a}),null!=s&&(h+=s),h+="        ",i=null!=(i=t.oauth||(null!=e?e.oauth:e))?i:o,r={name:"oauth",hash:{},fn:this.program(12,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.oauth||(s=u.call(e,s,r)),null!=s&&(h+=s),h+="\n",i=null!=(i=t.oauth||(null!=e?e.oauth:e))?i:o,r={name:"oauth",hash:{},fn:this.program(14,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.oauth||(s=u.call(e,s,r)),null!=s&&(h+=s),s=t["if"].call(e,null!=e?e.type:e,{name:"if",hash:{},fn:this.program(16,a),inverse:this.noop,data:a}),null!=s&&(h+=s),h+="        <form accept-charset='UTF-8' class='sandbox'>\n          <div style='margin:0;padding:0;display:inline'></div>\n",s=t["if"].call(e,null!=e?e.parameters:e,{name:"if",hash:{},fn:this.program(18,a),inverse:this.noop,data:a}),null!=s&&(h+=s),s=t["if"].call(e,null!=e?e.responseMessages:e,{name:"if",hash:{},fn:this.program(20,a),inverse:this.noop,data:a}),null!=s&&(h+=s),s=t["if"].call(e,null!=e?e.isReadOnly:e,{name:"if",hash:{},fn:this.program(22,a),inverse:this.program(24,a),data:a}),null!=s&&(h+=s),h+"        </form>\n        <div class='response' style='display:none'>\n          <h4>Request URL</h4>\n          <div class='block request_url'></div>\n          <h4>Response Body</h4>\n          <div class='block response_body'></div>\n          <h4>Response Code</h4>\n          <div class='block response_code'></div>\n          <h4>Response Headers</h4>\n          <div class='block response_headers'></div>\n        </div>\n      </div>\n    </li>\n  </ul>\n"},useData:!0});var ContentTypeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ContentTypeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),$("label[for=contentType]",$(this.el)).text("Response Content Type"),this},t.prototype.template=function(){return Handlebars.templates.content_type},t}(Backbone.View),this.Handlebars.templates.param=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(2,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i},2:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return'			<input type="file" name=\''+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+'\'/>\n			<div class="parameter-content-type" />\n'},4:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(5,a),inverse:this.program(7,a),data:a}),null!=s&&(i+=s),i},5:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<textarea class='body-textarea' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+'</textarea>\n        <br />\n        <div class="parameter-content-type" />\n'},7:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<textarea class='body-textarea' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n'},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(2,a),inverse:this.program(10,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(11,a),inverse:this.program(13,a),data:a}),null!=s&&(i+=s),i},11:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<input class='parameter' minlength='0' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"' placeholder='' type='text' value='"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"'/>\n"},13:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<input class='parameter' minlength='0' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"' placeholder='' type='text' value=''/>\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td class='code'>"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"</td>\n<td>\n\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(9,a),data:a}),null!=s&&(p+=s),p+='\n</td>\n<td class="markdown">',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="</td>\n<td>",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'</td>\n<td>\n	<span class="model-signature"></span>\n</td>\n'},useData:!0});var HeaderView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;HeaderView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"},t.prototype.initialize=function(){},t.prototype.showPetStore=function(){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})},t.prototype.showWordnikDev=function(){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})},t.prototype.showCustomOnKeyup=function(e){return 13===e.keyCode?this.showCustom():void 0},t.prototype.showCustom=function(e){return null!=e&&e.preventDefault(),this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})},t.prototype.update=function(e,t,n){return null==n&&(n=!1),$("#input_baseUrl").val(e),n?this.trigger("update-swagger-ui",{url:e}):void 0},t}(Backbone.View),this.Handlebars.templates.param_list=Handlebars.template({1:function(){return" multiple='multiple'"},3:function(){return""},5:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(3,a),inverse:this.program(6,a),data:a}),null!=s&&(i+=s),i},6:function(e,t,n,a){var s,i=t.helperMissing,r="";return s=(t.isArray||e&&e.isArray||i).call(e,e,{name:"isArray",hash:{},fn:this.program(3,a),inverse:this.program(7,a),data:a}),null!=s&&(r+=s),r},7:function(){return"          <option selected=\"\" value=''></option>\n"},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isDefault:e,{name:"if",hash:{},fn:this.program(10,a),inverse:this.program(12,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return'        <option selected="" value=\''+l((s=null!=(s=t.value||(null!=e?e.value:e))?s:r,typeof s===i?s.call(e,{name:"value",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t.value||(null!=e?e.value:e))?s:r,typeof s===i?s.call(e,{name:"value",hash:{},data:a}):s))+" (default)</option>\n"},12:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"        <option value='"+l((s=null!=(s=t.value||(null!=e?e.value:e))?s:r,typeof s===i?s.call(e,{name:"value",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t.value||(null!=e?e.value:e))?s:r,typeof s===i?s.call(e,{name:"value",hash:{},data:a}):s))+"</option>\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td class='code'>"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"</td>\n<td>\n  <select ";return s=(t.isArray||e&&e.isArray||l).call(e,e,{name:"isArray",hash:{},fn:this.program(1,a),inverse:this.noop,data:a}),null!=s&&(p+=s),p+=" class='parameter' name='"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"'>\n",s=t["if"].call(e,null!=e?e.required:e,{name:"if",hash:{},fn:this.program(3,a),inverse:this.program(5,a),data:a}),null!=s&&(p+=s),s=t.each.call(e,null!=(s=null!=e?e.allowableValues:e)?s.descriptiveValues:s,{name:"each",hash:{},fn:this.program(9,a),inverse:this.noop,data:a}),null!=s&&(p+=s),p+='  </select>\n</td>\n<td class="markdown">',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="</td>\n<td>",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'</td>\n<td><span class="model-signature"></span></td>'},useData:!0});var MainView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;MainView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}var n;return __extends(t,e),n={alpha:function(e,t){return e.path.localeCompare(t.path)},method:function(e,t){return e.method.localeCompare(t.method)}},t.prototype.initialize=function(e){var t,n,a,s;null==e&&(e={}),this.model.auths=[],s=this.model.securityDefinitions;for(n in s)a=s[n],t={name:n,type:a.type,value:a},this.model.auths.push(t);return"2.0"===this.model.swaggerVersion?this.model.validatorUrl="validatorUrl"in e.swaggerOptions?e.swaggerOptions.validatorUrl:this.model.url.indexOf("localhost")>0?null:"http://online.swagger.io/validator":void 0},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p;if(this.model.securityDefinitions)for(s in this.model.securityDefinitions)e=this.model.securityDefinitions[s],"apiKey"===e.type&&0===$("#apikey_button").length&&(t=new ApiKeyButton({model:e}).render().el,$(".auth_main_container").append(t)),"basicAuth"===e.type&&0===$("#basic_auth_button").length&&(t=new BasicAuthButton({model:e}).render().el,$(".auth_main_container").append(t));for($(this.el).html(Handlebars.templates.main(this.model)),r={},n=0,p=this.model.apisArray,l=0,o=p.length;o>l;l++){for(i=p[l],a=i.name;"undefined"!=typeof r[a];)a=a+"_"+n,n+=1;
+i.id=a,r[a]=i,this.addResource(i,this.model.auths)}return $(".propWrap").hover(function(){return $(".optionsWrapper",$(this)).show()},function(){return $(".optionsWrapper",$(this)).hide()}),this},t.prototype.addResource=function(e,t){var n;return e.id=e.id.replace(/\s/g,"_"),n=new ResourceView({model:e,tagName:"li",id:"resource_"+e.id,className:"resource",auths:t,swaggerOptions:this.options.swaggerOptions}),$("#resources").append(n.render().el)},t.prototype.clear=function(){return $(this.el).html("")},t}(Backbone.View),this.Handlebars.templates.param_readonly=Handlebars.template({1:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"        <textarea class='body-textarea' readonly='readonly' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"</textarea>\n"},3:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(4,a),inverse:this.program(6,a),data:a}),null!=s&&(i+=s),i},4:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"            "+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"\n"},6:function(){return"            (empty)\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td class='code'>"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"</td>\n<td>\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(3,a),data:a}),null!=s&&(p+=s),p+='</td>\n<td class="markdown">',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="</td>\n<td>",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),this.Handlebars.templates.param_readonly_required=Handlebars.template({1:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"        <textarea class='body-textarea'  readonly='readonly' placeholder='(required)' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"</textarea>\n"},3:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(4,a),inverse:this.program(6,a),data:a}),null!=s&&(i+=s),i},4:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"            "+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"\n"},6:function(){return"            (empty)\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td class='code required'>"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"</td>\n<td>\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(3,a),data:a}),null!=s&&(p+=s),p+='</td>\n<td class="markdown">',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="</td>\n<td>",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0});var OperationView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;OperationView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.invocationUrl=null,t.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"},t.prototype.initialize=function(e){return null==e&&(e={}),this.auths=e.auths,this.parentId=this.model.parentId,this.nickname=this.model.nickname,this},t.prototype.mouseEnter=function(e){var t,n,a,s,i,r,l,o,p,u;return t=$(this.el).find(".content"),p=e.pageX,u=e.pageY,r=$(window).scrollLeft(),l=$(window).scrollTop(),s=r+$(window).width(),i=l+$(window).height(),o=t.width(),n=t.height(),p+o>s&&(p=s-o),r>p&&(p=r),u+n>i&&(u=i-n),l>u&&(u=l),a={},a.top=u,a.left=p,t.css(a),$(e.currentTarget.parentNode).find("#api_information_panel").show()},t.prototype.mouseExit=function(e){return $(e.currentTarget.parentNode).find("#api_information_panel").hide()},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p,u,h,c,d,m,f,y,g,v,_,w,b,x,k,O,C,S,P,T,D,H,M,E,R,V,N,U,A;if(i=jQuery.inArray(this.model.method,this.model.supportedSubmitMethods())>=0,i||(this.model.isReadOnly=!0),this.model.description=this.model.description||this.model.notes,this.model.description&&(this.model.description=this.model.description.replace(/(?:\r\n|\r|\n)/g,"<br />")),this.model.oauth=null,o=this.model.authorizations||this.model.security)if(Array.isArray(o))for(k=0,P=o.length;P>k;k++){n=o[k];for(l in n){t=n[l];for(e in this.auths)if(t=this.auths[e],"oauth2"===t.type){this.model.oauth={},this.model.oauth.scopes=[],R=t.value.scopes;for(r in R)b=R[r],y=n[l].indexOf(r),y>=0&&(p={scope:r,description:b},this.model.oauth.scopes.push(p))}}}else for(r in o)if(b=o[r],"oauth2"===r)for(null===this.model.oauth&&(this.model.oauth={}),void 0===this.model.oauth.scopes&&(this.model.oauth.scopes=[]),O=0,T=b.length;T>O;O++)p=b[O],this.model.oauth.scopes.push(p);if("undefined"!=typeof this.model.responses){this.model.responseMessages=[],V=this.model.responses;for(a in V)x=V[a],m=null,f=this.model.responses[a].schema,f&&f.$ref&&(m=f.$ref,0===m.indexOf("#/definitions/")&&(m=m.substring("#/definitions/".length))),this.model.responseMessages.push({code:a,message:x.description,responseModel:m})}if("undefined"==typeof this.model.responseMessages&&(this.model.responseMessages=[]),g=null,this.model.successResponse){_=this.model.successResponse;for(l in _)x=_[l],this.model.successCode=l,"object"==typeof x&&"function"==typeof x.createJSONSample&&(g={sampleJSON:JSON.stringify(x.createJSONSample(),void 0,2),isParam:!1,signature:x.getMockSignature()})}else this.model.responseClassSignature&&"string"!==this.model.responseClassSignature&&(g={sampleJSON:this.model.responseSampleJSON,isParam:!1,signature:this.model.responseClassSignature});for($(this.el).html(Handlebars.templates.operation(this.model)),g?(d=new SignatureView({model:g,tagName:"div"}),$(".model-signature",$(this.el)).append(d.render().el)):(this.model.responseClassSignature="string",$(".model-signature",$(this.el)).html(this.model.type)),s={isParam:!1},s.consumes=this.model.consumes,s.produces=this.model.produces,N=this.model.parameters,C=0,D=N.length;D>C;C++)u=N[C],w=u.type||u.dataType||"","undefined"==typeof w&&(m=u.schema,m&&m.$ref&&(h=m.$ref,w=0===h.indexOf("#/definitions/")?h.substring("#/definitions/".length):h)),w&&"file"===w.toLowerCase()&&(s.consumes||(s.consumes="multipart/form-data")),u.type=w;for(c=new ResponseContentTypeView({model:s}),$(".response-content-type",$(this.el)).append(c.render().el),U=this.model.parameters,S=0,H=U.length;H>S;S++)u=U[S],this.addParameter(u,s.consumes);for(A=this.model.responseMessages,E=0,M=A.length;M>E;E++)v=A[E],this.addStatusCode(v);return this},t.prototype.addParameter=function(e,t){var n;return e.consumes=t,n=new ParameterView({model:e,tagName:"tr",readOnly:this.model.isReadOnly}),$(".operation-params",$(this.el)).append(n.render().el)},t.prototype.addStatusCode=function(e){var t;return t=new StatusCodeView({model:e,tagName:"tr"}),$(".operation-status",$(this.el)).append(t.render().el)},t.prototype.submitOperation=function(e){var t,n,a,s,i,r,l,o,p,u,h,c,d,m,f,y;if(null!=e&&e.preventDefault(),n=$(".sandbox",$(this.el)),t=!0,n.find("input.required").each(function(){return $(this).removeClass("error"),""===jQuery.trim($(this).val())?($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){return $(e).focus()}}(this)}),t=!1):void 0}),n.find("textarea.required").each(function(){return $(this).removeClass("error"),""===jQuery.trim($(this).val())?($(this).addClass("error"),$(this).wiggle({callback:function(e){return function(){return $(e).focus()}}(this)}),t=!1):void 0}),t){for(s={},r={parent:this},a=!1,m=n.find("input"),o=0,h=m.length;h>o;o++)i=m[o],null!=i.value&&jQuery.trim(i.value).length>0&&(s[i.name]=i.value),"file"===i.type&&(s[i.name]=i.files[0],a=!0);for(f=n.find("textarea"),p=0,c=f.length;c>p;p++)i=f[p],null!=i.value&&jQuery.trim(i.value).length>0&&(s[i.name]=i.value);for(y=n.find("select"),u=0,d=y.length;d>u;u++)i=y[u],l=this.getSelectedValue(i),null!=l&&jQuery.trim(l).length>0&&(s[i.name]=l);return r.responseContentType=$("div select[name=responseContentType]",$(this.el)).val(),r.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val(),$(".response_throbber",$(this.el)).show(),a?this.handleFileUpload(s,n):this.model["do"](s,r,this.showCompleteStatus,this.showErrorStatus,this)}},t.prototype.success=function(e,t){return t.showCompleteStatus(e)},t.prototype.handleFileUpload=function(e,t){var n,a,s,i,r,l,o,p,u,h,c,d,m,f,y,g,v,_,w;for(g=t.serializeArray(),p=0,d=g.length;d>p;p++)i=g[p],null!=i.value&&jQuery.trim(i.value).length>0&&(e[i.name]=i.value);for(n=new FormData,o=0,v=this.model.parameters,u=0,m=v.length;m>u;u++)l=v[u],("form"===l.paramType||"formData"===l["in"])&&"file"!==l.type.toLowerCase()&&void 0!==e[l.name]&&n.append(l.name,e[l.name]);for(s={},_=this.model.parameters,h=0,f=_.length;f>h;h++)l=_[h],"header"===l.paramType&&(s[l.name]=e[l.name]);for(w=t.find('input[type~="file"]'),c=0,y=w.length;y>c;c++)a=w[c],"undefined"!=typeof a.files[0]&&(n.append($(a).attr("name"),a.files[0]),o+=1);return this.invocationUrl=this.model.supportHeaderParams()?(s=this.model.getHeaderParams(e),delete s["Content-Type"],this.model.urlify(e,!1)):this.model.urlify(e,!0),$(".request_url",$(this.el)).html("<pre></pre>"),$(".request_url pre",$(this.el)).text(this.invocationUrl),r={type:this.model.method,url:this.invocationUrl,headers:s,data:n,dataType:"json",contentType:!1,processData:!1,error:function(e){return function(t){return e.showErrorStatus(e.wrap(t),e)}}(this),success:function(e){return function(t){return e.showResponse(t,e)}}(this),complete:function(e){return function(t){return e.showCompleteStatus(e.wrap(t),e)}}(this)},window.authorizations&&window.authorizations.apply(r),0===o&&r.data.append("fake","true"),jQuery.ajax(r),!1},t.prototype.wrap=function(e){var t,n,a,s,i,r,l;for(a={},n=e.getAllResponseHeaders().split("\r"),r=0,l=n.length;l>r;r++)s=n[r],t=s.match(/^([^:]*?):(.*)$/),t||(t=[]),t.shift(),void 0!==t[0]&&void 0!==t[1]&&(a[t[0].trim()]=t[1].trim());return i={},i.content={},i.content.data=e.responseText,i.headers=a,i.request={},i.request.url=this.invocationUrl,i.status=e.status,i},t.prototype.getSelectedValue=function(e){var t,n,a,s,i;if(e.multiple){for(n=[],i=e.options,a=0,s=i.length;s>a;a++)t=i[a],t.selected&&n.push(t.value);return n.length>0?n:null}return e.value},t.prototype.hideResponse=function(e){return null!=e&&e.preventDefault(),$(".response",$(this.el)).slideUp(),$(".response_hider",$(this.el)).fadeOut()},t.prototype.showResponse=function(e){var t;return t=JSON.stringify(e,null,"	").replace(/\n/g,"<br>"),$(".response_body",$(this.el)).html(escape(t))},t.prototype.showErrorStatus=function(e,t){return t.showStatus(e)},t.prototype.showCompleteStatus=function(e,t){return t.showStatus(e)},t.prototype.formatXml=function(e){var t,n,a,s,i,r,l,o,p,u,h,c,d;for(o=/(>)(<)(\/*)/g,u=/[ ]*(.*)[ ]+\n/g,t=/(<.+>)(.+\n)/g,e=e.replace(o,"$1\n$2$3").replace(u,"$1\n").replace(t,"$1\n$2"),l=0,n="",i=e.split("\n"),a=0,s="other",p={"single->single":0,"single->closing":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0},h=function(e){var t,i,r,l,o,u,h;return u={single:Boolean(e.match(/<.+\/>/)),closing:Boolean(e.match(/<\/.+>/)),opening:Boolean(e.match(/<[^!?].*>/))},o=function(){var e;e=[];for(r in u)h=u[r],h&&e.push(r);return e}()[0],o=void 0===o?"other":o,t=s+"->"+o,s=o,l="",a+=p[t],l=function(){var e,t,n;for(n=[],i=e=0,t=a;t>=0?t>e:e>t;i=t>=0?++e:--e)n.push("  ");return n}().join(""),"opening->closing"===t?n=n.substr(0,n.length-1)+e+"\n":n+=l+e+"\n"},c=0,d=i.length;d>c;c++)r=i[c],h(r);return n},t.prototype.showStatus=function(e){var t,n,a,s,i,r,l,o,p,u,h;if(void 0===e.content?(n=e.data,h=e.url):(n=e.content.data,h=e.request.url),i=e.headers,a=null,i&&(a=i["Content-Type"]||i["content-type"],a&&(a=a.split(";")[0].trim())),$(".response_body",$(this.el)).removeClass("json"),$(".response_body",$(this.el)).removeClass("xml"),n)if("application/json"===a||/\+json$/.test(a)){r=null;try{r=JSON.stringify(JSON.parse(n),null,"  ")}catch(c){s=c,r="can't parse JSON.  Raw result:\n\n"+n}t=$("<code />").text(r),o=$('<pre class="json" />').append(t)}else"application/xml"===a||/\+xml$/.test(a)?(t=$("<code />").text(this.formatXml(n)),o=$('<pre class="xml" />').append(t)):"text/html"===a?(t=$("<code />").html(_.escape(n)),o=$('<pre class="xml" />').append(t)):/^image\//.test(a)?o=$("<img>").attr("src",h):(t=$("<code />").text(n),o=$('<pre class="json" />').append(t));else t=$("<code />").text("no content"),o=$('<pre class="json" />').append(t);return p=o,$(".request_url",$(this.el)).html("<pre></pre>"),$(".request_url pre",$(this.el)).text(h),$(".response_code",$(this.el)).html("<pre>"+e.status+"</pre>"),$(".response_body",$(this.el)).html(p),$(".response_headers",$(this.el)).html("<pre>"+_.escape(JSON.stringify(e.headers,null,"  ")).replace(/\n/g,"<br>")+"</pre>"),$(".response",$(this.el)).slideDown(),$(".response_hider",$(this.el)).show(),$(".response_throbber",$(this.el)).hide(),u=$(".response_body",$(this.el))[0],l=this.options.swaggerOptions,l.highlightSizeThreshold&&e.data.length>l.highlightSizeThreshold?u:hljs.highlightBlock(u)},t.prototype.toggleOperationContent=function(){var e;return e=$("#"+Docs.escapeResourceName(this.parentId+"_"+this.nickname+"_content")),e.is(":visible")?Docs.collapseOperation(e):Docs.expandOperation(e)},t}(Backbone.View);var ParameterContentTypeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ParameterContentTypeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:"),this},t.prototype.template=function(){return Handlebars.templates.parameter_content_type},t}(Backbone.View),this.Handlebars.templates.param_required=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(2,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i},2:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return'			<input type="file" name=\''+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'/>\n"},4:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(5,a),inverse:this.program(7,a),data:a}),null!=s&&(i+=s),i},5:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<textarea class='body-textarea required' placeholder='(required)' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'>"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+'</textarea>\n        <br />\n        <div class="parameter-content-type" />\n'},7:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<textarea class='body-textarea required' placeholder='(required)' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+'\'></textarea>\n				<br />\n				<div class="parameter-content-type" />\n'},9:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e.isFile:e,{name:"if",hash:{},fn:this.program(10,a),inverse:this.program(12,a),data:a}),null!=s&&(i+=s),i},10:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"			<input class='parameter' class='required' type='file' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"'/>\n"},12:function(e,t,n,a){var s,i="";return s=t["if"].call(e,null!=e?e["default"]:e,{name:"if",hash:{},fn:this.program(13,a),inverse:this.program(15,a),data:a}),null!=s&&(i+=s),i},13:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<input class='parameter required' minlength='1' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"' placeholder='(required)' type='text' value='"+l((s=null!=(s=t["default"]||(null!=e?e["default"]:e))?s:r,typeof s===i?s.call(e,{name:"default",hash:{},data:a}):s))+"'/>\n"},15:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"				<input class='parameter required' minlength='1' name='"+l((s=null!=(s=t.name||(null!=e?e.name:e))?s:r,typeof s===i?s.call(e,{name:"name",hash:{},data:a}):s))+"' placeholder='(required)' type='text' value=''/>\n"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td class='code required'>"+o((i=null!=(i=t.name||(null!=e?e.name:e))?i:l,typeof i===r?i.call(e,{name:"name",hash:{},data:a}):i))+"</td>\n<td>\n";return s=t["if"].call(e,null!=e?e.isBody:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(9,a),data:a}),null!=s&&(p+=s),p+='</td>\n<td>\n	<strong><span class="markdown">',i=null!=(i=t.description||(null!=e?e.description:e))?i:l,s=typeof i===r?i.call(e,{name:"description",hash:{},data:a}):i,null!=s&&(p+=s),p+="</span></strong>\n</td>\n<td>",i=null!=(i=t.paramType||(null!=e?e.paramType:e))?i:l,s=typeof i===r?i.call(e,{name:"paramType",hash:{},data:a}):i,null!=s&&(p+=s),p+'</td>\n<td><span class="model-signature"></span></td>\n'},useData:!0}),this.Handlebars.templates.parameter_content_type=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t.each.call(e,null!=e?e.consumes:e,{name:"each",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i},2:function(e){var t,n=this.lambda,a='  <option value="';return t=n(e,e),null!=t&&(a+=t),a+='">',t=n(e,e),null!=t&&(a+=t),a+"</option>\n"},4:function(){return'  <option value="application/json">application/json</option>\n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';return s=t["if"].call(e,null!=e?e.consumes:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i+"</select>\n"},useData:!0});var ParameterView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ParameterView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(e,t){return"array"===e.type.toLowerCase()||e.allowMultiple?t.fn(this):t.inverse(this)})},t.prototype.render=function(){var e,t,n,a,s,i,r,l,o,p;return p=this.model.type||this.model.dataType,"undefined"==typeof p&&(i=this.model.schema,i&&i.$ref&&(a=i.$ref,p=0===a.indexOf("#/definitions/")?a.substring("#/definitions/".length):a)),this.model.type=p,this.model.paramType=this.model["in"]||this.model.paramType,("body"===this.model.paramType||"body"===this.model["in"])&&(this.model.isBody=!0),p&&"file"===p.toLowerCase()&&(this.model.isFile=!0),this.model["default"]=this.model["default"]||this.model.defaultValue,this.model.allowableValues&&(this.model.isList=!0),o=this.template(),$(this.el).html(o(this.model)),r={sampleJSON:this.model.sampleJSON,isParam:!0,signature:this.model.signature},this.model.sampleJSON?(l=new SignatureView({model:r,tagName:"div"}),$(".model-signature",$(this.el)).append(l.render().el)):$(".model-signature",$(this.el)).html(this.model.signature),t=!1,this.model.isBody&&(t=!0),e={isParam:t},e.consumes=this.model.consumes,t?(n=new ParameterContentTypeView({model:e}),$(".parameter-content-type",$(this.el)).append(n.render().el)):(s=new ResponseContentTypeView({model:e}),$(".response-content-type",$(this.el)).append(s.render().el)),this},t.prototype.template=function(){return this.model.isList?Handlebars.templates.param_list:this.options.readOnly?this.model.required?Handlebars.templates.param_readonly_required:Handlebars.templates.param_readonly:this.model.required?Handlebars.templates.param_required:Handlebars.templates.param},t}(Backbone.View);var ResourceView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ResourceView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(e){return null==e&&(e={}),this.auths=e.auths,""===this.model.description&&(this.model.description=null),null!=this.model.description?this.model.summary=this.model.description:void 0},t.prototype.render=function(){var e,t,n,a,s,i,r;for(n={},$(this.el).html(Handlebars.templates.resource(this.model)),r=this.model.operationsArray,s=0,i=r.length;i>s;s++){for(a=r[s],e=0,t=a.nickname;"undefined"!=typeof n[t];)t=t+"_"+e,e+=1;n[t]=a,a.nickname=t,a.parentId=this.model.id,this.addOperation(a)}return $(".toggleEndpointList",this.el).click(this.callDocs.bind(this,"toggleEndpointListForResource")),$(".collapseResource",this.el).click(this.callDocs.bind(this,"collapseOperationsForResource")),$(".expandResource",this.el).click(this.callDocs.bind(this,"expandOperationsForResource")),this},t.prototype.addOperation=function(e){var t;return e.number=this.number,t=new OperationView({model:e,tagName:"li",className:"endpoint",swaggerOptions:this.options.swaggerOptions,auths:this.auths}),$(".endpoints",$(this.el)).append(t.render().el),this.number++},t.prototype.callDocs=function(e,t){return t.preventDefault(),Docs[e](t.currentTarget.getAttribute("data-id"))},t}(Backbone.View),this.Handlebars.templates.resource=Handlebars.template({1:function(){return" : "},3:function(e,t,n,a){var s,i="function",r=t.helperMissing,l=this.escapeExpression;return"<li>\n      <a href='"+l((s=null!=(s=t.url||(null!=e?e.url:e))?s:r,typeof s===i?s.call(e,{name:"url",hash:{},data:a}):s))+"'>Raw</a>\n    </li>"},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r,l="function",o=t.helperMissing,p=this.escapeExpression,u=t.blockHelperMissing,h="<div class='heading'>\n  <h2>\n    <a href='#!/"+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'\' class="toggleEndpointList" data-id="'+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'">'+p((i=null!=(i=t.name||(null!=e?e.name:e))?i:o,typeof i===l?i.call(e,{name:"name",hash:{},data:a}):i))+"</a> ";return i=null!=(i=t.summary||(null!=e?e.summary:e))?i:o,r={name:"summary",hash:{},fn:this.program(1,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.summary||(s=u.call(e,s,r)),null!=s&&(h+=s),i=null!=(i=t.summary||(null!=e?e.summary:e))?i:o,s=typeof i===l?i.call(e,{name:"summary",hash:{},data:a}):i,null!=s&&(h+=s),h+="\n  </h2>\n  <ul class='options'>\n    <li>\n      <a href='#!/"+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+"' id='endpointListTogger_"+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'\' class="toggleEndpointList" data-id="'+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'">Show/Hide</a>\n    </li>\n    <li>\n      <a href=\'#\' class="collapseResource" data-id="'+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'">\n        List Operations\n      </a>\n    </li>\n    <li>\n      <a href=\'#\' class="expandResource" data-id="'+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+'">\n        Expand Operations\n      </a>\n    </li>\n    ',i=null!=(i=t.url||(null!=e?e.url:e))?i:o,r={name:"url",hash:{},fn:this.program(3,a),inverse:this.noop,data:a},s=typeof i===l?i.call(e,r):i,t.url||(s=u.call(e,s,r)),null!=s&&(h+=s),h+"\n  </ul>\n</div>\n<ul class='endpoints' id='"+p((i=null!=(i=t.id||(null!=e?e.id:e))?i:o,typeof i===l?i.call(e,{name:"id",hash:{},data:a}):i))+"_endpoint_list' style='display:none'>\n\n</ul>\n"},useData:!0});var ResponseContentTypeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;ResponseContentTypeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),$("label[for=responseContentType]",$(this.el)).text("Response Content Type"),this},t.prototype.template=function(){return Handlebars.templates.response_content_type},t}(Backbone.View),this.Handlebars.templates.response_content_type=Handlebars.template({1:function(e,t,n,a){var s,i="";return s=t.each.call(e,null!=e?e.produces:e,{name:"each",hash:{},fn:this.program(2,a),inverse:this.noop,data:a}),null!=s&&(i+=s),i},2:function(e){var t,n=this.lambda,a='  <option value="';return t=n(e,e),null!=t&&(a+=t),a+='">',t=n(e,e),null!=t&&(a+=t),a+"</option>\n"},4:function(){return'  <option value="application/json">application/json</option>\n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i='<label for="responseContentType"></label>\n<select name="responseContentType">\n';return s=t["if"].call(e,null!=e?e.produces:e,{name:"if",hash:{},fn:this.program(1,a),inverse:this.program(4,a),data:a}),null!=s&&(i+=s),i+"</select>\n"},useData:!0});var SignatureView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;SignatureView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"},t.prototype.initialize=function(){},t.prototype.render=function(){var e;return e=this.template(),$(this.el).html(e(this.model)),this.switchToSnippet(),this.isParam=this.model.isParam,this.isParam&&$(".notice",$(this.el)).text("Click to set as parameter value"),this},t.prototype.template=function(){return Handlebars.templates.signature},t.prototype.switchToDescription=function(e){return null!=e&&e.preventDefault(),$(".snippet",$(this.el)).hide(),$(".description",$(this.el)).show(),$(".description-link",$(this.el)).addClass("selected"),$(".snippet-link",$(this.el)).removeClass("selected")},t.prototype.switchToSnippet=function(e){return null!=e&&e.preventDefault(),$(".description",$(this.el)).hide(),$(".snippet",$(this.el)).show(),$(".snippet-link",$(this.el)).addClass("selected"),$(".description-link",$(this.el)).removeClass("selected")},t.prototype.snippetToTextArea=function(e){var t;return this.isParam&&(null!=e&&e.preventDefault(),t=$("textarea",$(this.el.parentNode.parentNode.parentNode)),""===$.trim(t.val()))?t.val(this.model.sampleJSON):void 0},t}(Backbone.View),this.Handlebars.templates.signature=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p='<div>\n<ul class="signature-nav">\n  <li><a class="description-link" href="#">Model</a></li>\n  <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n  <div class="description">\n    ';return i=null!=(i=t.signature||(null!=e?e.signature:e))?i:l,s=typeof i===r?i.call(e,{name:"signature",hash:{},data:a}):i,null!=s&&(p+=s),p+'\n  </div>\n\n  <div class="snippet">\n    <pre><code>'+o((i=null!=(i=t.sampleJSON||(null!=e?e.sampleJSON:e))?i:l,typeof i===r?i.call(e,{name:"sampleJSON",hash:{},data:a}):i))+'</code></pre>\n    <small class="notice"></small>\n  </div>\n</div>\n\n'},useData:!0});var StatusCodeView,__extends=function(e,t){function n(){this.constructor=e}for(var a in t)__hasProp.call(t,a)&&(e[a]=t[a]);return n.prototype=t.prototype,e.prototype=new n,e.__super__=t.prototype,e},__hasProp={}.hasOwnProperty;StatusCodeView=function(e){function t(){return t.__super__.constructor.apply(this,arguments)}return __extends(t,e),t.prototype.initialize=function(){},t.prototype.render=function(){var e,t,n;return n=this.template(),$(this.el).html(n(this.model)),swaggerUi.api.models.hasOwnProperty(this.model.responseModel)?(e={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:!1,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()},t=new SignatureView({model:e,tagName:"div"}),$(".model-signature",this.$el).append(t.render().el)):$(".model-signature",this.$el).html(""),this},t.prototype.template=function(){return Handlebars.templates.status_code},t}(Backbone.View),this.Handlebars.templates.status_code=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,a){var s,i,r="function",l=t.helperMissing,o=this.escapeExpression,p="<td width='15%' class='code'>"+o((i=null!=(i=t.code||(null!=e?e.code:e))?i:l,typeof i===r?i.call(e,{name:"code",hash:{},data:a}):i))+"</td>\n<td>";return i=null!=(i=t.message||(null!=e?e.message:e))?i:l,s=typeof i===r?i.call(e,{name:"message",hash:{},data:a}):i,null!=s&&(p+=s),p+"</td>\n<td width='50%'><span class=\"model-signature\" /></td>"},useData:!0});
\ No newline at end of file
diff --git a/src/main/webapp/client/css/bootstrap-notify.css b/src/main/webapp/client/css/bootstrap-notify.css
new file mode 100644
index 00000000..a2d6877f
--- /dev/null
+++ b/src/main/webapp/client/css/bootstrap-notify.css
@@ -0,0 +1,31 @@
+.notifications {
+  position: fixed;
+}
+
+/* Positioning */ 
+.notifications.top-right {
+  right: 10px;
+  top: 25px;
+}
+
+.notifications.top-left {
+  left: 10px;
+  top: 25px;
+}
+
+.notifications.bottom-left {
+  left: 10px;
+  bottom: 25px;
+}
+
+.notifications.bottom-right {
+  right: 10px;
+  bottom: 25px;
+}
+
+/* Notification Element */
+.notifications > div {
+  position: relative;
+  z-index: 9999;
+  margin: 5px 0px;
+}
\ No newline at end of file
diff --git a/src/main/webapp/client/css/bootstrap.min.css b/src/main/webapp/client/css/bootstrap.min.css
new file mode 100644
index 00000000..f0b9523c
--- /dev/null
+++ b/src/main/webapp/client/css/bootstrap.min.css
@@ -0,0 +1,727 @@
+/*!
+ * Bootstrap v2.0.4
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;}
+.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;}
+#map_canvas img{max-width:none;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.span12{width:940px;}
+.span11{width:860px;}
+.span10{width:780px;}
+.span9{width:700px;}
+.span8{width:620px;}
+.span7{width:540px;}
+.span6{width:460px;}
+.span5{width:380px;}
+.span4{width:300px;}
+.span3{width:220px;}
+.span2{width:140px;}
+.span1{width:60px;}
+.offset12{margin-left:980px;}
+.offset11{margin-left:900px;}
+.offset10{margin-left:820px;}
+.offset9{margin-left:740px;}
+.offset8{margin-left:660px;}
+.offset7{margin-left:580px;}
+.offset6{margin-left:500px;}
+.offset5{margin-left:420px;}
+.offset4{margin-left:340px;}
+.offset3{margin-left:260px;}
+.offset2{margin-left:180px;}
+.offset1{margin-left:100px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";}
+.row-fluid:after{clear:both;}
+.row-fluid [class*="span"]{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574%;*margin-left:2.0744680846382977%;}
+.row-fluid [class*="span"]:first-child{margin-left:0;}
+.row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%;}
+.row-fluid .span11{width:91.489361693%;*width:91.4361702036383%;}
+.row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%;}
+.row-fluid .span9{width:74.468085099%;*width:74.4148936096383%;}
+.row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%;}
+.row-fluid .span7{width:57.446808505%;*width:57.3936170156383%;}
+.row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%;}
+.row-fluid .span5{width:40.425531911%;*width:40.3723404216383%;}
+.row-fluid .span4{width:31.914893614%;*width:31.8617021246383%;}
+.row-fluid .span3{width:23.404255317%;*width:23.3510638276383%;}
+.row-fluid .span2{width:14.89361702%;*width:14.8404255306383%;}
+.row-fluid .span1{width:6.382978723%;*width:6.329787233638298%;}
+.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;}p small{font-size:11px;color:#999999;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
+h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
+h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
+h3{font-size:18px;line-height:27px;}h3 small{font-size:14px;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
+.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
+.page-header h1{line-height:1;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;}
+ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;line-height:17px;}
+dd{margin-left:9px;}
+.dl-horizontal dt{float:left;width:120px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
+.dl-horizontal dd{margin-left:130px;}
+hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+.muted{color:#999999;}
+abbr[title]{cursor:help;border-bottom:1px dotted #999999;}
+abbr.initialism{font-size:90%;text-transform:uppercase;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;font-style:normal;line-height:18px;}
+small{font-size:100%;}
+cite{font-style:normal;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;color:inherit;background-color:transparent;border:0;}
+.pre-scrollable{max-height:340px;overflow-y:scroll;}
+.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;}
+.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;}
+a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
+.label-important,.badge-important{background-color:#b94a48;}
+.label-important[href],.badge-important[href]{background-color:#953b39;}
+.label-warning,.badge-warning{background-color:#f89406;}
+.label-warning[href],.badge-warning[href]{background-color:#c67605;}
+.label-success,.badge-success{background-color:#468847;}
+.label-success[href],.badge-success[href]{background-color:#356635;}
+.label-info,.badge-info{background-color:#3a87ad;}
+.label-info[href],.badge-info[href]{background-color:#2d6987;}
+.label-inverse,.badge-inverse{background-color:#333333;}
+.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;}
+table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;}
+.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;}
+.table th{font-weight:bold;}
+.table thead th{vertical-align:bottom;}
+.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #dddddd;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
+.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;}
+table .span1{float:none;width:44px;margin-left:0;}
+table .span2{float:none;width:124px;margin-left:0;}
+table .span3{float:none;width:204px;margin-left:0;}
+table .span4{float:none;width:284px;margin-left:0;}
+table .span5{float:none;width:364px;margin-left:0;}
+table .span6{float:none;width:444px;margin-left:0;}
+table .span7{float:none;width:524px;margin-left:0;}
+table .span8{float:none;width:604px;margin-left:0;}
+table .span9{float:none;width:684px;margin-left:0;}
+table .span10{float:none;width:764px;margin-left:0;}
+table .span11{float:none;width:844px;margin-left:0;}
+table .span12{float:none;width:924px;margin-left:0;}
+table .span13{float:none;width:1004px;margin-left:0;}
+table .span14{float:none;width:1084px;margin-left:0;}
+table .span15{float:none;width:1164px;margin-left:0;}
+table .span16{float:none;width:1244px;margin-left:0;}
+table .span17{float:none;width:1324px;margin-left:0;}
+table .span18{float:none;width:1404px;margin-left:0;}
+table .span19{float:none;width:1484px;margin-left:0;}
+table .span20{float:none;width:1564px;margin-left:0;}
+table .span21{float:none;width:1644px;margin-left:0;}
+table .span22{float:none;width:1724px;margin-left:0;}
+table .span23{float:none;width:1804px;margin-left:0;}
+table .span24{float:none;width:1884px;margin-left:0;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#999999;}
+label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;}
+input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
+label{display:block;margin-bottom:5px;}
+select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;}
+input,textarea{width:210px;}
+textarea{height:auto;}
+textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);}
+input[type="radio"],input[type="checkbox"]{margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;}
+input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;}
+.uneditable-textarea{width:auto;height:auto;}
+select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
+select{width:220px;border:1px solid #bbb;}
+select[multiple],select[size]{height:auto;}
+select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.radio,.checkbox{min-height:18px;padding-left:18px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;}
+.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;}
+input,textarea,.uneditable-input{margin-left:0;}
+input.span12, textarea.span12, .uneditable-input.span12{width:930px;}
+input.span11, textarea.span11, .uneditable-input.span11{width:850px;}
+input.span10, textarea.span10, .uneditable-input.span10{width:770px;}
+input.span9, textarea.span9, .uneditable-input.span9{width:690px;}
+input.span8, textarea.span8, .uneditable-input.span8{width:610px;}
+input.span7, textarea.span7, .uneditable-input.span7{width:530px;}
+input.span6, textarea.span6, .uneditable-input.span6{width:450px;}
+input.span5, textarea.span5, .uneditable-input.span5{width:370px;}
+input.span4, textarea.span4, .uneditable-input.span4{width:290px;}
+input.span3, textarea.span3, .uneditable-input.span3{width:210px;}
+input.span2, textarea.span2, .uneditable-input.span2{width:130px;}
+input.span1, textarea.span1, .uneditable-input.span1{width:50px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;border-color:#ddd;}
+input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning .checkbox:focus,.control-group.warning .radio:focus,.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success .checkbox:focus,.control-group.success .radio:focus,.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
+.form-actions:after{clear:both;}
+.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);}
+:-moz-placeholder{color:#999999;}
+:-ms-input-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
+.help-block,.help-inline{color:#555555;}
+.help-block{display:block;margin-bottom:9px;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;}
+.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
+.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;}
+.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;}
+.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append .uneditable-input{border-right-color:#ccc;border-left-color:#eee;}
+.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;}
+.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;}
+.form-search label,.form-inline label{display:inline-block;}
+.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;}
+.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;}
+.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;}
+.control-group{margin-bottom:9px;}
+legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:160px;}
+.form-horizontal .help-block{margin-top:9px;margin-bottom:0;}
+.form-horizontal .form-actions{padding-left:160px;}
+.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;*line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;*background-color:#d9d9d9;}
+.btn:active,.btn.active{background-color:#cccccc \9;}
+.btn:first-child{*margin-left:0;}
+.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
+.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-large [class^="icon-"]{margin-top:1px;}
+.btn-small{padding:5px 9px;font-size:11px;line-height:16px;}
+.btn-small [class^="icon-"]{margin-top:-1px;}
+.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;}
+.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
+.btn{border-color:#ccc;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0055cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;*background-color:#004ab3;}
+.btn-primary:active,.btn-primary.active{background-color:#004099 \9;}
+.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505;}
+.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
+.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a;}
+.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
+.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;*background-color:#499249;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;*background-color:#151515;}
+.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
+button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
+button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;}
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;}
+.icon-white{background-image:url("../img/glyphicons-halflings-white.png");}
+.icon-glass{background-position:0 0;}
+.icon-music{background-position:-24px 0;}
+.icon-search{background-position:-48px 0;}
+.icon-envelope{background-position:-72px 0;}
+.icon-heart{background-position:-96px 0;}
+.icon-star{background-position:-120px 0;}
+.icon-star-empty{background-position:-144px 0;}
+.icon-user{background-position:-168px 0;}
+.icon-film{background-position:-192px 0;}
+.icon-th-large{background-position:-216px 0;}
+.icon-th{background-position:-240px 0;}
+.icon-th-list{background-position:-264px 0;}
+.icon-ok{background-position:-288px 0;}
+.icon-remove{background-position:-312px 0;}
+.icon-zoom-in{background-position:-336px 0;}
+.icon-zoom-out{background-position:-360px 0;}
+.icon-off{background-position:-384px 0;}
+.icon-signal{background-position:-408px 0;}
+.icon-cog{background-position:-432px 0;}
+.icon-trash{background-position:-456px 0;}
+.icon-home{background-position:0 -24px;}
+.icon-file{background-position:-24px -24px;}
+.icon-time{background-position:-48px -24px;}
+.icon-road{background-position:-72px -24px;}
+.icon-download-alt{background-position:-96px -24px;}
+.icon-download{background-position:-120px -24px;}
+.icon-upload{background-position:-144px -24px;}
+.icon-inbox{background-position:-168px -24px;}
+.icon-play-circle{background-position:-192px -24px;}
+.icon-repeat{background-position:-216px -24px;}
+.icon-refresh{background-position:-240px -24px;}
+.icon-list-alt{background-position:-264px -24px;}
+.icon-lock{background-position:-287px -24px;}
+.icon-flag{background-position:-312px -24px;}
+.icon-headphones{background-position:-336px -24px;}
+.icon-volume-off{background-position:-360px -24px;}
+.icon-volume-down{background-position:-384px -24px;}
+.icon-volume-up{background-position:-408px -24px;}
+.icon-qrcode{background-position:-432px -24px;}
+.icon-barcode{background-position:-456px -24px;}
+.icon-tag{background-position:0 -48px;}
+.icon-tags{background-position:-25px -48px;}
+.icon-book{background-position:-48px -48px;}
+.icon-bookmark{background-position:-72px -48px;}
+.icon-print{background-position:-96px -48px;}
+.icon-camera{background-position:-120px -48px;}
+.icon-font{background-position:-144px -48px;}
+.icon-bold{background-position:-167px -48px;}
+.icon-italic{background-position:-192px -48px;}
+.icon-text-height{background-position:-216px -48px;}
+.icon-text-width{background-position:-240px -48px;}
+.icon-align-left{background-position:-264px -48px;}
+.icon-align-center{background-position:-288px -48px;}
+.icon-align-right{background-position:-312px -48px;}
+.icon-align-justify{background-position:-336px -48px;}
+.icon-list{background-position:-360px -48px;}
+.icon-indent-left{background-position:-384px -48px;}
+.icon-indent-right{background-position:-408px -48px;}
+.icon-facetime-video{background-position:-432px -48px;}
+.icon-picture{background-position:-456px -48px;}
+.icon-pencil{background-position:0 -72px;}
+.icon-map-marker{background-position:-24px -72px;}
+.icon-adjust{background-position:-48px -72px;}
+.icon-tint{background-position:-72px -72px;}
+.icon-edit{background-position:-96px -72px;}
+.icon-share{background-position:-120px -72px;}
+.icon-check{background-position:-144px -72px;}
+.icon-move{background-position:-168px -72px;}
+.icon-step-backward{background-position:-192px -72px;}
+.icon-fast-backward{background-position:-216px -72px;}
+.icon-backward{background-position:-240px -72px;}
+.icon-play{background-position:-264px -72px;}
+.icon-pause{background-position:-288px -72px;}
+.icon-stop{background-position:-312px -72px;}
+.icon-forward{background-position:-336px -72px;}
+.icon-fast-forward{background-position:-360px -72px;}
+.icon-step-forward{background-position:-384px -72px;}
+.icon-eject{background-position:-408px -72px;}
+.icon-chevron-left{background-position:-432px -72px;}
+.icon-chevron-right{background-position:-456px -72px;}
+.icon-plus-sign{background-position:0 -96px;}
+.icon-minus-sign{background-position:-24px -96px;}
+.icon-remove-sign{background-position:-48px -96px;}
+.icon-ok-sign{background-position:-72px -96px;}
+.icon-question-sign{background-position:-96px -96px;}
+.icon-info-sign{background-position:-120px -96px;}
+.icon-screenshot{background-position:-144px -96px;}
+.icon-remove-circle{background-position:-168px -96px;}
+.icon-ok-circle{background-position:-192px -96px;}
+.icon-ban-circle{background-position:-216px -96px;}
+.icon-arrow-left{background-position:-240px -96px;}
+.icon-arrow-right{background-position:-264px -96px;}
+.icon-arrow-up{background-position:-289px -96px;}
+.icon-arrow-down{background-position:-312px -96px;}
+.icon-share-alt{background-position:-336px -96px;}
+.icon-resize-full{background-position:-360px -96px;}
+.icon-resize-small{background-position:-384px -96px;}
+.icon-plus{background-position:-408px -96px;}
+.icon-minus{background-position:-433px -96px;}
+.icon-asterisk{background-position:-456px -96px;}
+.icon-exclamation-sign{background-position:0 -120px;}
+.icon-gift{background-position:-24px -120px;}
+.icon-leaf{background-position:-48px -120px;}
+.icon-fire{background-position:-72px -120px;}
+.icon-eye-open{background-position:-96px -120px;}
+.icon-eye-close{background-position:-120px -120px;}
+.icon-warning-sign{background-position:-144px -120px;}
+.icon-plane{background-position:-168px -120px;}
+.icon-calendar{background-position:-192px -120px;}
+.icon-random{background-position:-216px -120px;}
+.icon-comment{background-position:-240px -120px;}
+.icon-magnet{background-position:-264px -120px;}
+.icon-chevron-up{background-position:-288px -120px;}
+.icon-chevron-down{background-position:-313px -119px;}
+.icon-retweet{background-position:-336px -120px;}
+.icon-shopping-cart{background-position:-360px -120px;}
+.icon-folder-close{background-position:-384px -120px;}
+.icon-folder-open{background-position:-408px -120px;}
+.icon-resize-vertical{background-position:-432px -119px;}
+.icon-resize-horizontal{background-position:-456px -118px;}
+.icon-hdd{background-position:0 -144px;}
+.icon-bullhorn{background-position:-24px -144px;}
+.icon-bell{background-position:-48px -144px;}
+.icon-certificate{background-position:-72px -144px;}
+.icon-thumbs-up{background-position:-96px -144px;}
+.icon-thumbs-down{background-position:-120px -144px;}
+.icon-hand-right{background-position:-144px -144px;}
+.icon-hand-left{background-position:-168px -144px;}
+.icon-hand-up{background-position:-192px -144px;}
+.icon-hand-down{background-position:-216px -144px;}
+.icon-circle-arrow-right{background-position:-240px -144px;}
+.icon-circle-arrow-left{background-position:-264px -144px;}
+.icon-circle-arrow-up{background-position:-288px -144px;}
+.icon-circle-arrow-down{background-position:-312px -144px;}
+.icon-globe{background-position:-336px -144px;}
+.icon-wrench{background-position:-360px -144px;}
+.icon-tasks{background-position:-384px -144px;}
+.icon-filter{background-position:-408px -144px;}
+.icon-briefcase{background-position:-432px -144px;}
+.icon-fullscreen{background-position:-456px -144px;}
+.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
+.btn-group:after{clear:both;}
+.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
+.btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group>.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);*padding-top:4px;*padding-bottom:4px;}
+.btn-group>.btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;}
+.btn-group>.btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;}
+.btn-group>.btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
+.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;}
+.btn-group.open .btn-primary.dropdown-toggle{background-color:#0055cc;}
+.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;}
+.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;}
+.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;}
+.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;}
+.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;}
+.btn .caret{margin-top:7px;margin-left:0;}
+.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
+.btn-mini .caret{margin-top:5px;}
+.btn-small .caret{margin-top:6px;}
+.btn-large .caret{margin-top:6px;border-left-width:5px;border-right-width:5px;border-top-width:5px;}
+.dropup .btn-large .caret{border-bottom:5px solid #000000;border-top:0;}
+.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
+.nav>.pull-right{float:right;}
+.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;}
+.nav li+.nav-header{margin-top:9px;}
+.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;}
+.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav-list>li>a{padding:3px 15px;}
+.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav-list [class^="icon-"]{margin-right:2px;}
+.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";}
+.nav-tabs:after,.nav-pills:after{clear:both;}
+.nav-tabs>li,.nav-pills>li{float:left;}
+.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.nav-tabs{border-bottom:1px solid #ddd;}
+.nav-tabs>li{margin-bottom:-1px;}
+.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav-stacked>li{float:none;}
+.nav-stacked>li>a{margin-right:0;}
+.nav-tabs.nav-stacked{border-bottom:0;}
+.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.nav-pills.nav-stacked>li>a{margin-bottom:3px;}
+.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;}
+.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
+.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;}
+.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;}
+.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs-stacked .open>a:hover{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
+.tabbable:after{clear:both;}
+.tab-content{overflow:auto;}
+.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below>.nav-tabs{border-top:1px solid #ddd;}
+.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;}
+.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;}
+.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);}
+.navbar .container{width:auto;}
+.nav-collapse.collapse{height:auto;}
+.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#999999;}
+.navbar .navbar-text{margin-bottom:0;line-height:40px;}
+.navbar .navbar-link{color:#999999;}.navbar .navbar-link:hover{color:#ffffff;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin:0;}
+.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";}
+.navbar-form:after{clear:both;}
+.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;}
+.navbar-search .search-query:-ms-input-placeholder{color:#cccccc;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
+.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.navbar-fixed-top{top:0;}
+.navbar-fixed-bottom{bottom:0;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px;}
+.navbar .btn-group{margin:0;padding:5px 5px 6px;}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;}
+.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#222222;*background-color:#151515;}
+.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#080808 \9;}
+.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .icon-bar+.icon-bar{margin-top:3px;}
+.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;}
+.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;}
+.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.navbar .nav li.dropdown.active .caret{opacity:1;filter:alpha(opacity=100);}
+.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#ffffff;}
+.navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{left:auto;right:12px;}
+.navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{left:auto;right:13px;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb .divider{padding:0 5px;color:#999999;}
+.breadcrumb .active a{color:#333333;}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination li{display:inline;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;cursor:default;}
+.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
+.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
+.thumbnails:after{clear:both;}
+.row-fluid .thumbnails{margin-left:0;}
+.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px;}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;}
+.alert-heading{color:inherit;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);}
+.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-2px;}
+.tooltip.right{margin-left:2px;}
+.tooltip.bottom{margin-top:2px;}
+.tooltip.left{margin-left:-2px;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+.popover.right{margin-left:5px;}
+.popover.bottom{margin-top:5px;}
+.popover.left{margin-left:-5px;}
+.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;}
+.modal-open .dropdown-menu{z-index:2050;}
+.modal-open .dropdown.open{*z-index:2050;}
+.modal-open .popover{z-index:2060;}
+.modal-open .tooltip{z-index:2070;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-body{overflow-y:auto;max-height:400px;padding:15px;}
+.modal-form{margin-bottom:0;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer:after{clear:both;}
+.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;}
+.modal-footer .btn-group .btn+.btn{margin-left:-1px;}
+.dropup,.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity:0.3;filter:alpha(opacity=30);}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;}
+.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
+.open{*z-index:1000;}.open >.dropdown-menu{display:block;}
+.pull-right>.dropdown-menu{right:0;left:auto;}
+.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";}
+.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion{margin-bottom:18px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-toggle{cursor:pointer;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;margin-bottom:18px;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .active{left:0;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}
+button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
+.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;}
+.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;}
+.hidden{display:none;visibility:hidden;}
+.visible-phone{display:none !important;}
+.visible-tablet{display:none !important;}
+.hidden-desktop{display:none !important;}
+@media (max-width:767px){.visible-phone{display:inherit !important;} .hidden-phone{display:none !important;} .hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important;}}@media (min-width:768px) and (max-width:979px){.visible-tablet{display:inherit !important;} .hidden-tablet{display:none !important;} .hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important ;}}@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:767px){body{padding-left:20px;padding-right:20px;} .navbar-fixed-top,.navbar-fixed-bottom{margin-left:-20px;margin-right:-20px;} .container-fluid{padding:0;} .dl-horizontal dt{float:none;clear:none;width:auto;text-align:left;} .dl-horizontal dd{margin-left:0;} .container{width:auto;} .row-fluid{width:100%;} .row,.thumbnails{margin-left:0;} [class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:auto;margin-left:0;} .input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px;} .span12{width:724px;} .span11{width:662px;} .span10{width:600px;} .span9{width:538px;} .span8{width:476px;} .span7{width:414px;} .span6{width:352px;} .span5{width:290px;} .span4{width:228px;} .span3{width:166px;} .span2{width:104px;} .span1{width:42px;} .offset12{margin-left:764px;} .offset11{margin-left:702px;} .offset10{margin-left:640px;} .offset9{margin-left:578px;} .offset8{margin-left:516px;} .offset7{margin-left:454px;} .offset6{margin-left:392px;} .offset5{margin-left:330px;} .offset4{margin-left:268px;} .offset3{margin-left:206px;} .offset2{margin-left:144px;} .offset1{margin-left:82px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.762430939%;*margin-left:2.709239449638298%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:99.999999993%;*width:99.9468085036383%;} .row-fluid .span11{width:91.436464082%;*width:91.38327259263829%;} .row-fluid .span10{width:82.87292817100001%;*width:82.8197366816383%;} .row-fluid .span9{width:74.30939226%;*width:74.25620077063829%;} .row-fluid .span8{width:65.74585634900001%;*width:65.6926648596383%;} .row-fluid .span7{width:57.182320438000005%;*width:57.129128948638304%;} .row-fluid .span6{width:48.618784527%;*width:48.5655930376383%;} .row-fluid .span5{width:40.055248616%;*width:40.0020571266383%;} .row-fluid .span4{width:31.491712705%;*width:31.4385212156383%;} .row-fluid .span3{width:22.928176794%;*width:22.874985304638297%;} .row-fluid .span2{width:14.364640883%;*width:14.311449393638298%;} .row-fluid .span1{width:5.801104972%;*width:5.747913482638298%;} input,textarea,.uneditable-input{margin-left:0;} input.span12, textarea.span12, .uneditable-input.span12{width:714px;} input.span11, textarea.span11, .uneditable-input.span11{width:652px;} input.span10, textarea.span10, .uneditable-input.span10{width:590px;} input.span9, textarea.span9, .uneditable-input.span9{width:528px;} input.span8, textarea.span8, .uneditable-input.span8{width:466px;} input.span7, textarea.span7, .uneditable-input.span7{width:404px;} input.span6, textarea.span6, .uneditable-input.span6{width:342px;} input.span5, textarea.span5, .uneditable-input.span5{width:280px;} input.span4, textarea.span4, .uneditable-input.span4{width:218px;} input.span3, textarea.span3, .uneditable-input.span3{width:156px;} input.span2, textarea.span2, .uneditable-input.span2{width:94px;} input.span1, textarea.span1, .uneditable-input.span1{width:32px;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:30px;} .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px;} .span12{width:1170px;} .span11{width:1070px;} .span10{width:970px;} .span9{width:870px;} .span8{width:770px;} .span7{width:670px;} .span6{width:570px;} .span5{width:470px;} .span4{width:370px;} .span3{width:270px;} .span2{width:170px;} .span1{width:70px;} .offset12{margin-left:1230px;} .offset11{margin-left:1130px;} .offset10{margin-left:1030px;} .offset9{margin-left:930px;} .offset8{margin-left:830px;} .offset7{margin-left:730px;} .offset6{margin-left:630px;} .offset5{margin-left:530px;} .offset4{margin-left:430px;} .offset3{margin-left:330px;} .offset2{margin-left:230px;} .offset1{margin-left:130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.564102564%;*margin-left:2.510911074638298%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} .row-fluid .span11{width:91.45299145300001%;*width:91.3997999636383%;} .row-fluid .span10{width:82.905982906%;*width:82.8527914166383%;} .row-fluid .span9{width:74.358974359%;*width:74.30578286963829%;} .row-fluid .span8{width:65.81196581200001%;*width:65.7587743226383%;} .row-fluid .span7{width:57.264957265%;*width:57.2117657756383%;} .row-fluid .span6{width:48.717948718%;*width:48.6647572286383%;} .row-fluid .span5{width:40.170940171000005%;*width:40.117748681638304%;} .row-fluid .span4{width:31.623931624%;*width:31.5707401346383%;} .row-fluid .span3{width:23.076923077%;*width:23.0237315876383%;} .row-fluid .span2{width:14.529914530000001%;*width:14.4767230406383%;} .row-fluid .span1{width:5.982905983%;*width:5.929714493638298%;} input,textarea,.uneditable-input{margin-left:0;} input.span12, textarea.span12, .uneditable-input.span12{width:1160px;} input.span11, textarea.span11, .uneditable-input.span11{width:1060px;} input.span10, textarea.span10, .uneditable-input.span10{width:960px;} input.span9, textarea.span9, .uneditable-input.span9{width:860px;} input.span8, textarea.span8, .uneditable-input.span8{width:760px;} input.span7, textarea.span7, .uneditable-input.span7{width:660px;} input.span6, textarea.span6, .uneditable-input.span6{width:560px;} input.span5, textarea.span5, .uneditable-input.span5{width:460px;} input.span4, textarea.span4, .uneditable-input.span4{width:360px;} input.span3, textarea.span3, .uneditable-input.span3{width:260px;} input.span2, textarea.span2, .uneditable-input.span2{width:160px;} input.span1, textarea.span1, .uneditable-input.span1{width:60px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .row-fluid .thumbnails{margin-left:0;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:static;} .navbar-fixed-top{margin-bottom:18px;} .navbar-fixed-bottom{margin-top:18px;} .navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .nav-collapse{clear:both;} .nav-collapse .nav{float:none;margin:0 0 9px;} .nav-collapse .nav>li{float:none;} .nav-collapse .nav>li>a{margin-bottom:2px;} .nav-collapse .nav>.divider-vertical{display:none;} .nav-collapse .nav .nav-header{color:#999999;text-shadow:none;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .nav-collapse .dropdown-menu li+li a{margin-bottom:2px;} .nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#222222;} .nav-collapse.in .btn-group{margin-top:5px;padding:0;} .nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none;} .nav-collapse .dropdown-menu .divider{display:none;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);} .navbar .nav-collapse .nav.pull-right{float:none;margin-left:0;} .nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0;} .navbar .btn-navbar{display:block;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;overflow:visible !important;}}
diff --git a/src/main/webapp/client/css/custom.css b/src/main/webapp/client/css/custom.css
new file mode 100644
index 00000000..f2be31d1
--- /dev/null
+++ b/src/main/webapp/client/css/custom.css
@@ -0,0 +1,471 @@
+body {
+    background-color: #FFFFFF !important;
+    font: 12px/18px Arial, Helvetica, sans-serif !important;
+    min-width: 1033px;
+}
+
+.header {
+    background: transparent none no-repeat !important;
+    box-shadow: none !important;
+    margin: 0;
+    padding: 0;
+}
+
+.header-line {
+    height: 6px;
+    border-top: 6px solid #00305d;
+    background-color: #B1B2B3;
+    margin-top: 90px;
+}
+
+.header-page-title {
+    margin-bottom: 50px;
+}
+
+.header-title {
+    font-size: 70px;
+    margin-right: 20px;
+    margin-top: 50px;
+}
+
+.header-title-first-letters {
+    color: #00305d;
+}
+
+.header-title-last-letters {
+    color: #B1B2B3;
+}
+
+/* Content */
+div.content {
+    background-color: #EEEEEE;
+    margin-bottom: 10px;
+    padding: 5px;
+}
+
+div.content h2 {
+    margin-bottom: 15px;
+}
+
+.content-title {
+    background-color: #DDDDDD;
+    margin-bottom: 1px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+.content-title-grey {
+    background-color: #DDDDDD;
+}
+
+.content-title-grey:hover {
+    background-color: #B1B2B3;
+}
+
+.content-title h2 {
+    display: inline;
+    font-size: 18px;
+    font-style: normal;
+    line-height: 35px;
+}
+
+.content-title h3 {
+    display: inline;
+    font-size: 15px;
+    font-style: normal;
+    line-height: 35px;
+}
+
+.content-title h4 {
+    display: inline;
+    font-size: 12px;
+    font-style: normal;
+    line-height: 35px;
+    padding-right: 5px;
+}
+
+.horizontal-nav > .content-title {
+    overflow: hidden;
+}
+
+.horizontal-nav > .content-title > h2 {
+    float: left;
+}
+
+.horizontal-nav > .content-title > ul {
+    padding-top: 0;
+    float: left;
+    padding-left: 112px;
+}
+
+.horizontal-nav > .content-title > ul.nav-pills > li {
+    padding-top: 3px;
+}
+
+.horizontal-nav > .content-title > ul.nav-pills > li > a {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+.accordion-content-title {
+    margin-bottom: 0 !important;
+}
+
+.accordion-group {
+    border: medium none;
+}
+
+.accordion-heading {
+    background: #00305d no-repeat;
+}
+
+.accordion-heading {
+    border: 1px solid #00305d;
+    margin-bottom: 0;
+}
+
+.accordion-heading a {
+    color: white;
+    padding-left: 18px !important;
+    text-decoration: none;
+}
+
+.accordion-heading a:hover {
+    color: white;
+    text-decoration: none;
+}
+
+a.accordion-heading-open {
+    background: url("../../images/up_black.png") no-repeat center;
+}
+
+.accordion-inner {
+    background-color: #DDDDDD;
+    border-image: none;
+    border: 1px solid #00305d;
+}
+
+.selectParentAddress {
+    cursor: pointer;
+}
+
+.item-select {
+    cursor: pointer;
+}
+
+/* Buttons */
+.back-button-link {
+    background: #DDDDDD url("../../images/back.png") 0 35px;
+    display: block;
+    float: left;
+    height: 35px;
+    margin-right: 10px;
+    width: 60px;
+}
+
+.collapsable-indicator {
+    background: url("../../images/down_black.png") no-repeat center;
+    border-right: 1px solid white;
+    display: block;
+    float: left;
+    height: 35px;
+    margin-right: 10px;
+    width: 38px;
+}
+
+.collapsable-indicator.notclickable {
+    background-image: none;
+    cursor: default;
+}
+
+.back-button-link:hover {
+    background-position: 0 0;
+}
+
+.btn {
+    text-shadow: none;
+    background-color: #F7F7F7;
+}
+
+.btn:hover {
+    text-shadow: none;
+    opacity: 0.8 !important;
+}
+
+.btn.disabled {
+    opacity: 0.5 !important;
+}
+
+.btn-primary {
+    background: #00305d none !important;
+}
+
+.btn-create-top {
+    margin-top: 5px;
+}
+
+.btn-create-bottom {
+    margin-bottom: 5px;
+}
+
+/* Form */
+.form-horizontal {
+    padding-top: 25px;
+}
+
+.form-actions {
+    background-color: transparent;
+    border: medium none;
+}
+
+.error {
+    color: #B94A48 !important;
+}
+
+input.error {
+    border-color: #B94A48 !important;
+    color: #B94A48;
+}
+
+input.error:focus {
+    border-color: #B94A48 !important;
+    box-shadow: 0 0 6px #D59392;
+    color: #B94A48;
+}
+
+span.error {
+    color: #B94A48 !important;
+}
+
+/* Tables */
+.iris-table {
+    margin-bottom: 0;
+}
+
+.iris-table th {
+    background-color: #00305d;
+    border: 1px solid white;
+    color: #FFFFFF;
+    text-align: center;
+}
+
+.iris-table th a {
+    color: #FFFFFF;
+    text-decoration: none;
+}
+
+.iris-table th a:hover {
+    color: #FFFFFF;
+}
+
+.iris-table tr:hover {
+    background-color: #B1B2B3 !important;
+}
+
+.iris-table td a {
+    color: #00305d !important;
+}
+
+.iris-table td a:hover {
+    color: #00305d !important;
+    text-decoration: none;
+}
+
+.iris-table td {
+    border: 1px solid white;
+    padding: 5px;
+    text-align: left;
+    vertical-align: middle;
+}
+
+.iris-table td form {
+    margin: 0 !important;
+    padding: 0 !important;
+    text-align: center;
+}
+
+.iris-table td a.btn, .iris-table th a.btn {
+    color: #FFFFFF !important;
+}
+
+.iris-table td.table-buttons {
+    text-align: center;
+}
+
+.iris-table tr:nth-of-type(n+1) {
+    background-color: #D9D9D9;
+}
+
+.iris-table tr:nth-of-type(2n+1) {
+    background-color: #EBEBEB;
+}
+
+.table tbody tr:hover td, .table tbody tr:hover th {
+    background-color: transparent;
+}
+
+.triangleTableTotals {
+    border-top: 2px solid black !important;
+}
+
+.geocoding-results {
+    height: 377px;
+    overflow: auto;
+}
+
+/*Navigation*/
+.nav {
+    margin: 0;
+    padding-top: 10px;
+}
+
+.nav li:first-child {
+    padding-left: 0;
+}
+
+.nav li {
+    float: left;
+    padding-left: 20px;
+}
+
+.header .dropdown-menu {
+    min-width: 0;
+}
+
+.header .nav > li > a {
+    color: #00305d;
+    text-shadow: none;
+}
+
+.header .nav > li > a:hover {
+    background-color: transparent;
+    color: #B1B2B3;
+}
+
+.dropdown-menu li {
+    background-color: #00305d;
+    color: white;
+    width: 100%;
+    cursor: pointer;
+}
+
+.dropdown-menu li.nav-header {
+    padding-left: 5px;
+    text-align: left;
+}
+
+.dropdown-menu li a {
+    background-color: white !important;
+    color: #00305d !important;
+    text-align: left;
+}
+
+.dropdown-menu li a:hover {
+    color: #B1B2B3 !important;
+}
+
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover {
+    background-color: white !important;
+    color: #B1B2B3 !important;
+}
+
+.iris-nav-links {
+    padding-top: 0 !important;
+}
+
+.iris-nav-links li {
+    background-color: transparent !important;
+}
+
+.iris-nav-links .dropdown li {
+    padding-left: 0 !important;
+}
+
+/* Footer */
+.footer {
+    border-top: 6px solid #00305d;
+    margin: 20px;
+}
+
+.footer-border {
+    border-top: 6px solid #B1B2B3;
+}
+
+.to-top-scroller {
+    background: url("../../images/top-scroller.png") no-repeat;
+    height: 30px;
+    margin-top: 5px;
+    opacity: 0.6;
+    position: absolute;
+    width: 30px;
+    z-index: 2;
+}
+
+/* Management */
+.management-button-top {
+    margin-bottom: 50px;
+}
+
+.management-button-bottom {
+    margin-top: 50px;
+}
+
+/* Messages */
+.message {
+    font-size: 15px;
+    line-height: 35px;
+    margin-bottom: 1px;
+    text-align: center;
+}
+
+.message-error {
+    background-color: #FCE2E4;
+    border: 3px solid red;
+    color: red !important;
+}
+
+.message-success {
+    background-color: #DFFFDF;
+    border: 3px solid #B1B2B3;
+    color: #B1B2B3 !important;
+}
+
+.message-width {
+    width: -moz-calc(100% - 6px);
+    width: -webkit-calc(100% - 6px);
+    width: calc(100% - 6px);
+}
+
+.terminals {
+    margin-bottom: 5px;
+}
+
+.gap {
+    display: block;
+    font-size: 13px;
+    font-weight: normal;
+    line-height: 18px;
+    margin-bottom: 5px;
+}
+
+.country-container .btn-group:before {
+    display: inline;
+}
+
+.country-container, .country-container .btn-group {
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.underlined {
+    text-decoration: underline;
+}
+
+.icon-red {
+    background-image: url("../img/glyphicons-halflings-red.png");
+}
+
+.unsupported-browser {
+    margin-bottom: 40px;
+    display: inline-block;
+}
\ No newline at end of file
diff --git a/src/main/webapp/client/img/glyphicons-halflings-red.png b/src/main/webapp/client/img/glyphicons-halflings-red.png
new file mode 100644
index 00000000..a474999c
Binary files /dev/null and b/src/main/webapp/client/img/glyphicons-halflings-red.png differ
diff --git a/src/main/webapp/client/img/glyphicons-halflings-white.png b/src/main/webapp/client/img/glyphicons-halflings-white.png
new file mode 100644
index 00000000..3bf6484a
Binary files /dev/null and b/src/main/webapp/client/img/glyphicons-halflings-white.png differ
diff --git a/src/main/webapp/client/img/glyphicons-halflings.png b/src/main/webapp/client/img/glyphicons-halflings.png
new file mode 100644
index 00000000..79bc568c
Binary files /dev/null and b/src/main/webapp/client/img/glyphicons-halflings.png differ
diff --git a/src/main/webapp/client/js/lib/ReplaceCommaByPoint.js b/src/main/webapp/client/js/lib/ReplaceCommaByPoint.js
new file mode 100644
index 00000000..00b43453
--- /dev/null
+++ b/src/main/webapp/client/js/lib/ReplaceCommaByPoint.js
@@ -0,0 +1,16 @@
+$(document).ready(function () {
+
+    $('form').submit(function () {
+        $('input.comma-replacement-aware').each(function () {
+            replaceCommaByPoint($(this));
+        });
+    });
+
+    $('input.comma-replacement-aware').on('blur', function () {
+        replaceCommaByPoint($(this));
+    });
+
+    function replaceCommaByPoint(input) {
+        input.val(input.val().replace(/,/g, '.'));
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/backbone.js b/src/main/webapp/client/js/lib/backbone.js
new file mode 100644
index 00000000..24a550a0
--- /dev/null
+++ b/src/main/webapp/client/js/lib/backbone.js
@@ -0,0 +1,1608 @@
+//     Backbone.js 1.1.2
+
+//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(root, factory) {
+
+  // Set up Backbone appropriately for the environment. Start with AMD.
+  if (typeof define === 'function' && define.amd) {
+    define(['underscore', 'jquery', 'exports'], function(_, $, exports) {
+      // Export global even in AMD case in case this script is loaded with
+      // others that may still expect a global Backbone.
+      root.Backbone = factory(root, exports, _, $);
+    });
+
+  // Next for Node.js or CommonJS. jQuery may not be needed as a module.
+  } else if (typeof exports !== 'undefined') {
+    var _ = require('underscore');
+    factory(root, exports, _);
+
+  // Finally, as a browser global.
+  } else {
+    root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$));
+  }
+
+}(this, function(root, Backbone, _, $) {
+
+  // Initial Setup
+  // -------------
+
+  // Save the previous value of the `Backbone` variable, so that it can be
+  // restored later on, if `noConflict` is used.
+  var previousBackbone = root.Backbone;
+
+  // Create local references to array methods we'll want to use later.
+  var array = [];
+  var push = array.push;
+  var slice = array.slice;
+  var splice = array.splice;
+
+  // Current version of the library. Keep in sync with `package.json`.
+  Backbone.VERSION = '1.1.2';
+
+  // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
+  // the `$` variable.
+  Backbone.$ = $;
+
+  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
+  // to its previous owner. Returns a reference to this Backbone object.
+  Backbone.noConflict = function() {
+    root.Backbone = previousBackbone;
+    return this;
+  };
+
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
+  // will fake `"PATCH"`, `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+  // set a `X-Http-Method-Override` header.
+  Backbone.emulateHTTP = false;
+
+  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
+  // `application/json` requests ... will encode the body as
+  // `application/x-www-form-urlencoded` instead and will send the model in a
+  // form param named `model`.
+  Backbone.emulateJSON = false;
+
+  // Backbone.Events
+  // ---------------
+
+  // A module that can be mixed in to *any object* in order to provide it with
+  // custom events. You may bind with `on` or remove with `off` callback
+  // functions to an event; `trigger`-ing an event fires all callbacks in
+  // succession.
+  //
+  //     var object = {};
+  //     _.extend(object, Backbone.Events);
+  //     object.on('expand', function(){ alert('expanded'); });
+  //     object.trigger('expand');
+  //
+  var Events = Backbone.Events = {
+
+    // Bind an event to a `callback` function. Passing `"all"` will bind
+    // the callback to all events fired.
+    on: function(name, callback, context) {
+      if (!eventsApi(this, 'on', name, [callback, context]) || !callback) return this;
+      this._events || (this._events = {});
+      var events = this._events[name] || (this._events[name] = []);
+      events.push({callback: callback, context: context, ctx: context || this});
+      return this;
+    },
+
+    // Bind an event to only be triggered a single time. After the first time
+    // the callback is invoked, it will be removed.
+    once: function(name, callback, context) {
+      if (!eventsApi(this, 'once', name, [callback, context]) || !callback) return this;
+      var self = this;
+      var once = _.once(function() {
+        self.off(name, once);
+        callback.apply(this, arguments);
+      });
+      once._callback = callback;
+      return this.on(name, once, context);
+    },
+
+    // Remove one or many callbacks. If `context` is null, removes all
+    // callbacks with that function. If `callback` is null, removes all
+    // callbacks for the event. If `name` is null, removes all bound
+    // callbacks for all events.
+    off: function(name, callback, context) {
+      var retain, ev, events, names, i, l, j, k;
+      if (!this._events || !eventsApi(this, 'off', name, [callback, context])) return this;
+      if (!name && !callback && !context) {
+        this._events = void 0;
+        return this;
+      }
+      names = name ? [name] : _.keys(this._events);
+      for (i = 0, l = names.length; i < l; i++) {
+        name = names[i];
+        if (events = this._events[name]) {
+          this._events[name] = retain = [];
+          if (callback || context) {
+            for (j = 0, k = events.length; j < k; j++) {
+              ev = events[j];
+              if ((callback && callback !== ev.callback && callback !== ev.callback._callback) ||
+                  (context && context !== ev.context)) {
+                retain.push(ev);
+              }
+            }
+          }
+          if (!retain.length) delete this._events[name];
+        }
+      }
+
+      return this;
+    },
+
+    // Trigger one or many events, firing all bound callbacks. Callbacks are
+    // passed the same arguments as `trigger` is, apart from the event name
+    // (unless you're listening on `"all"`, which will cause your callback to
+    // receive the true name of the event as the first argument).
+    trigger: function(name) {
+      if (!this._events) return this;
+      var args = slice.call(arguments, 1);
+      if (!eventsApi(this, 'trigger', name, args)) return this;
+      var events = this._events[name];
+      var allEvents = this._events.all;
+      if (events) triggerEvents(events, args);
+      if (allEvents) triggerEvents(allEvents, arguments);
+      return this;
+    },
+
+    // Tell this object to stop listening to either specific events ... or
+    // to every object it's currently listening to.
+    stopListening: function(obj, name, callback) {
+      var listeningTo = this._listeningTo;
+      if (!listeningTo) return this;
+      var remove = !name && !callback;
+      if (!callback && typeof name === 'object') callback = this;
+      if (obj) (listeningTo = {})[obj._listenId] = obj;
+      for (var id in listeningTo) {
+        obj = listeningTo[id];
+        obj.off(name, callback, this);
+        if (remove || _.isEmpty(obj._events)) delete this._listeningTo[id];
+      }
+      return this;
+    }
+
+  };
+
+  // Regular expression used to split event strings.
+  var eventSplitter = /\s+/;
+
+  // Implement fancy features of the Events API such as multiple event
+  // names `"change blur"` and jQuery-style event maps `{change: action}`
+  // in terms of the existing API.
+  var eventsApi = function(obj, action, name, rest) {
+    if (!name) return true;
+
+    // Handle event maps.
+    if (typeof name === 'object') {
+      for (var key in name) {
+        obj[action].apply(obj, [key, name[key]].concat(rest));
+      }
+      return false;
+    }
+
+    // Handle space separated event names.
+    if (eventSplitter.test(name)) {
+      var names = name.split(eventSplitter);
+      for (var i = 0, l = names.length; i < l; i++) {
+        obj[action].apply(obj, [names[i]].concat(rest));
+      }
+      return false;
+    }
+
+    return true;
+  };
+
+  // A difficult-to-believe, but optimized internal dispatch function for
+  // triggering events. Tries to keep the usual cases speedy (most internal
+  // Backbone events have 3 arguments).
+  var triggerEvents = function(events, args) {
+    var ev, i = -1, l = events.length, a1 = args[0], a2 = args[1], a3 = args[2];
+    switch (args.length) {
+      case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx); return;
+      case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1); return;
+      case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2); return;
+      case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2, a3); return;
+      default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); return;
+    }
+  };
+
+  var listenMethods = {listenTo: 'on', listenToOnce: 'once'};
+
+  // Inversion-of-control versions of `on` and `once`. Tell *this* object to
+  // listen to an event in another object ... keeping track of what it's
+  // listening to.
+  _.each(listenMethods, function(implementation, method) {
+    Events[method] = function(obj, name, callback) {
+      var listeningTo = this._listeningTo || (this._listeningTo = {});
+      var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
+      listeningTo[id] = obj;
+      if (!callback && typeof name === 'object') callback = this;
+      obj[implementation](name, callback, this);
+      return this;
+    };
+  });
+
+  // Aliases for backwards compatibility.
+  Events.bind   = Events.on;
+  Events.unbind = Events.off;
+
+  // Allow the `Backbone` object to serve as a global event bus, for folks who
+  // want global "pubsub" in a convenient place.
+  _.extend(Backbone, Events);
+
+  // Backbone.Model
+  // --------------
+
+  // Backbone **Models** are the basic data object in the framework --
+  // frequently representing a row in a table in a database on your server.
+  // A discrete chunk of data and a bunch of useful, related methods for
+  // performing computations and transformations on that data.
+
+  // Create a new model with the specified attributes. A client id (`cid`)
+  // is automatically generated and assigned for you.
+  var Model = Backbone.Model = function(attributes, options) {
+    var attrs = attributes || {};
+    options || (options = {});
+    this.cid = _.uniqueId('c');
+    this.attributes = {};
+    if (options.collection) this.collection = options.collection;
+    if (options.parse) attrs = this.parse(attrs, options) || {};
+    attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
+    this.set(attrs, options);
+    this.changed = {};
+    this.initialize.apply(this, arguments);
+  };
+
+  // Attach all inheritable methods to the Model prototype.
+  _.extend(Model.prototype, Events, {
+
+    // A hash of attributes whose current and previous value differ.
+    changed: null,
+
+    // The value returned during the last failed validation.
+    validationError: null,
+
+    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
+    // CouchDB users may want to set this to `"_id"`.
+    idAttribute: 'id',
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Return a copy of the model's `attributes` object.
+    toJSON: function(options) {
+      return _.clone(this.attributes);
+    },
+
+    // Proxy `Backbone.sync` by default -- but override this if you need
+    // custom syncing semantics for *this* particular model.
+    sync: function() {
+      return Backbone.sync.apply(this, arguments);
+    },
+
+    // Get the value of an attribute.
+    get: function(attr) {
+      return this.attributes[attr];
+    },
+
+    // Get the HTML-escaped value of an attribute.
+    escape: function(attr) {
+      return _.escape(this.get(attr));
+    },
+
+    // Returns `true` if the attribute contains a value that is not null
+    // or undefined.
+    has: function(attr) {
+      return this.get(attr) != null;
+    },
+
+    // Set a hash of model attributes on the object, firing `"change"`. This is
+    // the core primitive operation of a model, updating the data and notifying
+    // anyone who needs to know about the change in state. The heart of the beast.
+    set: function(key, val, options) {
+      var attr, attrs, unset, changes, silent, changing, prev, current;
+      if (key == null) return this;
+
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      if (typeof key === 'object') {
+        attrs = key;
+        options = val;
+      } else {
+        (attrs = {})[key] = val;
+      }
+
+      options || (options = {});
+
+      // Run validation.
+      if (!this._validate(attrs, options)) return false;
+
+      // Extract attributes and options.
+      unset           = options.unset;
+      silent          = options.silent;
+      changes         = [];
+      changing        = this._changing;
+      this._changing  = true;
+
+      if (!changing) {
+        this._previousAttributes = _.clone(this.attributes);
+        this.changed = {};
+      }
+      current = this.attributes, prev = this._previousAttributes;
+
+      // Check for changes of `id`.
+      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
+
+      // For each `set` attribute, update or delete the current value.
+      for (attr in attrs) {
+        val = attrs[attr];
+        if (!_.isEqual(current[attr], val)) changes.push(attr);
+        if (!_.isEqual(prev[attr], val)) {
+          this.changed[attr] = val;
+        } else {
+          delete this.changed[attr];
+        }
+        unset ? delete current[attr] : current[attr] = val;
+      }
+
+      // Trigger all relevant attribute changes.
+      if (!silent) {
+        if (changes.length) this._pending = options;
+        for (var i = 0, l = changes.length; i < l; i++) {
+          this.trigger('change:' + changes[i], this, current[changes[i]], options);
+        }
+      }
+
+      // You might be wondering why there's a `while` loop here. Changes can
+      // be recursively nested within `"change"` events.
+      if (changing) return this;
+      if (!silent) {
+        while (this._pending) {
+          options = this._pending;
+          this._pending = false;
+          this.trigger('change', this, options);
+        }
+      }
+      this._pending = false;
+      this._changing = false;
+      return this;
+    },
+
+    // Remove an attribute from the model, firing `"change"`. `unset` is a noop
+    // if the attribute doesn't exist.
+    unset: function(attr, options) {
+      return this.set(attr, void 0, _.extend({}, options, {unset: true}));
+    },
+
+    // Clear all attributes on the model, firing `"change"`.
+    clear: function(options) {
+      var attrs = {};
+      for (var key in this.attributes) attrs[key] = void 0;
+      return this.set(attrs, _.extend({}, options, {unset: true}));
+    },
+
+    // Determine if the model has changed since the last `"change"` event.
+    // If you specify an attribute name, determine if that attribute has changed.
+    hasChanged: function(attr) {
+      if (attr == null) return !_.isEmpty(this.changed);
+      return _.has(this.changed, attr);
+    },
+
+    // Return an object containing all the attributes that have changed, or
+    // false if there are no changed attributes. Useful for determining what
+    // parts of a view need to be updated and/or what attributes need to be
+    // persisted to the server. Unset attributes will be set to undefined.
+    // You can also pass an attributes object to diff against the model,
+    // determining if there *would be* a change.
+    changedAttributes: function(diff) {
+      if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
+      var val, changed = false;
+      var old = this._changing ? this._previousAttributes : this.attributes;
+      for (var attr in diff) {
+        if (_.isEqual(old[attr], (val = diff[attr]))) continue;
+        (changed || (changed = {}))[attr] = val;
+      }
+      return changed;
+    },
+
+    // Get the previous value of an attribute, recorded at the time the last
+    // `"change"` event was fired.
+    previous: function(attr) {
+      if (attr == null || !this._previousAttributes) return null;
+      return this._previousAttributes[attr];
+    },
+
+    // Get all of the attributes of the model at the time of the previous
+    // `"change"` event.
+    previousAttributes: function() {
+      return _.clone(this._previousAttributes);
+    },
+
+    // Fetch the model from the server. If the server's representation of the
+    // model differs from its current attributes, they will be overridden,
+    // triggering a `"change"` event.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      if (options.parse === void 0) options.parse = true;
+      var model = this;
+      var success = options.success;
+      options.success = function(resp) {
+        if (!model.set(model.parse(resp, options), options)) return false;
+        if (success) success(model, resp, options);
+        model.trigger('sync', model, resp, options);
+      };
+      wrapError(this, options);
+      return this.sync('read', this, options);
+    },
+
+    // Set a hash of model attributes, and sync the model to the server.
+    // If the server returns an attributes hash that differs, the model's
+    // state will be `set` again.
+    save: function(key, val, options) {
+      var attrs, method, xhr, attributes = this.attributes;
+
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      if (key == null || typeof key === 'object') {
+        attrs = key;
+        options = val;
+      } else {
+        (attrs = {})[key] = val;
+      }
+
+      options = _.extend({validate: true}, options);
+
+      // If we're not waiting and attributes exist, save acts as
+      // `set(attr).save(null, opts)` with validation. Otherwise, check if
+      // the model will be valid when the attributes, if any, are set.
+      if (attrs && !options.wait) {
+        if (!this.set(attrs, options)) return false;
+      } else {
+        if (!this._validate(attrs, options)) return false;
+      }
+
+      // Set temporary attributes if `{wait: true}`.
+      if (attrs && options.wait) {
+        this.attributes = _.extend({}, attributes, attrs);
+      }
+
+      // After a successful server-side save, the client is (optionally)
+      // updated with the server-side state.
+      if (options.parse === void 0) options.parse = true;
+      var model = this;
+      var success = options.success;
+      options.success = function(resp) {
+        // Ensure attributes are restored during synchronous saves.
+        model.attributes = attributes;
+        var serverAttrs = model.parse(resp, options);
+        if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs);
+        if (_.isObject(serverAttrs) && !model.set(serverAttrs, options)) {
+          return false;
+        }
+        if (success) success(model, resp, options);
+        model.trigger('sync', model, resp, options);
+      };
+      wrapError(this, options);
+
+      method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update');
+      if (method === 'patch') options.attrs = attrs;
+      xhr = this.sync(method, this, options);
+
+      // Restore attributes.
+      if (attrs && options.wait) this.attributes = attributes;
+
+      return xhr;
+    },
+
+    // Destroy this model on the server if it was already persisted.
+    // Optimistically removes the model from its collection, if it has one.
+    // If `wait: true` is passed, waits for the server to respond before removal.
+    destroy: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+
+      var destroy = function() {
+        model.trigger('destroy', model, model.collection, options);
+      };
+
+      options.success = function(resp) {
+        if (options.wait || model.isNew()) destroy();
+        if (success) success(model, resp, options);
+        if (!model.isNew()) model.trigger('sync', model, resp, options);
+      };
+
+      if (this.isNew()) {
+        options.success();
+        return false;
+      }
+      wrapError(this, options);
+
+      var xhr = this.sync('delete', this, options);
+      if (!options.wait) destroy();
+      return xhr;
+    },
+
+    // Default URL for the model's representation on the server -- if you're
+    // using Backbone's restful methods, override this to change the endpoint
+    // that will be called.
+    url: function() {
+      var base =
+        _.result(this, 'urlRoot') ||
+        _.result(this.collection, 'url') ||
+        urlError();
+      if (this.isNew()) return base;
+      return base.replace(/([^\/])$/, '$1/') + encodeURIComponent(this.id);
+    },
+
+    // **parse** converts a response into the hash of attributes to be `set` on
+    // the model. The default implementation is just to pass the response along.
+    parse: function(resp, options) {
+      return resp;
+    },
+
+    // Create a new model with identical attributes to this one.
+    clone: function() {
+      return new this.constructor(this.attributes);
+    },
+
+    // A model is new if it has never been saved to the server, and lacks an id.
+    isNew: function() {
+      return !this.has(this.idAttribute);
+    },
+
+    // Check if the model is currently in a valid state.
+    isValid: function(options) {
+      return this._validate({}, _.extend(options || {}, { validate: true }));
+    },
+
+    // Run validation against the next complete set of model attributes,
+    // returning `true` if all is well. Otherwise, fire an `"invalid"` event.
+    _validate: function(attrs, options) {
+      if (!options.validate || !this.validate) return true;
+      attrs = _.extend({}, this.attributes, attrs);
+      var error = this.validationError = this.validate(attrs, options) || null;
+      if (!error) return true;
+      this.trigger('invalid', this, error, _.extend(options, {validationError: error}));
+      return false;
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Model.
+  var modelMethods = ['keys', 'values', 'pairs', 'invert', 'pick', 'omit'];
+
+  // Mix in each Underscore method as a proxy to `Model#attributes`.
+  _.each(modelMethods, function(method) {
+    Model.prototype[method] = function() {
+      var args = slice.call(arguments);
+      args.unshift(this.attributes);
+      return _[method].apply(_, args);
+    };
+  });
+
+  // Backbone.Collection
+  // -------------------
+
+  // If models tend to represent a single row of data, a Backbone Collection is
+  // more analagous to a table full of data ... or a small slice or page of that
+  // table, or a collection of rows that belong together for a particular reason
+  // -- all of the messages in this particular folder, all of the documents
+  // belonging to this particular author, and so on. Collections maintain
+  // indexes of their models, both in order, and for lookup by `id`.
+
+  // Create a new **Collection**, perhaps to contain a specific type of `model`.
+  // If a `comparator` is specified, the Collection will maintain
+  // its models in sort order, as they're added and removed.
+  var Collection = Backbone.Collection = function(models, options) {
+    options || (options = {});
+    if (options.model) this.model = options.model;
+    if (options.comparator !== void 0) this.comparator = options.comparator;
+    this._reset();
+    this.initialize.apply(this, arguments);
+    if (models) this.reset(models, _.extend({silent: true}, options));
+  };
+
+  // Default options for `Collection#set`.
+  var setOptions = {add: true, remove: true, merge: true};
+  var addOptions = {add: true, remove: false};
+
+  // Define the Collection's inheritable methods.
+  _.extend(Collection.prototype, Events, {
+
+    // The default model for a collection is just a **Backbone.Model**.
+    // This should be overridden in most cases.
+    model: Model,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // The JSON representation of a Collection is an array of the
+    // models' attributes.
+    toJSON: function(options) {
+      return this.map(function(model){ return model.toJSON(options); });
+    },
+
+    // Proxy `Backbone.sync` by default.
+    sync: function() {
+      return Backbone.sync.apply(this, arguments);
+    },
+
+    // Add a model, or list of models to the set.
+    add: function(models, options) {
+      return this.set(models, _.extend({merge: false}, options, addOptions));
+    },
+
+    // Remove a model, or a list of models from the set.
+    remove: function(models, options) {
+      var singular = !_.isArray(models);
+      models = singular ? [models] : _.clone(models);
+      options || (options = {});
+      var i, l, index, model;
+      for (i = 0, l = models.length; i < l; i++) {
+        model = models[i] = this.get(models[i]);
+        if (!model) continue;
+        delete this._byId[model.id];
+        delete this._byId[model.cid];
+        index = this.indexOf(model);
+        this.models.splice(index, 1);
+        this.length--;
+        if (!options.silent) {
+          options.index = index;
+          model.trigger('remove', model, this, options);
+        }
+        this._removeReference(model, options);
+      }
+      return singular ? models[0] : models;
+    },
+
+    // Update a collection by `set`-ing a new list of models, adding new ones,
+    // removing models that are no longer present, and merging models that
+    // already exist in the collection, as necessary. Similar to **Model#set**,
+    // the core operation for updating the data contained by the collection.
+    set: function(models, options) {
+      options = _.defaults({}, options, setOptions);
+      if (options.parse) models = this.parse(models, options);
+      var singular = !_.isArray(models);
+      models = singular ? (models ? [models] : []) : _.clone(models);
+      var i, l, id, model, attrs, existing, sort;
+      var at = options.at;
+      var targetModel = this.model;
+      var sortable = this.comparator && (at == null) && options.sort !== false;
+      var sortAttr = _.isString(this.comparator) ? this.comparator : null;
+      var toAdd = [], toRemove = [], modelMap = {};
+      var add = options.add, merge = options.merge, remove = options.remove;
+      var order = !sortable && add && remove ? [] : false;
+
+      // Turn bare objects into model references, and prevent invalid models
+      // from being added.
+      for (i = 0, l = models.length; i < l; i++) {
+        attrs = models[i] || {};
+        if (attrs instanceof Model) {
+          id = model = attrs;
+        } else {
+          id = attrs[targetModel.prototype.idAttribute || 'id'];
+        }
+
+        // If a duplicate is found, prevent it from being added and
+        // optionally merge it into the existing model.
+        if (existing = this.get(id)) {
+          if (remove) modelMap[existing.cid] = true;
+          if (merge) {
+            attrs = attrs === model ? model.attributes : attrs;
+            if (options.parse) attrs = existing.parse(attrs, options);
+            existing.set(attrs, options);
+            if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
+          }
+          models[i] = existing;
+
+        // If this is a new, valid model, push it to the `toAdd` list.
+        } else if (add) {
+          model = models[i] = this._prepareModel(attrs, options);
+          if (!model) continue;
+          toAdd.push(model);
+          this._addReference(model, options);
+        }
+
+        // Do not add multiple models with the same `id`.
+        model = existing || model;
+        if (order && (model.isNew() || !modelMap[model.id])) order.push(model);
+        modelMap[model.id] = true;
+      }
+
+      // Remove nonexistent models if appropriate.
+      if (remove) {
+        for (i = 0, l = this.length; i < l; ++i) {
+          if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model);
+        }
+        if (toRemove.length) this.remove(toRemove, options);
+      }
+
+      // See if sorting is needed, update `length` and splice in new models.
+      if (toAdd.length || (order && order.length)) {
+        if (sortable) sort = true;
+        this.length += toAdd.length;
+        if (at != null) {
+          for (i = 0, l = toAdd.length; i < l; i++) {
+            this.models.splice(at + i, 0, toAdd[i]);
+          }
+        } else {
+          if (order) this.models.length = 0;
+          var orderedModels = order || toAdd;
+          for (i = 0, l = orderedModels.length; i < l; i++) {
+            this.models.push(orderedModels[i]);
+          }
+        }
+      }
+
+      // Silently sort the collection if appropriate.
+      if (sort) this.sort({silent: true});
+
+      // Unless silenced, it's time to fire all appropriate add/sort events.
+      if (!options.silent) {
+        for (i = 0, l = toAdd.length; i < l; i++) {
+          (model = toAdd[i]).trigger('add', model, this, options);
+        }
+        if (sort || (order && order.length)) this.trigger('sort', this, options);
+      }
+
+      // Return the added (or merged) model (or models).
+      return singular ? models[0] : models;
+    },
+
+    // When you have more items than you want to add or remove individually,
+    // you can reset the entire set with a new list of models, without firing
+    // any granular `add` or `remove` events. Fires `reset` when finished.
+    // Useful for bulk operations and optimizations.
+    reset: function(models, options) {
+      options || (options = {});
+      for (var i = 0, l = this.models.length; i < l; i++) {
+        this._removeReference(this.models[i], options);
+      }
+      options.previousModels = this.models;
+      this._reset();
+      models = this.add(models, _.extend({silent: true}, options));
+      if (!options.silent) this.trigger('reset', this, options);
+      return models;
+    },
+
+    // Add a model to the end of the collection.
+    push: function(model, options) {
+      return this.add(model, _.extend({at: this.length}, options));
+    },
+
+    // Remove a model from the end of the collection.
+    pop: function(options) {
+      var model = this.at(this.length - 1);
+      this.remove(model, options);
+      return model;
+    },
+
+    // Add a model to the beginning of the collection.
+    unshift: function(model, options) {
+      return this.add(model, _.extend({at: 0}, options));
+    },
+
+    // Remove a model from the beginning of the collection.
+    shift: function(options) {
+      var model = this.at(0);
+      this.remove(model, options);
+      return model;
+    },
+
+    // Slice out a sub-array of models from the collection.
+    slice: function() {
+      return slice.apply(this.models, arguments);
+    },
+
+    // Get a model from the set by id.
+    get: function(obj) {
+      if (obj == null) return void 0;
+      return this._byId[obj] || this._byId[obj.id] || this._byId[obj.cid];
+    },
+
+    // Get the model at the given index.
+    at: function(index) {
+      return this.models[index];
+    },
+
+    // Return models with matching attributes. Useful for simple cases of
+    // `filter`.
+    where: function(attrs, first) {
+      if (_.isEmpty(attrs)) return first ? void 0 : [];
+      return this[first ? 'find' : 'filter'](function(model) {
+        for (var key in attrs) {
+          if (attrs[key] !== model.get(key)) return false;
+        }
+        return true;
+      });
+    },
+
+    // Return the first model with matching attributes. Useful for simple cases
+    // of `find`.
+    findWhere: function(attrs) {
+      return this.where(attrs, true);
+    },
+
+    // Force the collection to re-sort itself. You don't need to call this under
+    // normal circumstances, as the set will maintain sort order as each item
+    // is added.
+    sort: function(options) {
+      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
+      options || (options = {});
+
+      // Run sort based on type of `comparator`.
+      if (_.isString(this.comparator) || this.comparator.length === 1) {
+        this.models = this.sortBy(this.comparator, this);
+      } else {
+        this.models.sort(_.bind(this.comparator, this));
+      }
+
+      if (!options.silent) this.trigger('sort', this, options);
+      return this;
+    },
+
+    // Pluck an attribute from each model in the collection.
+    pluck: function(attr) {
+      return _.invoke(this.models, 'get', attr);
+    },
+
+    // Fetch the default set of models for this collection, resetting the
+    // collection when they arrive. If `reset: true` is passed, the response
+    // data will be passed through the `reset` method instead of `set`.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      if (options.parse === void 0) options.parse = true;
+      var success = options.success;
+      var collection = this;
+      options.success = function(resp) {
+        var method = options.reset ? 'reset' : 'set';
+        collection[method](resp, options);
+        if (success) success(collection, resp, options);
+        collection.trigger('sync', collection, resp, options);
+      };
+      wrapError(this, options);
+      return this.sync('read', this, options);
+    },
+
+    // Create a new instance of a model in this collection. Add the model to the
+    // collection immediately, unless `wait: true` is passed, in which case we
+    // wait for the server to agree.
+    create: function(model, options) {
+      options = options ? _.clone(options) : {};
+      if (!(model = this._prepareModel(model, options))) return false;
+      if (!options.wait) this.add(model, options);
+      var collection = this;
+      var success = options.success;
+      options.success = function(model, resp) {
+        if (options.wait) collection.add(model, options);
+        if (success) success(model, resp, options);
+      };
+      model.save(null, options);
+      return model;
+    },
+
+    // **parse** converts a response into a list of models to be added to the
+    // collection. The default implementation is just to pass it through.
+    parse: function(resp, options) {
+      return resp;
+    },
+
+    // Create a new collection with an identical list of models as this one.
+    clone: function() {
+      return new this.constructor(this.models);
+    },
+
+    // Private method to reset all internal state. Called when the collection
+    // is first initialized or reset.
+    _reset: function() {
+      this.length = 0;
+      this.models = [];
+      this._byId  = {};
+    },
+
+    // Prepare a hash of attributes (or other model) to be added to this
+    // collection.
+    _prepareModel: function(attrs, options) {
+      if (attrs instanceof Model) return attrs;
+      options = options ? _.clone(options) : {};
+      options.collection = this;
+      var model = new this.model(attrs, options);
+      if (!model.validationError) return model;
+      this.trigger('invalid', this, model.validationError, options);
+      return false;
+    },
+
+    // Internal method to create a model's ties to a collection.
+    _addReference: function(model, options) {
+      this._byId[model.cid] = model;
+      if (model.id != null) this._byId[model.id] = model;
+      if (!model.collection) model.collection = this;
+      model.on('all', this._onModelEvent, this);
+    },
+
+    // Internal method to sever a model's ties to a collection.
+    _removeReference: function(model, options) {
+      if (this === model.collection) delete model.collection;
+      model.off('all', this._onModelEvent, this);
+    },
+
+    // Internal method called every time a model in the set fires an event.
+    // Sets need to update their indexes when models change ids. All other
+    // events simply proxy through. "add" and "remove" events that originate
+    // in other collections are ignored.
+    _onModelEvent: function(event, model, collection, options) {
+      if ((event === 'add' || event === 'remove') && collection !== this) return;
+      if (event === 'destroy') this.remove(model, options);
+      if (model && event === 'change:' + model.idAttribute) {
+        delete this._byId[model.previous(model.idAttribute)];
+        if (model.id != null) this._byId[model.id] = model;
+      }
+      this.trigger.apply(this, arguments);
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Collection.
+  // 90% of the core usefulness of Backbone Collections is actually implemented
+  // right here:
+  var methods = ['forEach', 'each', 'map', 'collect', 'reduce', 'foldl',
+    'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select',
+    'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',
+    'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest',
+    'tail', 'drop', 'last', 'without', 'difference', 'indexOf', 'shuffle',
+    'lastIndexOf', 'isEmpty', 'chain', 'sample'];
+
+  // Mix in each Underscore method as a proxy to `Collection#models`.
+  _.each(methods, function(method) {
+    Collection.prototype[method] = function() {
+      var args = slice.call(arguments);
+      args.unshift(this.models);
+      return _[method].apply(_, args);
+    };
+  });
+
+  // Underscore methods that take a property name as an argument.
+  var attributeMethods = ['groupBy', 'countBy', 'sortBy', 'indexBy'];
+
+  // Use attributes instead of properties.
+  _.each(attributeMethods, function(method) {
+    Collection.prototype[method] = function(value, context) {
+      var iterator = _.isFunction(value) ? value : function(model) {
+        return model.get(value);
+      };
+      return _[method](this.models, iterator, context);
+    };
+  });
+
+  // Backbone.View
+  // -------------
+
+  // Backbone Views are almost more convention than they are actual code. A View
+  // is simply a JavaScript object that represents a logical chunk of UI in the
+  // DOM. This might be a single item, an entire list, a sidebar or panel, or
+  // even the surrounding frame which wraps your whole app. Defining a chunk of
+  // UI as a **View** allows you to define your DOM events declaratively, without
+  // having to worry about render order ... and makes it easy for the view to
+  // react to specific changes in the state of your models.
+
+  // Creating a Backbone.View creates its initial element outside of the DOM,
+  // if an existing element is not provided...
+  var View = Backbone.View = function(options) {
+    this.cid = _.uniqueId('view');
+    options || (options = {});
+    _.extend(this, _.pick(options, viewOptions));
+    this._ensureElement();
+    this.initialize.apply(this, arguments);
+    this.delegateEvents();
+  };
+
+  // Cached regex to split keys for `delegate`.
+  var delegateEventSplitter = /^(\S+)\s*(.*)$/;
+
+  // List of view options to be merged as properties.
+  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events'];
+
+  // Set up all inheritable **Backbone.View** properties and methods.
+  _.extend(View.prototype, Events, {
+
+    // The default `tagName` of a View's element is `"div"`.
+    tagName: 'div',
+
+    // jQuery delegate for element lookup, scoped to DOM elements within the
+    // current view. This should be preferred to global lookups where possible.
+    $: function(selector) {
+      return this.$el.find(selector);
+    },
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // **render** is the core function that your view should override, in order
+    // to populate its element (`this.el`), with the appropriate HTML. The
+    // convention is for **render** to always return `this`.
+    render: function() {
+      return this;
+    },
+
+    // Remove this view by taking the element out of the DOM, and removing any
+    // applicable Backbone.Events listeners.
+    remove: function() {
+      this.$el.remove();
+      this.stopListening();
+      return this;
+    },
+
+    // Change the view's element (`this.el` property), including event
+    // re-delegation.
+    setElement: function(element, delegate) {
+      if (this.$el) this.undelegateEvents();
+      this.$el = element instanceof Backbone.$ ? element : Backbone.$(element);
+      this.el = this.$el[0];
+      if (delegate !== false) this.delegateEvents();
+      return this;
+    },
+
+    // Set callbacks, where `this.events` is a hash of
+    //
+    // *{"event selector": "callback"}*
+    //
+    //     {
+    //       'mousedown .title':  'edit',
+    //       'click .button':     'save',
+    //       'click .open':       function(e) { ... }
+    //     }
+    //
+    // pairs. Callbacks will be bound to the view, with `this` set properly.
+    // Uses event delegation for efficiency.
+    // Omitting the selector binds the event to `this.el`.
+    // This only works for delegate-able events: not `focus`, `blur`, and
+    // not `change`, `submit`, and `reset` in Internet Explorer.
+    delegateEvents: function(events) {
+      if (!(events || (events = _.result(this, 'events')))) return this;
+      this.undelegateEvents();
+      for (var key in events) {
+        var method = events[key];
+        if (!_.isFunction(method)) method = this[events[key]];
+        if (!method) continue;
+
+        var match = key.match(delegateEventSplitter);
+        var eventName = match[1], selector = match[2];
+        method = _.bind(method, this);
+        eventName += '.delegateEvents' + this.cid;
+        if (selector === '') {
+          this.$el.on(eventName, method);
+        } else {
+          this.$el.on(eventName, selector, method);
+        }
+      }
+      return this;
+    },
+
+    // Clears all callbacks previously bound to the view with `delegateEvents`.
+    // You usually don't need to use this, but may wish to if you have multiple
+    // Backbone views attached to the same DOM element.
+    undelegateEvents: function() {
+      this.$el.off('.delegateEvents' + this.cid);
+      return this;
+    },
+
+    // Ensure that the View has a DOM element to render into.
+    // If `this.el` is a string, pass it through `$()`, take the first
+    // matching element, and re-assign it to `el`. Otherwise, create
+    // an element from the `id`, `className` and `tagName` properties.
+    _ensureElement: function() {
+      if (!this.el) {
+        var attrs = _.extend({}, _.result(this, 'attributes'));
+        if (this.id) attrs.id = _.result(this, 'id');
+        if (this.className) attrs['class'] = _.result(this, 'className');
+        var $el = Backbone.$('<' + _.result(this, 'tagName') + '>').attr(attrs);
+        this.setElement($el, false);
+      } else {
+        this.setElement(_.result(this, 'el'), false);
+      }
+    }
+
+  });
+
+  // Backbone.sync
+  // -------------
+
+  // Override this function to change the manner in which Backbone persists
+  // models to the server. You will be passed the type of request, and the
+  // model in question. By default, makes a RESTful Ajax request
+  // to the model's `url()`. Some possible customizations could be:
+  //
+  // * Use `setTimeout` to batch rapid-fire updates into a single request.
+  // * Send up the models as XML instead of JSON.
+  // * Persist models via WebSockets instead of Ajax.
+  //
+  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
+  // as `POST`, with a `_method` parameter containing the true HTTP method,
+  // as well as all requests with the body as `application/x-www-form-urlencoded`
+  // instead of `application/json` with the model in a param named `model`.
+  // Useful when interfacing with server-side languages like **PHP** that make
+  // it difficult to read the body of `PUT` requests.
+  Backbone.sync = function(method, model, options) {
+    var type = methodMap[method];
+
+    // Default options, unless specified.
+    _.defaults(options || (options = {}), {
+      emulateHTTP: Backbone.emulateHTTP,
+      emulateJSON: Backbone.emulateJSON
+    });
+
+    // Default JSON-request options.
+    var params = {type: type, dataType: 'json'};
+
+    // Ensure that we have a URL.
+    if (!options.url) {
+      params.url = _.result(model, 'url') || urlError();
+    }
+
+    // Ensure that we have the appropriate request data.
+    if (options.data == null && model && (method === 'create' || method === 'update' || method === 'patch')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(options.attrs || model.toJSON(options));
+    }
+
+    // For older servers, emulate JSON by encoding the request into an HTML-form.
+    if (options.emulateJSON) {
+      params.contentType = 'application/x-www-form-urlencoded';
+      params.data = params.data ? {model: params.data} : {};
+    }
+
+    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
+    // And an `X-HTTP-Method-Override` header.
+    if (options.emulateHTTP && (type === 'PUT' || type === 'DELETE' || type === 'PATCH')) {
+      params.type = 'POST';
+      if (options.emulateJSON) params.data._method = type;
+      var beforeSend = options.beforeSend;
+      options.beforeSend = function(xhr) {
+        xhr.setRequestHeader('X-HTTP-Method-Override', type);
+        if (beforeSend) return beforeSend.apply(this, arguments);
+      };
+    }
+
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !options.emulateJSON) {
+      params.processData = false;
+    }
+
+    // If we're sending a `PATCH` request, and we're in an old Internet Explorer
+    // that still has ActiveX enabled by default, override jQuery to use that
+    // for XHR instead. Remove this line when jQuery supports `PATCH` on IE8.
+    if (params.type === 'PATCH' && noXhrPatch) {
+      params.xhr = function() {
+        return new ActiveXObject("Microsoft.XMLHTTP");
+      };
+    }
+
+    // Make the request, allowing the user to override any Ajax options.
+    var xhr = options.xhr = Backbone.ajax(_.extend(params, options));
+    model.trigger('request', model, xhr, options);
+    return xhr;
+  };
+
+  var noXhrPatch =
+    typeof window !== 'undefined' && !!window.ActiveXObject &&
+      !(window.XMLHttpRequest && (new XMLHttpRequest).dispatchEvent);
+
+  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
+  var methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'patch':  'PATCH',
+    'delete': 'DELETE',
+    'read':   'GET'
+  };
+
+  // Set the default implementation of `Backbone.ajax` to proxy through to `$`.
+  // Override this if you'd like to use a different library.
+  Backbone.ajax = function() {
+    return Backbone.$.ajax.apply(Backbone.$, arguments);
+  };
+
+  // Backbone.Router
+  // ---------------
+
+  // Routers map faux-URLs to actions, and fire events when routes are
+  // matched. Creating a new one sets its `routes` hash, if not set statically.
+  var Router = Backbone.Router = function(options) {
+    options || (options = {});
+    if (options.routes) this.routes = options.routes;
+    this._bindRoutes();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regular expressions for matching named param parts and splatted
+  // parts of route strings.
+  var optionalParam = /\((.*?)\)/g;
+  var namedParam    = /(\(\?)?:\w+/g;
+  var splatParam    = /\*\w+/g;
+  var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
+
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Router.prototype, Events, {
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Manually bind a single named route to a callback. For example:
+    //
+    //     this.route('search/:query/p:num', 'search', function(query, num) {
+    //       ...
+    //     });
+    //
+    route: function(route, name, callback) {
+      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
+      if (_.isFunction(name)) {
+        callback = name;
+        name = '';
+      }
+      if (!callback) callback = this[name];
+      var router = this;
+      Backbone.history.route(route, function(fragment) {
+        var args = router._extractParameters(route, fragment);
+        router.execute(callback, args);
+        router.trigger.apply(router, ['route:' + name].concat(args));
+        router.trigger('route', name, args);
+        Backbone.history.trigger('route', router, name, args);
+      });
+      return this;
+    },
+
+    // Execute a route handler with the provided parameters.  This is an
+    // excellent place to do pre-route setup or post-route cleanup.
+    execute: function(callback, args) {
+      if (callback) callback.apply(this, args);
+    },
+
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate: function(fragment, options) {
+      Backbone.history.navigate(fragment, options);
+      return this;
+    },
+
+    // Bind all defined routes to `Backbone.history`. We have to reverse the
+    // order of the routes here to support behavior where the most general
+    // routes can be defined at the bottom of the route map.
+    _bindRoutes: function() {
+      if (!this.routes) return;
+      this.routes = _.result(this, 'routes');
+      var route, routes = _.keys(this.routes);
+      while ((route = routes.pop()) != null) {
+        this.route(route, this.routes[route]);
+      }
+    },
+
+    // Convert a route string into a regular expression, suitable for matching
+    // against the current location hash.
+    _routeToRegExp: function(route) {
+      route = route.replace(escapeRegExp, '\\$&')
+                   .replace(optionalParam, '(?:$1)?')
+                   .replace(namedParam, function(match, optional) {
+                     return optional ? match : '([^/?]+)';
+                   })
+                   .replace(splatParam, '([^?]*?)');
+      return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');
+    },
+
+    // Given a route, and a URL fragment that it matches, return the array of
+    // extracted decoded parameters. Empty or unmatched parameters will be
+    // treated as `null` to normalize cross-browser behavior.
+    _extractParameters: function(route, fragment) {
+      var params = route.exec(fragment).slice(1);
+      return _.map(params, function(param, i) {
+        // Don't decode the search params.
+        if (i === params.length - 1) return param || null;
+        return param ? decodeURIComponent(param) : null;
+      });
+    }
+
+  });
+
+  // Backbone.History
+  // ----------------
+
+  // Handles cross-browser history management, based on either
+  // [pushState](http://diveintohtml5.info/history.html) and real URLs, or
+  // [onhashchange](https://developer.mozilla.org/en-US/docs/DOM/window.onhashchange)
+  // and URL fragments. If the browser supports neither (old IE, natch),
+  // falls back to polling.
+  var History = Backbone.History = function() {
+    this.handlers = [];
+    _.bindAll(this, 'checkUrl');
+
+    // Ensure that `History` can be used outside of the browser.
+    if (typeof window !== 'undefined') {
+      this.location = window.location;
+      this.history = window.history;
+    }
+  };
+
+  // Cached regex for stripping a leading hash/slash and trailing space.
+  var routeStripper = /^[#\/]|\s+$/g;
+
+  // Cached regex for stripping leading and trailing slashes.
+  var rootStripper = /^\/+|\/+$/g;
+
+  // Cached regex for detecting MSIE.
+  var isExplorer = /msie [\w.]+/;
+
+  // Cached regex for removing a trailing slash.
+  var trailingSlash = /\/$/;
+
+  // Cached regex for stripping urls of hash.
+  var pathStripper = /#.*$/;
+
+  // Has the history handling already been started?
+  History.started = false;
+
+  // Set up all inheritable **Backbone.History** properties and methods.
+  _.extend(History.prototype, Events, {
+
+    // The default interval to poll for hash changes, if necessary, is
+    // twenty times a second.
+    interval: 50,
+
+    // Are we at the app root?
+    atRoot: function() {
+      return this.location.pathname.replace(/[^\/]$/, '$&/') === this.root;
+    },
+
+    // Gets the true hash value. Cannot use location.hash directly due to bug
+    // in Firefox where location.hash will always be decoded.
+    getHash: function(window) {
+      var match = (window || this).location.href.match(/#(.*)$/);
+      return match ? match[1] : '';
+    },
+
+    // Get the cross-browser normalized URL fragment, either from the URL,
+    // the hash, or the override.
+    getFragment: function(fragment, forcePushState) {
+      if (fragment == null) {
+        if (this._hasPushState || !this._wantsHashChange || forcePushState) {
+          fragment = decodeURI(this.location.pathname + this.location.search);
+          var root = this.root.replace(trailingSlash, '');
+          if (!fragment.indexOf(root)) fragment = fragment.slice(root.length);
+        } else {
+          fragment = this.getHash();
+        }
+      }
+      return fragment.replace(routeStripper, '');
+    },
+
+    // Start the hash change handling, returning `true` if the current URL matches
+    // an existing route, and `false` otherwise.
+    start: function(options) {
+      if (History.started) throw new Error("Backbone.history has already been started");
+      History.started = true;
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
+      this.options          = _.extend({root: '/'}, this.options, options);
+      this.root             = this.options.root;
+      this._wantsHashChange = this.options.hashChange !== false;
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.options.pushState && this.history && this.history.pushState);
+      var fragment          = this.getFragment();
+      var docMode           = document.documentMode;
+      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+
+      // Normalize root to always include a leading and trailing slash.
+      this.root = ('/' + this.root + '/').replace(rootStripper, '/');
+
+      if (oldIE && this._wantsHashChange) {
+        var frame = Backbone.$('<iframe src="javascript:0" tabindex="-1">');
+        this.iframe = frame.hide().appendTo('body')[0].contentWindow;
+        this.navigate(fragment);
+      }
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._hasPushState) {
+        Backbone.$(window).on('popstate', this.checkUrl);
+      } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
+        Backbone.$(window).on('hashchange', this.checkUrl);
+      } else if (this._wantsHashChange) {
+        this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
+      }
+
+      // Determine if we need to change the base url, for a pushState link
+      // opened by a non-pushState browser.
+      this.fragment = fragment;
+      var loc = this.location;
+
+      // Transition from hashChange to pushState or vice versa if both are
+      // requested.
+      if (this._wantsHashChange && this._wantsPushState) {
+
+        // If we've started off with a route from a `pushState`-enabled
+        // browser, but we're currently in a browser that doesn't support it...
+        if (!this._hasPushState && !this.atRoot()) {
+          this.fragment = this.getFragment(null, true);
+          this.location.replace(this.root + '#' + this.fragment);
+          // Return immediately as browser will do redirect to new url
+          return true;
+
+        // Or if we've started out with a hash-based route, but we're currently
+        // in a browser where it could be `pushState`-based instead...
+        } else if (this._hasPushState && this.atRoot() && loc.hash) {
+          this.fragment = this.getHash().replace(routeStripper, '');
+          this.history.replaceState({}, document.title, this.root + this.fragment);
+        }
+
+      }
+
+      if (!this.options.silent) return this.loadUrl();
+    },
+
+    // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
+    // but possibly useful for unit testing Routers.
+    stop: function() {
+      Backbone.$(window).off('popstate', this.checkUrl).off('hashchange', this.checkUrl);
+      if (this._checkUrlInterval) clearInterval(this._checkUrlInterval);
+      History.started = false;
+    },
+
+    // Add a route to be tested when the fragment changes. Routes added later
+    // may override previous routes.
+    route: function(route, callback) {
+      this.handlers.unshift({route: route, callback: callback});
+    },
+
+    // Checks the current URL to see if it has changed, and if it has,
+    // calls `loadUrl`, normalizing across the hidden iframe.
+    checkUrl: function(e) {
+      var current = this.getFragment();
+      if (current === this.fragment && this.iframe) {
+        current = this.getFragment(this.getHash(this.iframe));
+      }
+      if (current === this.fragment) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl();
+    },
+
+    // Attempt to load the current URL fragment. If a route succeeds with a
+    // match, returns `true`. If no defined routes matches the fragment,
+    // returns `false`.
+    loadUrl: function(fragment) {
+      fragment = this.fragment = this.getFragment(fragment);
+      return _.any(this.handlers, function(handler) {
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
+          return true;
+        }
+      });
+    },
+
+    // Save a fragment into the hash history, or replace the URL state if the
+    // 'replace' option is passed. You are responsible for properly URL-encoding
+    // the fragment in advance.
+    //
+    // The options object can contain `trigger: true` if you wish to have the
+    // route callback be fired (not usually desirable), or `replace: true`, if
+    // you wish to modify the current URL without adding an entry to the history.
+    navigate: function(fragment, options) {
+      if (!History.started) return false;
+      if (!options || options === true) options = {trigger: !!options};
+
+      var url = this.root + (fragment = this.getFragment(fragment || ''));
+
+      // Strip the hash for matching.
+      fragment = fragment.replace(pathStripper, '');
+
+      if (this.fragment === fragment) return;
+      this.fragment = fragment;
+
+      // Don't include a trailing slash on the root.
+      if (fragment === '' && url !== '/') url = url.slice(0, -1);
+
+      // If pushState is available, we use it to set the fragment as a real URL.
+      if (this._hasPushState) {
+        this.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, url);
+
+      // If hash changes haven't been explicitly disabled, update the hash
+      // fragment to store history.
+      } else if (this._wantsHashChange) {
+        this._updateHash(this.location, fragment, options.replace);
+        if (this.iframe && (fragment !== this.getFragment(this.getHash(this.iframe)))) {
+          // Opening and closing the iframe tricks IE7 and earlier to push a
+          // history entry on hash-tag change.  When replace is true, we don't
+          // want this.
+          if(!options.replace) this.iframe.document.open().close();
+          this._updateHash(this.iframe.location, fragment, options.replace);
+        }
+
+      // If you've told us that you explicitly don't want fallback hashchange-
+      // based history, then `navigate` becomes a page refresh.
+      } else {
+        return this.location.assign(url);
+      }
+      if (options.trigger) return this.loadUrl(fragment);
+    },
+
+    // Update the hash location, either replacing the current entry, or adding
+    // a new one to the browser history.
+    _updateHash: function(location, fragment, replace) {
+      if (replace) {
+        var href = location.href.replace(/(javascript:|#).*$/, '');
+        location.replace(href + '#' + fragment);
+      } else {
+        // Some browsers require that `hash` contains a leading #.
+        location.hash = '#' + fragment;
+      }
+    }
+
+  });
+
+  // Create the default Backbone.history.
+  Backbone.history = new History;
+
+  // Helpers
+  // -------
+
+  // Helper function to correctly set up the prototype chain, for subclasses.
+  // Similar to `goog.inherits`, but uses a hash of prototype properties and
+  // class properties to be extended.
+  var extend = function(protoProps, staticProps) {
+    var parent = this;
+    var child;
+
+    // The constructor function for the new subclass is either defined by you
+    // (the "constructor" property in your `extend` definition), or defaulted
+    // by us to simply call the parent's constructor.
+    if (protoProps && _.has(protoProps, 'constructor')) {
+      child = protoProps.constructor;
+    } else {
+      child = function(){ return parent.apply(this, arguments); };
+    }
+
+    // Add static properties to the constructor function, if supplied.
+    _.extend(child, parent, staticProps);
+
+    // Set the prototype chain to inherit from `parent`, without calling
+    // `parent`'s constructor function.
+    var Surrogate = function(){ this.constructor = child; };
+    Surrogate.prototype = parent.prototype;
+    child.prototype = new Surrogate;
+
+    // Add prototype properties (instance properties) to the subclass,
+    // if supplied.
+    if (protoProps) _.extend(child.prototype, protoProps);
+
+    // Set a convenience property in case the parent's prototype is needed
+    // later.
+    child.__super__ = parent.prototype;
+
+    return child;
+  };
+
+  // Set up inheritance for the model, collection, router, view and history.
+  Model.extend = Collection.extend = Router.extend = View.extend = History.extend = extend;
+
+  // Throw an error when a URL is needed, and none is supplied.
+  var urlError = function() {
+    throw new Error('A "url" property or function must be specified');
+  };
+
+  // Wrap an optional error callback with a fallback error event.
+  var wrapError = function(model, options) {
+    var error = options.error;
+    options.error = function(resp) {
+      if (error) error(model, resp, options);
+      model.trigger('error', model, resp, options);
+    };
+  };
+
+  return Backbone;
+
+}));
diff --git a/src/main/webapp/client/js/lib/bootstrap-notify.js b/src/main/webapp/client/js/lib/bootstrap-notify.js
new file mode 100644
index 00000000..b4ad0e99
--- /dev/null
+++ b/src/main/webapp/client/js/lib/bootstrap-notify.js
@@ -0,0 +1,103 @@
+/**
+ * bootstrap-notify.js v1.0
+ * --
+ * http://twitter.com/nijikokun
+ * Copyright 2012 Nijiko Yonskai, Goodybag
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+!function ($) {
+  var Notification = function (element, options) {
+    var self = this
+
+    // Element collection
+    this.$element = $(element)
+    this.$note    = $('<div class="alert"></div>')
+    this.options  = $.extend({}, $.fn.notify.defaults, options)
+
+    // Setup from options
+    if(this.options.transition)
+      if(this.options.transition == 'fade')
+        this.$note.addClass('in').addClass(this.options.transition)
+      else this.$note.addClass(this.options.transition)
+    else this.$note.addClass('fade').addClass('in')
+
+    if(this.options.type)
+      this.$note.addClass('alert-' + this.options.type)
+    else this.$note.addClass('alert-success')
+
+    if(!this.options.message && this.$element.data("message") !== '') // dom text
+      this.$note.html(this.$element.data("message"))
+    else 
+      if(typeof this.options.message === 'object')
+        if(this.options.message.html)
+          this.$note.html(this.options.message.html)
+        else if(this.options.message.text)
+          this.$note.text(this.options.message.text)
+      else 
+        this.$note.html(this.options.message)
+
+    if(this.options.closable)
+      this.$note.prepend($('<a class="close pull-right" data-dismiss="alert" href="#">&times;</a>'))
+
+    return this;
+  }
+
+  Notification.prototype.show = function () {
+    var self = this;
+
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', function () {
+        self.options.onClose()
+        $(this).remove()
+        self.options.onClosed()
+      })
+
+    this.$element.append(this.$note)
+    this.$note.alert()
+  }
+
+  Notification.prototype.hide = function () {
+    var self = this;
+
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', function () {
+        self.options.onClose()
+        $(this).remove()
+        self.options.onClosed()
+      })
+    else {
+      self.options.onClose()
+      this.$note.remove()
+      self.options.onClosed()
+    }
+  }
+
+  $.fn.notify = function (options) {
+    return new Notification(this, options)
+  }
+
+  $.fn.notify.defaults = {
+    type: 'success',
+    closable: true,
+    transition: 'fade',
+    fadeOut: {
+      enabled: true,
+      delay: 3000
+    },
+    message: null,
+    onClose: function () {},
+    onClosed: function () {}
+  }
+}(window.jQuery);
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/bootstrap.min.js b/src/main/webapp/client/js/lib/bootstrap.min.js
new file mode 100644
index 00000000..2c00b6f1
--- /dev/null
+++ b/src/main/webapp/client/js/lib/bootstrap.min.js
@@ -0,0 +1,7 @@
+/**
+* Bootstrap.js by @fat & @mdo
+* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery)
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/handlebars-1.3.0.js b/src/main/webapp/client/js/lib/handlebars-1.3.0.js
new file mode 100644
index 00000000..e96b071f
--- /dev/null
+++ b/src/main/webapp/client/js/lib/handlebars-1.3.0.js
@@ -0,0 +1,2746 @@
+/*!
+
+ handlebars v1.3.0
+
+ Copyright (C) 2011 by Yehuda Katz
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+ @license
+ */
+/* exported Handlebars */
+var Handlebars = (function() {
+// handlebars/safe-string.js
+    var __module4__ = (function() {
+        "use strict";
+        var __exports__;
+        // Build out our basic SafeString type
+        function SafeString(string) {
+            this.string = string;
+        }
+
+        SafeString.prototype.toString = function() {
+            return "" + this.string;
+        };
+
+        __exports__ = SafeString;
+        return __exports__;
+    })();
+
+// handlebars/utils.js
+    var __module3__ = (function(__dependency1__) {
+        "use strict";
+        var __exports__ = {};
+        /*jshint -W004 */
+        var SafeString = __dependency1__;
+
+        var escape = {
+            "&": "&amp;",
+            "<": "&lt;",
+            ">": "&gt;",
+            '"': "&quot;",
+            "'": "&#x27;",
+            "`": "&#x60;"
+        };
+
+        var badChars = /[&<>"'`]/g;
+        var possible = /[&<>"'`]/;
+
+        function escapeChar(chr) {
+            return escape[chr] || "&amp;";
+        }
+
+        function extend(obj, value) {
+            for(var key in value) {
+                if(Object.prototype.hasOwnProperty.call(value, key)) {
+                    obj[key] = value[key];
+                }
+            }
+        }
+
+        __exports__.extend = extend;var toString = Object.prototype.toString;
+        __exports__.toString = toString;
+        // Sourced from lodash
+        // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
+        var isFunction = function(value) {
+            return typeof value === 'function';
+        };
+        // fallback for older versions of Chrome and Safari
+        if (isFunction(/x/)) {
+            isFunction = function(value) {
+                return typeof value === 'function' && toString.call(value) === '[object Function]';
+            };
+        }
+        var isFunction;
+        __exports__.isFunction = isFunction;
+        var isArray = Array.isArray || function(value) {
+            return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
+        };
+        __exports__.isArray = isArray;
+
+        function escapeExpression(string) {
+            // don't escape SafeStrings, since they're already safe
+            if (string instanceof SafeString) {
+                return string.toString();
+            } else if (!string && string !== 0) {
+                return "";
+            }
+
+            // Force a string conversion as this will be done by the append regardless and
+            // the regex test will do this transparently behind the scenes, causing issues if
+            // an object's to string has escaped characters in it.
+            string = "" + string;
+
+            if(!possible.test(string)) { return string; }
+            return string.replace(badChars, escapeChar);
+        }
+
+        __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
+            if (!value && value !== 0) {
+                return true;
+            } else if (isArray(value) && value.length === 0) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        __exports__.isEmpty = isEmpty;
+        return __exports__;
+    })(__module4__);
+
+// handlebars/exception.js
+    var __module5__ = (function() {
+        "use strict";
+        var __exports__;
+
+        var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+        function Exception(message, node) {
+            var line;
+            if (node && node.firstLine) {
+                line = node.firstLine;
+
+                message += ' - ' + line + ':' + node.firstColumn;
+            }
+
+            var tmp = Error.prototype.constructor.call(this, message);
+
+            // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+            for (var idx = 0; idx < errorProps.length; idx++) {
+                this[errorProps[idx]] = tmp[errorProps[idx]];
+            }
+
+            if (line) {
+                this.lineNumber = line;
+                this.column = node.firstColumn;
+            }
+        }
+
+        Exception.prototype = new Error();
+
+        __exports__ = Exception;
+        return __exports__;
+    })();
+
+// handlebars/base.js
+    var __module2__ = (function(__dependency1__, __dependency2__) {
+        "use strict";
+        var __exports__ = {};
+        var Utils = __dependency1__;
+        var Exception = __dependency2__;
+
+        var VERSION = "1.3.0";
+        __exports__.VERSION = VERSION;var COMPILER_REVISION = 4;
+        __exports__.COMPILER_REVISION = COMPILER_REVISION;
+        var REVISION_CHANGES = {
+            1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+            2: '== 1.0.0-rc.3',
+            3: '== 1.0.0-rc.4',
+            4: '>= 1.0.0'
+        };
+        __exports__.REVISION_CHANGES = REVISION_CHANGES;
+        var isArray = Utils.isArray,
+            isFunction = Utils.isFunction,
+            toString = Utils.toString,
+            objectType = '[object Object]';
+
+        function HandlebarsEnvironment(helpers, partials) {
+            this.helpers = helpers || {};
+            this.partials = partials || {};
+
+            registerDefaultHelpers(this);
+        }
+
+        __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
+            constructor: HandlebarsEnvironment,
+
+            logger: logger,
+            log: log,
+
+            registerHelper: function(name, fn, inverse) {
+                if (toString.call(name) === objectType) {
+                    if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); }
+                    Utils.extend(this.helpers, name);
+                } else {
+                    if (inverse) { fn.not = inverse; }
+                    this.helpers[name] = fn;
+                }
+            },
+
+            registerPartial: function(name, str) {
+                if (toString.call(name) === objectType) {
+                    Utils.extend(this.partials,  name);
+                } else {
+                    this.partials[name] = str;
+                }
+            }
+        };
+
+        function registerDefaultHelpers(instance) {
+            instance.registerHelper('helperMissing', function(arg) {
+                if(arguments.length === 2) {
+                    return undefined;
+                } else {
+                    throw new Exception("Missing helper: '" + arg + "'");
+                }
+            });
+
+            instance.registerHelper('blockHelperMissing', function(context, options) {
+                var inverse = options.inverse || function() {}, fn = options.fn;
+
+                if (isFunction(context)) { context = context.call(this); }
+
+                if(context === true) {
+                    return fn(this);
+                } else if(context === false || context == null) {
+                    return inverse(this);
+                } else if (isArray(context)) {
+                    if(context.length > 0) {
+                        return instance.helpers.each(context, options);
+                    } else {
+                        return inverse(this);
+                    }
+                } else {
+                    return fn(context);
+                }
+            });
+
+            instance.registerHelper('each', function(context, options) {
+                var fn = options.fn, inverse = options.inverse;
+                var i = 0, ret = "", data;
+
+                if (isFunction(context)) { context = context.call(this); }
+
+                if (options.data) {
+                    data = createFrame(options.data);
+                }
+
+                if(context && typeof context === 'object') {
+                    if (isArray(context)) {
+                        for(var j = context.length; i<j; i++) {
+                            if (data) {
+                                data.index = i;
+                                data.first = (i === 0);
+                                data.last  = (i === (context.length-1));
+                            }
+                            ret = ret + fn(context[i], { data: data });
+                        }
+                    } else {
+                        for(var key in context) {
+                            if(context.hasOwnProperty(key)) {
+                                if(data) {
+                                    data.key = key;
+                                    data.index = i;
+                                    data.first = (i === 0);
+                                }
+                                ret = ret + fn(context[key], {data: data});
+                                i++;
+                            }
+                        }
+                    }
+                }
+
+                if(i === 0){
+                    ret = inverse(this);
+                }
+
+                return ret;
+            });
+
+            instance.registerHelper('if', function(conditional, options) {
+                if (isFunction(conditional)) { conditional = conditional.call(this); }
+
+                // Default behavior is to render the positive path if the value is truthy and not empty.
+                // The `includeZero` option may be set to treat the condtional as purely not empty based on the
+                // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+                if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+                    return options.inverse(this);
+                } else {
+                    return options.fn(this);
+                }
+            });
+
+            instance.registerHelper('unless', function(conditional, options) {
+                return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+            });
+
+            instance.registerHelper('with', function(context, options) {
+                if (isFunction(context)) { context = context.call(this); }
+
+                if (!Utils.isEmpty(context)) return options.fn(context);
+            });
+
+            instance.registerHelper('log', function(context, options) {
+                var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+                instance.log(level, context);
+            });
+        }
+
+        var logger = {
+            methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+            // State enum
+            DEBUG: 0,
+            INFO: 1,
+            WARN: 2,
+            ERROR: 3,
+            level: 3,
+
+            // can be overridden in the host environment
+            log: function(level, obj) {
+                if (logger.level <= level) {
+                    var method = logger.methodMap[level];
+                    if (typeof console !== 'undefined' && console[method]) {
+                        console[method].call(console, obj);
+                    }
+                }
+            }
+        };
+        __exports__.logger = logger;
+        function log(level, obj) { logger.log(level, obj); }
+
+        __exports__.log = log;var createFrame = function(object) {
+            var obj = {};
+            Utils.extend(obj, object);
+            return obj;
+        };
+        __exports__.createFrame = createFrame;
+        return __exports__;
+    })(__module3__, __module5__);
+
+// handlebars/runtime.js
+    var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
+        "use strict";
+        var __exports__ = {};
+        var Utils = __dependency1__;
+        var Exception = __dependency2__;
+        var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
+        var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+
+        function checkRevision(compilerInfo) {
+            var compilerRevision = compilerInfo && compilerInfo[0] || 1,
+                currentRevision = COMPILER_REVISION;
+
+            if (compilerRevision !== currentRevision) {
+                if (compilerRevision < currentRevision) {
+                    var runtimeVersions = REVISION_CHANGES[currentRevision],
+                        compilerVersions = REVISION_CHANGES[compilerRevision];
+                    throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
+                        "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+                } else {
+                    // Use the embedded version info since the runtime doesn't know about this revision yet
+                    throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+                        "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+                }
+            }
+        }
+
+        __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
+
+        function template(templateSpec, env) {
+            if (!env) {
+                throw new Exception("No environment passed to template");
+            }
+
+            // Note: Using env.VM references rather than local var references throughout this section to allow
+            // for external users to override these as psuedo-supported APIs.
+            var invokePartialWrapper = function(partial, name, context, helpers, partials, data) {
+                var result = env.VM.invokePartial.apply(this, arguments);
+                if (result != null) { return result; }
+
+                if (env.compile) {
+                    var options = { helpers: helpers, partials: partials, data: data };
+                    partials[name] = env.compile(partial, { data: data !== undefined }, env);
+                    return partials[name](context, options);
+                } else {
+                    throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
+                }
+            };
+
+            // Just add water
+            var container = {
+                escapeExpression: Utils.escapeExpression,
+                invokePartial: invokePartialWrapper,
+                programs: [],
+                program: function(i, fn, data) {
+                    var programWrapper = this.programs[i];
+                    if(data) {
+                        programWrapper = program(i, fn, data);
+                    } else if (!programWrapper) {
+                        programWrapper = this.programs[i] = program(i, fn);
+                    }
+                    return programWrapper;
+                },
+                merge: function(param, common) {
+                    var ret = param || common;
+
+                    if (param && common && (param !== common)) {
+                        ret = {};
+                        Utils.extend(ret, common);
+                        Utils.extend(ret, param);
+                    }
+                    return ret;
+                },
+                programWithDepth: env.VM.programWithDepth,
+                noop: env.VM.noop,
+                compilerInfo: null
+            };
+
+            return function(context, options) {
+                options = options || {};
+                var namespace = options.partial ? options : env,
+                    helpers,
+                    partials;
+
+                if (!options.partial) {
+                    helpers = options.helpers;
+                    partials = options.partials;
+                }
+                var result = templateSpec.call(
+                    container,
+                    namespace, context,
+                    helpers,
+                    partials,
+                    options.data);
+
+                if (!options.partial) {
+                    env.VM.checkRevision(container.compilerInfo);
+                }
+
+                return result;
+            };
+        }
+
+        __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) {
+            var args = Array.prototype.slice.call(arguments, 3);
+
+            var prog = function(context, options) {
+                options = options || {};
+
+                return fn.apply(this, [context, options.data || data].concat(args));
+            };
+            prog.program = i;
+            prog.depth = args.length;
+            return prog;
+        }
+
+        __exports__.programWithDepth = programWithDepth;function program(i, fn, data) {
+            var prog = function(context, options) {
+                options = options || {};
+
+                return fn(context, options.data || data);
+            };
+            prog.program = i;
+            prog.depth = 0;
+            return prog;
+        }
+
+        __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) {
+            var options = { partial: true, helpers: helpers, partials: partials, data: data };
+
+            if(partial === undefined) {
+                throw new Exception("The partial " + name + " could not be found");
+            } else if(partial instanceof Function) {
+                return partial(context, options);
+            }
+        }
+
+        __exports__.invokePartial = invokePartial;function noop() { return ""; }
+
+        __exports__.noop = noop;
+        return __exports__;
+    })(__module3__, __module5__, __module2__);
+
+// handlebars.runtime.js
+    var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+        "use strict";
+        var __exports__;
+        /*globals Handlebars: true */
+        var base = __dependency1__;
+
+        // Each of these augment the Handlebars object. No need to setup here.
+        // (This is done to easily share code between commonjs and browse envs)
+        var SafeString = __dependency2__;
+        var Exception = __dependency3__;
+        var Utils = __dependency4__;
+        var runtime = __dependency5__;
+
+        // For compatibility and usage outside of module systems, make the Handlebars object a namespace
+        var create = function() {
+            var hb = new base.HandlebarsEnvironment();
+
+            Utils.extend(hb, base);
+            hb.SafeString = SafeString;
+            hb.Exception = Exception;
+            hb.Utils = Utils;
+
+            hb.VM = runtime;
+            hb.template = function(spec) {
+                return runtime.template(spec, hb);
+            };
+
+            return hb;
+        };
+
+        var Handlebars = create();
+        Handlebars.create = create;
+
+        __exports__ = Handlebars;
+        return __exports__;
+    })(__module2__, __module4__, __module5__, __module3__, __module6__);
+
+// handlebars/compiler/ast.js
+    var __module7__ = (function(__dependency1__) {
+        "use strict";
+        var __exports__;
+        var Exception = __dependency1__;
+
+        function LocationInfo(locInfo){
+            locInfo = locInfo || {};
+            this.firstLine   = locInfo.first_line;
+            this.firstColumn = locInfo.first_column;
+            this.lastColumn  = locInfo.last_column;
+            this.lastLine    = locInfo.last_line;
+        }
+
+        var AST = {
+            ProgramNode: function(statements, inverseStrip, inverse, locInfo) {
+                var inverseLocationInfo, firstInverseNode;
+                if (arguments.length === 3) {
+                    locInfo = inverse;
+                    inverse = null;
+                } else if (arguments.length === 2) {
+                    locInfo = inverseStrip;
+                    inverseStrip = null;
+                }
+
+                LocationInfo.call(this, locInfo);
+                this.type = "program";
+                this.statements = statements;
+                this.strip = {};
+
+                if(inverse) {
+                    firstInverseNode = inverse[0];
+                    if (firstInverseNode) {
+                        inverseLocationInfo = {
+                            first_line: firstInverseNode.firstLine,
+                            last_line: firstInverseNode.lastLine,
+                            last_column: firstInverseNode.lastColumn,
+                            first_column: firstInverseNode.firstColumn
+                        };
+                        this.inverse = new AST.ProgramNode(inverse, inverseStrip, inverseLocationInfo);
+                    } else {
+                        this.inverse = new AST.ProgramNode(inverse, inverseStrip);
+                    }
+                    this.strip.right = inverseStrip.left;
+                } else if (inverseStrip) {
+                    this.strip.left = inverseStrip.right;
+                }
+            },
+
+            MustacheNode: function(rawParams, hash, open, strip, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "mustache";
+                this.strip = strip;
+
+                // Open may be a string parsed from the parser or a passed boolean flag
+                if (open != null && open.charAt) {
+                    // Must use charAt to support IE pre-10
+                    var escapeFlag = open.charAt(3) || open.charAt(2);
+                    this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
+                } else {
+                    this.escaped = !!open;
+                }
+
+                if (rawParams instanceof AST.SexprNode) {
+                    this.sexpr = rawParams;
+                } else {
+                    // Support old AST API
+                    this.sexpr = new AST.SexprNode(rawParams, hash);
+                }
+
+                this.sexpr.isRoot = true;
+
+                // Support old AST API that stored this info in MustacheNode
+                this.id = this.sexpr.id;
+                this.params = this.sexpr.params;
+                this.hash = this.sexpr.hash;
+                this.eligibleHelper = this.sexpr.eligibleHelper;
+                this.isHelper = this.sexpr.isHelper;
+            },
+
+            SexprNode: function(rawParams, hash, locInfo) {
+                LocationInfo.call(this, locInfo);
+
+                this.type = "sexpr";
+                this.hash = hash;
+
+                var id = this.id = rawParams[0];
+                var params = this.params = rawParams.slice(1);
+
+                // a mustache is an eligible helper if:
+                // * its id is simple (a single part, not `this` or `..`)
+                var eligibleHelper = this.eligibleHelper = id.isSimple;
+
+                // a mustache is definitely a helper if:
+                // * it is an eligible helper, and
+                // * it has at least one parameter or hash segment
+                this.isHelper = eligibleHelper && (params.length || hash);
+
+                // if a mustache is an eligible helper but not a definite
+                // helper, it is ambiguous, and will be resolved in a later
+                // pass or at runtime.
+            },
+
+            PartialNode: function(partialName, context, strip, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type         = "partial";
+                this.partialName  = partialName;
+                this.context      = context;
+                this.strip = strip;
+            },
+
+            BlockNode: function(mustache, program, inverse, close, locInfo) {
+                LocationInfo.call(this, locInfo);
+
+                if(mustache.sexpr.id.original !== close.path.original) {
+                    throw new Exception(mustache.sexpr.id.original + " doesn't match " + close.path.original, this);
+                }
+
+                this.type = 'block';
+                this.mustache = mustache;
+                this.program  = program;
+                this.inverse  = inverse;
+
+                this.strip = {
+                    left: mustache.strip.left,
+                    right: close.strip.right
+                };
+
+                (program || inverse).strip.left = mustache.strip.right;
+                (inverse || program).strip.right = close.strip.left;
+
+                if (inverse && !program) {
+                    this.isInverse = true;
+                }
+            },
+
+            ContentNode: function(string, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "content";
+                this.string = string;
+            },
+
+            HashNode: function(pairs, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "hash";
+                this.pairs = pairs;
+            },
+
+            IdNode: function(parts, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "ID";
+
+                var original = "",
+                    dig = [],
+                    depth = 0;
+
+                for(var i=0,l=parts.length; i<l; i++) {
+                    var part = parts[i].part;
+                    original += (parts[i].separator || '') + part;
+
+                    if (part === ".." || part === "." || part === "this") {
+                        if (dig.length > 0) {
+                            throw new Exception("Invalid path: " + original, this);
+                        } else if (part === "..") {
+                            depth++;
+                        } else {
+                            this.isScoped = true;
+                        }
+                    } else {
+                        dig.push(part);
+                    }
+                }
+
+                this.original = original;
+                this.parts    = dig;
+                this.string   = dig.join('.');
+                this.depth    = depth;
+
+                // an ID is simple if it only has one part, and that part is not
+                // `..` or `this`.
+                this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
+
+                this.stringModeValue = this.string;
+            },
+
+            PartialNameNode: function(name, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "PARTIAL_NAME";
+                this.name = name.original;
+            },
+
+            DataNode: function(id, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "DATA";
+                this.id = id;
+            },
+
+            StringNode: function(string, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "STRING";
+                this.original =
+                    this.string =
+                        this.stringModeValue = string;
+            },
+
+            IntegerNode: function(integer, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "INTEGER";
+                this.original =
+                    this.integer = integer;
+                this.stringModeValue = Number(integer);
+            },
+
+            BooleanNode: function(bool, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "BOOLEAN";
+                this.bool = bool;
+                this.stringModeValue = bool === "true";
+            },
+
+            CommentNode: function(comment, locInfo) {
+                LocationInfo.call(this, locInfo);
+                this.type = "comment";
+                this.comment = comment;
+            }
+        };
+
+        // Must be exported as an object rather than the root of the module as the jison lexer
+        // most modify the object to operate properly.
+        __exports__ = AST;
+        return __exports__;
+    })(__module5__);
+
+// handlebars/compiler/parser.js
+    var __module9__ = (function() {
+        "use strict";
+        var __exports__;
+        /* jshint ignore:start */
+        /* Jison generated parser */
+        var handlebars = (function(){
+            var parser = {trace: function trace() { },
+                yy: {},
+                symbols_: {"error":2,"root":3,"statements":4,"EOF":5,"program":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"sexpr":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"partial_option0":27,"sexpr_repetition0":28,"sexpr_option0":29,"dataName":30,"param":31,"STRING":32,"INTEGER":33,"BOOLEAN":34,"OPEN_SEXPR":35,"CLOSE_SEXPR":36,"hash":37,"hash_repetition_plus0":38,"hashSegment":39,"ID":40,"EQUALS":41,"DATA":42,"pathSegments":43,"SEP":44,"$accept":0,"$end":1},
+                terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",35:"OPEN_SEXPR",36:"CLOSE_SEXPR",40:"ID",41:"EQUALS",42:"DATA",44:"SEP"},
+                productions_: [0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[31,3],[37,1],[39,3],[26,1],[26,1],[26,1],[30,2],[21,1],[43,3],[43,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[38,1],[38,2]],
+                performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
+
+                    var $0 = $$.length - 1;
+                    switch (yystate) {
+                        case 1: return new yy.ProgramNode($$[$0-1], this._$);
+                            break;
+                        case 2: return new yy.ProgramNode([], this._$);
+                            break;
+                        case 3:this.$ = new yy.ProgramNode([], $$[$0-1], $$[$0], this._$);
+                            break;
+                        case 4:this.$ = new yy.ProgramNode($$[$0-2], $$[$0-1], $$[$0], this._$);
+                            break;
+                        case 5:this.$ = new yy.ProgramNode($$[$0-1], $$[$0], [], this._$);
+                            break;
+                        case 6:this.$ = new yy.ProgramNode($$[$0], this._$);
+                            break;
+                        case 7:this.$ = new yy.ProgramNode([], this._$);
+                            break;
+                        case 8:this.$ = new yy.ProgramNode([], this._$);
+                            break;
+                        case 9:this.$ = [$$[$0]];
+                            break;
+                        case 10: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
+                            break;
+                        case 11:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0], this._$);
+                            break;
+                        case 12:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0], this._$);
+                            break;
+                        case 13:this.$ = $$[$0];
+                            break;
+                        case 14:this.$ = $$[$0];
+                            break;
+                        case 15:this.$ = new yy.ContentNode($$[$0], this._$);
+                            break;
+                        case 16:this.$ = new yy.CommentNode($$[$0], this._$);
+                            break;
+                        case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+                            break;
+                        case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+                            break;
+                        case 19:this.$ = {path: $$[$0-1], strip: stripFlags($$[$0-2], $$[$0])};
+                            break;
+                        case 20:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+                            break;
+                        case 21:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+                            break;
+                        case 22:this.$ = new yy.PartialNode($$[$0-2], $$[$0-1], stripFlags($$[$0-3], $$[$0]), this._$);
+                            break;
+                        case 23:this.$ = stripFlags($$[$0-1], $$[$0]);
+                            break;
+                        case 24:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$);
+                            break;
+                        case 25:this.$ = new yy.SexprNode([$$[$0]], null, this._$);
+                            break;
+                        case 26:this.$ = $$[$0];
+                            break;
+                        case 27:this.$ = new yy.StringNode($$[$0], this._$);
+                            break;
+                        case 28:this.$ = new yy.IntegerNode($$[$0], this._$);
+                            break;
+                        case 29:this.$ = new yy.BooleanNode($$[$0], this._$);
+                            break;
+                        case 30:this.$ = $$[$0];
+                            break;
+                        case 31:$$[$0-1].isHelper = true; this.$ = $$[$0-1];
+                            break;
+                        case 32:this.$ = new yy.HashNode($$[$0], this._$);
+                            break;
+                        case 33:this.$ = [$$[$0-2], $$[$0]];
+                            break;
+                        case 34:this.$ = new yy.PartialNameNode($$[$0], this._$);
+                            break;
+                        case 35:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$);
+                            break;
+                        case 36:this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0], this._$));
+                            break;
+                        case 37:this.$ = new yy.DataNode($$[$0], this._$);
+                            break;
+                        case 38:this.$ = new yy.IdNode($$[$0], this._$);
+                            break;
+                        case 39: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2];
+                            break;
+                        case 40:this.$ = [{part: $$[$0]}];
+                            break;
+                        case 43:this.$ = [];
+                            break;
+                        case 44:$$[$0-1].push($$[$0]);
+                            break;
+                        case 47:this.$ = [$$[$0]];
+                            break;
+                        case 48:$$[$0-1].push($$[$0]);
+                            break;
+                    }
+                },
+                table: [{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:29,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:30,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:31,21:24,30:25,40:[1,28],42:[1,27],43:26},{21:33,26:32,32:[1,34],33:[1,35],40:[1,28],43:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,40:[1,28],42:[1,27],43:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,43],24:[2,43],28:43,32:[2,43],33:[2,43],34:[2,43],35:[2,43],36:[2,43],40:[2,43],42:[2,43]},{18:[2,25],24:[2,25],36:[2,25]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],35:[2,38],36:[2,38],40:[2,38],42:[2,38],44:[1,44]},{21:45,40:[1,28],43:26},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],42:[2,40],44:[2,40]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,41],21:50,27:49,40:[1,28],43:26},{18:[2,34],40:[2,34]},{18:[2,35],40:[2,35]},{18:[2,36],40:[2,36]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,40:[1,28],43:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,45],21:56,24:[2,45],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:[1,61],36:[2,45],37:55,38:62,39:63,40:[1,64],42:[1,27],43:26},{40:[1,65]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],35:[2,37],36:[2,37],40:[2,37],42:[2,37]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,66]},{18:[2,42]},{18:[1,67]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24],36:[2,24]},{18:[2,44],24:[2,44],32:[2,44],33:[2,44],34:[2,44],35:[2,44],36:[2,44],40:[2,44],42:[2,44]},{18:[2,46],24:[2,46],36:[2,46]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],35:[2,26],36:[2,26],40:[2,26],42:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],35:[2,27],36:[2,27],40:[2,27],42:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],35:[2,28],36:[2,28],40:[2,28],42:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],35:[2,29],36:[2,29],40:[2,29],42:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],35:[2,30],36:[2,30],40:[2,30],42:[2,30]},{17:68,21:24,30:25,40:[1,28],42:[1,27],43:26},{18:[2,32],24:[2,32],36:[2,32],39:69,40:[1,70]},{18:[2,47],24:[2,47],36:[2,47],40:[2,47]},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],41:[1,71],42:[2,40],44:[2,40]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],35:[2,39],36:[2,39],40:[2,39],42:[2,39],44:[2,39]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{36:[1,72]},{18:[2,48],24:[2,48],36:[2,48],40:[2,48]},{41:[1,71]},{21:56,30:60,31:73,32:[1,57],33:[1,58],34:[1,59],35:[1,61],40:[1,28],42:[1,27],43:26},{18:[2,31],24:[2,31],32:[2,31],33:[2,31],34:[2,31],35:[2,31],36:[2,31],40:[2,31],42:[2,31]},{18:[2,33],24:[2,33],36:[2,33],40:[2,33]}],
+                defaultActions: {3:[2,2],16:[2,1],50:[2,42]},
+                parseError: function parseError(str, hash) {
+                    throw new Error(str);
+                },
+                parse: function parse(input) {
+                    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
+                    this.lexer.setInput(input);
+                    this.lexer.yy = this.yy;
+                    this.yy.lexer = this.lexer;
+                    this.yy.parser = this;
+                    if (typeof this.lexer.yylloc == "undefined")
+                        this.lexer.yylloc = {};
+                    var yyloc = this.lexer.yylloc;
+                    lstack.push(yyloc);
+                    var ranges = this.lexer.options && this.lexer.options.ranges;
+                    if (typeof this.yy.parseError === "function")
+                        this.parseError = this.yy.parseError;
+                    function popStack(n) {
+                        stack.length = stack.length - 2 * n;
+                        vstack.length = vstack.length - n;
+                        lstack.length = lstack.length - n;
+                    }
+                    function lex() {
+                        var token;
+                        token = self.lexer.lex() || 1;
+                        if (typeof token !== "number") {
+                            token = self.symbols_[token] || token;
+                        }
+                        return token;
+                    }
+                    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
+                    while (true) {
+                        state = stack[stack.length - 1];
+                        if (this.defaultActions[state]) {
+                            action = this.defaultActions[state];
+                        } else {
+                            if (symbol === null || typeof symbol == "undefined") {
+                                symbol = lex();
+                            }
+                            action = table[state] && table[state][symbol];
+                        }
+                        if (typeof action === "undefined" || !action.length || !action[0]) {
+                            var errStr = "";
+                            if (!recovering) {
+                                expected = [];
+                                for (p in table[state])
+                                    if (this.terminals_[p] && p > 2) {
+                                        expected.push("'" + this.terminals_[p] + "'");
+                                    }
+                                if (this.lexer.showPosition) {
+                                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
+                                } else {
+                                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
+                                }
+                                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
+                            }
+                        }
+                        if (action[0] instanceof Array && action.length > 1) {
+                            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
+                        }
+                        switch (action[0]) {
+                            case 1:
+                                stack.push(symbol);
+                                vstack.push(this.lexer.yytext);
+                                lstack.push(this.lexer.yylloc);
+                                stack.push(action[1]);
+                                symbol = null;
+                                if (!preErrorSymbol) {
+                                    yyleng = this.lexer.yyleng;
+                                    yytext = this.lexer.yytext;
+                                    yylineno = this.lexer.yylineno;
+                                    yyloc = this.lexer.yylloc;
+                                    if (recovering > 0)
+                                        recovering--;
+                                } else {
+                                    symbol = preErrorSymbol;
+                                    preErrorSymbol = null;
+                                }
+                                break;
+                            case 2:
+                                len = this.productions_[action[1]][1];
+                                yyval.$ = vstack[vstack.length - len];
+                                yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
+                                if (ranges) {
+                                    yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
+                                }
+                                r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
+                                if (typeof r !== "undefined") {
+                                    return r;
+                                }
+                                if (len) {
+                                    stack = stack.slice(0, -1 * len * 2);
+                                    vstack = vstack.slice(0, -1 * len);
+                                    lstack = lstack.slice(0, -1 * len);
+                                }
+                                stack.push(this.productions_[action[1]][0]);
+                                vstack.push(yyval.$);
+                                lstack.push(yyval._$);
+                                newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
+                                stack.push(newState);
+                                break;
+                            case 3:
+                                return true;
+                        }
+                    }
+                    return true;
+                }
+            };
+
+
+            function stripFlags(open, close) {
+                return {
+                    left: open.charAt(2) === '~',
+                    right: close.charAt(0) === '~' || close.charAt(1) === '~'
+                };
+            }
+
+            /* Jison generated lexer */
+            var lexer = (function(){
+                var lexer = ({EOF:1,
+                    parseError:function parseError(str, hash) {
+                        if (this.yy.parser) {
+                            this.yy.parser.parseError(str, hash);
+                        } else {
+                            throw new Error(str);
+                        }
+                    },
+                    setInput:function (input) {
+                        this._input = input;
+                        this._more = this._less = this.done = false;
+                        this.yylineno = this.yyleng = 0;
+                        this.yytext = this.matched = this.match = '';
+                        this.conditionStack = ['INITIAL'];
+                        this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
+                        if (this.options.ranges) this.yylloc.range = [0,0];
+                        this.offset = 0;
+                        return this;
+                    },
+                    input:function () {
+                        var ch = this._input[0];
+                        this.yytext += ch;
+                        this.yyleng++;
+                        this.offset++;
+                        this.match += ch;
+                        this.matched += ch;
+                        var lines = ch.match(/(?:\r\n?|\n).*/g);
+                        if (lines) {
+                            this.yylineno++;
+                            this.yylloc.last_line++;
+                        } else {
+                            this.yylloc.last_column++;
+                        }
+                        if (this.options.ranges) this.yylloc.range[1]++;
+
+                        this._input = this._input.slice(1);
+                        return ch;
+                    },
+                    unput:function (ch) {
+                        var len = ch.length;
+                        var lines = ch.split(/(?:\r\n?|\n)/g);
+
+                        this._input = ch + this._input;
+                        this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
+                        //this.yyleng -= len;
+                        this.offset -= len;
+                        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
+                        this.match = this.match.substr(0, this.match.length-1);
+                        this.matched = this.matched.substr(0, this.matched.length-1);
+
+                        if (lines.length-1) this.yylineno -= lines.length-1;
+                        var r = this.yylloc.range;
+
+                        this.yylloc = {first_line: this.yylloc.first_line,
+                            last_line: this.yylineno+1,
+                            first_column: this.yylloc.first_column,
+                            last_column: lines ?
+                                (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
+                                this.yylloc.first_column - len
+                        };
+
+                        if (this.options.ranges) {
+                            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+                        }
+                        return this;
+                    },
+                    more:function () {
+                        this._more = true;
+                        return this;
+                    },
+                    less:function (n) {
+                        this.unput(this.match.slice(n));
+                    },
+                    pastInput:function () {
+                        var past = this.matched.substr(0, this.matched.length - this.match.length);
+                        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
+                    },
+                    upcomingInput:function () {
+                        var next = this.match;
+                        if (next.length < 20) {
+                            next += this._input.substr(0, 20-next.length);
+                        }
+                        return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
+                    },
+                    showPosition:function () {
+                        var pre = this.pastInput();
+                        var c = new Array(pre.length + 1).join("-");
+                        return pre + this.upcomingInput() + "\n" + c+"^";
+                    },
+                    next:function () {
+                        if (this.done) {
+                            return this.EOF;
+                        }
+                        if (!this._input) this.done = true;
+
+                        var token,
+                            match,
+                            tempMatch,
+                            index,
+                            col,
+                            lines;
+                        if (!this._more) {
+                            this.yytext = '';
+                            this.match = '';
+                        }
+                        var rules = this._currentRules();
+                        for (var i=0;i < rules.length; i++) {
+                            tempMatch = this._input.match(this.rules[rules[i]]);
+                            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
+                                match = tempMatch;
+                                index = i;
+                                if (!this.options.flex) break;
+                            }
+                        }
+                        if (match) {
+                            lines = match[0].match(/(?:\r\n?|\n).*/g);
+                            if (lines) this.yylineno += lines.length;
+                            this.yylloc = {first_line: this.yylloc.last_line,
+                                last_line: this.yylineno+1,
+                                first_column: this.yylloc.last_column,
+                                last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
+                            this.yytext += match[0];
+                            this.match += match[0];
+                            this.matches = match;
+                            this.yyleng = this.yytext.length;
+                            if (this.options.ranges) {
+                                this.yylloc.range = [this.offset, this.offset += this.yyleng];
+                            }
+                            this._more = false;
+                            this._input = this._input.slice(match[0].length);
+                            this.matched += match[0];
+                            token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
+                            if (this.done && this._input) this.done = false;
+                            if (token) return token;
+                            else return;
+                        }
+                        if (this._input === "") {
+                            return this.EOF;
+                        } else {
+                            return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
+                                {text: "", token: null, line: this.yylineno});
+                        }
+                    },
+                    lex:function lex() {
+                        var r = this.next();
+                        if (typeof r !== 'undefined') {
+                            return r;
+                        } else {
+                            return this.lex();
+                        }
+                    },
+                    begin:function begin(condition) {
+                        this.conditionStack.push(condition);
+                    },
+                    popState:function popState() {
+                        return this.conditionStack.pop();
+                    },
+                    _currentRules:function _currentRules() {
+                        return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
+                    },
+                    topState:function () {
+                        return this.conditionStack[this.conditionStack.length-2];
+                    },
+                    pushState:function begin(condition) {
+                        this.begin(condition);
+                    }});
+                lexer.options = {};
+                lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
+
+
+                    function strip(start, end) {
+                        return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end);
+                    }
+
+
+                    var YYSTATE=YY_START
+                    switch($avoiding_name_collisions) {
+                        case 0:
+                            if(yy_.yytext.slice(-2) === "\\\\") {
+                                strip(0,1);
+                                this.begin("mu");
+                            } else if(yy_.yytext.slice(-1) === "\\") {
+                                strip(0,1);
+                                this.begin("emu");
+                            } else {
+                                this.begin("mu");
+                            }
+                            if(yy_.yytext) return 14;
+
+                            break;
+                        case 1:return 14;
+                            break;
+                        case 2:
+                            this.popState();
+                            return 14;
+
+                            break;
+                        case 3:strip(0,4); this.popState(); return 15;
+                            break;
+                        case 4:return 35;
+                            break;
+                        case 5:return 36;
+                            break;
+                        case 6:return 25;
+                            break;
+                        case 7:return 16;
+                            break;
+                        case 8:return 20;
+                            break;
+                        case 9:return 19;
+                            break;
+                        case 10:return 19;
+                            break;
+                        case 11:return 23;
+                            break;
+                        case 12:return 22;
+                            break;
+                        case 13:this.popState(); this.begin('com');
+                            break;
+                        case 14:strip(3,5); this.popState(); return 15;
+                            break;
+                        case 15:return 22;
+                            break;
+                        case 16:return 41;
+                            break;
+                        case 17:return 40;
+                            break;
+                        case 18:return 40;
+                            break;
+                        case 19:return 44;
+                            break;
+                        case 20:// ignore whitespace
+                            break;
+                        case 21:this.popState(); return 24;
+                            break;
+                        case 22:this.popState(); return 18;
+                            break;
+                        case 23:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 32;
+                            break;
+                        case 24:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 32;
+                            break;
+                        case 25:return 42;
+                            break;
+                        case 26:return 34;
+                            break;
+                        case 27:return 34;
+                            break;
+                        case 28:return 33;
+                            break;
+                        case 29:return 40;
+                            break;
+                        case 30:yy_.yytext = strip(1,2); return 40;
+                            break;
+                        case 31:return 'INVALID';
+                            break;
+                        case 32:return 5;
+                            break;
+                    }
+                };
+                lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
+                lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"INITIAL":{"rules":[0,1,32],"inclusive":true}};
+                return lexer;})()
+            parser.lexer = lexer;
+            function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
+            return new Parser;
+        })();__exports__ = handlebars;
+        /* jshint ignore:end */
+        return __exports__;
+    })();
+
+// handlebars/compiler/base.js
+    var __module8__ = (function(__dependency1__, __dependency2__) {
+        "use strict";
+        var __exports__ = {};
+        var parser = __dependency1__;
+        var AST = __dependency2__;
+
+        __exports__.parser = parser;
+
+        function parse(input) {
+            // Just return if an already-compile AST was passed in.
+            if(input.constructor === AST.ProgramNode) { return input; }
+
+            parser.yy = AST;
+            return parser.parse(input);
+        }
+
+        __exports__.parse = parse;
+        return __exports__;
+    })(__module9__, __module7__);
+
+// handlebars/compiler/compiler.js
+    var __module10__ = (function(__dependency1__) {
+        "use strict";
+        var __exports__ = {};
+        var Exception = __dependency1__;
+
+        function Compiler() {}
+
+        __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a
+        // function in a context. This is necessary for mustache compatibility, which
+        // requires that context functions in blocks are evaluated by blockHelperMissing,
+        // and then proceed as if the resulting value was provided to blockHelperMissing.
+
+        Compiler.prototype = {
+            compiler: Compiler,
+
+            disassemble: function() {
+                var opcodes = this.opcodes, opcode, out = [], params, param;
+
+                for (var i=0, l=opcodes.length; i<l; i++) {
+                    opcode = opcodes[i];
+
+                    if (opcode.opcode === 'DECLARE') {
+                        out.push("DECLARE " + opcode.name + "=" + opcode.value);
+                    } else {
+                        params = [];
+                        for (var j=0; j<opcode.args.length; j++) {
+                            param = opcode.args[j];
+                            if (typeof param === "string") {
+                                param = "\"" + param.replace("\n", "\\n") + "\"";
+                            }
+                            params.push(param);
+                        }
+                        out.push(opcode.opcode + " " + params.join(" "));
+                    }
+                }
+
+                return out.join("\n");
+            },
+
+            equals: function(other) {
+                var len = this.opcodes.length;
+                if (other.opcodes.length !== len) {
+                    return false;
+                }
+
+                for (var i = 0; i < len; i++) {
+                    var opcode = this.opcodes[i],
+                        otherOpcode = other.opcodes[i];
+                    if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
+                        return false;
+                    }
+                    for (var j = 0; j < opcode.args.length; j++) {
+                        if (opcode.args[j] !== otherOpcode.args[j]) {
+                            return false;
+                        }
+                    }
+                }
+
+                len = this.children.length;
+                if (other.children.length !== len) {
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if (!this.children[i].equals(other.children[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            },
+
+            guid: 0,
+
+            compile: function(program, options) {
+                this.opcodes = [];
+                this.children = [];
+                this.depths = {list: []};
+                this.options = options;
+
+                // These changes will propagate to the other compiler components
+                var knownHelpers = this.options.knownHelpers;
+                this.options.knownHelpers = {
+                    'helperMissing': true,
+                    'blockHelperMissing': true,
+                    'each': true,
+                    'if': true,
+                    'unless': true,
+                    'with': true,
+                    'log': true
+                };
+                if (knownHelpers) {
+                    for (var name in knownHelpers) {
+                        this.options.knownHelpers[name] = knownHelpers[name];
+                    }
+                }
+
+                return this.accept(program);
+            },
+
+            accept: function(node) {
+                var strip = node.strip || {},
+                    ret;
+                if (strip.left) {
+                    this.opcode('strip');
+                }
+
+                ret = this[node.type](node);
+
+                if (strip.right) {
+                    this.opcode('strip');
+                }
+
+                return ret;
+            },
+
+            program: function(program) {
+                var statements = program.statements;
+
+                for(var i=0, l=statements.length; i<l; i++) {
+                    this.accept(statements[i]);
+                }
+                this.isSimple = l === 1;
+
+                this.depths.list = this.depths.list.sort(function(a, b) {
+                    return a - b;
+                });
+
+                return this;
+            },
+
+            compileProgram: function(program) {
+                var result = new this.compiler().compile(program, this.options);
+                var guid = this.guid++, depth;
+
+                this.usePartial = this.usePartial || result.usePartial;
+
+                this.children[guid] = result;
+
+                for(var i=0, l=result.depths.list.length; i<l; i++) {
+                    depth = result.depths.list[i];
+
+                    if(depth < 2) { continue; }
+                    else { this.addDepth(depth - 1); }
+                }
+
+                return guid;
+            },
+
+            block: function(block) {
+                var mustache = block.mustache,
+                    program = block.program,
+                    inverse = block.inverse;
+
+                if (program) {
+                    program = this.compileProgram(program);
+                }
+
+                if (inverse) {
+                    inverse = this.compileProgram(inverse);
+                }
+
+                var sexpr = mustache.sexpr;
+                var type = this.classifySexpr(sexpr);
+
+                if (type === "helper") {
+                    this.helperSexpr(sexpr, program, inverse);
+                } else if (type === "simple") {
+                    this.simpleSexpr(sexpr);
+
+                    // now that the simple mustache is resolved, we need to
+                    // evaluate it by executing `blockHelperMissing`
+                    this.opcode('pushProgram', program);
+                    this.opcode('pushProgram', inverse);
+                    this.opcode('emptyHash');
+                    this.opcode('blockValue');
+                } else {
+                    this.ambiguousSexpr(sexpr, program, inverse);
+
+                    // now that the simple mustache is resolved, we need to
+                    // evaluate it by executing `blockHelperMissing`
+                    this.opcode('pushProgram', program);
+                    this.opcode('pushProgram', inverse);
+                    this.opcode('emptyHash');
+                    this.opcode('ambiguousBlockValue');
+                }
+
+                this.opcode('append');
+            },
+
+            hash: function(hash) {
+                var pairs = hash.pairs, pair, val;
+
+                this.opcode('pushHash');
+
+                for(var i=0, l=pairs.length; i<l; i++) {
+                    pair = pairs[i];
+                    val  = pair[1];
+
+                    if (this.options.stringParams) {
+                        if(val.depth) {
+                            this.addDepth(val.depth);
+                        }
+                        this.opcode('getContext', val.depth || 0);
+                        this.opcode('pushStringParam', val.stringModeValue, val.type);
+
+                        if (val.type === 'sexpr') {
+                            // Subexpressions get evaluated and passed in
+                            // in string params mode.
+                            this.sexpr(val);
+                        }
+                    } else {
+                        this.accept(val);
+                    }
+
+                    this.opcode('assignToHash', pair[0]);
+                }
+                this.opcode('popHash');
+            },
+
+            partial: function(partial) {
+                var partialName = partial.partialName;
+                this.usePartial = true;
+
+                if(partial.context) {
+                    this.ID(partial.context);
+                } else {
+                    this.opcode('push', 'depth0');
+                }
+
+                this.opcode('invokePartial', partialName.name);
+                this.opcode('append');
+            },
+
+            content: function(content) {
+                this.opcode('appendContent', content.string);
+            },
+
+            mustache: function(mustache) {
+                this.sexpr(mustache.sexpr);
+
+                if(mustache.escaped && !this.options.noEscape) {
+                    this.opcode('appendEscaped');
+                } else {
+                    this.opcode('append');
+                }
+            },
+
+            ambiguousSexpr: function(sexpr, program, inverse) {
+                var id = sexpr.id,
+                    name = id.parts[0],
+                    isBlock = program != null || inverse != null;
+
+                this.opcode('getContext', id.depth);
+
+                this.opcode('pushProgram', program);
+                this.opcode('pushProgram', inverse);
+
+                this.opcode('invokeAmbiguous', name, isBlock);
+            },
+
+            simpleSexpr: function(sexpr) {
+                var id = sexpr.id;
+
+                if (id.type === 'DATA') {
+                    this.DATA(id);
+                } else if (id.parts.length) {
+                    this.ID(id);
+                } else {
+                    // Simplified ID for `this`
+                    this.addDepth(id.depth);
+                    this.opcode('getContext', id.depth);
+                    this.opcode('pushContext');
+                }
+
+                this.opcode('resolvePossibleLambda');
+            },
+
+            helperSexpr: function(sexpr, program, inverse) {
+                var params = this.setupFullMustacheParams(sexpr, program, inverse),
+                    name = sexpr.id.parts[0];
+
+                if (this.options.knownHelpers[name]) {
+                    this.opcode('invokeKnownHelper', params.length, name);
+                } else if (this.options.knownHelpersOnly) {
+                    throw new Exception("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
+                } else {
+                    this.opcode('invokeHelper', params.length, name, sexpr.isRoot);
+                }
+            },
+
+            sexpr: function(sexpr) {
+                var type = this.classifySexpr(sexpr);
+
+                if (type === "simple") {
+                    this.simpleSexpr(sexpr);
+                } else if (type === "helper") {
+                    this.helperSexpr(sexpr);
+                } else {
+                    this.ambiguousSexpr(sexpr);
+                }
+            },
+
+            ID: function(id) {
+                this.addDepth(id.depth);
+                this.opcode('getContext', id.depth);
+
+                var name = id.parts[0];
+                if (!name) {
+                    this.opcode('pushContext');
+                } else {
+                    this.opcode('lookupOnContext', id.parts[0]);
+                }
+
+                for(var i=1, l=id.parts.length; i<l; i++) {
+                    this.opcode('lookup', id.parts[i]);
+                }
+            },
+
+            DATA: function(data) {
+                this.options.data = true;
+                if (data.id.isScoped || data.id.depth) {
+                    throw new Exception('Scoped data references are not supported: ' + data.original, data);
+                }
+
+                this.opcode('lookupData');
+                var parts = data.id.parts;
+                for(var i=0, l=parts.length; i<l; i++) {
+                    this.opcode('lookup', parts[i]);
+                }
+            },
+
+            STRING: function(string) {
+                this.opcode('pushString', string.string);
+            },
+
+            INTEGER: function(integer) {
+                this.opcode('pushLiteral', integer.integer);
+            },
+
+            BOOLEAN: function(bool) {
+                this.opcode('pushLiteral', bool.bool);
+            },
+
+            comment: function() {},
+
+            // HELPERS
+            opcode: function(name) {
+                this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
+            },
+
+            declare: function(name, value) {
+                this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
+            },
+
+            addDepth: function(depth) {
+                if(depth === 0) { return; }
+
+                if(!this.depths[depth]) {
+                    this.depths[depth] = true;
+                    this.depths.list.push(depth);
+                }
+            },
+
+            classifySexpr: function(sexpr) {
+                var isHelper   = sexpr.isHelper;
+                var isEligible = sexpr.eligibleHelper;
+                var options    = this.options;
+
+                // if ambiguous, we can possibly resolve the ambiguity now
+                if (isEligible && !isHelper) {
+                    var name = sexpr.id.parts[0];
+
+                    if (options.knownHelpers[name]) {
+                        isHelper = true;
+                    } else if (options.knownHelpersOnly) {
+                        isEligible = false;
+                    }
+                }
+
+                if (isHelper) { return "helper"; }
+                else if (isEligible) { return "ambiguous"; }
+                else { return "simple"; }
+            },
+
+            pushParams: function(params) {
+                var i = params.length, param;
+
+                while(i--) {
+                    param = params[i];
+
+                    if(this.options.stringParams) {
+                        if(param.depth) {
+                            this.addDepth(param.depth);
+                        }
+
+                        this.opcode('getContext', param.depth || 0);
+                        this.opcode('pushStringParam', param.stringModeValue, param.type);
+
+                        if (param.type === 'sexpr') {
+                            // Subexpressions get evaluated and passed in
+                            // in string params mode.
+                            this.sexpr(param);
+                        }
+                    } else {
+                        this[param.type](param);
+                    }
+                }
+            },
+
+            setupFullMustacheParams: function(sexpr, program, inverse) {
+                var params = sexpr.params;
+                this.pushParams(params);
+
+                this.opcode('pushProgram', program);
+                this.opcode('pushProgram', inverse);
+
+                if (sexpr.hash) {
+                    this.hash(sexpr.hash);
+                } else {
+                    this.opcode('emptyHash');
+                }
+
+                return params;
+            }
+        };
+
+        function precompile(input, options, env) {
+            if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
+                throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
+            }
+
+            options = options || {};
+            if (!('data' in options)) {
+                options.data = true;
+            }
+
+            var ast = env.parse(input);
+            var environment = new env.Compiler().compile(ast, options);
+            return new env.JavaScriptCompiler().compile(environment, options);
+        }
+
+        __exports__.precompile = precompile;function compile(input, options, env) {
+            if (input == null || (typeof input !== 'string' && input.constructor !== env.AST.ProgramNode)) {
+                throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
+            }
+
+            options = options || {};
+
+            if (!('data' in options)) {
+                options.data = true;
+            }
+
+            var compiled;
+
+            function compileInput() {
+                var ast = env.parse(input);
+                var environment = new env.Compiler().compile(ast, options);
+                var templateSpec = new env.JavaScriptCompiler().compile(environment, options, undefined, true);
+                return env.template(templateSpec);
+            }
+
+            // Template is only compiled on first use and cached after that point.
+            return function(context, options) {
+                if (!compiled) {
+                    compiled = compileInput();
+                }
+                return compiled.call(this, context, options);
+            };
+        }
+
+        __exports__.compile = compile;
+        return __exports__;
+    })(__module5__);
+
+// handlebars/compiler/javascript-compiler.js
+    var __module11__ = (function(__dependency1__, __dependency2__) {
+        "use strict";
+        var __exports__;
+        var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
+        var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
+        var log = __dependency1__.log;
+        var Exception = __dependency2__;
+
+        function Literal(value) {
+            this.value = value;
+        }
+
+        function JavaScriptCompiler() {}
+
+        JavaScriptCompiler.prototype = {
+            // PUBLIC API: You can override these methods in a subclass to provide
+            // alternative compiled forms for name lookup and buffering semantics
+            nameLookup: function(parent, name /* , type*/) {
+                var wrap,
+                    ret;
+                if (parent.indexOf('depth') === 0) {
+                    wrap = true;
+                }
+
+                if (/^[0-9]+$/.test(name)) {
+                    ret = parent + "[" + name + "]";
+                } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+                    ret = parent + "." + name;
+                }
+                else {
+                    ret = parent + "['" + name + "']";
+                }
+
+                if (wrap) {
+                    return '(' + parent + ' && ' + ret + ')';
+                } else {
+                    return ret;
+                }
+            },
+
+            compilerInfo: function() {
+                var revision = COMPILER_REVISION,
+                    versions = REVISION_CHANGES[revision];
+                return "this.compilerInfo = ["+revision+",'"+versions+"'];\n";
+            },
+
+            appendToBuffer: function(string) {
+                if (this.environment.isSimple) {
+                    return "return " + string + ";";
+                } else {
+                    return {
+                        appendToBuffer: true,
+                        content: string,
+                        toString: function() { return "buffer += " + string + ";"; }
+                    };
+                }
+            },
+
+            initializeBuffer: function() {
+                return this.quotedString("");
+            },
+
+            namespace: "Handlebars",
+            // END PUBLIC API
+
+            compile: function(environment, options, context, asObject) {
+                this.environment = environment;
+                this.options = options || {};
+
+                log('debug', this.environment.disassemble() + "\n\n");
+
+                this.name = this.environment.name;
+                this.isChild = !!context;
+                this.context = context || {
+                    programs: [],
+                    environments: [],
+                    aliases: { }
+                };
+
+                this.preamble();
+
+                this.stackSlot = 0;
+                this.stackVars = [];
+                this.registers = { list: [] };
+                this.hashes = [];
+                this.compileStack = [];
+                this.inlineStack = [];
+
+                this.compileChildren(environment, options);
+
+                var opcodes = environment.opcodes, opcode;
+
+                this.i = 0;
+
+                for(var l=opcodes.length; this.i<l; this.i++) {
+                    opcode = opcodes[this.i];
+
+                    if(opcode.opcode === 'DECLARE') {
+                        this[opcode.name] = opcode.value;
+                    } else {
+                        this[opcode.opcode].apply(this, opcode.args);
+                    }
+
+                    // Reset the stripNext flag if it was not set by this operation.
+                    if (opcode.opcode !== this.stripNext) {
+                        this.stripNext = false;
+                    }
+                }
+
+                // Flush any trailing content that might be pending.
+                this.pushSource('');
+
+                if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
+                    throw new Exception('Compile completed with content left on stack');
+                }
+
+                return this.createFunctionContext(asObject);
+            },
+
+            preamble: function() {
+                var out = [];
+
+                if (!this.isChild) {
+                    var namespace = this.namespace;
+
+                    var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
+                    if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
+                    if (this.options.data) { copies = copies + " data = data || {};"; }
+                    out.push(copies);
+                } else {
+                    out.push('');
+                }
+
+                if (!this.environment.isSimple) {
+                    out.push(", buffer = " + this.initializeBuffer());
+                } else {
+                    out.push("");
+                }
+
+                // track the last context pushed into place to allow skipping the
+                // getContext opcode when it would be a noop
+                this.lastContext = 0;
+                this.source = out;
+            },
+
+            createFunctionContext: function(asObject) {
+                var locals = this.stackVars.concat(this.registers.list);
+
+                if(locals.length > 0) {
+                    this.source[1] = this.source[1] + ", " + locals.join(", ");
+                }
+
+                // Generate minimizer alias mappings
+                if (!this.isChild) {
+                    for (var alias in this.context.aliases) {
+                        if (this.context.aliases.hasOwnProperty(alias)) {
+                            this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
+                        }
+                    }
+                }
+
+                if (this.source[1]) {
+                    this.source[1] = "var " + this.source[1].substring(2) + ";";
+                }
+
+                // Merge children
+                if (!this.isChild) {
+                    this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
+                }
+
+                if (!this.environment.isSimple) {
+                    this.pushSource("return buffer;");
+                }
+
+                var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
+
+                for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
+                    params.push("depth" + this.environment.depths.list[i]);
+                }
+
+                // Perform a second pass over the output to merge content when possible
+                var source = this.mergeSource();
+
+                if (!this.isChild) {
+                    source = this.compilerInfo()+source;
+                }
+
+                if (asObject) {
+                    params.push(source);
+
+                    return Function.apply(this, params);
+                } else {
+                    var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
+                    log('debug', functionSource + "\n\n");
+                    return functionSource;
+                }
+            },
+            mergeSource: function() {
+                // WARN: We are not handling the case where buffer is still populated as the source should
+                // not have buffer append operations as their final action.
+                var source = '',
+                    buffer;
+                for (var i = 0, len = this.source.length; i < len; i++) {
+                    var line = this.source[i];
+                    if (line.appendToBuffer) {
+                        if (buffer) {
+                            buffer = buffer + '\n    + ' + line.content;
+                        } else {
+                            buffer = line.content;
+                        }
+                    } else {
+                        if (buffer) {
+                            source += 'buffer += ' + buffer + ';\n  ';
+                            buffer = undefined;
+                        }
+                        source += line + '\n  ';
+                    }
+                }
+                return source;
+            },
+
+            // [blockValue]
+            //
+            // On stack, before: hash, inverse, program, value
+            // On stack, after: return value of blockHelperMissing
+            //
+            // The purpose of this opcode is to take a block of the form
+            // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
+            // replace it on the stack with the result of properly
+            // invoking blockHelperMissing.
+            blockValue: function() {
+                this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+                var params = ["depth0"];
+                this.setupParams(0, params);
+
+                this.replaceStack(function(current) {
+                    params.splice(1, 0, current);
+                    return "blockHelperMissing.call(" + params.join(", ") + ")";
+                });
+            },
+
+            // [ambiguousBlockValue]
+            //
+            // On stack, before: hash, inverse, program, value
+            // Compiler value, before: lastHelper=value of last found helper, if any
+            // On stack, after, if no lastHelper: same as [blockValue]
+            // On stack, after, if lastHelper: value
+            ambiguousBlockValue: function() {
+                this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+                var params = ["depth0"];
+                this.setupParams(0, params);
+
+                var current = this.topStack();
+                params.splice(1, 0, current);
+
+                this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
+            },
+
+            // [appendContent]
+            //
+            // On stack, before: ...
+            // On stack, after: ...
+            //
+            // Appends the string value of `content` to the current buffer
+            appendContent: function(content) {
+                if (this.pendingContent) {
+                    content = this.pendingContent + content;
+                }
+                if (this.stripNext) {
+                    content = content.replace(/^\s+/, '');
+                }
+
+                this.pendingContent = content;
+            },
+
+            // [strip]
+            //
+            // On stack, before: ...
+            // On stack, after: ...
+            //
+            // Removes any trailing whitespace from the prior content node and flags
+            // the next operation for stripping if it is a content node.
+            strip: function() {
+                if (this.pendingContent) {
+                    this.pendingContent = this.pendingContent.replace(/\s+$/, '');
+                }
+                this.stripNext = 'strip';
+            },
+
+            // [append]
+            //
+            // On stack, before: value, ...
+            // On stack, after: ...
+            //
+            // Coerces `value` to a String and appends it to the current buffer.
+            //
+            // If `value` is truthy, or 0, it is coerced into a string and appended
+            // Otherwise, the empty string is appended
+            append: function() {
+                // Force anything that is inlined onto the stack so we don't have duplication
+                // when we examine local
+                this.flushInline();
+                var local = this.popStack();
+                this.pushSource("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
+                if (this.environment.isSimple) {
+                    this.pushSource("else { " + this.appendToBuffer("''") + " }");
+                }
+            },
+
+            // [appendEscaped]
+            //
+            // On stack, before: value, ...
+            // On stack, after: ...
+            //
+            // Escape `value` and append it to the buffer
+            appendEscaped: function() {
+                this.context.aliases.escapeExpression = 'this.escapeExpression';
+
+                this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
+            },
+
+            // [getContext]
+            //
+            // On stack, before: ...
+            // On stack, after: ...
+            // Compiler value, after: lastContext=depth
+            //
+            // Set the value of the `lastContext` compiler value to the depth
+            getContext: function(depth) {
+                if(this.lastContext !== depth) {
+                    this.lastContext = depth;
+                }
+            },
+
+            // [lookupOnContext]
+            //
+            // On stack, before: ...
+            // On stack, after: currentContext[name], ...
+            //
+            // Looks up the value of `name` on the current context and pushes
+            // it onto the stack.
+            lookupOnContext: function(name) {
+                this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
+            },
+
+            // [pushContext]
+            //
+            // On stack, before: ...
+            // On stack, after: currentContext, ...
+            //
+            // Pushes the value of the current context onto the stack.
+            pushContext: function() {
+                this.pushStackLiteral('depth' + this.lastContext);
+            },
+
+            // [resolvePossibleLambda]
+            //
+            // On stack, before: value, ...
+            // On stack, after: resolved value, ...
+            //
+            // If the `value` is a lambda, replace it on the stack by
+            // the return value of the lambda
+            resolvePossibleLambda: function() {
+                this.context.aliases.functionType = '"function"';
+
+                this.replaceStack(function(current) {
+                    return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
+                });
+            },
+
+            // [lookup]
+            //
+            // On stack, before: value, ...
+            // On stack, after: value[name], ...
+            //
+            // Replace the value on the stack with the result of looking
+            // up `name` on `value`
+            lookup: function(name) {
+                this.replaceStack(function(current) {
+                    return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
+                });
+            },
+
+            // [lookupData]
+            //
+            // On stack, before: ...
+            // On stack, after: data, ...
+            //
+            // Push the data lookup operator
+            lookupData: function() {
+                this.pushStackLiteral('data');
+            },
+
+            // [pushStringParam]
+            //
+            // On stack, before: ...
+            // On stack, after: string, currentContext, ...
+            //
+            // This opcode is designed for use in string mode, which
+            // provides the string value of a parameter along with its
+            // depth rather than resolving it immediately.
+            pushStringParam: function(string, type) {
+                this.pushStackLiteral('depth' + this.lastContext);
+
+                this.pushString(type);
+
+                // If it's a subexpression, the string result
+                // will be pushed after this opcode.
+                if (type !== 'sexpr') {
+                    if (typeof string === 'string') {
+                        this.pushString(string);
+                    } else {
+                        this.pushStackLiteral(string);
+                    }
+                }
+            },
+
+            emptyHash: function() {
+                this.pushStackLiteral('{}');
+
+                if (this.options.stringParams) {
+                    this.push('{}'); // hashContexts
+                    this.push('{}'); // hashTypes
+                }
+            },
+            pushHash: function() {
+                if (this.hash) {
+                    this.hashes.push(this.hash);
+                }
+                this.hash = {values: [], types: [], contexts: []};
+            },
+            popHash: function() {
+                var hash = this.hash;
+                this.hash = this.hashes.pop();
+
+                if (this.options.stringParams) {
+                    this.push('{' + hash.contexts.join(',') + '}');
+                    this.push('{' + hash.types.join(',') + '}');
+                }
+
+                this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
+            },
+
+            // [pushString]
+            //
+            // On stack, before: ...
+            // On stack, after: quotedString(string), ...
+            //
+            // Push a quoted version of `string` onto the stack
+            pushString: function(string) {
+                this.pushStackLiteral(this.quotedString(string));
+            },
+
+            // [push]
+            //
+            // On stack, before: ...
+            // On stack, after: expr, ...
+            //
+            // Push an expression onto the stack
+            push: function(expr) {
+                this.inlineStack.push(expr);
+                return expr;
+            },
+
+            // [pushLiteral]
+            //
+            // On stack, before: ...
+            // On stack, after: value, ...
+            //
+            // Pushes a value onto the stack. This operation prevents
+            // the compiler from creating a temporary variable to hold
+            // it.
+            pushLiteral: function(value) {
+                this.pushStackLiteral(value);
+            },
+
+            // [pushProgram]
+            //
+            // On stack, before: ...
+            // On stack, after: program(guid), ...
+            //
+            // Push a program expression onto the stack. This takes
+            // a compile-time guid and converts it into a runtime-accessible
+            // expression.
+            pushProgram: function(guid) {
+                if (guid != null) {
+                    this.pushStackLiteral(this.programExpression(guid));
+                } else {
+                    this.pushStackLiteral(null);
+                }
+            },
+
+            // [invokeHelper]
+            //
+            // On stack, before: hash, inverse, program, params..., ...
+            // On stack, after: result of helper invocation
+            //
+            // Pops off the helper's parameters, invokes the helper,
+            // and pushes the helper's return value onto the stack.
+            //
+            // If the helper is not found, `helperMissing` is called.
+            invokeHelper: function(paramSize, name, isRoot) {
+                this.context.aliases.helperMissing = 'helpers.helperMissing';
+                this.useRegister('helper');
+
+                var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
+                var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
+
+                var lookup = 'helper = ' + helper.name + ' || ' + nonHelper;
+                if (helper.paramsInit) {
+                    lookup += ',' + helper.paramsInit;
+                }
+
+                this.push(
+                    '('
+                        + lookup
+                        + ',helper '
+                        + '? helper.call(' + helper.callParams + ') '
+                        + ': helperMissing.call(' + helper.helperMissingParams + '))');
+
+                // Always flush subexpressions. This is both to prevent the compounding size issue that
+                // occurs when the code has to be duplicated for inlining and also to prevent errors
+                // due to the incorrect options object being passed due to the shared register.
+                if (!isRoot) {
+                    this.flushInline();
+                }
+            },
+
+            // [invokeKnownHelper]
+            //
+            // On stack, before: hash, inverse, program, params..., ...
+            // On stack, after: result of helper invocation
+            //
+            // This operation is used when the helper is known to exist,
+            // so a `helperMissing` fallback is not required.
+            invokeKnownHelper: function(paramSize, name) {
+                var helper = this.setupHelper(paramSize, name);
+                this.push(helper.name + ".call(" + helper.callParams + ")");
+            },
+
+            // [invokeAmbiguous]
+            //
+            // On stack, before: hash, inverse, program, params..., ...
+            // On stack, after: result of disambiguation
+            //
+            // This operation is used when an expression like `{{foo}}`
+            // is provided, but we don't know at compile-time whether it
+            // is a helper or a path.
+            //
+            // This operation emits more code than the other options,
+            // and can be avoided by passing the `knownHelpers` and
+            // `knownHelpersOnly` flags at compile-time.
+            invokeAmbiguous: function(name, helperCall) {
+                this.context.aliases.functionType = '"function"';
+                this.useRegister('helper');
+
+                this.emptyHash();
+                var helper = this.setupHelper(0, name, helperCall);
+
+                var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
+
+                var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
+                var nextStack = this.nextStack();
+
+                if (helper.paramsInit) {
+                    this.pushSource(helper.paramsInit);
+                }
+                this.pushSource('if (helper = ' + helperName + ') { ' + nextStack + ' = helper.call(' + helper.callParams + '); }');
+                this.pushSource('else { helper = ' + nonHelper + '; ' + nextStack + ' = typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper; }');
+            },
+
+            // [invokePartial]
+            //
+            // On stack, before: context, ...
+            // On stack after: result of partial invocation
+            //
+            // This operation pops off a context, invokes a partial with that context,
+            // and pushes the result of the invocation back.
+            invokePartial: function(name) {
+                var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
+
+                if (this.options.data) {
+                    params.push("data");
+                }
+
+                this.context.aliases.self = "this";
+                this.push("self.invokePartial(" + params.join(", ") + ")");
+            },
+
+            // [assignToHash]
+            //
+            // On stack, before: value, hash, ...
+            // On stack, after: hash, ...
+            //
+            // Pops a value and hash off the stack, assigns `hash[key] = value`
+            // and pushes the hash back onto the stack.
+            assignToHash: function(key) {
+                var value = this.popStack(),
+                    context,
+                    type;
+
+                if (this.options.stringParams) {
+                    type = this.popStack();
+                    context = this.popStack();
+                }
+
+                var hash = this.hash;
+                if (context) {
+                    hash.contexts.push("'" + key + "': " + context);
+                }
+                if (type) {
+                    hash.types.push("'" + key + "': " + type);
+                }
+                hash.values.push("'" + key + "': (" + value + ")");
+            },
+
+            // HELPERS
+
+            compiler: JavaScriptCompiler,
+
+            compileChildren: function(environment, options) {
+                var children = environment.children, child, compiler;
+
+                for(var i=0, l=children.length; i<l; i++) {
+                    child = children[i];
+                    compiler = new this.compiler();
+
+                    var index = this.matchExistingProgram(child);
+
+                    if (index == null) {
+                        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
+                        index = this.context.programs.length;
+                        child.index = index;
+                        child.name = 'program' + index;
+                        this.context.programs[index] = compiler.compile(child, options, this.context);
+                        this.context.environments[index] = child;
+                    } else {
+                        child.index = index;
+                        child.name = 'program' + index;
+                    }
+                }
+            },
+            matchExistingProgram: function(child) {
+                for (var i = 0, len = this.context.environments.length; i < len; i++) {
+                    var environment = this.context.environments[i];
+                    if (environment && environment.equals(child)) {
+                        return i;
+                    }
+                }
+            },
+
+            programExpression: function(guid) {
+                this.context.aliases.self = "this";
+
+                if(guid == null) {
+                    return "self.noop";
+                }
+
+                var child = this.environment.children[guid],
+                    depths = child.depths.list, depth;
+
+                var programParams = [child.index, child.name, "data"];
+
+                for(var i=0, l = depths.length; i<l; i++) {
+                    depth = depths[i];
+
+                    if(depth === 1) { programParams.push("depth0"); }
+                    else { programParams.push("depth" + (depth - 1)); }
+                }
+
+                return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
+            },
+
+            register: function(name, val) {
+                this.useRegister(name);
+                this.pushSource(name + " = " + val + ";");
+            },
+
+            useRegister: function(name) {
+                if(!this.registers[name]) {
+                    this.registers[name] = true;
+                    this.registers.list.push(name);
+                }
+            },
+
+            pushStackLiteral: function(item) {
+                return this.push(new Literal(item));
+            },
+
+            pushSource: function(source) {
+                if (this.pendingContent) {
+                    this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent)));
+                    this.pendingContent = undefined;
+                }
+
+                if (source) {
+                    this.source.push(source);
+                }
+            },
+
+            pushStack: function(item) {
+                this.flushInline();
+
+                var stack = this.incrStack();
+                if (item) {
+                    this.pushSource(stack + " = " + item + ";");
+                }
+                this.compileStack.push(stack);
+                return stack;
+            },
+
+            replaceStack: function(callback) {
+                var prefix = '',
+                    inline = this.isInline(),
+                    stack,
+                    createdStack,
+                    usedLiteral;
+
+                // If we are currently inline then we want to merge the inline statement into the
+                // replacement statement via ','
+                if (inline) {
+                    var top = this.popStack(true);
+
+                    if (top instanceof Literal) {
+                        // Literals do not need to be inlined
+                        stack = top.value;
+                        usedLiteral = true;
+                    } else {
+                        // Get or create the current stack name for use by the inline
+                        createdStack = !this.stackSlot;
+                        var name = !createdStack ? this.topStackName() : this.incrStack();
+
+                        prefix = '(' + this.push(name) + ' = ' + top + '),';
+                        stack = this.topStack();
+                    }
+                } else {
+                    stack = this.topStack();
+                }
+
+                var item = callback.call(this, stack);
+
+                if (inline) {
+                    if (!usedLiteral) {
+                        this.popStack();
+                    }
+                    if (createdStack) {
+                        this.stackSlot--;
+                    }
+                    this.push('(' + prefix + item + ')');
+                } else {
+                    // Prevent modification of the context depth variable. Through replaceStack
+                    if (!/^stack/.test(stack)) {
+                        stack = this.nextStack();
+                    }
+
+                    this.pushSource(stack + " = (" + prefix + item + ");");
+                }
+                return stack;
+            },
+
+            nextStack: function() {
+                return this.pushStack();
+            },
+
+            incrStack: function() {
+                this.stackSlot++;
+                if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
+                return this.topStackName();
+            },
+            topStackName: function() {
+                return "stack" + this.stackSlot;
+            },
+            flushInline: function() {
+                var inlineStack = this.inlineStack;
+                if (inlineStack.length) {
+                    this.inlineStack = [];
+                    for (var i = 0, len = inlineStack.length; i < len; i++) {
+                        var entry = inlineStack[i];
+                        if (entry instanceof Literal) {
+                            this.compileStack.push(entry);
+                        } else {
+                            this.pushStack(entry);
+                        }
+                    }
+                }
+            },
+            isInline: function() {
+                return this.inlineStack.length;
+            },
+
+            popStack: function(wrapped) {
+                var inline = this.isInline(),
+                    item = (inline ? this.inlineStack : this.compileStack).pop();
+
+                if (!wrapped && (item instanceof Literal)) {
+                    return item.value;
+                } else {
+                    if (!inline) {
+                        if (!this.stackSlot) {
+                            throw new Exception('Invalid stack pop');
+                        }
+                        this.stackSlot--;
+                    }
+                    return item;
+                }
+            },
+
+            topStack: function(wrapped) {
+                var stack = (this.isInline() ? this.inlineStack : this.compileStack),
+                    item = stack[stack.length - 1];
+
+                if (!wrapped && (item instanceof Literal)) {
+                    return item.value;
+                } else {
+                    return item;
+                }
+            },
+
+            quotedString: function(str) {
+                return '"' + str
+                    .replace(/\\/g, '\\\\')
+                    .replace(/"/g, '\\"')
+                    .replace(/\n/g, '\\n')
+                    .replace(/\r/g, '\\r')
+                    .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
+                    .replace(/\u2029/g, '\\u2029') + '"';
+            },
+
+            setupHelper: function(paramSize, name, missingParams) {
+                var params = [],
+                    paramsInit = this.setupParams(paramSize, params, missingParams);
+                var foundHelper = this.nameLookup('helpers', name, 'helper');
+
+                return {
+                    params: params,
+                    paramsInit: paramsInit,
+                    name: foundHelper,
+                    callParams: ["depth0"].concat(params).join(", "),
+                    helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
+                };
+            },
+
+            setupOptions: function(paramSize, params) {
+                var options = [], contexts = [], types = [], param, inverse, program;
+
+                options.push("hash:" + this.popStack());
+
+                if (this.options.stringParams) {
+                    options.push("hashTypes:" + this.popStack());
+                    options.push("hashContexts:" + this.popStack());
+                }
+
+                inverse = this.popStack();
+                program = this.popStack();
+
+                // Avoid setting fn and inverse if neither are set. This allows
+                // helpers to do a check for `if (options.fn)`
+                if (program || inverse) {
+                    if (!program) {
+                        this.context.aliases.self = "this";
+                        program = "self.noop";
+                    }
+
+                    if (!inverse) {
+                        this.context.aliases.self = "this";
+                        inverse = "self.noop";
+                    }
+
+                    options.push("inverse:" + inverse);
+                    options.push("fn:" + program);
+                }
+
+                for(var i=0; i<paramSize; i++) {
+                    param = this.popStack();
+                    params.push(param);
+
+                    if(this.options.stringParams) {
+                        types.push(this.popStack());
+                        contexts.push(this.popStack());
+                    }
+                }
+
+                if (this.options.stringParams) {
+                    options.push("contexts:[" + contexts.join(",") + "]");
+                    options.push("types:[" + types.join(",") + "]");
+                }
+
+                if(this.options.data) {
+                    options.push("data:data");
+                }
+
+                return options;
+            },
+
+            // the params and contexts arguments are passed in arrays
+            // to fill in
+            setupParams: function(paramSize, params, useRegister) {
+                var options = '{' + this.setupOptions(paramSize, params).join(',') + '}';
+
+                if (useRegister) {
+                    this.useRegister('options');
+                    params.push('options');
+                    return 'options=' + options;
+                } else {
+                    params.push(options);
+                    return '';
+                }
+            }
+        };
+
+        var reservedWords = (
+            "break else new var" +
+                " case finally return void" +
+                " catch for switch while" +
+                " continue function this with" +
+                " default if throw" +
+                " delete in try" +
+                " do instanceof typeof" +
+                " abstract enum int short" +
+                " boolean export interface static" +
+                " byte extends long super" +
+                " char final native synchronized" +
+                " class float package throws" +
+                " const goto private transient" +
+                " debugger implements protected volatile" +
+                " double import public let yield"
+            ).split(" ");
+
+        var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
+
+        for(var i=0, l=reservedWords.length; i<l; i++) {
+            compilerWords[reservedWords[i]] = true;
+        }
+
+        JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
+            if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)) {
+                return true;
+            }
+            return false;
+        };
+
+        __exports__ = JavaScriptCompiler;
+        return __exports__;
+    })(__module2__, __module5__);
+
+// handlebars.js
+    var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+        "use strict";
+        var __exports__;
+        /*globals Handlebars: true */
+        var Handlebars = __dependency1__;
+
+        // Compiler imports
+        var AST = __dependency2__;
+        var Parser = __dependency3__.parser;
+        var parse = __dependency3__.parse;
+        var Compiler = __dependency4__.Compiler;
+        var compile = __dependency4__.compile;
+        var precompile = __dependency4__.precompile;
+        var JavaScriptCompiler = __dependency5__;
+
+        var _create = Handlebars.create;
+        var create = function() {
+            var hb = _create();
+
+            hb.compile = function(input, options) {
+                return compile(input, options, hb);
+            };
+            hb.precompile = function (input, options) {
+                return precompile(input, options, hb);
+            };
+
+            hb.AST = AST;
+            hb.Compiler = Compiler;
+            hb.JavaScriptCompiler = JavaScriptCompiler;
+            hb.Parser = Parser;
+            hb.parse = parse;
+
+            return hb;
+        };
+
+        Handlebars = create();
+        Handlebars.create = create;
+
+        __exports__ = Handlebars;
+        return __exports__;
+    })(__module1__, __module7__, __module8__, __module10__, __module11__);
+
+    return __module0__;
+})();
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/images/layers-2x.png b/src/main/webapp/client/js/lib/images/layers-2x.png
new file mode 100644
index 00000000..a2cf7f9e
Binary files /dev/null and b/src/main/webapp/client/js/lib/images/layers-2x.png differ
diff --git a/src/main/webapp/client/js/lib/images/layers.png b/src/main/webapp/client/js/lib/images/layers.png
new file mode 100644
index 00000000..bca0a0e4
Binary files /dev/null and b/src/main/webapp/client/js/lib/images/layers.png differ
diff --git a/src/main/webapp/client/js/lib/images/marker-icon-2x.png b/src/main/webapp/client/js/lib/images/marker-icon-2x.png
new file mode 100644
index 00000000..0015b649
Binary files /dev/null and b/src/main/webapp/client/js/lib/images/marker-icon-2x.png differ
diff --git a/src/main/webapp/client/js/lib/images/marker-icon.png b/src/main/webapp/client/js/lib/images/marker-icon.png
new file mode 100644
index 00000000..e2e9f757
Binary files /dev/null and b/src/main/webapp/client/js/lib/images/marker-icon.png differ
diff --git a/src/main/webapp/client/js/lib/images/marker-shadow.png b/src/main/webapp/client/js/lib/images/marker-shadow.png
new file mode 100644
index 00000000..d1e773c7
Binary files /dev/null and b/src/main/webapp/client/js/lib/images/marker-shadow.png differ
diff --git a/src/main/webapp/client/js/lib/jquery-1.10.2.min.js b/src/main/webapp/client/js/lib/jquery-1.10.2.min.js
new file mode 100644
index 00000000..da417064
--- /dev/null
+++ b/src/main/webapp/client/js/lib/jquery-1.10.2.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.2.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/src/main/webapp/client/js/lib/jquery-migrate-1.2.1.min.js b/src/main/webapp/client/js/lib/jquery-migrate-1.2.1.min.js
new file mode 100644
index 00000000..62149c28
--- /dev/null
+++ b/src/main/webapp/client/js/lib/jquery-migrate-1.2.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v1.2.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
+jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){var r=t.console;i[n]||(i[n]=!0,e.migrateWarnings.push(n),r&&r.warn&&!e.migrateMute&&(r.warn("JQMIGRATE: "+n),e.migrateTrace&&r.trace&&r.trace()))}function a(t,a,i,o){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(o),i},set:function(e){r(o),i=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=i}var i={};e.migrateWarnings=[],!e.migrateMute&&t.console&&t.console.log&&t.console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){i={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var o=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",o||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,i,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(o?a in o:e.isFunction(e.fn[a])))?e(t)[a](i):("type"===a&&i!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,i=e.prop(t,r);return i===!0||"boolean"!=typeof i&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,i))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^([^<]*)(<[\w\W]+>)([^>]*)$/;e.fn.init=function(t,n,a){var i;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(i=y.exec(e.trim(t)))&&i[0]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),i[3]&&r("$(html) HTML text after last tag is ignored"),"#"===i[0].charAt(0)&&(r("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(i[2],n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,i,o=this[0];return!o||"events"!==t||1!==arguments.length||(a=e.data(o,t),i=e._data(o,t),a!==n&&a!==i||i===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),i)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,i,o){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),i)for(c=function(e){return!e.type||j.test(e.type)?o?o.push(e.parentNode?e.parentNode.removeChild(e):e):i.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(i.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,T=e.fn.live,M=e.fn.die,S="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",C=RegExp("\\b(?:"+S+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,i){e!==document&&C.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,i)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,i=t.guid||e.guid++,o=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%o;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=i;a.length>o;)a[o++].guid=i;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),T?T.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),M?M.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||C.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(S.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/leaflet-src.js b/src/main/webapp/client/js/lib/leaflet-src.js
new file mode 100644
index 00000000..2466f561
--- /dev/null
+++ b/src/main/webapp/client/js/lib/leaflet-src.js
@@ -0,0 +1,8909 @@
+/*
+ Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com
+ (c) 2010-2013, Vladimir Agafonkin
+ (c) 2010-2011, CloudMade
+*/
+(function (window, document, undefined) {
+var oldL = window.L,
+    L = {};
+
+L.version = '0.6.4';
+
+// define Leaflet for Node module pattern loaders, including Browserify
+if (typeof module === 'object' && typeof module.exports === 'object') {
+	module.exports = L;
+
+// define Leaflet as an AMD module
+} else if (typeof define === 'function' && define.amd) {
+	define(L);
+}
+
+// define Leaflet as a global L variable, saving the original L to restore later if needed
+
+L.noConflict = function () {
+	window.L = oldL;
+	return this;
+};
+
+window.L = L;
+
+
+/*
+ * L.Util contains various utility functions used throughout Leaflet code.
+ */
+
+L.Util = {
+	extend: function (dest) { // (Object[, Object, ...]) ->
+		var sources = Array.prototype.slice.call(arguments, 1),
+		    i, j, len, src;
+
+		for (j = 0, len = sources.length; j < len; j++) {
+			src = sources[j] || {};
+			for (i in src) {
+				if (src.hasOwnProperty(i)) {
+					dest[i] = src[i];
+				}
+			}
+		}
+		return dest;
+	},
+
+	bind: function (fn, obj) { // (Function, Object) -> Function
+		var args = arguments.length > 2 ? Array.prototype.slice.call(arguments, 2) : null;
+		return function () {
+			return fn.apply(obj, args || arguments);
+		};
+	},
+
+	stamp: (function () {
+		var lastId = 0,
+		    key = '_leaflet_id';
+		return function (obj) {
+			obj[key] = obj[key] || ++lastId;
+			return obj[key];
+		};
+	}()),
+
+	invokeEach: function (obj, method, context) {
+		var i, args;
+
+		if (typeof obj === 'object') {
+			args = Array.prototype.slice.call(arguments, 3);
+
+			for (i in obj) {
+				method.apply(context, [i, obj[i]].concat(args));
+			}
+			return true;
+		}
+
+		return false;
+	},
+
+	limitExecByInterval: function (fn, time, context) {
+		var lock, execOnUnlock;
+
+		return function wrapperFn() {
+			var args = arguments;
+
+			if (lock) {
+				execOnUnlock = true;
+				return;
+			}
+
+			lock = true;
+
+			setTimeout(function () {
+				lock = false;
+
+				if (execOnUnlock) {
+					wrapperFn.apply(context, args);
+					execOnUnlock = false;
+				}
+			}, time);
+
+			fn.apply(context, args);
+		};
+	},
+
+	falseFn: function () {
+		return false;
+	},
+
+	formatNum: function (num, digits) {
+		var pow = Math.pow(10, digits || 5);
+		return Math.round(num * pow) / pow;
+	},
+
+	trim: function (str) {
+		return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g, '');
+	},
+
+	splitWords: function (str) {
+		return L.Util.trim(str).split(/\s+/);
+	},
+
+	setOptions: function (obj, options) {
+		obj.options = L.extend({}, obj.options, options);
+		return obj.options;
+	},
+
+	getParamString: function (obj, existingUrl, uppercase) {
+		var params = [];
+		for (var i in obj) {
+			params.push(encodeURIComponent(uppercase ? i.toUpperCase() : i) + '=' + encodeURIComponent(obj[i]));
+		}
+		return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
+	},
+
+	template: function (str, data) {
+		return str.replace(/\{ *([\w_]+) *\}/g, function (str, key) {
+			var value = data[key];
+			if (value === undefined) {
+				throw new Error('No value provided for variable ' + str);
+			} else if (typeof value === 'function') {
+				value = value(data);
+			}
+			return value;
+		});
+	},
+
+	isArray: function (obj) {
+		return (Object.prototype.toString.call(obj) === '[object Array]');
+	},
+
+	emptyImageUrl: 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs='
+};
+
+(function () {
+
+	// inspired by http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+
+	function getPrefixed(name) {
+		var i, fn,
+		    prefixes = ['webkit', 'moz', 'o', 'ms'];
+
+		for (i = 0; i < prefixes.length && !fn; i++) {
+			fn = window[prefixes[i] + name];
+		}
+
+		return fn;
+	}
+
+	var lastTime = 0;
+
+	function timeoutDefer(fn) {
+		var time = +new Date(),
+		    timeToCall = Math.max(0, 16 - (time - lastTime));
+
+		lastTime = time + timeToCall;
+		return window.setTimeout(fn, timeToCall);
+	}
+
+	var requestFn = window.requestAnimationFrame ||
+	        getPrefixed('RequestAnimationFrame') || timeoutDefer;
+
+	var cancelFn = window.cancelAnimationFrame ||
+	        getPrefixed('CancelAnimationFrame') ||
+	        getPrefixed('CancelRequestAnimationFrame') ||
+	        function (id) { window.clearTimeout(id); };
+
+
+	L.Util.requestAnimFrame = function (fn, context, immediate, element) {
+		fn = L.bind(fn, context);
+
+		if (immediate && requestFn === timeoutDefer) {
+			fn();
+		} else {
+			return requestFn.call(window, fn, element);
+		}
+	};
+
+	L.Util.cancelAnimFrame = function (id) {
+		if (id) {
+			cancelFn.call(window, id);
+		}
+	};
+
+}());
+
+// shortcuts for most used utility functions
+L.extend = L.Util.extend;
+L.bind = L.Util.bind;
+L.stamp = L.Util.stamp;
+L.setOptions = L.Util.setOptions;
+
+
+/*
+ * L.Class powers the OOP facilities of the library.
+ * Thanks to John Resig and Dean Edwards for inspiration!
+ */
+
+L.Class = function () {};
+
+L.Class.extend = function (props) {
+
+	// extended class with the new prototype
+	var NewClass = function () {
+
+		// call the constructor
+		if (this.initialize) {
+			this.initialize.apply(this, arguments);
+		}
+
+		// call all constructor hooks
+		if (this._initHooks) {
+			this.callInitHooks();
+		}
+	};
+
+	// instantiate class without calling constructor
+	var F = function () {};
+	F.prototype = this.prototype;
+
+	var proto = new F();
+	proto.constructor = NewClass;
+
+	NewClass.prototype = proto;
+
+	//inherit parent's statics
+	for (var i in this) {
+		if (this.hasOwnProperty(i) && i !== 'prototype') {
+			NewClass[i] = this[i];
+		}
+	}
+
+	// mix static properties into the class
+	if (props.statics) {
+		L.extend(NewClass, props.statics);
+		delete props.statics;
+	}
+
+	// mix includes into the prototype
+	if (props.includes) {
+		L.Util.extend.apply(null, [proto].concat(props.includes));
+		delete props.includes;
+	}
+
+	// merge options
+	if (props.options && proto.options) {
+		props.options = L.extend({}, proto.options, props.options);
+	}
+
+	// mix given properties into the prototype
+	L.extend(proto, props);
+
+	proto._initHooks = [];
+
+	var parent = this;
+	// jshint camelcase: false
+	NewClass.__super__ = parent.prototype;
+
+	// add method for calling all hooks
+	proto.callInitHooks = function () {
+
+		if (this._initHooksCalled) { return; }
+
+		if (parent.prototype.callInitHooks) {
+			parent.prototype.callInitHooks.call(this);
+		}
+
+		this._initHooksCalled = true;
+
+		for (var i = 0, len = proto._initHooks.length; i < len; i++) {
+			proto._initHooks[i].call(this);
+		}
+	};
+
+	return NewClass;
+};
+
+
+// method for adding properties to prototype
+L.Class.include = function (props) {
+	L.extend(this.prototype, props);
+};
+
+// merge new default options to the Class
+L.Class.mergeOptions = function (options) {
+	L.extend(this.prototype.options, options);
+};
+
+// add a constructor hook
+L.Class.addInitHook = function (fn) { // (Function) || (String, args...)
+	var args = Array.prototype.slice.call(arguments, 1);
+
+	var init = typeof fn === 'function' ? fn : function () {
+		this[fn].apply(this, args);
+	};
+
+	this.prototype._initHooks = this.prototype._initHooks || [];
+	this.prototype._initHooks.push(init);
+};
+
+
+/*
+ * L.Mixin.Events is used to add custom events functionality to Leaflet classes.
+ */
+
+var eventsKey = '_leaflet_events';
+
+L.Mixin = {};
+
+L.Mixin.Events = {
+
+	addEventListener: function (types, fn, context) { // (String, Function[, Object]) or (Object[, Object])
+
+		// types can be a map of types/handlers
+		if (L.Util.invokeEach(types, this.addEventListener, this, fn, context)) { return this; }
+
+		var events = this[eventsKey] = this[eventsKey] || {},
+		    contextId = context && L.stamp(context),
+		    i, len, event, type, indexKey, indexLenKey, typeIndex;
+
+		// types can be a string of space-separated words
+		types = L.Util.splitWords(types);
+
+		for (i = 0, len = types.length; i < len; i++) {
+			event = {
+				action: fn,
+				context: context || this
+			};
+			type = types[i];
+
+			if (context) {
+				// store listeners of a particular context in a separate hash (if it has an id)
+				// gives a major performance boost when removing thousands of map layers
+
+				indexKey = type + '_idx';
+				indexLenKey = indexKey + '_len';
+
+				typeIndex = events[indexKey] = events[indexKey] || {};
+
+				if (!typeIndex[contextId]) {
+					typeIndex[contextId] = [];
+
+					// keep track of the number of keys in the index to quickly check if it's empty
+					events[indexLenKey] = (events[indexLenKey] || 0) + 1;
+				}
+
+				typeIndex[contextId].push(event);
+
+
+			} else {
+				events[type] = events[type] || [];
+				events[type].push(event);
+			}
+		}
+
+		return this;
+	},
+
+	hasEventListeners: function (type) { // (String) -> Boolean
+		var events = this[eventsKey];
+		return !!events && ((type in events && events[type].length > 0) ||
+		                    (type + '_idx' in events && events[type + '_idx_len'] > 0));
+	},
+
+	removeEventListener: function (types, fn, context) { // ([String, Function, Object]) or (Object[, Object])
+
+		if (!this[eventsKey]) {
+			return this;
+		}
+
+		if (!types) {
+			return this.clearAllEventListeners();
+		}
+
+		if (L.Util.invokeEach(types, this.removeEventListener, this, fn, context)) { return this; }
+
+		var events = this[eventsKey],
+		    contextId = context && L.stamp(context),
+		    i, len, type, listeners, j, indexKey, indexLenKey, typeIndex, removed;
+
+		types = L.Util.splitWords(types);
+
+		for (i = 0, len = types.length; i < len; i++) {
+			type = types[i];
+			indexKey = type + '_idx';
+			indexLenKey = indexKey + '_len';
+
+			typeIndex = events[indexKey];
+
+			if (!fn) {
+				// clear all listeners for a type if function isn't specified
+				delete events[type];
+				delete events[indexKey];
+
+			} else {
+				listeners = context && typeIndex ? typeIndex[contextId] : events[type];
+
+				if (listeners) {
+					for (j = listeners.length - 1; j >= 0; j--) {
+						if ((listeners[j].action === fn) && (!context || (listeners[j].context === context))) {
+							removed = listeners.splice(j, 1);
+							// set the old action to a no-op, because it is possible
+							// that the listener is being iterated over as part of a dispatch
+							removed[0].action = L.Util.falseFn;
+						}
+					}
+
+					if (context && typeIndex && (listeners.length === 0)) {
+						delete typeIndex[contextId];
+						events[indexLenKey]--;
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	clearAllEventListeners: function () {
+		delete this[eventsKey];
+		return this;
+	},
+
+	fireEvent: function (type, data) { // (String[, Object])
+		if (!this.hasEventListeners(type)) {
+			return this;
+		}
+
+		var event = L.Util.extend({}, data, { type: type, target: this });
+
+		var events = this[eventsKey],
+		    listeners, i, len, typeIndex, contextId;
+
+		if (events[type]) {
+			// make sure adding/removing listeners inside other listeners won't cause infinite loop
+			listeners = events[type].slice();
+
+			for (i = 0, len = listeners.length; i < len; i++) {
+				listeners[i].action.call(listeners[i].context || this, event);
+			}
+		}
+
+		// fire event for the context-indexed listeners as well
+		typeIndex = events[type + '_idx'];
+
+		for (contextId in typeIndex) {
+			listeners = typeIndex[contextId].slice();
+
+			if (listeners) {
+				for (i = 0, len = listeners.length; i < len; i++) {
+					listeners[i].action.call(listeners[i].context || this, event);
+				}
+			}
+		}
+
+		return this;
+	},
+
+	addOneTimeEventListener: function (types, fn, context) {
+
+		if (L.Util.invokeEach(types, this.addOneTimeEventListener, this, fn, context)) { return this; }
+
+		var handler = L.bind(function () {
+			this
+			    .removeEventListener(types, fn, context)
+			    .removeEventListener(types, handler, context);
+		}, this);
+
+		return this
+		    .addEventListener(types, fn, context)
+		    .addEventListener(types, handler, context);
+	}
+};
+
+L.Mixin.Events.on = L.Mixin.Events.addEventListener;
+L.Mixin.Events.off = L.Mixin.Events.removeEventListener;
+L.Mixin.Events.once = L.Mixin.Events.addOneTimeEventListener;
+L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
+
+
+/*
+ * L.Browser handles different browser and feature detections for internal Leaflet use.
+ */
+
+(function () {
+
+	var ie = !!window.ActiveXObject,
+	    ie6 = ie && !window.XMLHttpRequest,
+	    ie7 = ie && !document.querySelector,
+		ielt9 = ie && !document.addEventListener,
+
+	    // terrible browser detection to work around Safari / iOS / Android browser bugs
+	    ua = navigator.userAgent.toLowerCase(),
+	    webkit = ua.indexOf('webkit') !== -1,
+	    chrome = ua.indexOf('chrome') !== -1,
+	    phantomjs = ua.indexOf('phantom') !== -1,
+	    android = ua.indexOf('android') !== -1,
+	    android23 = ua.search('android [23]') !== -1,
+
+	    mobile = typeof orientation !== undefined + '',
+	    msTouch = window.navigator && window.navigator.msPointerEnabled &&
+	              window.navigator.msMaxTouchPoints,
+	    retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
+	             ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
+	              window.matchMedia('(min-resolution:144dpi)').matches),
+
+	    doc = document.documentElement,
+	    ie3d = ie && ('transition' in doc.style),
+	    webkit3d = ('WebKitCSSMatrix' in window) && ('m11' in new window.WebKitCSSMatrix()),
+	    gecko3d = 'MozPerspective' in doc.style,
+	    opera3d = 'OTransition' in doc.style,
+	    any3d = !window.L_DISABLE_3D && (ie3d || webkit3d || gecko3d || opera3d) && !phantomjs;
+
+
+	// PhantomJS has 'ontouchstart' in document.documentElement, but doesn't actually support touch.
+	// https://github.com/Leaflet/Leaflet/pull/1434#issuecomment-13843151
+
+	var touch = !window.L_NO_TOUCH && !phantomjs && (function () {
+
+		var startName = 'ontouchstart';
+
+		// IE10+ (We simulate these into touch* events in L.DomEvent and L.DomEvent.MsTouch) or WebKit, etc.
+		if (msTouch || (startName in doc)) {
+			return true;
+		}
+
+		// Firefox/Gecko
+		var div = document.createElement('div'),
+		    supported = false;
+
+		if (!div.setAttribute) {
+			return false;
+		}
+		div.setAttribute(startName, 'return;');
+
+		if (typeof div[startName] === 'function') {
+			supported = true;
+		}
+
+		div.removeAttribute(startName);
+		div = null;
+
+		return supported;
+	}());
+
+
+	L.Browser = {
+		ie: ie,
+		ie6: ie6,
+		ie7: ie7,
+		ielt9: ielt9,
+		webkit: webkit,
+
+		android: android,
+		android23: android23,
+
+		chrome: chrome,
+
+		ie3d: ie3d,
+		webkit3d: webkit3d,
+		gecko3d: gecko3d,
+		opera3d: opera3d,
+		any3d: any3d,
+
+		mobile: mobile,
+		mobileWebkit: mobile && webkit,
+		mobileWebkit3d: mobile && webkit3d,
+		mobileOpera: mobile && window.opera,
+
+		touch: touch,
+		msTouch: msTouch,
+
+		retina: retina
+	};
+
+}());
+
+
+/*
+ * L.Point represents a point with x and y coordinates.
+ */
+
+L.Point = function (/*Number*/ x, /*Number*/ y, /*Boolean*/ round) {
+	this.x = (round ? Math.round(x) : x);
+	this.y = (round ? Math.round(y) : y);
+};
+
+L.Point.prototype = {
+
+	clone: function () {
+		return new L.Point(this.x, this.y);
+	},
+
+	// non-destructive, returns a new point
+	add: function (point) {
+		return this.clone()._add(L.point(point));
+	},
+
+	// destructive, used directly for performance in situations where it's safe to modify existing point
+	_add: function (point) {
+		this.x += point.x;
+		this.y += point.y;
+		return this;
+	},
+
+	subtract: function (point) {
+		return this.clone()._subtract(L.point(point));
+	},
+
+	_subtract: function (point) {
+		this.x -= point.x;
+		this.y -= point.y;
+		return this;
+	},
+
+	divideBy: function (num) {
+		return this.clone()._divideBy(num);
+	},
+
+	_divideBy: function (num) {
+		this.x /= num;
+		this.y /= num;
+		return this;
+	},
+
+	multiplyBy: function (num) {
+		return this.clone()._multiplyBy(num);
+	},
+
+	_multiplyBy: function (num) {
+		this.x *= num;
+		this.y *= num;
+		return this;
+	},
+
+	round: function () {
+		return this.clone()._round();
+	},
+
+	_round: function () {
+		this.x = Math.round(this.x);
+		this.y = Math.round(this.y);
+		return this;
+	},
+
+	floor: function () {
+		return this.clone()._floor();
+	},
+
+	_floor: function () {
+		this.x = Math.floor(this.x);
+		this.y = Math.floor(this.y);
+		return this;
+	},
+
+	distanceTo: function (point) {
+		point = L.point(point);
+
+		var x = point.x - this.x,
+		    y = point.y - this.y;
+
+		return Math.sqrt(x * x + y * y);
+	},
+
+	equals: function (point) {
+		point = L.point(point);
+
+		return point.x === this.x &&
+		       point.y === this.y;
+	},
+
+	contains: function (point) {
+		point = L.point(point);
+
+		return Math.abs(point.x) <= Math.abs(this.x) &&
+		       Math.abs(point.y) <= Math.abs(this.y);
+	},
+
+	toString: function () {
+		return 'Point(' +
+		        L.Util.formatNum(this.x) + ', ' +
+		        L.Util.formatNum(this.y) + ')';
+	}
+};
+
+L.point = function (x, y, round) {
+	if (x instanceof L.Point) {
+		return x;
+	}
+	if (L.Util.isArray(x)) {
+		return new L.Point(x[0], x[1]);
+	}
+	if (x === undefined || x === null) {
+		return x;
+	}
+	return new L.Point(x, y, round);
+};
+
+
+/*
+ * L.Bounds represents a rectangular area on the screen in pixel coordinates.
+ */
+
+L.Bounds = function (a, b) { //(Point, Point) or Point[]
+	if (!a) { return; }
+
+	var points = b ? [a, b] : a;
+
+	for (var i = 0, len = points.length; i < len; i++) {
+		this.extend(points[i]);
+	}
+};
+
+L.Bounds.prototype = {
+	// extend the bounds to contain the given point
+	extend: function (point) { // (Point)
+		point = L.point(point);
+
+		if (!this.min && !this.max) {
+			this.min = point.clone();
+			this.max = point.clone();
+		} else {
+			this.min.x = Math.min(point.x, this.min.x);
+			this.max.x = Math.max(point.x, this.max.x);
+			this.min.y = Math.min(point.y, this.min.y);
+			this.max.y = Math.max(point.y, this.max.y);
+		}
+		return this;
+	},
+
+	getCenter: function (round) { // (Boolean) -> Point
+		return new L.Point(
+		        (this.min.x + this.max.x) / 2,
+		        (this.min.y + this.max.y) / 2, round);
+	},
+
+	getBottomLeft: function () { // -> Point
+		return new L.Point(this.min.x, this.max.y);
+	},
+
+	getTopRight: function () { // -> Point
+		return new L.Point(this.max.x, this.min.y);
+	},
+
+	getSize: function () {
+		return this.max.subtract(this.min);
+	},
+
+	contains: function (obj) { // (Bounds) or (Point) -> Boolean
+		var min, max;
+
+		if (typeof obj[0] === 'number' || obj instanceof L.Point) {
+			obj = L.point(obj);
+		} else {
+			obj = L.bounds(obj);
+		}
+
+		if (obj instanceof L.Bounds) {
+			min = obj.min;
+			max = obj.max;
+		} else {
+			min = max = obj;
+		}
+
+		return (min.x >= this.min.x) &&
+		       (max.x <= this.max.x) &&
+		       (min.y >= this.min.y) &&
+		       (max.y <= this.max.y);
+	},
+
+	intersects: function (bounds) { // (Bounds) -> Boolean
+		bounds = L.bounds(bounds);
+
+		var min = this.min,
+		    max = this.max,
+		    min2 = bounds.min,
+		    max2 = bounds.max,
+		    xIntersects = (max2.x >= min.x) && (min2.x <= max.x),
+		    yIntersects = (max2.y >= min.y) && (min2.y <= max.y);
+
+		return xIntersects && yIntersects;
+	},
+
+	isValid: function () {
+		return !!(this.min && this.max);
+	}
+};
+
+L.bounds = function (a, b) { // (Bounds) or (Point, Point) or (Point[])
+	if (!a || a instanceof L.Bounds) {
+		return a;
+	}
+	return new L.Bounds(a, b);
+};
+
+
+/*
+ * L.Transformation is an utility class to perform simple point transformations through a 2d-matrix.
+ */
+
+L.Transformation = function (a, b, c, d) {
+	this._a = a;
+	this._b = b;
+	this._c = c;
+	this._d = d;
+};
+
+L.Transformation.prototype = {
+	transform: function (point, scale) { // (Point, Number) -> Point
+		return this._transform(point.clone(), scale);
+	},
+
+	// destructive transform (faster)
+	_transform: function (point, scale) {
+		scale = scale || 1;
+		point.x = scale * (this._a * point.x + this._b);
+		point.y = scale * (this._c * point.y + this._d);
+		return point;
+	},
+
+	untransform: function (point, scale) {
+		scale = scale || 1;
+		return new L.Point(
+		        (point.x / scale - this._b) / this._a,
+		        (point.y / scale - this._d) / this._c);
+	}
+};
+
+
+/*
+ * L.DomUtil contains various utility functions for working with DOM.
+ */
+
+L.DomUtil = {
+	get: function (id) {
+		return (typeof id === 'string' ? document.getElementById(id) : id);
+	},
+
+	getStyle: function (el, style) {
+
+		var value = el.style[style];
+
+		if (!value && el.currentStyle) {
+			value = el.currentStyle[style];
+		}
+
+		if ((!value || value === 'auto') && document.defaultView) {
+			var css = document.defaultView.getComputedStyle(el, null);
+			value = css ? css[style] : null;
+		}
+
+		return value === 'auto' ? null : value;
+	},
+
+	getViewportOffset: function (element) {
+
+		var top = 0,
+		    left = 0,
+		    el = element,
+		    docBody = document.body,
+		    docEl = document.documentElement,
+		    pos,
+		    ie7 = L.Browser.ie7;
+
+		do {
+			top  += el.offsetTop  || 0;
+			left += el.offsetLeft || 0;
+
+			//add borders
+			top += parseInt(L.DomUtil.getStyle(el, 'borderTopWidth'), 10) || 0;
+			left += parseInt(L.DomUtil.getStyle(el, 'borderLeftWidth'), 10) || 0;
+
+			pos = L.DomUtil.getStyle(el, 'position');
+
+			if (el.offsetParent === docBody && pos === 'absolute') { break; }
+
+			if (pos === 'fixed') {
+				top  += docBody.scrollTop  || docEl.scrollTop  || 0;
+				left += docBody.scrollLeft || docEl.scrollLeft || 0;
+				break;
+			}
+
+			if (pos === 'relative' && !el.offsetLeft) {
+				var width = L.DomUtil.getStyle(el, 'width'),
+				    maxWidth = L.DomUtil.getStyle(el, 'max-width'),
+				    r = el.getBoundingClientRect();
+
+				if (width !== 'none' || maxWidth !== 'none') {
+					left += r.left + el.clientLeft;
+				}
+
+				//calculate full y offset since we're breaking out of the loop
+				top += r.top + (docBody.scrollTop  || docEl.scrollTop  || 0);
+
+				break;
+			}
+
+			el = el.offsetParent;
+
+		} while (el);
+
+		el = element;
+
+		do {
+			if (el === docBody) { break; }
+
+			top  -= el.scrollTop  || 0;
+			left -= el.scrollLeft || 0;
+
+			// webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+			// https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+			if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+				left += el.scrollWidth - el.clientWidth;
+
+				// ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+				// need to add it back in if it is visible; scrollbar is on the left as we are RTL
+				if (ie7 && L.DomUtil.getStyle(el, 'overflow-y') !== 'hidden' &&
+				           L.DomUtil.getStyle(el, 'overflow') !== 'hidden') {
+					left += 17;
+				}
+			}
+
+			el = el.parentNode;
+		} while (el);
+
+		return new L.Point(left, top);
+	},
+
+	documentIsLtr: function () {
+		if (!L.DomUtil._docIsLtrCached) {
+			L.DomUtil._docIsLtrCached = true;
+			L.DomUtil._docIsLtr = L.DomUtil.getStyle(document.body, 'direction') === 'ltr';
+		}
+		return L.DomUtil._docIsLtr;
+	},
+
+	create: function (tagName, className, container) {
+
+		var el = document.createElement(tagName);
+		el.className = className;
+
+		if (container) {
+			container.appendChild(el);
+		}
+
+		return el;
+	},
+
+	hasClass: function (el, name) {
+		return (el.className.length > 0) &&
+		        new RegExp('(^|\\s)' + name + '(\\s|$)').test(el.className);
+	},
+
+	addClass: function (el, name) {
+		if (!L.DomUtil.hasClass(el, name)) {
+			el.className += (el.className ? ' ' : '') + name;
+		}
+	},
+
+	removeClass: function (el, name) {
+		el.className = L.Util.trim((' ' + el.className + ' ').replace(' ' + name + ' ', ' '));
+	},
+
+	setOpacity: function (el, value) {
+
+		if ('opacity' in el.style) {
+			el.style.opacity = value;
+
+		} else if ('filter' in el.style) {
+
+			var filter = false,
+			    filterName = 'DXImageTransform.Microsoft.Alpha';
+
+			// filters collection throws an error if we try to retrieve a filter that doesn't exist
+			try {
+				filter = el.filters.item(filterName);
+			} catch (e) {
+				// don't set opacity to 1 if we haven't already set an opacity,
+				// it isn't needed and breaks transparent pngs.
+				if (value === 1) { return; }
+			}
+
+			value = Math.round(value * 100);
+
+			if (filter) {
+				filter.Enabled = (value !== 100);
+				filter.Opacity = value;
+			} else {
+				el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
+			}
+		}
+	},
+
+	testProp: function (props) {
+
+		var style = document.documentElement.style;
+
+		for (var i = 0; i < props.length; i++) {
+			if (props[i] in style) {
+				return props[i];
+			}
+		}
+		return false;
+	},
+
+	getTranslateString: function (point) {
+		// on WebKit browsers (Chrome/Safari/iOS Safari/Android) using translate3d instead of translate
+		// makes animation smoother as it ensures HW accel is used. Firefox 13 doesn't care
+		// (same speed either way), Opera 12 doesn't support translate3d
+
+		var is3d = L.Browser.webkit3d,
+		    open = 'translate' + (is3d ? '3d' : '') + '(',
+		    close = (is3d ? ',0' : '') + ')';
+
+		return open + point.x + 'px,' + point.y + 'px' + close;
+	},
+
+	getScaleString: function (scale, origin) {
+
+		var preTranslateStr = L.DomUtil.getTranslateString(origin.add(origin.multiplyBy(-1 * scale))),
+		    scaleStr = ' scale(' + scale + ') ';
+
+		return preTranslateStr + scaleStr;
+	},
+
+	setPosition: function (el, point, disable3D) { // (HTMLElement, Point[, Boolean])
+
+		// jshint camelcase: false
+		el._leaflet_pos = point;
+
+		if (!disable3D && L.Browser.any3d) {
+			el.style[L.DomUtil.TRANSFORM] =  L.DomUtil.getTranslateString(point);
+
+			// workaround for Android 2/3 stability (https://github.com/CloudMade/Leaflet/issues/69)
+			if (L.Browser.mobileWebkit3d) {
+				el.style.WebkitBackfaceVisibility = 'hidden';
+			}
+		} else {
+			el.style.left = point.x + 'px';
+			el.style.top = point.y + 'px';
+		}
+	},
+
+	getPosition: function (el) {
+		// this method is only used for elements previously positioned using setPosition,
+		// so it's safe to cache the position for performance
+
+		// jshint camelcase: false
+		return el._leaflet_pos;
+	}
+};
+
+
+// prefix style property names
+
+L.DomUtil.TRANSFORM = L.DomUtil.testProp(
+        ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform']);
+
+// webkitTransition comes first because some browser versions that drop vendor prefix don't do
+// the same for the transitionend event, in particular the Android 4.1 stock browser
+
+L.DomUtil.TRANSITION = L.DomUtil.testProp(
+        ['webkitTransition', 'transition', 'OTransition', 'MozTransition', 'msTransition']);
+
+L.DomUtil.TRANSITION_END =
+        L.DomUtil.TRANSITION === 'webkitTransition' || L.DomUtil.TRANSITION === 'OTransition' ?
+        L.DomUtil.TRANSITION + 'End' : 'transitionend';
+
+(function () {
+	var userSelectProperty = L.DomUtil.testProp(
+		['userSelect', 'WebkitUserSelect', 'OUserSelect', 'MozUserSelect', 'msUserSelect']);
+
+	L.extend(L.DomUtil, {
+		disableTextSelection: function () {
+			L.DomEvent.on(window, 'selectstart', L.DomEvent.preventDefault);
+			if (userSelectProperty) {
+				var style = document.documentElement.style;
+				this._userSelect = style[userSelectProperty];
+				style[userSelectProperty] = 'none';
+			}
+		},
+
+		enableTextSelection: function () {
+			L.DomEvent.off(window, 'selectstart', L.DomEvent.preventDefault);
+			if (userSelectProperty) {
+				document.documentElement.style[userSelectProperty] = this._userSelect;
+				delete this._userSelect;
+			}
+		},
+
+		disableImageDrag: function () {
+			L.DomEvent.on(window, 'dragstart', L.DomEvent.preventDefault);
+		},
+
+		enableImageDrag: function () {
+			L.DomEvent.off(window, 'dragstart', L.DomEvent.preventDefault);
+		}
+	});
+})();
+
+
+/*
+ * L.LatLng represents a geographical point with latitude and longitude coordinates.
+ */
+
+L.LatLng = function (rawLat, rawLng) { // (Number, Number)
+	var lat = parseFloat(rawLat),
+	    lng = parseFloat(rawLng);
+
+	if (isNaN(lat) || isNaN(lng)) {
+		throw new Error('Invalid LatLng object: (' + rawLat + ', ' + rawLng + ')');
+	}
+
+	this.lat = lat;
+	this.lng = lng;
+};
+
+L.extend(L.LatLng, {
+	DEG_TO_RAD: Math.PI / 180,
+	RAD_TO_DEG: 180 / Math.PI,
+	MAX_MARGIN: 1.0E-9 // max margin of error for the "equals" check
+});
+
+L.LatLng.prototype = {
+	equals: function (obj) { // (LatLng) -> Boolean
+		if (!obj) { return false; }
+
+		obj = L.latLng(obj);
+
+		var margin = Math.max(
+		        Math.abs(this.lat - obj.lat),
+		        Math.abs(this.lng - obj.lng));
+
+		return margin <= L.LatLng.MAX_MARGIN;
+	},
+
+	toString: function (precision) { // (Number) -> String
+		return 'LatLng(' +
+		        L.Util.formatNum(this.lat, precision) + ', ' +
+		        L.Util.formatNum(this.lng, precision) + ')';
+	},
+
+	// Haversine distance formula, see http://en.wikipedia.org/wiki/Haversine_formula
+	// TODO move to projection code, LatLng shouldn't know about Earth
+	distanceTo: function (other) { // (LatLng) -> Number
+		other = L.latLng(other);
+
+		var R = 6378137, // earth radius in meters
+		    d2r = L.LatLng.DEG_TO_RAD,
+		    dLat = (other.lat - this.lat) * d2r,
+		    dLon = (other.lng - this.lng) * d2r,
+		    lat1 = this.lat * d2r,
+		    lat2 = other.lat * d2r,
+		    sin1 = Math.sin(dLat / 2),
+		    sin2 = Math.sin(dLon / 2);
+
+		var a = sin1 * sin1 + sin2 * sin2 * Math.cos(lat1) * Math.cos(lat2);
+
+		return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+	},
+
+	wrap: function (a, b) { // (Number, Number) -> LatLng
+		var lng = this.lng;
+
+		a = a || -180;
+		b = b ||  180;
+
+		lng = (lng + b) % (b - a) + (lng < a || lng === b ? b : a);
+
+		return new L.LatLng(this.lat, lng);
+	}
+};
+
+L.latLng = function (a, b) { // (LatLng) or ([Number, Number]) or (Number, Number)
+	if (a instanceof L.LatLng) {
+		return a;
+	}
+	if (L.Util.isArray(a)) {
+		return new L.LatLng(a[0], a[1]);
+	}
+	if (a === undefined || a === null) {
+		return a;
+	}
+	if (typeof a === 'object' && 'lat' in a) {
+		return new L.LatLng(a.lat, 'lng' in a ? a.lng : a.lon);
+	}
+	return new L.LatLng(a, b);
+};
+
+
+
+/*
+ * L.LatLngBounds represents a rectangular area on the map in geographical coordinates.
+ */
+
+L.LatLngBounds = function (southWest, northEast) { // (LatLng, LatLng) or (LatLng[])
+	if (!southWest) { return; }
+
+	var latlngs = northEast ? [southWest, northEast] : southWest;
+
+	for (var i = 0, len = latlngs.length; i < len; i++) {
+		this.extend(latlngs[i]);
+	}
+};
+
+L.LatLngBounds.prototype = {
+	// extend the bounds to contain the given point or bounds
+	extend: function (obj) { // (LatLng) or (LatLngBounds)
+		if (!obj) { return this; }
+
+		if (typeof obj[0] === 'number' || typeof obj[0] === 'string' || obj instanceof L.LatLng) {
+			obj = L.latLng(obj);
+		} else {
+			obj = L.latLngBounds(obj);
+		}
+
+		if (obj instanceof L.LatLng) {
+			if (!this._southWest && !this._northEast) {
+				this._southWest = new L.LatLng(obj.lat, obj.lng);
+				this._northEast = new L.LatLng(obj.lat, obj.lng);
+			} else {
+				this._southWest.lat = Math.min(obj.lat, this._southWest.lat);
+				this._southWest.lng = Math.min(obj.lng, this._southWest.lng);
+
+				this._northEast.lat = Math.max(obj.lat, this._northEast.lat);
+				this._northEast.lng = Math.max(obj.lng, this._northEast.lng);
+			}
+		} else if (obj instanceof L.LatLngBounds) {
+			this.extend(obj._southWest);
+			this.extend(obj._northEast);
+		}
+		return this;
+	},
+
+	// extend the bounds by a percentage
+	pad: function (bufferRatio) { // (Number) -> LatLngBounds
+		var sw = this._southWest,
+		    ne = this._northEast,
+		    heightBuffer = Math.abs(sw.lat - ne.lat) * bufferRatio,
+		    widthBuffer = Math.abs(sw.lng - ne.lng) * bufferRatio;
+
+		return new L.LatLngBounds(
+		        new L.LatLng(sw.lat - heightBuffer, sw.lng - widthBuffer),
+		        new L.LatLng(ne.lat + heightBuffer, ne.lng + widthBuffer));
+	},
+
+	getCenter: function () { // -> LatLng
+		return new L.LatLng(
+		        (this._southWest.lat + this._northEast.lat) / 2,
+		        (this._southWest.lng + this._northEast.lng) / 2);
+	},
+
+	getSouthWest: function () {
+		return this._southWest;
+	},
+
+	getNorthEast: function () {
+		return this._northEast;
+	},
+
+	getNorthWest: function () {
+		return new L.LatLng(this.getNorth(), this.getWest());
+	},
+
+	getSouthEast: function () {
+		return new L.LatLng(this.getSouth(), this.getEast());
+	},
+
+	getWest: function () {
+		return this._southWest.lng;
+	},
+
+	getSouth: function () {
+		return this._southWest.lat;
+	},
+
+	getEast: function () {
+		return this._northEast.lng;
+	},
+
+	getNorth: function () {
+		return this._northEast.lat;
+	},
+
+	contains: function (obj) { // (LatLngBounds) or (LatLng) -> Boolean
+		if (typeof obj[0] === 'number' || obj instanceof L.LatLng) {
+			obj = L.latLng(obj);
+		} else {
+			obj = L.latLngBounds(obj);
+		}
+
+		var sw = this._southWest,
+		    ne = this._northEast,
+		    sw2, ne2;
+
+		if (obj instanceof L.LatLngBounds) {
+			sw2 = obj.getSouthWest();
+			ne2 = obj.getNorthEast();
+		} else {
+			sw2 = ne2 = obj;
+		}
+
+		return (sw2.lat >= sw.lat) && (ne2.lat <= ne.lat) &&
+		       (sw2.lng >= sw.lng) && (ne2.lng <= ne.lng);
+	},
+
+	intersects: function (bounds) { // (LatLngBounds)
+		bounds = L.latLngBounds(bounds);
+
+		var sw = this._southWest,
+		    ne = this._northEast,
+		    sw2 = bounds.getSouthWest(),
+		    ne2 = bounds.getNorthEast(),
+
+		    latIntersects = (ne2.lat >= sw.lat) && (sw2.lat <= ne.lat),
+		    lngIntersects = (ne2.lng >= sw.lng) && (sw2.lng <= ne.lng);
+
+		return latIntersects && lngIntersects;
+	},
+
+	toBBoxString: function () {
+		return [this.getWest(), this.getSouth(), this.getEast(), this.getNorth()].join(',');
+	},
+
+	equals: function (bounds) { // (LatLngBounds)
+		if (!bounds) { return false; }
+
+		bounds = L.latLngBounds(bounds);
+
+		return this._southWest.equals(bounds.getSouthWest()) &&
+		       this._northEast.equals(bounds.getNorthEast());
+	},
+
+	isValid: function () {
+		return !!(this._southWest && this._northEast);
+	}
+};
+
+//TODO International date line?
+
+L.latLngBounds = function (a, b) { // (LatLngBounds) or (LatLng, LatLng)
+	if (!a || a instanceof L.LatLngBounds) {
+		return a;
+	}
+	return new L.LatLngBounds(a, b);
+};
+
+
+/*
+ * L.Projection contains various geographical projections used by CRS classes.
+ */
+
+L.Projection = {};
+
+
+/*
+ * Spherical Mercator is the most popular map projection, used by EPSG:3857 CRS used by default.
+ */
+
+L.Projection.SphericalMercator = {
+	MAX_LATITUDE: 85.0511287798,
+
+	project: function (latlng) { // (LatLng) -> Point
+		var d = L.LatLng.DEG_TO_RAD,
+		    max = this.MAX_LATITUDE,
+		    lat = Math.max(Math.min(max, latlng.lat), -max),
+		    x = latlng.lng * d,
+		    y = lat * d;
+
+		y = Math.log(Math.tan((Math.PI / 4) + (y / 2)));
+
+		return new L.Point(x, y);
+	},
+
+	unproject: function (point) { // (Point, Boolean) -> LatLng
+		var d = L.LatLng.RAD_TO_DEG,
+		    lng = point.x * d,
+		    lat = (2 * Math.atan(Math.exp(point.y)) - (Math.PI / 2)) * d;
+
+		return new L.LatLng(lat, lng);
+	}
+};
+
+
+/*
+ * Simple equirectangular (Plate Carree) projection, used by CRS like EPSG:4326 and Simple.
+ */
+
+L.Projection.LonLat = {
+	project: function (latlng) {
+		return new L.Point(latlng.lng, latlng.lat);
+	},
+
+	unproject: function (point) {
+		return new L.LatLng(point.y, point.x);
+	}
+};
+
+
+/*
+ * L.CRS is a base object for all defined CRS (Coordinate Reference Systems) in Leaflet.
+ */
+
+L.CRS = {
+	latLngToPoint: function (latlng, zoom) { // (LatLng, Number) -> Point
+		var projectedPoint = this.projection.project(latlng),
+		    scale = this.scale(zoom);
+
+		return this.transformation._transform(projectedPoint, scale);
+	},
+
+	pointToLatLng: function (point, zoom) { // (Point, Number[, Boolean]) -> LatLng
+		var scale = this.scale(zoom),
+		    untransformedPoint = this.transformation.untransform(point, scale);
+
+		return this.projection.unproject(untransformedPoint);
+	},
+
+	project: function (latlng) {
+		return this.projection.project(latlng);
+	},
+
+	scale: function (zoom) {
+		return 256 * Math.pow(2, zoom);
+	}
+};
+
+
+/*
+ * A simple CRS that can be used for flat non-Earth maps like panoramas or game maps.
+ */
+
+L.CRS.Simple = L.extend({}, L.CRS, {
+	projection: L.Projection.LonLat,
+	transformation: new L.Transformation(1, 0, -1, 0),
+
+	scale: function (zoom) {
+		return Math.pow(2, zoom);
+	}
+});
+
+
+/*
+ * L.CRS.EPSG3857 (Spherical Mercator) is the most common CRS for web mapping
+ * and is used by Leaflet by default.
+ */
+
+L.CRS.EPSG3857 = L.extend({}, L.CRS, {
+	code: 'EPSG:3857',
+
+	projection: L.Projection.SphericalMercator,
+	transformation: new L.Transformation(0.5 / Math.PI, 0.5, -0.5 / Math.PI, 0.5),
+
+	project: function (latlng) { // (LatLng) -> Point
+		var projectedPoint = this.projection.project(latlng),
+		    earthRadius = 6378137;
+		return projectedPoint.multiplyBy(earthRadius);
+	}
+});
+
+L.CRS.EPSG900913 = L.extend({}, L.CRS.EPSG3857, {
+	code: 'EPSG:900913'
+});
+
+
+/*
+ * L.CRS.EPSG4326 is a CRS popular among advanced GIS specialists.
+ */
+
+L.CRS.EPSG4326 = L.extend({}, L.CRS, {
+	code: 'EPSG:4326',
+
+	projection: L.Projection.LonLat,
+	transformation: new L.Transformation(1 / 360, 0.5, -1 / 360, 0.5)
+});
+
+
+/*
+ * L.Map is the central class of the API - it is used to create a map.
+ */
+
+L.Map = L.Class.extend({
+
+	includes: L.Mixin.Events,
+
+	options: {
+		crs: L.CRS.EPSG3857,
+
+		/*
+		center: LatLng,
+		zoom: Number,
+		layers: Array,
+		*/
+
+		fadeAnimation: L.DomUtil.TRANSITION && !L.Browser.android23,
+		trackResize: true,
+		markerZoomAnimation: L.DomUtil.TRANSITION && L.Browser.any3d
+	},
+
+	initialize: function (id, options) { // (HTMLElement or String, Object)
+		options = L.setOptions(this, options);
+
+		this._initContainer(id);
+		this._initLayout();
+		this._initEvents();
+
+		if (options.maxBounds) {
+			this.setMaxBounds(options.maxBounds);
+		}
+
+		if (options.center && options.zoom !== undefined) {
+			this.setView(L.latLng(options.center), options.zoom, {reset: true});
+		}
+
+		this._handlers = [];
+
+		this._layers = {};
+		this._zoomBoundLayers = {};
+		this._tileLayersNum = 0;
+
+		this.callInitHooks();
+
+		this._addLayers(options.layers);
+	},
+
+
+	// public methods that modify map state
+
+	// replaced by animation-powered implementation in Map.PanAnimation.js
+	setView: function (center, zoom) {
+		this._resetView(L.latLng(center), this._limitZoom(zoom));
+		return this;
+	},
+
+	setZoom: function (zoom, options) {
+		return this.setView(this.getCenter(), zoom, {zoom: options});
+	},
+
+	zoomIn: function (delta, options) {
+		return this.setZoom(this._zoom + (delta || 1), options);
+	},
+
+	zoomOut: function (delta, options) {
+		return this.setZoom(this._zoom - (delta || 1), options);
+	},
+
+	setZoomAround: function (latlng, zoom, options) {
+		var scale = this.getZoomScale(zoom),
+		    viewHalf = this.getSize().divideBy(2),
+		    containerPoint = latlng instanceof L.Point ? latlng : this.latLngToContainerPoint(latlng),
+
+		    centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale),
+		    newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset));
+
+		return this.setView(newCenter, zoom, {zoom: options});
+	},
+
+	fitBounds: function (bounds, options) {
+
+		options = options || {};
+		bounds = bounds.getBounds ? bounds.getBounds() : L.latLngBounds(bounds);
+
+		var paddingTL = L.point(options.paddingTopLeft || options.padding || [0, 0]),
+		    paddingBR = L.point(options.paddingBottomRight || options.padding || [0, 0]),
+
+		    zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)),
+		    paddingOffset = paddingBR.subtract(paddingTL).divideBy(2),
+
+		    swPoint = this.project(bounds.getSouthWest(), zoom),
+		    nePoint = this.project(bounds.getNorthEast(), zoom),
+		    center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom);
+
+		return this.setView(center, zoom, options);
+	},
+
+	fitWorld: function (options) {
+		return this.fitBounds([[-90, -180], [90, 180]], options);
+	},
+
+	panTo: function (center, options) { // (LatLng)
+		return this.setView(center, this._zoom, {pan: options});
+	},
+
+	panBy: function (offset) { // (Point)
+		// replaced with animated panBy in Map.Animation.js
+		this.fire('movestart');
+
+		this._rawPanBy(L.point(offset));
+
+		this.fire('move');
+		return this.fire('moveend');
+	},
+
+	setMaxBounds: function (bounds, options) {
+		bounds = L.latLngBounds(bounds);
+
+		this.options.maxBounds = bounds;
+
+		if (!bounds) {
+			this._boundsMinZoom = null;
+			this.off('moveend', this._panInsideMaxBounds, this);
+			return this;
+		}
+
+		var minZoom = this.getBoundsZoom(bounds, true);
+
+		this._boundsMinZoom = minZoom;
+
+		if (this._loaded) {
+			if (this._zoom < minZoom) {
+				this.setView(bounds.getCenter(), minZoom, options);
+			} else {
+				this.panInsideBounds(bounds);
+			}
+		}
+
+		this.on('moveend', this._panInsideMaxBounds, this);
+
+		return this;
+	},
+
+	panInsideBounds: function (bounds) {
+		bounds = L.latLngBounds(bounds);
+
+		var viewBounds = this.getPixelBounds(),
+		    viewSw = viewBounds.getBottomLeft(),
+		    viewNe = viewBounds.getTopRight(),
+		    sw = this.project(bounds.getSouthWest()),
+		    ne = this.project(bounds.getNorthEast()),
+		    dx = 0,
+		    dy = 0;
+
+		if (viewNe.y < ne.y) { // north
+			dy = Math.ceil(ne.y - viewNe.y);
+		}
+		if (viewNe.x > ne.x) { // east
+			dx = Math.floor(ne.x - viewNe.x);
+		}
+		if (viewSw.y > sw.y) { // south
+			dy = Math.floor(sw.y - viewSw.y);
+		}
+		if (viewSw.x < sw.x) { // west
+			dx = Math.ceil(sw.x - viewSw.x);
+		}
+
+		if (dx || dy) {
+			return this.panBy([dx, dy]);
+		}
+
+		return this;
+	},
+
+	addLayer: function (layer) {
+		// TODO method is too big, refactor
+
+		var id = L.stamp(layer);
+
+		if (this._layers[id]) { return this; }
+
+		this._layers[id] = layer;
+
+		// TODO getMaxZoom, getMinZoom in ILayer (instead of options)
+		if (layer.options && (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom))) {
+			this._zoomBoundLayers[id] = layer;
+			this._updateZoomLevels();
+		}
+
+		// TODO looks ugly, refactor!!!
+		if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
+			this._tileLayersNum++;
+			this._tileLayersToLoad++;
+			layer.on('load', this._onTileLayerLoad, this);
+		}
+
+		if (this._loaded) {
+			this._layerAdd(layer);
+		}
+
+		return this;
+	},
+
+	removeLayer: function (layer) {
+		var id = L.stamp(layer);
+
+		if (!this._layers[id]) { return; }
+
+		if (this._loaded) {
+			layer.onRemove(this);
+		}
+
+		delete this._layers[id];
+
+		if (this._loaded) {
+			this.fire('layerremove', {layer: layer});
+		}
+
+		if (this._zoomBoundLayers[id]) {
+			delete this._zoomBoundLayers[id];
+			this._updateZoomLevels();
+		}
+
+		// TODO looks ugly, refactor
+		if (this.options.zoomAnimation && L.TileLayer && (layer instanceof L.TileLayer)) {
+			this._tileLayersNum--;
+			this._tileLayersToLoad--;
+			layer.off('load', this._onTileLayerLoad, this);
+		}
+
+		return this;
+	},
+
+	hasLayer: function (layer) {
+		if (!layer) { return false; }
+
+		return (L.stamp(layer) in this._layers);
+	},
+
+	eachLayer: function (method, context) {
+		for (var i in this._layers) {
+			method.call(context, this._layers[i]);
+		}
+		return this;
+	},
+
+	invalidateSize: function (options) {
+		options = L.extend({
+			animate: false,
+			pan: true
+		}, options === true ? {animate: true} : options);
+
+		var oldSize = this.getSize();
+		this._sizeChanged = true;
+
+		if (this.options.maxBounds) {
+			this.setMaxBounds(this.options.maxBounds);
+		}
+
+		if (!this._loaded) { return this; }
+
+		var newSize = this.getSize(),
+		    offset = oldSize.subtract(newSize).divideBy(2).round();
+
+		if (!offset.x && !offset.y) { return this; }
+
+		if (options.animate && options.pan) {
+			this.panBy(offset);
+
+		} else {
+			if (options.pan) {
+				this._rawPanBy(offset);
+			}
+
+			this.fire('move');
+
+			// make sure moveend is not fired too often on resize
+			clearTimeout(this._sizeTimer);
+			this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
+		}
+
+		return this.fire('resize', {
+			oldSize: oldSize,
+			newSize: newSize
+		});
+	},
+
+	// TODO handler.addTo
+	addHandler: function (name, HandlerClass) {
+		if (!HandlerClass) { return; }
+
+		var handler = this[name] = new HandlerClass(this);
+
+		this._handlers.push(handler);
+
+		if (this.options[name]) {
+			handler.enable();
+		}
+
+		return this;
+	},
+
+	remove: function () {
+		if (this._loaded) {
+			this.fire('unload');
+		}
+
+		this._initEvents('off');
+
+		delete this._container._leaflet;
+
+		this._clearPanes();
+		if (this._clearControlPos) {
+			this._clearControlPos();
+		}
+
+		this._clearHandlers();
+
+		return this;
+	},
+
+
+	// public methods for getting map state
+
+	getCenter: function () { // (Boolean) -> LatLng
+		this._checkIfLoaded();
+
+		if (!this._moved()) {
+			return this._initialCenter;
+		}
+		return this.layerPointToLatLng(this._getCenterLayerPoint());
+	},
+
+	getZoom: function () {
+		return this._zoom;
+	},
+
+	getBounds: function () {
+		var bounds = this.getPixelBounds(),
+		    sw = this.unproject(bounds.getBottomLeft()),
+		    ne = this.unproject(bounds.getTopRight());
+
+		return new L.LatLngBounds(sw, ne);
+	},
+
+	getMinZoom: function () {
+		var z1 = this._layersMinZoom === undefined ? 0 : this._layersMinZoom,
+		    z2 = this._boundsMinZoom === undefined ? 0 : this._boundsMinZoom;
+		return this.options.minZoom === undefined ? Math.max(z1, z2) : this.options.minZoom;
+	},
+
+	getMaxZoom: function () {
+		return this.options.maxZoom === undefined ?
+			(this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) :
+			this.options.maxZoom;
+	},
+
+	getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number
+		bounds = L.latLngBounds(bounds);
+
+		var zoom = this.getMinZoom() - (inside ? 1 : 0),
+		    maxZoom = this.getMaxZoom(),
+		    size = this.getSize(),
+
+		    nw = bounds.getNorthWest(),
+		    se = bounds.getSouthEast(),
+
+		    zoomNotFound = true,
+		    boundsSize;
+
+		padding = L.point(padding || [0, 0]);
+
+		do {
+			zoom++;
+			boundsSize = this.project(se, zoom).subtract(this.project(nw, zoom)).add(padding);
+			zoomNotFound = !inside ? size.contains(boundsSize) : boundsSize.x < size.x || boundsSize.y < size.y;
+
+		} while (zoomNotFound && zoom <= maxZoom);
+
+		if (zoomNotFound && inside) {
+			return null;
+		}
+
+		return inside ? zoom : zoom - 1;
+	},
+
+	getSize: function () {
+		if (!this._size || this._sizeChanged) {
+			this._size = new L.Point(
+				this._container.clientWidth,
+				this._container.clientHeight);
+
+			this._sizeChanged = false;
+		}
+		return this._size.clone();
+	},
+
+	getPixelBounds: function () {
+		var topLeftPoint = this._getTopLeftPoint();
+		return new L.Bounds(topLeftPoint, topLeftPoint.add(this.getSize()));
+	},
+
+	getPixelOrigin: function () {
+		this._checkIfLoaded();
+		return this._initialTopLeftPoint;
+	},
+
+	getPanes: function () {
+		return this._panes;
+	},
+
+	getContainer: function () {
+		return this._container;
+	},
+
+
+	// TODO replace with universal implementation after refactoring projections
+
+	getZoomScale: function (toZoom) {
+		var crs = this.options.crs;
+		return crs.scale(toZoom) / crs.scale(this._zoom);
+	},
+
+	getScaleZoom: function (scale) {
+		return this._zoom + (Math.log(scale) / Math.LN2);
+	},
+
+
+	// conversion methods
+
+	project: function (latlng, zoom) { // (LatLng[, Number]) -> Point
+		zoom = zoom === undefined ? this._zoom : zoom;
+		return this.options.crs.latLngToPoint(L.latLng(latlng), zoom);
+	},
+
+	unproject: function (point, zoom) { // (Point[, Number]) -> LatLng
+		zoom = zoom === undefined ? this._zoom : zoom;
+		return this.options.crs.pointToLatLng(L.point(point), zoom);
+	},
+
+	layerPointToLatLng: function (point) { // (Point)
+		var projectedPoint = L.point(point).add(this.getPixelOrigin());
+		return this.unproject(projectedPoint);
+	},
+
+	latLngToLayerPoint: function (latlng) { // (LatLng)
+		var projectedPoint = this.project(L.latLng(latlng))._round();
+		return projectedPoint._subtract(this.getPixelOrigin());
+	},
+
+	containerPointToLayerPoint: function (point) { // (Point)
+		return L.point(point).subtract(this._getMapPanePos());
+	},
+
+	layerPointToContainerPoint: function (point) { // (Point)
+		return L.point(point).add(this._getMapPanePos());
+	},
+
+	containerPointToLatLng: function (point) {
+		var layerPoint = this.containerPointToLayerPoint(L.point(point));
+		return this.layerPointToLatLng(layerPoint);
+	},
+
+	latLngToContainerPoint: function (latlng) {
+		return this.layerPointToContainerPoint(this.latLngToLayerPoint(L.latLng(latlng)));
+	},
+
+	mouseEventToContainerPoint: function (e) { // (MouseEvent)
+		return L.DomEvent.getMousePosition(e, this._container);
+	},
+
+	mouseEventToLayerPoint: function (e) { // (MouseEvent)
+		return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e));
+	},
+
+	mouseEventToLatLng: function (e) { // (MouseEvent)
+		return this.layerPointToLatLng(this.mouseEventToLayerPoint(e));
+	},
+
+
+	// map initialization methods
+
+	_initContainer: function (id) {
+		var container = this._container = L.DomUtil.get(id);
+
+		if (!container) {
+			throw new Error('Map container not found.');
+		} else if (container._leaflet) {
+			throw new Error('Map container is already initialized.');
+		}
+
+		container._leaflet = true;
+	},
+
+	_initLayout: function () {
+		var container = this._container;
+
+		L.DomUtil.addClass(container, 'leaflet-container' +
+			(L.Browser.touch ? ' leaflet-touch' : '') +
+			(L.Browser.retina ? ' leaflet-retina' : '') +
+			(this.options.fadeAnimation ? ' leaflet-fade-anim' : ''));
+
+		var position = L.DomUtil.getStyle(container, 'position');
+
+		if (position !== 'absolute' && position !== 'relative' && position !== 'fixed') {
+			container.style.position = 'relative';
+		}
+
+		this._initPanes();
+
+		if (this._initControlPos) {
+			this._initControlPos();
+		}
+	},
+
+	_initPanes: function () {
+		var panes = this._panes = {};
+
+		this._mapPane = panes.mapPane = this._createPane('leaflet-map-pane', this._container);
+
+		this._tilePane = panes.tilePane = this._createPane('leaflet-tile-pane', this._mapPane);
+		panes.objectsPane = this._createPane('leaflet-objects-pane', this._mapPane);
+		panes.shadowPane = this._createPane('leaflet-shadow-pane');
+		panes.overlayPane = this._createPane('leaflet-overlay-pane');
+		panes.markerPane = this._createPane('leaflet-marker-pane');
+		panes.popupPane = this._createPane('leaflet-popup-pane');
+
+		var zoomHide = ' leaflet-zoom-hide';
+
+		if (!this.options.markerZoomAnimation) {
+			L.DomUtil.addClass(panes.markerPane, zoomHide);
+			L.DomUtil.addClass(panes.shadowPane, zoomHide);
+			L.DomUtil.addClass(panes.popupPane, zoomHide);
+		}
+	},
+
+	_createPane: function (className, container) {
+		return L.DomUtil.create('div', className, container || this._panes.objectsPane);
+	},
+
+	_clearPanes: function () {
+		this._container.removeChild(this._mapPane);
+	},
+
+	_addLayers: function (layers) {
+		layers = layers ? (L.Util.isArray(layers) ? layers : [layers]) : [];
+
+		for (var i = 0, len = layers.length; i < len; i++) {
+			this.addLayer(layers[i]);
+		}
+	},
+
+
+	// private methods that modify map state
+
+	_resetView: function (center, zoom, preserveMapOffset, afterZoomAnim) {
+
+		var zoomChanged = (this._zoom !== zoom);
+
+		if (!afterZoomAnim) {
+			this.fire('movestart');
+
+			if (zoomChanged) {
+				this.fire('zoomstart');
+			}
+		}
+
+		this._zoom = zoom;
+		this._initialCenter = center;
+
+		this._initialTopLeftPoint = this._getNewTopLeftPoint(center);
+
+		if (!preserveMapOffset) {
+			L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
+		} else {
+			this._initialTopLeftPoint._add(this._getMapPanePos());
+		}
+
+		this._tileLayersToLoad = this._tileLayersNum;
+
+		var loading = !this._loaded;
+		this._loaded = true;
+
+		if (loading) {
+			this.fire('load');
+			this.eachLayer(this._layerAdd, this);
+		}
+
+		this.fire('viewreset', {hard: !preserveMapOffset});
+
+		this.fire('move');
+
+		if (zoomChanged || afterZoomAnim) {
+			this.fire('zoomend');
+		}
+
+		this.fire('moveend', {hard: !preserveMapOffset});
+	},
+
+	_rawPanBy: function (offset) {
+		L.DomUtil.setPosition(this._mapPane, this._getMapPanePos().subtract(offset));
+	},
+
+	_getZoomSpan: function () {
+		return this.getMaxZoom() - this.getMinZoom();
+	},
+
+	_updateZoomLevels: function () {
+		var i,
+			minZoom = Infinity,
+			maxZoom = -Infinity,
+			oldZoomSpan = this._getZoomSpan();
+
+		for (i in this._zoomBoundLayers) {
+			var layer = this._zoomBoundLayers[i];
+			if (!isNaN(layer.options.minZoom)) {
+				minZoom = Math.min(minZoom, layer.options.minZoom);
+			}
+			if (!isNaN(layer.options.maxZoom)) {
+				maxZoom = Math.max(maxZoom, layer.options.maxZoom);
+			}
+		}
+
+		if (i === undefined) { // we have no tilelayers
+			this._layersMaxZoom = this._layersMinZoom = undefined;
+		} else {
+			this._layersMaxZoom = maxZoom;
+			this._layersMinZoom = minZoom;
+		}
+
+		if (oldZoomSpan !== this._getZoomSpan()) {
+			this.fire('zoomlevelschange');
+		}
+	},
+
+	_panInsideMaxBounds: function () {
+		this.panInsideBounds(this.options.maxBounds);
+	},
+
+	_checkIfLoaded: function () {
+		if (!this._loaded) {
+			throw new Error('Set map center and zoom first.');
+		}
+	},
+
+	// map events
+
+	_initEvents: function (onOff) {
+		if (!L.DomEvent) { return; }
+
+		onOff = onOff || 'on';
+
+		L.DomEvent[onOff](this._container, 'click', this._onMouseClick, this);
+
+		var events = ['dblclick', 'mousedown', 'mouseup', 'mouseenter',
+		              'mouseleave', 'mousemove', 'contextmenu'],
+		    i, len;
+
+		for (i = 0, len = events.length; i < len; i++) {
+			L.DomEvent[onOff](this._container, events[i], this._fireMouseEvent, this);
+		}
+
+		if (this.options.trackResize) {
+			L.DomEvent[onOff](window, 'resize', this._onResize, this);
+		}
+	},
+
+	_onResize: function () {
+		L.Util.cancelAnimFrame(this._resizeRequest);
+		this._resizeRequest = L.Util.requestAnimFrame(
+		        this.invalidateSize, this, false, this._container);
+	},
+
+	_onMouseClick: function (e) {
+		if (!this._loaded || (!e._simulated && this.dragging && this.dragging.moved()) ||
+		        L.DomEvent._skipped(e)) { return; }
+
+		this.fire('preclick');
+		this._fireMouseEvent(e);
+	},
+
+	_fireMouseEvent: function (e) {
+		if (!this._loaded || L.DomEvent._skipped(e)) { return; }
+
+		var type = e.type;
+
+		type = (type === 'mouseenter' ? 'mouseover' : (type === 'mouseleave' ? 'mouseout' : type));
+
+		if (!this.hasEventListeners(type)) { return; }
+
+		if (type === 'contextmenu') {
+			L.DomEvent.preventDefault(e);
+		}
+
+		var containerPoint = this.mouseEventToContainerPoint(e),
+		    layerPoint = this.containerPointToLayerPoint(containerPoint),
+		    latlng = this.layerPointToLatLng(layerPoint);
+
+		this.fire(type, {
+			latlng: latlng,
+			layerPoint: layerPoint,
+			containerPoint: containerPoint,
+			originalEvent: e
+		});
+	},
+
+	_onTileLayerLoad: function () {
+		this._tileLayersToLoad--;
+		if (this._tileLayersNum && !this._tileLayersToLoad) {
+			this.fire('tilelayersload');
+		}
+	},
+
+	_clearHandlers: function () {
+		for (var i = 0, len = this._handlers.length; i < len; i++) {
+			this._handlers[i].disable();
+		}
+	},
+
+	whenReady: function (callback, context) {
+		if (this._loaded) {
+			callback.call(context || this, this);
+		} else {
+			this.on('load', callback, context);
+		}
+		return this;
+	},
+
+	_layerAdd: function (layer) {
+		layer.onAdd(this);
+		this.fire('layeradd', {layer: layer});
+	},
+
+
+	// private methods for getting map state
+
+	_getMapPanePos: function () {
+		return L.DomUtil.getPosition(this._mapPane);
+	},
+
+	_moved: function () {
+		var pos = this._getMapPanePos();
+		return pos && !pos.equals([0, 0]);
+	},
+
+	_getTopLeftPoint: function () {
+		return this.getPixelOrigin().subtract(this._getMapPanePos());
+	},
+
+	_getNewTopLeftPoint: function (center, zoom) {
+		var viewHalf = this.getSize()._divideBy(2);
+		// TODO round on display, not calculation to increase precision?
+		return this.project(center, zoom)._subtract(viewHalf)._round();
+	},
+
+	_latLngToNewLayerPoint: function (latlng, newZoom, newCenter) {
+		var topLeft = this._getNewTopLeftPoint(newCenter, newZoom).add(this._getMapPanePos());
+		return this.project(latlng, newZoom)._subtract(topLeft);
+	},
+
+	// layer point of the current center
+	_getCenterLayerPoint: function () {
+		return this.containerPointToLayerPoint(this.getSize()._divideBy(2));
+	},
+
+	// offset of the specified place to the current center in pixels
+	_getCenterOffset: function (latlng) {
+		return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint());
+	},
+
+	_limitZoom: function (zoom) {
+		var min = this.getMinZoom(),
+		    max = this.getMaxZoom();
+
+		return Math.max(min, Math.min(max, zoom));
+	}
+});
+
+L.map = function (id, options) {
+	return new L.Map(id, options);
+};
+
+
+/*
+ * Mercator projection that takes into account that the Earth is not a perfect sphere.
+ * Less popular than spherical mercator; used by projections like EPSG:3395.
+ */
+
+L.Projection.Mercator = {
+	MAX_LATITUDE: 85.0840591556,
+
+	R_MINOR: 6356752.314245179,
+	R_MAJOR: 6378137,
+
+	project: function (latlng) { // (LatLng) -> Point
+		var d = L.LatLng.DEG_TO_RAD,
+		    max = this.MAX_LATITUDE,
+		    lat = Math.max(Math.min(max, latlng.lat), -max),
+		    r = this.R_MAJOR,
+		    r2 = this.R_MINOR,
+		    x = latlng.lng * d * r,
+		    y = lat * d,
+		    tmp = r2 / r,
+		    eccent = Math.sqrt(1.0 - tmp * tmp),
+		    con = eccent * Math.sin(y);
+
+		con = Math.pow((1 - con) / (1 + con), eccent * 0.5);
+
+		var ts = Math.tan(0.5 * ((Math.PI * 0.5) - y)) / con;
+		y = -r * Math.log(ts);
+
+		return new L.Point(x, y);
+	},
+
+	unproject: function (point) { // (Point, Boolean) -> LatLng
+		var d = L.LatLng.RAD_TO_DEG,
+		    r = this.R_MAJOR,
+		    r2 = this.R_MINOR,
+		    lng = point.x * d / r,
+		    tmp = r2 / r,
+		    eccent = Math.sqrt(1 - (tmp * tmp)),
+		    ts = Math.exp(- point.y / r),
+		    phi = (Math.PI / 2) - 2 * Math.atan(ts),
+		    numIter = 15,
+		    tol = 1e-7,
+		    i = numIter,
+		    dphi = 0.1,
+		    con;
+
+		while ((Math.abs(dphi) > tol) && (--i > 0)) {
+			con = eccent * Math.sin(phi);
+			dphi = (Math.PI / 2) - 2 * Math.atan(ts *
+			            Math.pow((1.0 - con) / (1.0 + con), 0.5 * eccent)) - phi;
+			phi += dphi;
+		}
+
+		return new L.LatLng(phi * d, lng);
+	}
+};
+
+
+
+L.CRS.EPSG3395 = L.extend({}, L.CRS, {
+	code: 'EPSG:3395',
+
+	projection: L.Projection.Mercator,
+
+	transformation: (function () {
+		var m = L.Projection.Mercator,
+		    r = m.R_MAJOR,
+		    r2 = m.R_MINOR;
+
+		return new L.Transformation(0.5 / (Math.PI * r), 0.5, -0.5 / (Math.PI * r2), 0.5);
+	}())
+});
+
+
+/*
+ * L.TileLayer is used for standard xyz-numbered tile layers.
+ */
+
+L.TileLayer = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	options: {
+		minZoom: 0,
+		maxZoom: 18,
+		tileSize: 256,
+		subdomains: 'abc',
+		errorTileUrl: '',
+		attribution: '',
+		zoomOffset: 0,
+		opacity: 1,
+		/* (undefined works too)
+		zIndex: null,
+		tms: false,
+		continuousWorld: false,
+		noWrap: false,
+		zoomReverse: false,
+		detectRetina: false,
+		reuseTiles: false,
+		bounds: false,
+		*/
+		unloadInvisibleTiles: L.Browser.mobile,
+		updateWhenIdle: L.Browser.mobile
+	},
+
+	initialize: function (url, options) {
+		options = L.setOptions(this, options);
+
+		// detecting retina displays, adjusting tileSize and zoom levels
+		if (options.detectRetina && L.Browser.retina && options.maxZoom > 0) {
+
+			options.tileSize = Math.floor(options.tileSize / 2);
+			options.zoomOffset++;
+
+			if (options.minZoom > 0) {
+				options.minZoom--;
+			}
+			this.options.maxZoom--;
+		}
+
+		if (options.bounds) {
+			options.bounds = L.latLngBounds(options.bounds);
+		}
+
+		this._url = url;
+
+		var subdomains = this.options.subdomains;
+
+		if (typeof subdomains === 'string') {
+			this.options.subdomains = subdomains.split('');
+		}
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+		this._animated = map._zoomAnimated;
+
+		// create a container div for tiles
+		this._initContainer();
+
+		// create an image to clone for tiles
+		this._createTileProto();
+
+		// set up events
+		map.on({
+			'viewreset': this._reset,
+			'moveend': this._update
+		}, this);
+
+		if (this._animated) {
+			map.on({
+				'zoomanim': this._animateZoom,
+				'zoomend': this._endZoomAnim
+			}, this);
+		}
+
+		if (!this.options.updateWhenIdle) {
+			this._limitedUpdate = L.Util.limitExecByInterval(this._update, 150, this);
+			map.on('move', this._limitedUpdate, this);
+		}
+
+		this._reset();
+		this._update();
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	onRemove: function (map) {
+		this._container.parentNode.removeChild(this._container);
+
+		map.off({
+			'viewreset': this._reset,
+			'moveend': this._update
+		}, this);
+
+		if (this._animated) {
+			map.off({
+				'zoomanim': this._animateZoom,
+				'zoomend': this._endZoomAnim
+			}, this);
+		}
+
+		if (!this.options.updateWhenIdle) {
+			map.off('move', this._limitedUpdate, this);
+		}
+
+		this._container = null;
+		this._map = null;
+	},
+
+	bringToFront: function () {
+		var pane = this._map._panes.tilePane;
+
+		if (this._container) {
+			pane.appendChild(this._container);
+			this._setAutoZIndex(pane, Math.max);
+		}
+
+		return this;
+	},
+
+	bringToBack: function () {
+		var pane = this._map._panes.tilePane;
+
+		if (this._container) {
+			pane.insertBefore(this._container, pane.firstChild);
+			this._setAutoZIndex(pane, Math.min);
+		}
+
+		return this;
+	},
+
+	getAttribution: function () {
+		return this.options.attribution;
+	},
+
+	getContainer: function () {
+		return this._container;
+	},
+
+	setOpacity: function (opacity) {
+		this.options.opacity = opacity;
+
+		if (this._map) {
+			this._updateOpacity();
+		}
+
+		return this;
+	},
+
+	setZIndex: function (zIndex) {
+		this.options.zIndex = zIndex;
+		this._updateZIndex();
+
+		return this;
+	},
+
+	setUrl: function (url, noRedraw) {
+		this._url = url;
+
+		if (!noRedraw) {
+			this.redraw();
+		}
+
+		return this;
+	},
+
+	redraw: function () {
+		if (this._map) {
+			this._reset({hard: true});
+			this._update();
+		}
+		return this;
+	},
+
+	_updateZIndex: function () {
+		if (this._container && this.options.zIndex !== undefined) {
+			this._container.style.zIndex = this.options.zIndex;
+		}
+	},
+
+	_setAutoZIndex: function (pane, compare) {
+
+		var layers = pane.children,
+		    edgeZIndex = -compare(Infinity, -Infinity), // -Infinity for max, Infinity for min
+		    zIndex, i, len;
+
+		for (i = 0, len = layers.length; i < len; i++) {
+
+			if (layers[i] !== this._container) {
+				zIndex = parseInt(layers[i].style.zIndex, 10);
+
+				if (!isNaN(zIndex)) {
+					edgeZIndex = compare(edgeZIndex, zIndex);
+				}
+			}
+		}
+
+		this.options.zIndex = this._container.style.zIndex =
+		        (isFinite(edgeZIndex) ? edgeZIndex : 0) + compare(1, -1);
+	},
+
+	_updateOpacity: function () {
+		var i,
+		    tiles = this._tiles;
+
+		if (L.Browser.ielt9) {
+			for (i in tiles) {
+				L.DomUtil.setOpacity(tiles[i], this.options.opacity);
+			}
+		} else {
+			L.DomUtil.setOpacity(this._container, this.options.opacity);
+		}
+	},
+
+	_initContainer: function () {
+		var tilePane = this._map._panes.tilePane;
+
+		if (!this._container) {
+			this._container = L.DomUtil.create('div', 'leaflet-layer');
+
+			this._updateZIndex();
+
+			if (this._animated) {
+				var className = 'leaflet-tile-container leaflet-zoom-animated';
+
+				this._bgBuffer = L.DomUtil.create('div', className, this._container);
+				this._tileContainer = L.DomUtil.create('div', className, this._container);
+
+			} else {
+				this._tileContainer = this._container;
+			}
+
+			tilePane.appendChild(this._container);
+
+			if (this.options.opacity < 1) {
+				this._updateOpacity();
+			}
+		}
+	},
+
+	_reset: function (e) {
+		for (var key in this._tiles) {
+			this.fire('tileunload', {tile: this._tiles[key]});
+		}
+
+		this._tiles = {};
+		this._tilesToLoad = 0;
+
+		if (this.options.reuseTiles) {
+			this._unusedTiles = [];
+		}
+
+		this._tileContainer.innerHTML = '';
+
+		if (this._animated && e && e.hard) {
+			this._clearBgBuffer();
+		}
+
+		this._initContainer();
+	},
+
+	_update: function () {
+
+		if (!this._map) { return; }
+
+		var bounds = this._map.getPixelBounds(),
+		    zoom = this._map.getZoom(),
+		    tileSize = this.options.tileSize;
+
+		if (zoom > this.options.maxZoom || zoom < this.options.minZoom) {
+			return;
+		}
+
+		var tileBounds = L.bounds(
+		        bounds.min.divideBy(tileSize)._floor(),
+		        bounds.max.divideBy(tileSize)._floor());
+
+		this._addTilesFromCenterOut(tileBounds);
+
+		if (this.options.unloadInvisibleTiles || this.options.reuseTiles) {
+			this._removeOtherTiles(tileBounds);
+		}
+	},
+
+	_addTilesFromCenterOut: function (bounds) {
+		var queue = [],
+		    center = bounds.getCenter();
+
+		var j, i, point;
+
+		for (j = bounds.min.y; j <= bounds.max.y; j++) {
+			for (i = bounds.min.x; i <= bounds.max.x; i++) {
+				point = new L.Point(i, j);
+
+				if (this._tileShouldBeLoaded(point)) {
+					queue.push(point);
+				}
+			}
+		}
+
+		var tilesToLoad = queue.length;
+
+		if (tilesToLoad === 0) { return; }
+
+		// load tiles in order of their distance to center
+		queue.sort(function (a, b) {
+			return a.distanceTo(center) - b.distanceTo(center);
+		});
+
+		var fragment = document.createDocumentFragment();
+
+		// if its the first batch of tiles to load
+		if (!this._tilesToLoad) {
+			this.fire('loading');
+		}
+
+		this._tilesToLoad += tilesToLoad;
+
+		for (i = 0; i < tilesToLoad; i++) {
+			this._addTile(queue[i], fragment);
+		}
+
+		this._tileContainer.appendChild(fragment);
+	},
+
+	_tileShouldBeLoaded: function (tilePoint) {
+		if ((tilePoint.x + ':' + tilePoint.y) in this._tiles) {
+			return false; // already loaded
+		}
+
+		var options = this.options;
+
+		if (!options.continuousWorld) {
+			var limit = this._getWrapTileNum();
+
+			// don't load if exceeds world bounds
+			if ((options.noWrap && (tilePoint.x < 0 || tilePoint.x >= limit)) ||
+				tilePoint.y < 0 || tilePoint.y >= limit) { return false; }
+		}
+
+		if (options.bounds) {
+			var tileSize = options.tileSize,
+			    nwPoint = tilePoint.multiplyBy(tileSize),
+			    sePoint = nwPoint.add([tileSize, tileSize]),
+			    nw = this._map.unproject(nwPoint),
+			    se = this._map.unproject(sePoint);
+
+			// TODO temporary hack, will be removed after refactoring projections
+			// https://github.com/Leaflet/Leaflet/issues/1618
+			if (!options.continuousWorld && !options.noWrap) {
+				nw = nw.wrap();
+				se = se.wrap();
+			}
+
+			if (!options.bounds.intersects([nw, se])) { return false; }
+		}
+
+		return true;
+	},
+
+	_removeOtherTiles: function (bounds) {
+		var kArr, x, y, key;
+
+		for (key in this._tiles) {
+			kArr = key.split(':');
+			x = parseInt(kArr[0], 10);
+			y = parseInt(kArr[1], 10);
+
+			// remove tile if it's out of bounds
+			if (x < bounds.min.x || x > bounds.max.x || y < bounds.min.y || y > bounds.max.y) {
+				this._removeTile(key);
+			}
+		}
+	},
+
+	_removeTile: function (key) {
+		var tile = this._tiles[key];
+
+		this.fire('tileunload', {tile: tile, url: tile.src});
+
+		if (this.options.reuseTiles) {
+			L.DomUtil.removeClass(tile, 'leaflet-tile-loaded');
+			this._unusedTiles.push(tile);
+
+		} else if (tile.parentNode === this._tileContainer) {
+			this._tileContainer.removeChild(tile);
+		}
+
+		// for https://github.com/CloudMade/Leaflet/issues/137
+		if (!L.Browser.android) {
+			tile.onload = null;
+			tile.src = L.Util.emptyImageUrl;
+		}
+
+		delete this._tiles[key];
+	},
+
+	_addTile: function (tilePoint, container) {
+		var tilePos = this._getTilePos(tilePoint);
+
+		// get unused tile - or create a new tile
+		var tile = this._getTile();
+
+		/*
+		Chrome 20 layouts much faster with top/left (verify with timeline, frames)
+		Android 4 browser has display issues with top/left and requires transform instead
+		Android 2 browser requires top/left or tiles disappear on load or first drag
+		(reappear after zoom) https://github.com/CloudMade/Leaflet/issues/866
+		(other browsers don't currently care) - see debug/hacks/jitter.html for an example
+		*/
+		L.DomUtil.setPosition(tile, tilePos, L.Browser.chrome || L.Browser.android23);
+
+		this._tiles[tilePoint.x + ':' + tilePoint.y] = tile;
+
+		this._loadTile(tile, tilePoint);
+
+		if (tile.parentNode !== this._tileContainer) {
+			container.appendChild(tile);
+		}
+	},
+
+	_getZoomForUrl: function () {
+
+		var options = this.options,
+		    zoom = this._map.getZoom();
+
+		if (options.zoomReverse) {
+			zoom = options.maxZoom - zoom;
+		}
+
+		return zoom + options.zoomOffset;
+	},
+
+	_getTilePos: function (tilePoint) {
+		var origin = this._map.getPixelOrigin(),
+		    tileSize = this.options.tileSize;
+
+		return tilePoint.multiplyBy(tileSize).subtract(origin);
+	},
+
+	// image-specific code (override to implement e.g. Canvas or SVG tile layer)
+
+	getTileUrl: function (tilePoint) {
+		return L.Util.template(this._url, L.extend({
+			s: this._getSubdomain(tilePoint),
+			z: tilePoint.z,
+			x: tilePoint.x,
+			y: tilePoint.y
+		}, this.options));
+	},
+
+	_getWrapTileNum: function () {
+		// TODO refactor, limit is not valid for non-standard projections
+		return Math.pow(2, this._getZoomForUrl());
+	},
+
+	_adjustTilePoint: function (tilePoint) {
+
+		var limit = this._getWrapTileNum();
+
+		// wrap tile coordinates
+		if (!this.options.continuousWorld && !this.options.noWrap) {
+			tilePoint.x = ((tilePoint.x % limit) + limit) % limit;
+		}
+
+		if (this.options.tms) {
+			tilePoint.y = limit - tilePoint.y - 1;
+		}
+
+		tilePoint.z = this._getZoomForUrl();
+	},
+
+	_getSubdomain: function (tilePoint) {
+		var index = Math.abs(tilePoint.x + tilePoint.y) % this.options.subdomains.length;
+		return this.options.subdomains[index];
+	},
+
+	_createTileProto: function () {
+		var img = this._tileImg = L.DomUtil.create('img', 'leaflet-tile');
+		img.style.width = img.style.height = this.options.tileSize + 'px';
+		img.galleryimg = 'no';
+	},
+
+	_getTile: function () {
+		if (this.options.reuseTiles && this._unusedTiles.length > 0) {
+			var tile = this._unusedTiles.pop();
+			this._resetTile(tile);
+			return tile;
+		}
+		return this._createTile();
+	},
+
+	// Override if data stored on a tile needs to be cleaned up before reuse
+	_resetTile: function (/*tile*/) {},
+
+	_createTile: function () {
+		var tile = this._tileImg.cloneNode(false);
+		tile.onselectstart = tile.onmousemove = L.Util.falseFn;
+
+		if (L.Browser.ielt9 && this.options.opacity !== undefined) {
+			L.DomUtil.setOpacity(tile, this.options.opacity);
+		}
+		return tile;
+	},
+
+	_loadTile: function (tile, tilePoint) {
+		tile._layer  = this;
+		tile.onload  = this._tileOnLoad;
+		tile.onerror = this._tileOnError;
+
+		this._adjustTilePoint(tilePoint);
+		tile.src     = this.getTileUrl(tilePoint);
+	},
+
+	_tileLoaded: function () {
+		this._tilesToLoad--;
+		if (!this._tilesToLoad) {
+			this.fire('load');
+
+			if (this._animated) {
+				// clear scaled tiles after all new tiles are loaded (for performance)
+				clearTimeout(this._clearBgBufferTimer);
+				this._clearBgBufferTimer = setTimeout(L.bind(this._clearBgBuffer, this), 500);
+			}
+		}
+	},
+
+	_tileOnLoad: function () {
+		var layer = this._layer;
+
+		//Only if we are loading an actual image
+		if (this.src !== L.Util.emptyImageUrl) {
+			L.DomUtil.addClass(this, 'leaflet-tile-loaded');
+
+			layer.fire('tileload', {
+				tile: this,
+				url: this.src
+			});
+		}
+
+		layer._tileLoaded();
+	},
+
+	_tileOnError: function () {
+		var layer = this._layer;
+
+		layer.fire('tileerror', {
+			tile: this,
+			url: this.src
+		});
+
+		var newUrl = layer.options.errorTileUrl;
+		if (newUrl) {
+			this.src = newUrl;
+		}
+
+		layer._tileLoaded();
+	}
+});
+
+L.tileLayer = function (url, options) {
+	return new L.TileLayer(url, options);
+};
+
+
+/*
+ * L.TileLayer.WMS is used for putting WMS tile layers on the map.
+ */
+
+L.TileLayer.WMS = L.TileLayer.extend({
+
+	defaultWmsParams: {
+		service: 'WMS',
+		request: 'GetMap',
+		version: '1.1.1',
+		layers: '',
+		styles: '',
+		format: 'image/jpeg',
+		transparent: false
+	},
+
+	initialize: function (url, options) { // (String, Object)
+
+		this._url = url;
+
+		var wmsParams = L.extend({}, this.defaultWmsParams),
+		    tileSize = options.tileSize || this.options.tileSize;
+
+		if (options.detectRetina && L.Browser.retina) {
+			wmsParams.width = wmsParams.height = tileSize * 2;
+		} else {
+			wmsParams.width = wmsParams.height = tileSize;
+		}
+
+		for (var i in options) {
+			// all keys that are not TileLayer options go to WMS params
+			if (!this.options.hasOwnProperty(i) && i !== 'crs') {
+				wmsParams[i] = options[i];
+			}
+		}
+
+		this.wmsParams = wmsParams;
+
+		L.setOptions(this, options);
+	},
+
+	onAdd: function (map) {
+
+		this._crs = this.options.crs || map.options.crs;
+
+		var projectionKey = parseFloat(this.wmsParams.version) >= 1.3 ? 'crs' : 'srs';
+		this.wmsParams[projectionKey] = this._crs.code;
+
+		L.TileLayer.prototype.onAdd.call(this, map);
+	},
+
+	getTileUrl: function (tilePoint, zoom) { // (Point, Number) -> String
+
+		var map = this._map,
+		    tileSize = this.options.tileSize,
+
+		    nwPoint = tilePoint.multiplyBy(tileSize),
+		    sePoint = nwPoint.add([tileSize, tileSize]),
+
+		    nw = this._crs.project(map.unproject(nwPoint, zoom)),
+		    se = this._crs.project(map.unproject(sePoint, zoom)),
+
+		    bbox = [nw.x, se.y, se.x, nw.y].join(','),
+
+		    url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
+
+		return url + L.Util.getParamString(this.wmsParams, url, true) + '&BBOX=' + bbox;
+	},
+
+	setParams: function (params, noRedraw) {
+
+		L.extend(this.wmsParams, params);
+
+		if (!noRedraw) {
+			this.redraw();
+		}
+
+		return this;
+	}
+});
+
+L.tileLayer.wms = function (url, options) {
+	return new L.TileLayer.WMS(url, options);
+};
+
+
+/*
+ * L.TileLayer.Canvas is a class that you can use as a base for creating
+ * dynamically drawn Canvas-based tile layers.
+ */
+
+L.TileLayer.Canvas = L.TileLayer.extend({
+	options: {
+		async: false
+	},
+
+	initialize: function (options) {
+		L.setOptions(this, options);
+	},
+
+	redraw: function () {
+		if (this._map) {
+			this._reset({hard: true});
+			this._update();
+		}
+		
+		for (var i in this._tiles) {
+			this._redrawTile(this._tiles[i]);
+		}
+		return this;
+	},
+
+	_redrawTile: function (tile) {
+		this.drawTile(tile, tile._tilePoint, this._map._zoom);
+	},
+
+	_createTileProto: function () {
+		var proto = this._canvasProto = L.DomUtil.create('canvas', 'leaflet-tile');
+		proto.width = proto.height = this.options.tileSize;
+	},
+
+	_createTile: function () {
+		var tile = this._canvasProto.cloneNode(false);
+		tile.onselectstart = tile.onmousemove = L.Util.falseFn;
+		return tile;
+	},
+
+	_loadTile: function (tile, tilePoint) {
+		tile._layer = this;
+		tile._tilePoint = tilePoint;
+
+		this._redrawTile(tile);
+
+		if (!this.options.async) {
+			this.tileDrawn(tile);
+		}
+	},
+
+	drawTile: function (/*tile, tilePoint*/) {
+		// override with rendering code
+	},
+
+	tileDrawn: function (tile) {
+		this._tileOnLoad.call(tile);
+	}
+});
+
+
+L.tileLayer.canvas = function (options) {
+	return new L.TileLayer.Canvas(options);
+};
+
+
+/*
+ * L.ImageOverlay is used to overlay images over the map (to specific geographical bounds).
+ */
+
+L.ImageOverlay = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	options: {
+		opacity: 1
+	},
+
+	initialize: function (url, bounds, options) { // (String, LatLngBounds, Object)
+		this._url = url;
+		this._bounds = L.latLngBounds(bounds);
+
+		L.setOptions(this, options);
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+
+		if (!this._image) {
+			this._initImage();
+		}
+
+		map._panes.overlayPane.appendChild(this._image);
+
+		map.on('viewreset', this._reset, this);
+
+		if (map.options.zoomAnimation && L.Browser.any3d) {
+			map.on('zoomanim', this._animateZoom, this);
+		}
+
+		this._reset();
+	},
+
+	onRemove: function (map) {
+		map.getPanes().overlayPane.removeChild(this._image);
+
+		map.off('viewreset', this._reset, this);
+
+		if (map.options.zoomAnimation) {
+			map.off('zoomanim', this._animateZoom, this);
+		}
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	setOpacity: function (opacity) {
+		this.options.opacity = opacity;
+		this._updateOpacity();
+		return this;
+	},
+
+	// TODO remove bringToFront/bringToBack duplication from TileLayer/Path
+	bringToFront: function () {
+		if (this._image) {
+			this._map._panes.overlayPane.appendChild(this._image);
+		}
+		return this;
+	},
+
+	bringToBack: function () {
+		var pane = this._map._panes.overlayPane;
+		if (this._image) {
+			pane.insertBefore(this._image, pane.firstChild);
+		}
+		return this;
+	},
+
+	_initImage: function () {
+		this._image = L.DomUtil.create('img', 'leaflet-image-layer');
+
+		if (this._map.options.zoomAnimation && L.Browser.any3d) {
+			L.DomUtil.addClass(this._image, 'leaflet-zoom-animated');
+		} else {
+			L.DomUtil.addClass(this._image, 'leaflet-zoom-hide');
+		}
+
+		this._updateOpacity();
+
+		//TODO createImage util method to remove duplication
+		L.extend(this._image, {
+			galleryimg: 'no',
+			onselectstart: L.Util.falseFn,
+			onmousemove: L.Util.falseFn,
+			onload: L.bind(this._onImageLoad, this),
+			src: this._url
+		});
+	},
+
+	_animateZoom: function (e) {
+		var map = this._map,
+		    image = this._image,
+		    scale = map.getZoomScale(e.zoom),
+		    nw = this._bounds.getNorthWest(),
+		    se = this._bounds.getSouthEast(),
+
+		    topLeft = map._latLngToNewLayerPoint(nw, e.zoom, e.center),
+		    size = map._latLngToNewLayerPoint(se, e.zoom, e.center)._subtract(topLeft),
+		    origin = topLeft._add(size._multiplyBy((1 / 2) * (1 - 1 / scale)));
+
+		image.style[L.DomUtil.TRANSFORM] =
+		        L.DomUtil.getTranslateString(origin) + ' scale(' + scale + ') ';
+	},
+
+	_reset: function () {
+		var image   = this._image,
+		    topLeft = this._map.latLngToLayerPoint(this._bounds.getNorthWest()),
+		    size = this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(topLeft);
+
+		L.DomUtil.setPosition(image, topLeft);
+
+		image.style.width  = size.x + 'px';
+		image.style.height = size.y + 'px';
+	},
+
+	_onImageLoad: function () {
+		this.fire('load');
+	},
+
+	_updateOpacity: function () {
+		L.DomUtil.setOpacity(this._image, this.options.opacity);
+	}
+});
+
+L.imageOverlay = function (url, bounds, options) {
+	return new L.ImageOverlay(url, bounds, options);
+};
+
+
+/*
+ * L.Icon is an image-based icon class that you can use with L.Marker for custom markers.
+ */
+
+L.Icon = L.Class.extend({
+	options: {
+		/*
+		iconUrl: (String) (required)
+		iconRetinaUrl: (String) (optional, used for retina devices if detected)
+		iconSize: (Point) (can be set through CSS)
+		iconAnchor: (Point) (centered by default, can be set in CSS with negative margins)
+		popupAnchor: (Point) (if not specified, popup opens in the anchor point)
+		shadowUrl: (String) (no shadow by default)
+		shadowRetinaUrl: (String) (optional, used for retina devices if detected)
+		shadowSize: (Point)
+		shadowAnchor: (Point)
+		*/
+		className: ''
+	},
+
+	initialize: function (options) {
+		L.setOptions(this, options);
+	},
+
+	createIcon: function (oldIcon) {
+		return this._createIcon('icon', oldIcon);
+	},
+
+	createShadow: function (oldIcon) {
+		return this._createIcon('shadow', oldIcon);
+	},
+
+	_createIcon: function (name, oldIcon) {
+		var src = this._getIconUrl(name);
+
+		if (!src) {
+			if (name === 'icon') {
+				throw new Error('iconUrl not set in Icon options (see the docs).');
+			}
+			return null;
+		}
+
+		var img;
+		if (!oldIcon || oldIcon.tagName !== 'IMG') {
+			img = this._createImg(src);
+		} else {
+			img = this._createImg(src, oldIcon);
+		}
+		this._setIconStyles(img, name);
+
+		return img;
+	},
+
+	_setIconStyles: function (img, name) {
+		var options = this.options,
+		    size = L.point(options[name + 'Size']),
+		    anchor;
+
+		if (name === 'shadow') {
+			anchor = L.point(options.shadowAnchor || options.iconAnchor);
+		} else {
+			anchor = L.point(options.iconAnchor);
+		}
+
+		if (!anchor && size) {
+			anchor = size.divideBy(2, true);
+		}
+
+		img.className = 'leaflet-marker-' + name + ' ' + options.className;
+
+		if (anchor) {
+			img.style.marginLeft = (-anchor.x) + 'px';
+			img.style.marginTop  = (-anchor.y) + 'px';
+		}
+
+		if (size) {
+			img.style.width  = size.x + 'px';
+			img.style.height = size.y + 'px';
+		}
+	},
+
+	_createImg: function (src, el) {
+
+		if (!L.Browser.ie6) {
+			if (!el) {
+				el = document.createElement('img');
+			}
+			el.src = src;
+		} else {
+			if (!el) {
+				el = document.createElement('div');
+			}
+			el.style.filter =
+			        'progid:DXImageTransform.Microsoft.AlphaImageLoader(src="' + src + '")';
+		}
+		return el;
+	},
+
+	_getIconUrl: function (name) {
+		if (L.Browser.retina && this.options[name + 'RetinaUrl']) {
+			return this.options[name + 'RetinaUrl'];
+		}
+		return this.options[name + 'Url'];
+	}
+});
+
+L.icon = function (options) {
+	return new L.Icon(options);
+};
+
+
+/*
+ * L.Icon.Default is the blue marker icon used by default in Leaflet.
+ */
+
+L.Icon.Default = L.Icon.extend({
+
+	options: {
+		iconSize: [25, 41],
+		iconAnchor: [12, 41],
+		popupAnchor: [1, -34],
+
+		shadowSize: [41, 41]
+	},
+
+	_getIconUrl: function (name) {
+		var key = name + 'Url';
+
+		if (this.options[key]) {
+			return this.options[key];
+		}
+
+		if (L.Browser.retina && name === 'icon') {
+			name += '-2x';
+		}
+
+		var path = L.Icon.Default.imagePath;
+
+		if (!path) {
+			throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.');
+		}
+
+		return path + '/marker-' + name + '.png';
+	}
+});
+
+L.Icon.Default.imagePath = (function () {
+	var scripts = document.getElementsByTagName('script'),
+	    leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+
+	var i, len, src, matches, path;
+
+	for (i = 0, len = scripts.length; i < len; i++) {
+		src = scripts[i].src;
+		matches = src.match(leafletRe);
+
+		if (matches) {
+			path = src.split(leafletRe)[0];
+			return (path ? path + '/' : '') + 'images';
+		}
+	}
+}());
+
+
+/*
+ * L.Marker is used to display clickable/draggable icons on the map.
+ */
+
+L.Marker = L.Class.extend({
+
+	includes: L.Mixin.Events,
+
+	options: {
+		icon: new L.Icon.Default(),
+		title: '',
+		clickable: true,
+		draggable: false,
+		keyboard: true,
+		zIndexOffset: 0,
+		opacity: 1,
+		riseOnHover: false,
+		riseOffset: 250
+	},
+
+	initialize: function (latlng, options) {
+		L.setOptions(this, options);
+		this._latlng = L.latLng(latlng);
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+
+		map.on('viewreset', this.update, this);
+
+		this._initIcon();
+		this.update();
+
+		if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
+			map.on('zoomanim', this._animateZoom, this);
+		}
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	onRemove: function (map) {
+		if (this.dragging) {
+			this.dragging.disable();
+		}
+
+		this._removeIcon();
+		this._removeShadow();
+
+		this.fire('remove');
+
+		map.off({
+			'viewreset': this.update,
+			'zoomanim': this._animateZoom
+		}, this);
+
+		this._map = null;
+	},
+
+	getLatLng: function () {
+		return this._latlng;
+	},
+
+	setLatLng: function (latlng) {
+		this._latlng = L.latLng(latlng);
+
+		this.update();
+
+		return this.fire('move', { latlng: this._latlng });
+	},
+
+	setZIndexOffset: function (offset) {
+		this.options.zIndexOffset = offset;
+		this.update();
+
+		return this;
+	},
+
+	setIcon: function (icon) {
+
+		this.options.icon = icon;
+
+		if (this._map) {
+			this._initIcon();
+			this.update();
+		}
+
+		return this;
+	},
+
+	update: function () {
+		if (this._icon) {
+			var pos = this._map.latLngToLayerPoint(this._latlng).round();
+			this._setPos(pos);
+		}
+
+		return this;
+	},
+
+	_initIcon: function () {
+		var options = this.options,
+		    map = this._map,
+		    animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),
+		    classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide';
+
+		var icon = options.icon.createIcon(this._icon),
+			addIcon = false;
+
+		// if we're not reusing the icon, remove the old one and init new one
+		if (icon !== this._icon) {
+			if (this._icon) {
+				this._removeIcon();
+			}
+			addIcon = true;
+
+			if (options.title) {
+				icon.title = options.title;
+			}
+		}
+
+		L.DomUtil.addClass(icon, classToAdd);
+
+		if (options.keyboard) {
+			icon.tabIndex = '0';
+		}
+
+		this._icon = icon;
+
+		this._initInteraction();
+
+		if (options.riseOnHover) {
+			L.DomEvent
+				.on(icon, 'mouseover', this._bringToFront, this)
+				.on(icon, 'mouseout', this._resetZIndex, this);
+		}
+
+		var newShadow = options.icon.createShadow(this._shadow),
+			addShadow = false;
+
+		if (newShadow !== this._shadow) {
+			this._removeShadow();
+			addShadow = true;
+		}
+
+		if (newShadow) {
+			L.DomUtil.addClass(newShadow, classToAdd);
+		}
+		this._shadow = newShadow;
+
+
+		if (options.opacity < 1) {
+			this._updateOpacity();
+		}
+
+
+		var panes = this._map._panes;
+
+		if (addIcon) {
+			panes.markerPane.appendChild(this._icon);
+		}
+
+		if (newShadow && addShadow) {
+			panes.shadowPane.appendChild(this._shadow);
+		}
+	},
+
+	_removeIcon: function () {
+		if (this.options.riseOnHover) {
+			L.DomEvent
+			    .off(this._icon, 'mouseover', this._bringToFront)
+			    .off(this._icon, 'mouseout', this._resetZIndex);
+		}
+
+		this._map._panes.markerPane.removeChild(this._icon);
+
+		this._icon = null;
+	},
+
+	_removeShadow: function () {
+		if (this._shadow) {
+			this._map._panes.shadowPane.removeChild(this._shadow);
+		}
+		this._shadow = null;
+	},
+
+	_setPos: function (pos) {
+		L.DomUtil.setPosition(this._icon, pos);
+
+		if (this._shadow) {
+			L.DomUtil.setPosition(this._shadow, pos);
+		}
+
+		this._zIndex = pos.y + this.options.zIndexOffset;
+
+		this._resetZIndex();
+	},
+
+	_updateZIndex: function (offset) {
+		this._icon.style.zIndex = this._zIndex + offset;
+	},
+
+	_animateZoom: function (opt) {
+		var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+
+		this._setPos(pos);
+	},
+
+	_initInteraction: function () {
+
+		if (!this.options.clickable) { return; }
+
+		// TODO refactor into something shared with Map/Path/etc. to DRY it up
+
+		var icon = this._icon,
+		    events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'contextmenu'];
+
+		L.DomUtil.addClass(icon, 'leaflet-clickable');
+		L.DomEvent.on(icon, 'click', this._onMouseClick, this);
+		L.DomEvent.on(icon, 'keypress', this._onKeyPress, this);
+
+		for (var i = 0; i < events.length; i++) {
+			L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);
+		}
+
+		if (L.Handler.MarkerDrag) {
+			this.dragging = new L.Handler.MarkerDrag(this);
+
+			if (this.options.draggable) {
+				this.dragging.enable();
+			}
+		}
+	},
+
+	_onMouseClick: function (e) {
+		var wasDragged = this.dragging && this.dragging.moved();
+
+		if (this.hasEventListeners(e.type) || wasDragged) {
+			L.DomEvent.stopPropagation(e);
+		}
+
+		if (wasDragged) { return; }
+
+		if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; }
+
+		this.fire(e.type, {
+			originalEvent: e,
+			latlng: this._latlng
+		});
+	},
+
+	_onKeyPress: function (e) {
+		if (e.keyCode === 13) {
+			this.fire('click', {
+				originalEvent: e,
+				latlng: this._latlng
+			});
+		}
+	},
+
+	_fireMouseEvent: function (e) {
+
+		this.fire(e.type, {
+			originalEvent: e,
+			latlng: this._latlng
+		});
+
+		// TODO proper custom event propagation
+		// this line will always be called if marker is in a FeatureGroup
+		if (e.type === 'contextmenu' && this.hasEventListeners(e.type)) {
+			L.DomEvent.preventDefault(e);
+		}
+		if (e.type !== 'mousedown') {
+			L.DomEvent.stopPropagation(e);
+		} else {
+			L.DomEvent.preventDefault(e);
+		}
+	},
+
+	setOpacity: function (opacity) {
+		this.options.opacity = opacity;
+		if (this._map) {
+			this._updateOpacity();
+		}
+		
+		return this;
+	},
+
+	_updateOpacity: function () {
+		L.DomUtil.setOpacity(this._icon, this.options.opacity);
+		if (this._shadow) {
+			L.DomUtil.setOpacity(this._shadow, this.options.opacity);
+		}
+	},
+
+	_bringToFront: function () {
+		this._updateZIndex(this.options.riseOffset);
+	},
+
+	_resetZIndex: function () {
+		this._updateZIndex(0);
+	}
+});
+
+L.marker = function (latlng, options) {
+	return new L.Marker(latlng, options);
+};
+
+
+/*
+ * L.DivIcon is a lightweight HTML-based icon class (as opposed to the image-based L.Icon)
+ * to use with L.Marker.
+ */
+
+L.DivIcon = L.Icon.extend({
+	options: {
+		iconSize: [12, 12], // also can be set through CSS
+		/*
+		iconAnchor: (Point)
+		popupAnchor: (Point)
+		html: (String)
+		bgPos: (Point)
+		*/
+		className: 'leaflet-div-icon',
+		html: false
+	},
+
+	createIcon: function (oldIcon) {
+		var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
+		    options = this.options;
+
+		if (options.html !== false) {
+			div.innerHTML = options.html;
+		} else {
+			div.innerHTML = '';
+		}
+
+		if (options.bgPos) {
+			div.style.backgroundPosition =
+			        (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+		}
+
+		this._setIconStyles(div, 'icon');
+		return div;
+	},
+
+	createShadow: function () {
+		return null;
+	}
+});
+
+L.divIcon = function (options) {
+	return new L.DivIcon(options);
+};
+
+
+/*
+ * L.Popup is used for displaying popups on the map.
+ */
+
+L.Map.mergeOptions({
+	closePopupOnClick: true
+});
+
+L.Popup = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	options: {
+		minWidth: 50,
+		maxWidth: 300,
+		maxHeight: null,
+		autoPan: true,
+		closeButton: true,
+		offset: [0, 7],
+		autoPanPadding: [5, 5],
+		keepInView: false,
+		className: '',
+		zoomAnimation: true
+	},
+
+	initialize: function (options, source) {
+		L.setOptions(this, options);
+
+		this._source = source;
+		this._animated = L.Browser.any3d && this.options.zoomAnimation;
+		this._isOpen = false;
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+
+		if (!this._container) {
+			this._initLayout();
+		}
+		this._updateContent();
+
+		var animFade = map.options.fadeAnimation;
+
+		if (animFade) {
+			L.DomUtil.setOpacity(this._container, 0);
+		}
+		map._panes.popupPane.appendChild(this._container);
+
+		map.on(this._getEvents(), this);
+
+		this._update();
+
+		if (animFade) {
+			L.DomUtil.setOpacity(this._container, 1);
+		}
+
+		this.fire('open');
+
+		map.fire('popupopen', {popup: this});
+
+		if (this._source) {
+			this._source.fire('popupopen', {popup: this});
+		}
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	openOn: function (map) {
+		map.openPopup(this);
+		return this;
+	},
+
+	onRemove: function (map) {
+		map._panes.popupPane.removeChild(this._container);
+
+		L.Util.falseFn(this._container.offsetWidth); // force reflow
+
+		map.off(this._getEvents(), this);
+
+		if (map.options.fadeAnimation) {
+			L.DomUtil.setOpacity(this._container, 0);
+		}
+
+		this._map = null;
+
+		this.fire('close');
+
+		map.fire('popupclose', {popup: this});
+
+		if (this._source) {
+			this._source.fire('popupclose', {popup: this});
+		}
+	},
+
+	setLatLng: function (latlng) {
+		this._latlng = L.latLng(latlng);
+		this._update();
+		return this;
+	},
+
+	setContent: function (content) {
+		this._content = content;
+		this._update();
+		return this;
+	},
+
+	_getEvents: function () {
+		var events = {
+			viewreset: this._updatePosition
+		};
+
+		if (this._animated) {
+			events.zoomanim = this._zoomAnimation;
+		}
+		if ('closeOnClick' in this.options ? this.options.closeOnClick : this._map.options.closePopupOnClick) {
+			events.preclick = this._close;
+		}
+		if (this.options.keepInView) {
+			events.moveend = this._adjustPan;
+		}
+
+		return events;
+	},
+
+	_close: function () {
+		if (this._map) {
+			this._map.closePopup(this);
+		}
+	},
+
+	_initLayout: function () {
+		var prefix = 'leaflet-popup',
+			containerClass = prefix + ' ' + this.options.className + ' leaflet-zoom-' +
+			        (this._animated ? 'animated' : 'hide'),
+			container = this._container = L.DomUtil.create('div', containerClass),
+			closeButton;
+
+		if (this.options.closeButton) {
+			closeButton = this._closeButton =
+			        L.DomUtil.create('a', prefix + '-close-button', container);
+			closeButton.href = '#close';
+			closeButton.innerHTML = '&#215;';
+			L.DomEvent.disableClickPropagation(closeButton);
+
+			L.DomEvent.on(closeButton, 'click', this._onCloseButtonClick, this);
+		}
+
+		var wrapper = this._wrapper =
+		        L.DomUtil.create('div', prefix + '-content-wrapper', container);
+		L.DomEvent.disableClickPropagation(wrapper);
+
+		this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
+		L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
+		L.DomEvent.on(this._contentNode, 'MozMousePixelScroll', L.DomEvent.stopPropagation);
+		L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
+		this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
+		this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
+	},
+
+	_update: function () {
+		if (!this._map) { return; }
+
+		this._container.style.visibility = 'hidden';
+
+		this._updateContent();
+		this._updateLayout();
+		this._updatePosition();
+
+		this._container.style.visibility = '';
+
+		this._adjustPan();
+	},
+
+	_updateContent: function () {
+		if (!this._content) { return; }
+
+		if (typeof this._content === 'string') {
+			this._contentNode.innerHTML = this._content;
+		} else {
+			while (this._contentNode.hasChildNodes()) {
+				this._contentNode.removeChild(this._contentNode.firstChild);
+			}
+			this._contentNode.appendChild(this._content);
+		}
+		this.fire('contentupdate');
+	},
+
+	_updateLayout: function () {
+		var container = this._contentNode,
+		    style = container.style;
+
+		style.width = '';
+		style.whiteSpace = 'nowrap';
+
+		var width = container.offsetWidth;
+		width = Math.min(width, this.options.maxWidth);
+		width = Math.max(width, this.options.minWidth);
+
+		style.width = (width + 1) + 'px';
+		style.whiteSpace = '';
+
+		style.height = '';
+
+		var height = container.offsetHeight,
+		    maxHeight = this.options.maxHeight,
+		    scrolledClass = 'leaflet-popup-scrolled';
+
+		if (maxHeight && height > maxHeight) {
+			style.height = maxHeight + 'px';
+			L.DomUtil.addClass(container, scrolledClass);
+		} else {
+			L.DomUtil.removeClass(container, scrolledClass);
+		}
+
+		this._containerWidth = this._container.offsetWidth;
+	},
+
+	_updatePosition: function () {
+		if (!this._map) { return; }
+
+		var pos = this._map.latLngToLayerPoint(this._latlng),
+		    animated = this._animated,
+		    offset = L.point(this.options.offset);
+
+		if (animated) {
+			L.DomUtil.setPosition(this._container, pos);
+		}
+
+		this._containerBottom = -offset.y - (animated ? 0 : pos.y);
+		this._containerLeft = -Math.round(this._containerWidth / 2) + offset.x + (animated ? 0 : pos.x);
+
+		// bottom position the popup in case the height of the popup changes (images loading etc)
+		this._container.style.bottom = this._containerBottom + 'px';
+		this._container.style.left = this._containerLeft + 'px';
+	},
+
+	_zoomAnimation: function (opt) {
+		var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center);
+
+		L.DomUtil.setPosition(this._container, pos);
+	},
+
+	_adjustPan: function () {
+		if (!this.options.autoPan) { return; }
+
+		var map = this._map,
+		    containerHeight = this._container.offsetHeight,
+		    containerWidth = this._containerWidth,
+
+		    layerPos = new L.Point(this._containerLeft, -containerHeight - this._containerBottom);
+
+		if (this._animated) {
+			layerPos._add(L.DomUtil.getPosition(this._container));
+		}
+
+		var containerPos = map.layerPointToContainerPoint(layerPos),
+		    padding = L.point(this.options.autoPanPadding),
+		    size = map.getSize(),
+		    dx = 0,
+		    dy = 0;
+
+		if (containerPos.x + containerWidth > size.x) { // right
+			dx = containerPos.x + containerWidth - size.x + padding.x;
+		}
+		if (containerPos.x - dx < 0) { // left
+			dx = containerPos.x - padding.x;
+		}
+		if (containerPos.y + containerHeight > size.y) { // bottom
+			dy = containerPos.y + containerHeight - size.y + padding.y;
+		}
+		if (containerPos.y - dy < 0) { // top
+			dy = containerPos.y - padding.y;
+		}
+
+		if (dx || dy) {
+			map
+			    .fire('autopanstart')
+			    .panBy([dx, dy]);
+		}
+	},
+
+	_onCloseButtonClick: function (e) {
+		this._close();
+		L.DomEvent.stop(e);
+	}
+});
+
+L.popup = function (options, source) {
+	return new L.Popup(options, source);
+};
+
+
+L.Map.include({
+	openPopup: function (popup, latlng, options) { // (Popup) or (String || HTMLElement, LatLng[, Object])
+		this.closePopup();
+
+		if (!(popup instanceof L.Popup)) {
+			var content = popup;
+
+			popup = new L.Popup(options)
+			    .setLatLng(latlng)
+			    .setContent(content);
+		}
+		popup._isOpen = true;
+
+		this._popup = popup;
+		return this.addLayer(popup);
+	},
+
+	closePopup: function (popup) {
+		if (!popup || popup === this._popup) {
+			popup = this._popup;
+			this._popup = null;
+		}
+		if (popup) {
+			this.removeLayer(popup);
+			popup._isOpen = false;
+		}
+		return this;
+	}
+});
+
+
+/*
+ * Popup extension to L.Marker, adding popup-related methods.
+ */
+
+L.Marker.include({
+	openPopup: function () {
+		if (this._popup && this._map && !this._map.hasLayer(this._popup)) {
+			this._popup.setLatLng(this._latlng);
+			this._map.openPopup(this._popup);
+		}
+
+		return this;
+	},
+
+	closePopup: function () {
+		if (this._popup) {
+			this._popup._close();
+		}
+		return this;
+	},
+
+	togglePopup: function () {
+		if (this._popup) {
+			if (this._popup._isOpen) {
+				this.closePopup();
+			} else {
+				this.openPopup();
+			}
+		}
+		return this;
+	},
+
+	bindPopup: function (content, options) {
+		var anchor = L.point(this.options.icon.options.popupAnchor || [0, 0]);
+
+		anchor = anchor.add(L.Popup.prototype.options.offset);
+
+		if (options && options.offset) {
+			anchor = anchor.add(options.offset);
+		}
+
+		options = L.extend({offset: anchor}, options);
+
+		if (!this._popup) {
+			this
+			    .on('click', this.togglePopup, this)
+			    .on('remove', this.closePopup, this)
+			    .on('move', this._movePopup, this);
+		}
+
+		if (content instanceof L.Popup) {
+			L.setOptions(content, options);
+			this._popup = content;
+		} else {
+			this._popup = new L.Popup(options, this)
+				.setContent(content);
+		}
+
+		return this;
+	},
+
+	setPopupContent: function (content) {
+		if (this._popup) {
+			this._popup.setContent(content);
+		}
+		return this;
+	},
+
+	unbindPopup: function () {
+		if (this._popup) {
+			this._popup = null;
+			this
+			    .off('click', this.togglePopup)
+			    .off('remove', this.closePopup)
+			    .off('move', this._movePopup);
+		}
+		return this;
+	},
+
+	_movePopup: function (e) {
+		this._popup.setLatLng(e.latlng);
+	}
+});
+
+
+/*
+ * L.LayerGroup is a class to combine several layers into one so that
+ * you can manipulate the group (e.g. add/remove it) as one layer.
+ */
+
+L.LayerGroup = L.Class.extend({
+	initialize: function (layers) {
+		this._layers = {};
+
+		var i, len;
+
+		if (layers) {
+			for (i = 0, len = layers.length; i < len; i++) {
+				this.addLayer(layers[i]);
+			}
+		}
+	},
+
+	addLayer: function (layer) {
+		var id = this.getLayerId(layer);
+
+		this._layers[id] = layer;
+
+		if (this._map) {
+			this._map.addLayer(layer);
+		}
+
+		return this;
+	},
+
+	removeLayer: function (layer) {
+		var id = layer in this._layers ? layer : this.getLayerId(layer);
+
+		if (this._map && this._layers[id]) {
+			this._map.removeLayer(this._layers[id]);
+		}
+
+		delete this._layers[id];
+
+		return this;
+	},
+
+	hasLayer: function (layer) {
+		if (!layer) { return false; }
+
+		return (layer in this._layers || this.getLayerId(layer) in this._layers);
+	},
+
+	clearLayers: function () {
+		this.eachLayer(this.removeLayer, this);
+		return this;
+	},
+
+	invoke: function (methodName) {
+		var args = Array.prototype.slice.call(arguments, 1),
+		    i, layer;
+
+		for (i in this._layers) {
+			layer = this._layers[i];
+
+			if (layer[methodName]) {
+				layer[methodName].apply(layer, args);
+			}
+		}
+
+		return this;
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+		this.eachLayer(map.addLayer, map);
+	},
+
+	onRemove: function (map) {
+		this.eachLayer(map.removeLayer, map);
+		this._map = null;
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	eachLayer: function (method, context) {
+		for (var i in this._layers) {
+			method.call(context, this._layers[i]);
+		}
+		return this;
+	},
+
+	getLayer: function (id) {
+		return this._layers[id];
+	},
+
+	getLayers: function () {
+		var layers = [];
+
+		for (var i in this._layers) {
+			layers.push(this._layers[i]);
+		}
+		return layers;
+	},
+
+	setZIndex: function (zIndex) {
+		return this.invoke('setZIndex', zIndex);
+	},
+
+	getLayerId: function (layer) {
+		return L.stamp(layer);
+	}
+});
+
+L.layerGroup = function (layers) {
+	return new L.LayerGroup(layers);
+};
+
+
+/*
+ * L.FeatureGroup extends L.LayerGroup by introducing mouse events and additional methods
+ * shared between a group of interactive layers (like vectors or markers).
+ */
+
+L.FeatureGroup = L.LayerGroup.extend({
+	includes: L.Mixin.Events,
+
+	statics: {
+		EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose'
+	},
+
+	addLayer: function (layer) {
+		if (this.hasLayer(layer)) {
+			return this;
+		}
+
+		layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+
+		L.LayerGroup.prototype.addLayer.call(this, layer);
+
+		if (this._popupContent && layer.bindPopup) {
+			layer.bindPopup(this._popupContent, this._popupOptions);
+		}
+
+		return this.fire('layeradd', {layer: layer});
+	},
+
+	removeLayer: function (layer) {
+		if (!this.hasLayer(layer)) {
+			return this;
+		}
+		if (layer in this._layers) {
+			layer = this._layers[layer];
+		}
+
+		layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
+
+		L.LayerGroup.prototype.removeLayer.call(this, layer);
+
+		if (this._popupContent) {
+			this.invoke('unbindPopup');
+		}
+
+		return this.fire('layerremove', {layer: layer});
+	},
+
+	bindPopup: function (content, options) {
+		this._popupContent = content;
+		this._popupOptions = options;
+		return this.invoke('bindPopup', content, options);
+	},
+
+	setStyle: function (style) {
+		return this.invoke('setStyle', style);
+	},
+
+	bringToFront: function () {
+		return this.invoke('bringToFront');
+	},
+
+	bringToBack: function () {
+		return this.invoke('bringToBack');
+	},
+
+	getBounds: function () {
+		var bounds = new L.LatLngBounds();
+
+		this.eachLayer(function (layer) {
+			bounds.extend(layer instanceof L.Marker ? layer.getLatLng() : layer.getBounds());
+		});
+
+		return bounds;
+	},
+
+	_propagateEvent: function (e) {
+		if (!e.layer) {
+			e.layer = e.target;
+		}
+		e.target = this;
+
+		this.fire(e.type, e);
+	}
+});
+
+L.featureGroup = function (layers) {
+	return new L.FeatureGroup(layers);
+};
+
+
+/*
+ * L.Path is a base class for rendering vector paths on a map. Inherited by Polyline, Circle, etc.
+ */
+
+L.Path = L.Class.extend({
+	includes: [L.Mixin.Events],
+
+	statics: {
+		// how much to extend the clip area around the map view
+		// (relative to its size, e.g. 0.5 is half the screen in each direction)
+		// set it so that SVG element doesn't exceed 1280px (vectors flicker on dragend if it is)
+		CLIP_PADDING: (function () {
+			var max = L.Browser.mobile ? 1280 : 2000,
+			    target = (max / Math.max(window.outerWidth, window.outerHeight) - 1) / 2;
+			return Math.max(0, Math.min(0.5, target));
+		})()
+	},
+
+	options: {
+		stroke: true,
+		color: '#0033ff',
+		dashArray: null,
+		weight: 5,
+		opacity: 0.5,
+
+		fill: false,
+		fillColor: null, //same as color by default
+		fillOpacity: 0.2,
+
+		clickable: true
+	},
+
+	initialize: function (options) {
+		L.setOptions(this, options);
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+
+		if (!this._container) {
+			this._initElements();
+			this._initEvents();
+		}
+
+		this.projectLatlngs();
+		this._updatePath();
+
+		if (this._container) {
+			this._map._pathRoot.appendChild(this._container);
+		}
+
+		this.fire('add');
+
+		map.on({
+			'viewreset': this.projectLatlngs,
+			'moveend': this._updatePath
+		}, this);
+	},
+
+	addTo: function (map) {
+		map.addLayer(this);
+		return this;
+	},
+
+	onRemove: function (map) {
+		map._pathRoot.removeChild(this._container);
+
+		// Need to fire remove event before we set _map to null as the event hooks might need the object
+		this.fire('remove');
+		this._map = null;
+
+		if (L.Browser.vml) {
+			this._container = null;
+			this._stroke = null;
+			this._fill = null;
+		}
+
+		map.off({
+			'viewreset': this.projectLatlngs,
+			'moveend': this._updatePath
+		}, this);
+	},
+
+	projectLatlngs: function () {
+		// do all projection stuff here
+	},
+
+	setStyle: function (style) {
+		L.setOptions(this, style);
+
+		if (this._container) {
+			this._updateStyle();
+		}
+
+		return this;
+	},
+
+	redraw: function () {
+		if (this._map) {
+			this.projectLatlngs();
+			this._updatePath();
+		}
+		return this;
+	}
+});
+
+L.Map.include({
+	_updatePathViewport: function () {
+		var p = L.Path.CLIP_PADDING,
+		    size = this.getSize(),
+		    panePos = L.DomUtil.getPosition(this._mapPane),
+		    min = panePos.multiplyBy(-1)._subtract(size.multiplyBy(p)._round()),
+		    max = min.add(size.multiplyBy(1 + p * 2)._round());
+
+		this._pathViewport = new L.Bounds(min, max);
+	}
+});
+
+
+/*
+ * Extends L.Path with SVG-specific rendering code.
+ */
+
+L.Path.SVG_NS = 'http://www.w3.org/2000/svg';
+
+L.Browser.svg = !!(document.createElementNS && document.createElementNS(L.Path.SVG_NS, 'svg').createSVGRect);
+
+L.Path = L.Path.extend({
+	statics: {
+		SVG: L.Browser.svg
+	},
+
+	bringToFront: function () {
+		var root = this._map._pathRoot,
+		    path = this._container;
+
+		if (path && root.lastChild !== path) {
+			root.appendChild(path);
+		}
+		return this;
+	},
+
+	bringToBack: function () {
+		var root = this._map._pathRoot,
+		    path = this._container,
+		    first = root.firstChild;
+
+		if (path && first !== path) {
+			root.insertBefore(path, first);
+		}
+		return this;
+	},
+
+	getPathString: function () {
+		// form path string here
+	},
+
+	_createElement: function (name) {
+		return document.createElementNS(L.Path.SVG_NS, name);
+	},
+
+	_initElements: function () {
+		this._map._initPathRoot();
+		this._initPath();
+		this._initStyle();
+	},
+
+	_initPath: function () {
+		this._container = this._createElement('g');
+
+		this._path = this._createElement('path');
+		this._container.appendChild(this._path);
+	},
+
+	_initStyle: function () {
+		if (this.options.stroke) {
+			this._path.setAttribute('stroke-linejoin', 'round');
+			this._path.setAttribute('stroke-linecap', 'round');
+		}
+		if (this.options.fill) {
+			this._path.setAttribute('fill-rule', 'evenodd');
+		}
+		if (this.options.pointerEvents) {
+			this._path.setAttribute('pointer-events', this.options.pointerEvents);
+		}
+		if (!this.options.clickable && !this.options.pointerEvents) {
+			this._path.setAttribute('pointer-events', 'none');
+		}
+		this._updateStyle();
+	},
+
+	_updateStyle: function () {
+		if (this.options.stroke) {
+			this._path.setAttribute('stroke', this.options.color);
+			this._path.setAttribute('stroke-opacity', this.options.opacity);
+			this._path.setAttribute('stroke-width', this.options.weight);
+			if (this.options.dashArray) {
+				this._path.setAttribute('stroke-dasharray', this.options.dashArray);
+			} else {
+				this._path.removeAttribute('stroke-dasharray');
+			}
+		} else {
+			this._path.setAttribute('stroke', 'none');
+		}
+		if (this.options.fill) {
+			this._path.setAttribute('fill', this.options.fillColor || this.options.color);
+			this._path.setAttribute('fill-opacity', this.options.fillOpacity);
+		} else {
+			this._path.setAttribute('fill', 'none');
+		}
+	},
+
+	_updatePath: function () {
+		var str = this.getPathString();
+		if (!str) {
+			// fix webkit empty string parsing bug
+			str = 'M0 0';
+		}
+		this._path.setAttribute('d', str);
+	},
+
+	// TODO remove duplication with L.Map
+	_initEvents: function () {
+		if (this.options.clickable) {
+			if (L.Browser.svg || !L.Browser.vml) {
+				this._path.setAttribute('class', 'leaflet-clickable');
+			}
+
+			L.DomEvent.on(this._container, 'click', this._onMouseClick, this);
+
+			var events = ['dblclick', 'mousedown', 'mouseover',
+			              'mouseout', 'mousemove', 'contextmenu'];
+			for (var i = 0; i < events.length; i++) {
+				L.DomEvent.on(this._container, events[i], this._fireMouseEvent, this);
+			}
+		}
+	},
+
+	_onMouseClick: function (e) {
+		if (this._map.dragging && this._map.dragging.moved()) { return; }
+
+		this._fireMouseEvent(e);
+	},
+
+	_fireMouseEvent: function (e) {
+		if (!this.hasEventListeners(e.type)) { return; }
+
+		var map = this._map,
+		    containerPoint = map.mouseEventToContainerPoint(e),
+		    layerPoint = map.containerPointToLayerPoint(containerPoint),
+		    latlng = map.layerPointToLatLng(layerPoint);
+
+		this.fire(e.type, {
+			latlng: latlng,
+			layerPoint: layerPoint,
+			containerPoint: containerPoint,
+			originalEvent: e
+		});
+
+		if (e.type === 'contextmenu') {
+			L.DomEvent.preventDefault(e);
+		}
+		if (e.type !== 'mousemove') {
+			L.DomEvent.stopPropagation(e);
+		}
+	}
+});
+
+L.Map.include({
+	_initPathRoot: function () {
+		if (!this._pathRoot) {
+			this._pathRoot = L.Path.prototype._createElement('svg');
+			this._panes.overlayPane.appendChild(this._pathRoot);
+
+			if (this.options.zoomAnimation && L.Browser.any3d) {
+				this._pathRoot.setAttribute('class', ' leaflet-zoom-animated');
+
+				this.on({
+					'zoomanim': this._animatePathZoom,
+					'zoomend': this._endPathZoom
+				});
+			} else {
+				this._pathRoot.setAttribute('class', ' leaflet-zoom-hide');
+			}
+
+			this.on('moveend', this._updateSvgViewport);
+			this._updateSvgViewport();
+		}
+	},
+
+	_animatePathZoom: function (e) {
+		var scale = this.getZoomScale(e.zoom),
+		    offset = this._getCenterOffset(e.center)._multiplyBy(-scale)._add(this._pathViewport.min);
+
+		this._pathRoot.style[L.DomUtil.TRANSFORM] =
+		        L.DomUtil.getTranslateString(offset) + ' scale(' + scale + ') ';
+
+		this._pathZooming = true;
+	},
+
+	_endPathZoom: function () {
+		this._pathZooming = false;
+	},
+
+	_updateSvgViewport: function () {
+
+		if (this._pathZooming) {
+			// Do not update SVGs while a zoom animation is going on otherwise the animation will break.
+			// When the zoom animation ends we will be updated again anyway
+			// This fixes the case where you do a momentum move and zoom while the move is still ongoing.
+			return;
+		}
+
+		this._updatePathViewport();
+
+		var vp = this._pathViewport,
+		    min = vp.min,
+		    max = vp.max,
+		    width = max.x - min.x,
+		    height = max.y - min.y,
+		    root = this._pathRoot,
+		    pane = this._panes.overlayPane;
+
+		// Hack to make flicker on drag end on mobile webkit less irritating
+		if (L.Browser.mobileWebkit) {
+			pane.removeChild(root);
+		}
+
+		L.DomUtil.setPosition(root, min);
+		root.setAttribute('width', width);
+		root.setAttribute('height', height);
+		root.setAttribute('viewBox', [min.x, min.y, width, height].join(' '));
+
+		if (L.Browser.mobileWebkit) {
+			pane.appendChild(root);
+		}
+	}
+});
+
+
+/*
+ * Popup extension to L.Path (polylines, polygons, circles), adding popup-related methods.
+ */
+
+L.Path.include({
+
+	bindPopup: function (content, options) {
+
+		if (content instanceof L.Popup) {
+			this._popup = content;
+		} else {
+			if (!this._popup || options) {
+				this._popup = new L.Popup(options, this);
+			}
+			this._popup.setContent(content);
+		}
+
+		if (!this._popupHandlersAdded) {
+			this
+			    .on('click', this._openPopup, this)
+			    .on('remove', this.closePopup, this);
+
+			this._popupHandlersAdded = true;
+		}
+
+		return this;
+	},
+
+	unbindPopup: function () {
+		if (this._popup) {
+			this._popup = null;
+			this
+			    .off('click', this._openPopup)
+			    .off('remove', this.closePopup);
+
+			this._popupHandlersAdded = false;
+		}
+		return this;
+	},
+
+	openPopup: function (latlng) {
+
+		if (this._popup) {
+			// open the popup from one of the path's points if not specified
+			latlng = latlng || this._latlng ||
+			         this._latlngs[Math.floor(this._latlngs.length / 2)];
+
+			this._openPopup({latlng: latlng});
+		}
+
+		return this;
+	},
+
+	closePopup: function () {
+		if (this._popup) {
+			this._popup._close();
+		}
+		return this;
+	},
+
+	_openPopup: function (e) {
+		this._popup.setLatLng(e.latlng);
+		this._map.openPopup(this._popup);
+	}
+});
+
+
+/*
+ * Vector rendering for IE6-8 through VML.
+ * Thanks to Dmitry Baranovsky and his Raphael library for inspiration!
+ */
+
+L.Browser.vml = !L.Browser.svg && (function () {
+	try {
+		var div = document.createElement('div');
+		div.innerHTML = '<v:shape adj="1"/>';
+
+		var shape = div.firstChild;
+		shape.style.behavior = 'url(#default#VML)';
+
+		return shape && (typeof shape.adj === 'object');
+
+	} catch (e) {
+		return false;
+	}
+}());
+
+L.Path = L.Browser.svg || !L.Browser.vml ? L.Path : L.Path.extend({
+	statics: {
+		VML: true,
+		CLIP_PADDING: 0.02
+	},
+
+	_createElement: (function () {
+		try {
+			document.namespaces.add('lvml', 'urn:schemas-microsoft-com:vml');
+			return function (name) {
+				return document.createElement('<lvml:' + name + ' class="lvml">');
+			};
+		} catch (e) {
+			return function (name) {
+				return document.createElement(
+				        '<' + name + ' xmlns="urn:schemas-microsoft.com:vml" class="lvml">');
+			};
+		}
+	}()),
+
+	_initPath: function () {
+		var container = this._container = this._createElement('shape');
+		L.DomUtil.addClass(container, 'leaflet-vml-shape');
+		if (this.options.clickable) {
+			L.DomUtil.addClass(container, 'leaflet-clickable');
+		}
+		container.coordsize = '1 1';
+
+		this._path = this._createElement('path');
+		container.appendChild(this._path);
+
+		this._map._pathRoot.appendChild(container);
+	},
+
+	_initStyle: function () {
+		this._updateStyle();
+	},
+
+	_updateStyle: function () {
+		var stroke = this._stroke,
+		    fill = this._fill,
+		    options = this.options,
+		    container = this._container;
+
+		container.stroked = options.stroke;
+		container.filled = options.fill;
+
+		if (options.stroke) {
+			if (!stroke) {
+				stroke = this._stroke = this._createElement('stroke');
+				stroke.endcap = 'round';
+				container.appendChild(stroke);
+			}
+			stroke.weight = options.weight + 'px';
+			stroke.color = options.color;
+			stroke.opacity = options.opacity;
+
+			if (options.dashArray) {
+				stroke.dashStyle = options.dashArray instanceof Array ?
+				    options.dashArray.join(' ') :
+				    options.dashArray.replace(/( *, *)/g, ' ');
+			} else {
+				stroke.dashStyle = '';
+			}
+
+		} else if (stroke) {
+			container.removeChild(stroke);
+			this._stroke = null;
+		}
+
+		if (options.fill) {
+			if (!fill) {
+				fill = this._fill = this._createElement('fill');
+				container.appendChild(fill);
+			}
+			fill.color = options.fillColor || options.color;
+			fill.opacity = options.fillOpacity;
+
+		} else if (fill) {
+			container.removeChild(fill);
+			this._fill = null;
+		}
+	},
+
+	_updatePath: function () {
+		var style = this._container.style;
+
+		style.display = 'none';
+		this._path.v = this.getPathString() + ' '; // the space fixes IE empty path string bug
+		style.display = '';
+	}
+});
+
+L.Map.include(L.Browser.svg || !L.Browser.vml ? {} : {
+	_initPathRoot: function () {
+		if (this._pathRoot) { return; }
+
+		var root = this._pathRoot = document.createElement('div');
+		root.className = 'leaflet-vml-container';
+		this._panes.overlayPane.appendChild(root);
+
+		this.on('moveend', this._updatePathViewport);
+		this._updatePathViewport();
+	}
+});
+
+
+/*
+ * Vector rendering for all browsers that support canvas.
+ */
+
+L.Browser.canvas = (function () {
+	return !!document.createElement('canvas').getContext;
+}());
+
+L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path : L.Path.extend({
+	statics: {
+		//CLIP_PADDING: 0.02, // not sure if there's a need to set it to a small value
+		CANVAS: true,
+		SVG: false
+	},
+
+	redraw: function () {
+		if (this._map) {
+			this.projectLatlngs();
+			this._requestUpdate();
+		}
+		return this;
+	},
+
+	setStyle: function (style) {
+		L.setOptions(this, style);
+
+		if (this._map) {
+			this._updateStyle();
+			this._requestUpdate();
+		}
+		return this;
+	},
+
+	onRemove: function (map) {
+		map
+		    .off('viewreset', this.projectLatlngs, this)
+		    .off('moveend', this._updatePath, this);
+
+		if (this.options.clickable) {
+			this._map.off('click', this._onClick, this);
+			this._map.off('mousemove', this._onMouseMove, this);
+		}
+
+		this._requestUpdate();
+
+		this._map = null;
+	},
+
+	_requestUpdate: function () {
+		if (this._map && !L.Path._updateRequest) {
+			L.Path._updateRequest = L.Util.requestAnimFrame(this._fireMapMoveEnd, this._map);
+		}
+	},
+
+	_fireMapMoveEnd: function () {
+		L.Path._updateRequest = null;
+		this.fire('moveend');
+	},
+
+	_initElements: function () {
+		this._map._initPathRoot();
+		this._ctx = this._map._canvasCtx;
+	},
+
+	_updateStyle: function () {
+		var options = this.options;
+
+		if (options.stroke) {
+			this._ctx.lineWidth = options.weight;
+			this._ctx.strokeStyle = options.color;
+		}
+		if (options.fill) {
+			this._ctx.fillStyle = options.fillColor || options.color;
+		}
+	},
+
+	_drawPath: function () {
+		var i, j, len, len2, point, drawMethod;
+
+		this._ctx.beginPath();
+
+		for (i = 0, len = this._parts.length; i < len; i++) {
+			for (j = 0, len2 = this._parts[i].length; j < len2; j++) {
+				point = this._parts[i][j];
+				drawMethod = (j === 0 ? 'move' : 'line') + 'To';
+
+				this._ctx[drawMethod](point.x, point.y);
+			}
+			// TODO refactor ugly hack
+			if (this instanceof L.Polygon) {
+				this._ctx.closePath();
+			}
+		}
+	},
+
+	_checkIfEmpty: function () {
+		return !this._parts.length;
+	},
+
+	_updatePath: function () {
+		if (this._checkIfEmpty()) { return; }
+
+		var ctx = this._ctx,
+		    options = this.options;
+
+		this._drawPath();
+		ctx.save();
+		this._updateStyle();
+
+		if (options.fill) {
+			ctx.globalAlpha = options.fillOpacity;
+			ctx.fill();
+		}
+
+		if (options.stroke) {
+			ctx.globalAlpha = options.opacity;
+			ctx.stroke();
+		}
+
+		ctx.restore();
+
+		// TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature
+	},
+
+	_initEvents: function () {
+		if (this.options.clickable) {
+			// TODO dblclick
+			this._map.on('mousemove', this._onMouseMove, this);
+			this._map.on('click', this._onClick, this);
+		}
+	},
+
+	_onClick: function (e) {
+		if (this._containsPoint(e.layerPoint)) {
+			this.fire('click', e);
+		}
+	},
+
+	_onMouseMove: function (e) {
+		if (!this._map || this._map._animatingZoom) { return; }
+
+		// TODO don't do on each move
+		if (this._containsPoint(e.layerPoint)) {
+			this._ctx.canvas.style.cursor = 'pointer';
+			this._mouseInside = true;
+			this.fire('mouseover', e);
+
+		} else if (this._mouseInside) {
+			this._ctx.canvas.style.cursor = '';
+			this._mouseInside = false;
+			this.fire('mouseout', e);
+		}
+	}
+});
+
+L.Map.include((L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? {} : {
+	_initPathRoot: function () {
+		var root = this._pathRoot,
+		    ctx;
+
+		if (!root) {
+			root = this._pathRoot = document.createElement('canvas');
+			root.style.position = 'absolute';
+			ctx = this._canvasCtx = root.getContext('2d');
+
+			ctx.lineCap = 'round';
+			ctx.lineJoin = 'round';
+
+			this._panes.overlayPane.appendChild(root);
+
+			if (this.options.zoomAnimation) {
+				this._pathRoot.className = 'leaflet-zoom-animated';
+				this.on('zoomanim', this._animatePathZoom);
+				this.on('zoomend', this._endPathZoom);
+			}
+			this.on('moveend', this._updateCanvasViewport);
+			this._updateCanvasViewport();
+		}
+	},
+
+	_updateCanvasViewport: function () {
+		// don't redraw while zooming. See _updateSvgViewport for more details
+		if (this._pathZooming) { return; }
+		this._updatePathViewport();
+
+		var vp = this._pathViewport,
+		    min = vp.min,
+		    size = vp.max.subtract(min),
+		    root = this._pathRoot;
+
+		//TODO check if this works properly on mobile webkit
+		L.DomUtil.setPosition(root, min);
+		root.width = size.x;
+		root.height = size.y;
+		root.getContext('2d').translate(-min.x, -min.y);
+	}
+});
+
+
+/*
+ * L.LineUtil contains different utility functions for line segments
+ * and polylines (clipping, simplification, distances, etc.)
+ */
+
+/*jshint bitwise:false */ // allow bitwise oprations for this file
+
+L.LineUtil = {
+
+	// Simplify polyline with vertex reduction and Douglas-Peucker simplification.
+	// Improves rendering performance dramatically by lessening the number of points to draw.
+
+	simplify: function (/*Point[]*/ points, /*Number*/ tolerance) {
+		if (!tolerance || !points.length) {
+			return points.slice();
+		}
+
+		var sqTolerance = tolerance * tolerance;
+
+		// stage 1: vertex reduction
+		points = this._reducePoints(points, sqTolerance);
+
+		// stage 2: Douglas-Peucker simplification
+		points = this._simplifyDP(points, sqTolerance);
+
+		return points;
+	},
+
+	// distance from a point to a segment between two points
+	pointToSegmentDistance:  function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
+		return Math.sqrt(this._sqClosestPointOnSegment(p, p1, p2, true));
+	},
+
+	closestPointOnSegment: function (/*Point*/ p, /*Point*/ p1, /*Point*/ p2) {
+		return this._sqClosestPointOnSegment(p, p1, p2);
+	},
+
+	// Douglas-Peucker simplification, see http://en.wikipedia.org/wiki/Douglas-Peucker_algorithm
+	_simplifyDP: function (points, sqTolerance) {
+
+		var len = points.length,
+		    ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array,
+		    markers = new ArrayConstructor(len);
+
+		markers[0] = markers[len - 1] = 1;
+
+		this._simplifyDPStep(points, markers, sqTolerance, 0, len - 1);
+
+		var i,
+		    newPoints = [];
+
+		for (i = 0; i < len; i++) {
+			if (markers[i]) {
+				newPoints.push(points[i]);
+			}
+		}
+
+		return newPoints;
+	},
+
+	_simplifyDPStep: function (points, markers, sqTolerance, first, last) {
+
+		var maxSqDist = 0,
+		    index, i, sqDist;
+
+		for (i = first + 1; i <= last - 1; i++) {
+			sqDist = this._sqClosestPointOnSegment(points[i], points[first], points[last], true);
+
+			if (sqDist > maxSqDist) {
+				index = i;
+				maxSqDist = sqDist;
+			}
+		}
+
+		if (maxSqDist > sqTolerance) {
+			markers[index] = 1;
+
+			this._simplifyDPStep(points, markers, sqTolerance, first, index);
+			this._simplifyDPStep(points, markers, sqTolerance, index, last);
+		}
+	},
+
+	// reduce points that are too close to each other to a single point
+	_reducePoints: function (points, sqTolerance) {
+		var reducedPoints = [points[0]];
+
+		for (var i = 1, prev = 0, len = points.length; i < len; i++) {
+			if (this._sqDist(points[i], points[prev]) > sqTolerance) {
+				reducedPoints.push(points[i]);
+				prev = i;
+			}
+		}
+		if (prev < len - 1) {
+			reducedPoints.push(points[len - 1]);
+		}
+		return reducedPoints;
+	},
+
+	// Cohen-Sutherland line clipping algorithm.
+	// Used to avoid rendering parts of a polyline that are not currently visible.
+
+	clipSegment: function (a, b, bounds, useLastCode) {
+		var codeA = useLastCode ? this._lastCode : this._getBitCode(a, bounds),
+		    codeB = this._getBitCode(b, bounds),
+
+		    codeOut, p, newCode;
+
+		// save 2nd code to avoid calculating it on the next segment
+		this._lastCode = codeB;
+
+		while (true) {
+			// if a,b is inside the clip window (trivial accept)
+			if (!(codeA | codeB)) {
+				return [a, b];
+			// if a,b is outside the clip window (trivial reject)
+			} else if (codeA & codeB) {
+				return false;
+			// other cases
+			} else {
+				codeOut = codeA || codeB;
+				p = this._getEdgeIntersection(a, b, codeOut, bounds);
+				newCode = this._getBitCode(p, bounds);
+
+				if (codeOut === codeA) {
+					a = p;
+					codeA = newCode;
+				} else {
+					b = p;
+					codeB = newCode;
+				}
+			}
+		}
+	},
+
+	_getEdgeIntersection: function (a, b, code, bounds) {
+		var dx = b.x - a.x,
+		    dy = b.y - a.y,
+		    min = bounds.min,
+		    max = bounds.max;
+
+		if (code & 8) { // top
+			return new L.Point(a.x + dx * (max.y - a.y) / dy, max.y);
+		} else if (code & 4) { // bottom
+			return new L.Point(a.x + dx * (min.y - a.y) / dy, min.y);
+		} else if (code & 2) { // right
+			return new L.Point(max.x, a.y + dy * (max.x - a.x) / dx);
+		} else if (code & 1) { // left
+			return new L.Point(min.x, a.y + dy * (min.x - a.x) / dx);
+		}
+	},
+
+	_getBitCode: function (/*Point*/ p, bounds) {
+		var code = 0;
+
+		if (p.x < bounds.min.x) { // left
+			code |= 1;
+		} else if (p.x > bounds.max.x) { // right
+			code |= 2;
+		}
+		if (p.y < bounds.min.y) { // bottom
+			code |= 4;
+		} else if (p.y > bounds.max.y) { // top
+			code |= 8;
+		}
+
+		return code;
+	},
+
+	// square distance (to avoid unnecessary Math.sqrt calls)
+	_sqDist: function (p1, p2) {
+		var dx = p2.x - p1.x,
+		    dy = p2.y - p1.y;
+		return dx * dx + dy * dy;
+	},
+
+	// return closest point on segment or distance to that point
+	_sqClosestPointOnSegment: function (p, p1, p2, sqDist) {
+		var x = p1.x,
+		    y = p1.y,
+		    dx = p2.x - x,
+		    dy = p2.y - y,
+		    dot = dx * dx + dy * dy,
+		    t;
+
+		if (dot > 0) {
+			t = ((p.x - x) * dx + (p.y - y) * dy) / dot;
+
+			if (t > 1) {
+				x = p2.x;
+				y = p2.y;
+			} else if (t > 0) {
+				x += dx * t;
+				y += dy * t;
+			}
+		}
+
+		dx = p.x - x;
+		dy = p.y - y;
+
+		return sqDist ? dx * dx + dy * dy : new L.Point(x, y);
+	}
+};
+
+
+/*
+ * L.Polyline is used to display polylines on a map.
+ */
+
+L.Polyline = L.Path.extend({
+	initialize: function (latlngs, options) {
+		L.Path.prototype.initialize.call(this, options);
+
+		this._latlngs = this._convertLatLngs(latlngs);
+	},
+
+	options: {
+		// how much to simplify the polyline on each zoom level
+		// more = better performance and smoother look, less = more accurate
+		smoothFactor: 1.0,
+		noClip: false
+	},
+
+	projectLatlngs: function () {
+		this._originalPoints = [];
+
+		for (var i = 0, len = this._latlngs.length; i < len; i++) {
+			this._originalPoints[i] = this._map.latLngToLayerPoint(this._latlngs[i]);
+		}
+	},
+
+	getPathString: function () {
+		for (var i = 0, len = this._parts.length, str = ''; i < len; i++) {
+			str += this._getPathPartStr(this._parts[i]);
+		}
+		return str;
+	},
+
+	getLatLngs: function () {
+		return this._latlngs;
+	},
+
+	setLatLngs: function (latlngs) {
+		this._latlngs = this._convertLatLngs(latlngs);
+		return this.redraw();
+	},
+
+	addLatLng: function (latlng) {
+		this._latlngs.push(L.latLng(latlng));
+		return this.redraw();
+	},
+
+	spliceLatLngs: function () { // (Number index, Number howMany)
+		var removed = [].splice.apply(this._latlngs, arguments);
+		this._convertLatLngs(this._latlngs, true);
+		this.redraw();
+		return removed;
+	},
+
+	closestLayerPoint: function (p) {
+		var minDistance = Infinity, parts = this._parts, p1, p2, minPoint = null;
+
+		for (var j = 0, jLen = parts.length; j < jLen; j++) {
+			var points = parts[j];
+			for (var i = 1, len = points.length; i < len; i++) {
+				p1 = points[i - 1];
+				p2 = points[i];
+				var sqDist = L.LineUtil._sqClosestPointOnSegment(p, p1, p2, true);
+				if (sqDist < minDistance) {
+					minDistance = sqDist;
+					minPoint = L.LineUtil._sqClosestPointOnSegment(p, p1, p2);
+				}
+			}
+		}
+		if (minPoint) {
+			minPoint.distance = Math.sqrt(minDistance);
+		}
+		return minPoint;
+	},
+
+	getBounds: function () {
+		return new L.LatLngBounds(this.getLatLngs());
+	},
+
+	_convertLatLngs: function (latlngs, overwrite) {
+		var i, len, target = overwrite ? latlngs : [];
+
+		for (i = 0, len = latlngs.length; i < len; i++) {
+			if (L.Util.isArray(latlngs[i]) && typeof latlngs[i][0] !== 'number') {
+				return;
+			}
+			target[i] = L.latLng(latlngs[i]);
+		}
+		return target;
+	},
+
+	_initEvents: function () {
+		L.Path.prototype._initEvents.call(this);
+	},
+
+	_getPathPartStr: function (points) {
+		var round = L.Path.VML;
+
+		for (var j = 0, len2 = points.length, str = '', p; j < len2; j++) {
+			p = points[j];
+			if (round) {
+				p._round();
+			}
+			str += (j ? 'L' : 'M') + p.x + ' ' + p.y;
+		}
+		return str;
+	},
+
+	_clipPoints: function () {
+		var points = this._originalPoints,
+		    len = points.length,
+		    i, k, segment;
+
+		if (this.options.noClip) {
+			this._parts = [points];
+			return;
+		}
+
+		this._parts = [];
+
+		var parts = this._parts,
+		    vp = this._map._pathViewport,
+		    lu = L.LineUtil;
+
+		for (i = 0, k = 0; i < len - 1; i++) {
+			segment = lu.clipSegment(points[i], points[i + 1], vp, i);
+			if (!segment) {
+				continue;
+			}
+
+			parts[k] = parts[k] || [];
+			parts[k].push(segment[0]);
+
+			// if segment goes out of screen, or it's the last one, it's the end of the line part
+			if ((segment[1] !== points[i + 1]) || (i === len - 2)) {
+				parts[k].push(segment[1]);
+				k++;
+			}
+		}
+	},
+
+	// simplify each clipped part of the polyline
+	_simplifyPoints: function () {
+		var parts = this._parts,
+		    lu = L.LineUtil;
+
+		for (var i = 0, len = parts.length; i < len; i++) {
+			parts[i] = lu.simplify(parts[i], this.options.smoothFactor);
+		}
+	},
+
+	_updatePath: function () {
+		if (!this._map) { return; }
+
+		this._clipPoints();
+		this._simplifyPoints();
+
+		L.Path.prototype._updatePath.call(this);
+	}
+});
+
+L.polyline = function (latlngs, options) {
+	return new L.Polyline(latlngs, options);
+};
+
+
+/*
+ * L.PolyUtil contains utility functions for polygons (clipping, etc.).
+ */
+
+/*jshint bitwise:false */ // allow bitwise operations here
+
+L.PolyUtil = {};
+
+/*
+ * Sutherland-Hodgeman polygon clipping algorithm.
+ * Used to avoid rendering parts of a polygon that are not currently visible.
+ */
+L.PolyUtil.clipPolygon = function (points, bounds) {
+	var clippedPoints,
+	    edges = [1, 4, 2, 8],
+	    i, j, k,
+	    a, b,
+	    len, edge, p,
+	    lu = L.LineUtil;
+
+	for (i = 0, len = points.length; i < len; i++) {
+		points[i]._code = lu._getBitCode(points[i], bounds);
+	}
+
+	// for each edge (left, bottom, right, top)
+	for (k = 0; k < 4; k++) {
+		edge = edges[k];
+		clippedPoints = [];
+
+		for (i = 0, len = points.length, j = len - 1; i < len; j = i++) {
+			a = points[i];
+			b = points[j];
+
+			// if a is inside the clip window
+			if (!(a._code & edge)) {
+				// if b is outside the clip window (a->b goes out of screen)
+				if (b._code & edge) {
+					p = lu._getEdgeIntersection(b, a, edge, bounds);
+					p._code = lu._getBitCode(p, bounds);
+					clippedPoints.push(p);
+				}
+				clippedPoints.push(a);
+
+			// else if b is inside the clip window (a->b enters the screen)
+			} else if (!(b._code & edge)) {
+				p = lu._getEdgeIntersection(b, a, edge, bounds);
+				p._code = lu._getBitCode(p, bounds);
+				clippedPoints.push(p);
+			}
+		}
+		points = clippedPoints;
+	}
+
+	return points;
+};
+
+
+/*
+ * L.Polygon is used to display polygons on a map.
+ */
+
+L.Polygon = L.Polyline.extend({
+	options: {
+		fill: true
+	},
+
+	initialize: function (latlngs, options) {
+		var i, len, hole;
+
+		L.Polyline.prototype.initialize.call(this, latlngs, options);
+
+		if (latlngs && L.Util.isArray(latlngs[0]) && (typeof latlngs[0][0] !== 'number')) {
+			this._latlngs = this._convertLatLngs(latlngs[0]);
+			this._holes = latlngs.slice(1);
+
+			for (i = 0, len = this._holes.length; i < len; i++) {
+				hole = this._holes[i] = this._convertLatLngs(this._holes[i]);
+				if (hole[0].equals(hole[hole.length - 1])) {
+					hole.pop();
+				}
+			}
+		}
+
+		// filter out last point if its equal to the first one
+		latlngs = this._latlngs;
+
+		if (latlngs.length >= 2 && latlngs[0].equals(latlngs[latlngs.length - 1])) {
+			latlngs.pop();
+		}
+	},
+
+	projectLatlngs: function () {
+		L.Polyline.prototype.projectLatlngs.call(this);
+
+		// project polygon holes points
+		// TODO move this logic to Polyline to get rid of duplication
+		this._holePoints = [];
+
+		if (!this._holes) { return; }
+
+		var i, j, len, len2;
+
+		for (i = 0, len = this._holes.length; i < len; i++) {
+			this._holePoints[i] = [];
+
+			for (j = 0, len2 = this._holes[i].length; j < len2; j++) {
+				this._holePoints[i][j] = this._map.latLngToLayerPoint(this._holes[i][j]);
+			}
+		}
+	},
+
+	_clipPoints: function () {
+		var points = this._originalPoints,
+		    newParts = [];
+
+		this._parts = [points].concat(this._holePoints);
+
+		if (this.options.noClip) { return; }
+
+		for (var i = 0, len = this._parts.length; i < len; i++) {
+			var clipped = L.PolyUtil.clipPolygon(this._parts[i], this._map._pathViewport);
+			if (clipped.length) {
+				newParts.push(clipped);
+			}
+		}
+
+		this._parts = newParts;
+	},
+
+	_getPathPartStr: function (points) {
+		var str = L.Polyline.prototype._getPathPartStr.call(this, points);
+		return str + (L.Browser.svg ? 'z' : 'x');
+	}
+});
+
+L.polygon = function (latlngs, options) {
+	return new L.Polygon(latlngs, options);
+};
+
+
+/*
+ * Contains L.MultiPolyline and L.MultiPolygon layers.
+ */
+
+(function () {
+	function createMulti(Klass) {
+
+		return L.FeatureGroup.extend({
+
+			initialize: function (latlngs, options) {
+				this._layers = {};
+				this._options = options;
+				this.setLatLngs(latlngs);
+			},
+
+			setLatLngs: function (latlngs) {
+				var i = 0,
+				    len = latlngs.length;
+
+				this.eachLayer(function (layer) {
+					if (i < len) {
+						layer.setLatLngs(latlngs[i++]);
+					} else {
+						this.removeLayer(layer);
+					}
+				}, this);
+
+				while (i < len) {
+					this.addLayer(new Klass(latlngs[i++], this._options));
+				}
+
+				return this;
+			},
+
+			getLatLngs: function () {
+				var latlngs = [];
+
+				this.eachLayer(function (layer) {
+					latlngs.push(layer.getLatLngs());
+				});
+
+				return latlngs;
+			}
+		});
+	}
+
+	L.MultiPolyline = createMulti(L.Polyline);
+	L.MultiPolygon = createMulti(L.Polygon);
+
+	L.multiPolyline = function (latlngs, options) {
+		return new L.MultiPolyline(latlngs, options);
+	};
+
+	L.multiPolygon = function (latlngs, options) {
+		return new L.MultiPolygon(latlngs, options);
+	};
+}());
+
+
+/*
+ * L.Rectangle extends Polygon and creates a rectangle when passed a LatLngBounds object.
+ */
+
+L.Rectangle = L.Polygon.extend({
+	initialize: function (latLngBounds, options) {
+		L.Polygon.prototype.initialize.call(this, this._boundsToLatLngs(latLngBounds), options);
+	},
+
+	setBounds: function (latLngBounds) {
+		this.setLatLngs(this._boundsToLatLngs(latLngBounds));
+	},
+
+	_boundsToLatLngs: function (latLngBounds) {
+		latLngBounds = L.latLngBounds(latLngBounds);
+		return [
+			latLngBounds.getSouthWest(),
+			latLngBounds.getNorthWest(),
+			latLngBounds.getNorthEast(),
+			latLngBounds.getSouthEast()
+		];
+	}
+});
+
+L.rectangle = function (latLngBounds, options) {
+	return new L.Rectangle(latLngBounds, options);
+};
+
+
+/*
+ * L.Circle is a circle overlay (with a certain radius in meters).
+ */
+
+L.Circle = L.Path.extend({
+	initialize: function (latlng, radius, options) {
+		L.Path.prototype.initialize.call(this, options);
+
+		this._latlng = L.latLng(latlng);
+		this._mRadius = radius;
+	},
+
+	options: {
+		fill: true
+	},
+
+	setLatLng: function (latlng) {
+		this._latlng = L.latLng(latlng);
+		return this.redraw();
+	},
+
+	setRadius: function (radius) {
+		this._mRadius = radius;
+		return this.redraw();
+	},
+
+	projectLatlngs: function () {
+		var lngRadius = this._getLngRadius(),
+		    latlng = this._latlng,
+		    pointLeft = this._map.latLngToLayerPoint([latlng.lat, latlng.lng - lngRadius]);
+
+		this._point = this._map.latLngToLayerPoint(latlng);
+		this._radius = Math.max(this._point.x - pointLeft.x, 1);
+	},
+
+	getBounds: function () {
+		var lngRadius = this._getLngRadius(),
+		    latRadius = (this._mRadius / 40075017) * 360,
+		    latlng = this._latlng;
+
+		return new L.LatLngBounds(
+		        [latlng.lat - latRadius, latlng.lng - lngRadius],
+		        [latlng.lat + latRadius, latlng.lng + lngRadius]);
+	},
+
+	getLatLng: function () {
+		return this._latlng;
+	},
+
+	getPathString: function () {
+		var p = this._point,
+		    r = this._radius;
+
+		if (this._checkIfEmpty()) {
+			return '';
+		}
+
+		if (L.Browser.svg) {
+			return 'M' + p.x + ',' + (p.y - r) +
+			       'A' + r + ',' + r + ',0,1,1,' +
+			       (p.x - 0.1) + ',' + (p.y - r) + ' z';
+		} else {
+			p._round();
+			r = Math.round(r);
+			return 'AL ' + p.x + ',' + p.y + ' ' + r + ',' + r + ' 0,' + (65535 * 360);
+		}
+	},
+
+	getRadius: function () {
+		return this._mRadius;
+	},
+
+	// TODO Earth hardcoded, move into projection code!
+
+	_getLatRadius: function () {
+		return (this._mRadius / 40075017) * 360;
+	},
+
+	_getLngRadius: function () {
+		return this._getLatRadius() / Math.cos(L.LatLng.DEG_TO_RAD * this._latlng.lat);
+	},
+
+	_checkIfEmpty: function () {
+		if (!this._map) {
+			return false;
+		}
+		var vp = this._map._pathViewport,
+		    r = this._radius,
+		    p = this._point;
+
+		return p.x - r > vp.max.x || p.y - r > vp.max.y ||
+		       p.x + r < vp.min.x || p.y + r < vp.min.y;
+	}
+});
+
+L.circle = function (latlng, radius, options) {
+	return new L.Circle(latlng, radius, options);
+};
+
+
+/*
+ * L.CircleMarker is a circle overlay with a permanent pixel radius.
+ */
+
+L.CircleMarker = L.Circle.extend({
+	options: {
+		radius: 10,
+		weight: 2
+	},
+
+	initialize: function (latlng, options) {
+		L.Circle.prototype.initialize.call(this, latlng, null, options);
+		this._radius = this.options.radius;
+	},
+
+	projectLatlngs: function () {
+		this._point = this._map.latLngToLayerPoint(this._latlng);
+	},
+
+	_updateStyle : function () {
+		L.Circle.prototype._updateStyle.call(this);
+		this.setRadius(this.options.radius);
+	},
+
+	setRadius: function (radius) {
+		this.options.radius = this._radius = radius;
+		return this.redraw();
+	}
+});
+
+L.circleMarker = function (latlng, options) {
+	return new L.CircleMarker(latlng, options);
+};
+
+
+/*
+ * Extends L.Polyline to be able to manually detect clicks on Canvas-rendered polylines.
+ */
+
+L.Polyline.include(!L.Path.CANVAS ? {} : {
+	_containsPoint: function (p, closed) {
+		var i, j, k, len, len2, dist, part,
+		    w = this.options.weight / 2;
+
+		if (L.Browser.touch) {
+			w += 10; // polyline click tolerance on touch devices
+		}
+
+		for (i = 0, len = this._parts.length; i < len; i++) {
+			part = this._parts[i];
+			for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+				if (!closed && (j === 0)) {
+					continue;
+				}
+
+				dist = L.LineUtil.pointToSegmentDistance(p, part[k], part[j]);
+
+				if (dist <= w) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+});
+
+
+/*
+ * Extends L.Polygon to be able to manually detect clicks on Canvas-rendered polygons.
+ */
+
+L.Polygon.include(!L.Path.CANVAS ? {} : {
+	_containsPoint: function (p) {
+		var inside = false,
+		    part, p1, p2,
+		    i, j, k,
+		    len, len2;
+
+		// TODO optimization: check if within bounds first
+
+		if (L.Polyline.prototype._containsPoint.call(this, p, true)) {
+			// click on polygon border
+			return true;
+		}
+
+		// ray casting algorithm for detecting if point is in polygon
+
+		for (i = 0, len = this._parts.length; i < len; i++) {
+			part = this._parts[i];
+
+			for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) {
+				p1 = part[j];
+				p2 = part[k];
+
+				if (((p1.y > p.y) !== (p2.y > p.y)) &&
+						(p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) {
+					inside = !inside;
+				}
+			}
+		}
+
+		return inside;
+	}
+});
+
+
+/*
+ * Extends L.Circle with Canvas-specific code.
+ */
+
+L.Circle.include(!L.Path.CANVAS ? {} : {
+	_drawPath: function () {
+		var p = this._point;
+		this._ctx.beginPath();
+		this._ctx.arc(p.x, p.y, this._radius, 0, Math.PI * 2, false);
+	},
+
+	_containsPoint: function (p) {
+		var center = this._point,
+		    w2 = this.options.stroke ? this.options.weight / 2 : 0;
+
+		return (p.distanceTo(center) <= this._radius + w2);
+	}
+});
+
+
+/*
+ * CircleMarker canvas specific drawing parts.
+ */
+
+L.CircleMarker.include(!L.Path.CANVAS ? {} : {
+	_updateStyle: function () {
+		L.Path.prototype._updateStyle.call(this);
+	}
+});
+
+
+/*
+ * L.GeoJSON turns any GeoJSON data into a Leaflet layer.
+ */
+
+L.GeoJSON = L.FeatureGroup.extend({
+
+	initialize: function (geojson, options) {
+		L.setOptions(this, options);
+
+		this._layers = {};
+
+		if (geojson) {
+			this.addData(geojson);
+		}
+	},
+
+	addData: function (geojson) {
+		var features = L.Util.isArray(geojson) ? geojson : geojson.features,
+		    i, len, feature;
+
+		if (features) {
+			for (i = 0, len = features.length; i < len; i++) {
+				// Only add this if geometry or geometries are set and not null
+				feature = features[i];
+				if (feature.geometries || feature.geometry || feature.features || feature.coordinates) {
+					this.addData(features[i]);
+				}
+			}
+			return this;
+		}
+
+		var options = this.options;
+
+		if (options.filter && !options.filter(geojson)) { return; }
+
+		var layer = L.GeoJSON.geometryToLayer(geojson, options.pointToLayer, options.coordsToLatLng);
+		layer.feature = L.GeoJSON.asFeature(geojson);
+
+		layer.defaultOptions = layer.options;
+		this.resetStyle(layer);
+
+		if (options.onEachFeature) {
+			options.onEachFeature(geojson, layer);
+		}
+
+		return this.addLayer(layer);
+	},
+
+	resetStyle: function (layer) {
+		var style = this.options.style;
+		if (style) {
+			// reset any custom styles
+			L.Util.extend(layer.options, layer.defaultOptions);
+
+			this._setLayerStyle(layer, style);
+		}
+	},
+
+	setStyle: function (style) {
+		this.eachLayer(function (layer) {
+			this._setLayerStyle(layer, style);
+		}, this);
+	},
+
+	_setLayerStyle: function (layer, style) {
+		if (typeof style === 'function') {
+			style = style(layer.feature);
+		}
+		if (layer.setStyle) {
+			layer.setStyle(style);
+		}
+	}
+});
+
+L.extend(L.GeoJSON, {
+	geometryToLayer: function (geojson, pointToLayer, coordsToLatLng) {
+		var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson,
+		    coords = geometry.coordinates,
+		    layers = [],
+		    latlng, latlngs, i, len, layer;
+
+		coordsToLatLng = coordsToLatLng || this.coordsToLatLng;
+
+		switch (geometry.type) {
+		case 'Point':
+			latlng = coordsToLatLng(coords);
+			return pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
+
+		case 'MultiPoint':
+			for (i = 0, len = coords.length; i < len; i++) {
+				latlng = coordsToLatLng(coords[i]);
+				layer = pointToLayer ? pointToLayer(geojson, latlng) : new L.Marker(latlng);
+				layers.push(layer);
+			}
+			return new L.FeatureGroup(layers);
+
+		case 'LineString':
+			latlngs = this.coordsToLatLngs(coords, 0, coordsToLatLng);
+			return new L.Polyline(latlngs);
+
+		case 'Polygon':
+			latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
+			return new L.Polygon(latlngs);
+
+		case 'MultiLineString':
+			latlngs = this.coordsToLatLngs(coords, 1, coordsToLatLng);
+			return new L.MultiPolyline(latlngs);
+
+		case 'MultiPolygon':
+			latlngs = this.coordsToLatLngs(coords, 2, coordsToLatLng);
+			return new L.MultiPolygon(latlngs);
+
+		case 'GeometryCollection':
+			for (i = 0, len = geometry.geometries.length; i < len; i++) {
+
+				layer = this.geometryToLayer({
+					geometry: geometry.geometries[i],
+					type: 'Feature',
+					properties: geojson.properties
+				}, pointToLayer, coordsToLatLng);
+
+				layers.push(layer);
+			}
+			return new L.FeatureGroup(layers);
+
+		default:
+			throw new Error('Invalid GeoJSON object.');
+		}
+	},
+
+	coordsToLatLng: function (coords) { // (Array[, Boolean]) -> LatLng
+		return new L.LatLng(coords[1], coords[0]);
+	},
+
+	coordsToLatLngs: function (coords, levelsDeep, coordsToLatLng) { // (Array[, Number, Function]) -> Array
+		var latlng, i, len,
+		    latlngs = [];
+
+		for (i = 0, len = coords.length; i < len; i++) {
+			latlng = levelsDeep ?
+			        this.coordsToLatLngs(coords[i], levelsDeep - 1, coordsToLatLng) :
+			        (coordsToLatLng || this.coordsToLatLng)(coords[i]);
+
+			latlngs.push(latlng);
+		}
+
+		return latlngs;
+	},
+
+	latLngToCoords: function (latLng) {
+		return [latLng.lng, latLng.lat];
+	},
+
+	latLngsToCoords: function (latLngs) {
+		var coords = [];
+
+		for (var i = 0, len = latLngs.length; i < len; i++) {
+			coords.push(L.GeoJSON.latLngToCoords(latLngs[i]));
+		}
+
+		return coords;
+	},
+
+	getFeature: function (layer, newGeometry) {
+		return layer.feature ? L.extend({}, layer.feature, {geometry: newGeometry}) : L.GeoJSON.asFeature(newGeometry);
+	},
+
+	asFeature: function (geoJSON) {
+		if (geoJSON.type === 'Feature') {
+			return geoJSON;
+		}
+
+		return {
+			type: 'Feature',
+			properties: {},
+			geometry: geoJSON
+		};
+	}
+});
+
+var PointToGeoJSON = {
+	toGeoJSON: function () {
+		return L.GeoJSON.getFeature(this, {
+			type: 'Point',
+			coordinates: L.GeoJSON.latLngToCoords(this.getLatLng())
+		});
+	}
+};
+
+L.Marker.include(PointToGeoJSON);
+L.Circle.include(PointToGeoJSON);
+L.CircleMarker.include(PointToGeoJSON);
+
+L.Polyline.include({
+	toGeoJSON: function () {
+		return L.GeoJSON.getFeature(this, {
+			type: 'LineString',
+			coordinates: L.GeoJSON.latLngsToCoords(this.getLatLngs())
+		});
+	}
+});
+
+L.Polygon.include({
+	toGeoJSON: function () {
+		var coords = [L.GeoJSON.latLngsToCoords(this.getLatLngs())],
+		    i, len, hole;
+
+		coords[0].push(coords[0][0]);
+
+		if (this._holes) {
+			for (i = 0, len = this._holes.length; i < len; i++) {
+				hole = L.GeoJSON.latLngsToCoords(this._holes[i]);
+				hole.push(hole[0]);
+				coords.push(hole);
+			}
+		}
+
+		return L.GeoJSON.getFeature(this, {
+			type: 'Polygon',
+			coordinates: coords
+		});
+	}
+});
+
+(function () {
+	function includeMulti(Klass, type) {
+		Klass.include({
+			toGeoJSON: function () {
+				var coords = [];
+
+				this.eachLayer(function (layer) {
+					coords.push(layer.toGeoJSON().geometry.coordinates);
+				});
+
+				return L.GeoJSON.getFeature(this, {
+					type: type,
+					coordinates: coords
+				});
+			}
+		});
+	}
+
+	includeMulti(L.MultiPolyline, 'MultiLineString');
+	includeMulti(L.MultiPolygon, 'MultiPolygon');
+}());
+
+L.LayerGroup.include({
+	toGeoJSON: function () {
+		var features = [];
+
+		this.eachLayer(function (layer) {
+			if (layer.toGeoJSON) {
+				features.push(L.GeoJSON.asFeature(layer.toGeoJSON()));
+			}
+		});
+
+		return {
+			type: 'FeatureCollection',
+			features: features
+		};
+	}
+});
+
+L.geoJson = function (geojson, options) {
+	return new L.GeoJSON(geojson, options);
+};
+
+
+/*
+ * L.DomEvent contains functions for working with DOM events.
+ */
+
+L.DomEvent = {
+	/* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
+	addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
+
+		var id = L.stamp(fn),
+		    key = '_leaflet_' + type + id,
+		    handler, originalHandler, newType;
+
+		if (obj[key]) { return this; }
+
+		handler = function (e) {
+			return fn.call(context || obj, e || L.DomEvent._getEvent());
+		};
+
+		if (L.Browser.msTouch && type.indexOf('touch') === 0) {
+			return this.addMsTouchListener(obj, type, handler, id);
+		}
+		if (L.Browser.touch && (type === 'dblclick') && this.addDoubleTapListener) {
+			this.addDoubleTapListener(obj, handler, id);
+		}
+
+		if ('addEventListener' in obj) {
+
+			if (type === 'mousewheel') {
+				obj.addEventListener('DOMMouseScroll', handler, false);
+				obj.addEventListener(type, handler, false);
+
+			} else if ((type === 'mouseenter') || (type === 'mouseleave')) {
+
+				originalHandler = handler;
+				newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');
+
+				handler = function (e) {
+					if (!L.DomEvent._checkMouse(obj, e)) { return; }
+					return originalHandler(e);
+				};
+
+				obj.addEventListener(newType, handler, false);
+
+			} else if (type === 'click' && L.Browser.android) {
+				originalHandler = handler;
+				handler = function (e) {
+					return L.DomEvent._filterClick(e, originalHandler);
+				};
+
+				obj.addEventListener(type, handler, false);
+			} else {
+				obj.addEventListener(type, handler, false);
+			}
+
+		} else if ('attachEvent' in obj) {
+			obj.attachEvent('on' + type, handler);
+		}
+
+		obj[key] = handler;
+
+		return this;
+	},
+
+	removeListener: function (obj, type, fn) {  // (HTMLElement, String, Function)
+
+		var id = L.stamp(fn),
+		    key = '_leaflet_' + type + id,
+		    handler = obj[key];
+
+		if (!handler) { return this; }
+
+		if (L.Browser.msTouch && type.indexOf('touch') === 0) {
+			this.removeMsTouchListener(obj, type, id);
+		} else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
+			this.removeDoubleTapListener(obj, id);
+
+		} else if ('removeEventListener' in obj) {
+
+			if (type === 'mousewheel') {
+				obj.removeEventListener('DOMMouseScroll', handler, false);
+				obj.removeEventListener(type, handler, false);
+
+			} else if ((type === 'mouseenter') || (type === 'mouseleave')) {
+				obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
+			} else {
+				obj.removeEventListener(type, handler, false);
+			}
+		} else if ('detachEvent' in obj) {
+			obj.detachEvent('on' + type, handler);
+		}
+
+		obj[key] = null;
+
+		return this;
+	},
+
+	stopPropagation: function (e) {
+
+		if (e.stopPropagation) {
+			e.stopPropagation();
+		} else {
+			e.cancelBubble = true;
+		}
+		return this;
+	},
+
+	disableClickPropagation: function (el) {
+		var stop = L.DomEvent.stopPropagation;
+
+		for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+			L.DomEvent.addListener(el, L.Draggable.START[i], stop);
+		}
+
+		return L.DomEvent
+			.addListener(el, 'click', L.DomEvent._fakeStop)
+			.addListener(el, 'dblclick', stop);
+	},
+
+	preventDefault: function (e) {
+
+		if (e.preventDefault) {
+			e.preventDefault();
+		} else {
+			e.returnValue = false;
+		}
+		return this;
+	},
+
+	stop: function (e) {
+		return L.DomEvent.preventDefault(e).stopPropagation(e);
+	},
+
+	getMousePosition: function (e, container) {
+
+		var ie7 = L.Browser.ie7,
+		    body = document.body,
+		    docEl = document.documentElement,
+		    x = e.pageX ? e.pageX - body.scrollLeft - docEl.scrollLeft: e.clientX,
+		    y = e.pageY ? e.pageY - body.scrollTop - docEl.scrollTop: e.clientY,
+		    pos = new L.Point(x, y),
+		    rect = container.getBoundingClientRect(),
+		    left = rect.left - container.clientLeft,
+		    top = rect.top - container.clientTop;
+
+		// webkit (and ie <= 7) handles RTL scrollLeft different to everyone else
+		// https://code.google.com/p/closure-library/source/browse/trunk/closure/goog/style/bidi.js
+		if (!L.DomUtil.documentIsLtr() && (L.Browser.webkit || ie7)) {
+			left += container.scrollWidth - container.clientWidth;
+
+			// ie7 shows the scrollbar by default and provides clientWidth counting it, so we
+			// need to add it back in if it is visible; scrollbar is on the left as we are RTL
+			if (ie7 && L.DomUtil.getStyle(container, 'overflow-y') !== 'hidden' &&
+			           L.DomUtil.getStyle(container, 'overflow') !== 'hidden') {
+				left += 17;
+			}
+		}
+
+		return pos._subtract(new L.Point(left, top));
+	},
+
+	getWheelDelta: function (e) {
+
+		var delta = 0;
+
+		if (e.wheelDelta) {
+			delta = e.wheelDelta / 120;
+		}
+		if (e.detail) {
+			delta = -e.detail / 3;
+		}
+		return delta;
+	},
+
+	_skipEvents: {},
+
+	_fakeStop: function (e) {
+		// fakes stopPropagation by setting a special event flag, checked/reset with L.DomEvent._skipped(e)
+		L.DomEvent._skipEvents[e.type] = true;
+	},
+
+	_skipped: function (e) {
+		var skipped = this._skipEvents[e.type];
+		// reset when checking, as it's only used in map container and propagates outside of the map
+		this._skipEvents[e.type] = false;
+		return skipped;
+	},
+
+	// check if element really left/entered the event target (for mouseenter/mouseleave)
+	_checkMouse: function (el, e) {
+
+		var related = e.relatedTarget;
+
+		if (!related) { return true; }
+
+		try {
+			while (related && (related !== el)) {
+				related = related.parentNode;
+			}
+		} catch (err) {
+			return false;
+		}
+		return (related !== el);
+	},
+
+	_getEvent: function () { // evil magic for IE
+		/*jshint noarg:false */
+		var e = window.event;
+		if (!e) {
+			var caller = arguments.callee.caller;
+			while (caller) {
+				e = caller['arguments'][0];
+				if (e && window.Event === e.constructor) {
+					break;
+				}
+				caller = caller.caller;
+			}
+		}
+		return e;
+	},
+
+	// this is a horrible workaround for a bug in Android where a single touch triggers two click events
+	_filterClick: function (e, handler) {
+		var timeStamp = (e.timeStamp || e.originalEvent.timeStamp),
+			elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);
+
+		// are they closer together than 1000ms yet more than 100ms?
+		// Android typically triggers them ~300ms apart while multiple listeners
+		// on the same event should be triggered far faster;
+		// or check if click is simulated on the element, and if it is, reject any non-simulated events
+
+		if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) {
+			L.DomEvent.stop(e);
+			return;
+		}
+		L.DomEvent._lastClick = timeStamp;
+
+		return handler(e);
+	}
+};
+
+L.DomEvent.on = L.DomEvent.addListener;
+L.DomEvent.off = L.DomEvent.removeListener;
+
+
+/*
+ * L.Draggable allows you to add dragging capabilities to any element. Supports mobile devices too.
+ */
+
+L.Draggable = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	statics: {
+		START: L.Browser.touch ? ['touchstart', 'mousedown'] : ['mousedown'],
+		END: {
+			mousedown: 'mouseup',
+			touchstart: 'touchend',
+			MSPointerDown: 'touchend'
+		},
+		MOVE: {
+			mousedown: 'mousemove',
+			touchstart: 'touchmove',
+			MSPointerDown: 'touchmove'
+		}
+	},
+
+	initialize: function (element, dragStartTarget) {
+		this._element = element;
+		this._dragStartTarget = dragStartTarget || element;
+	},
+
+	enable: function () {
+		if (this._enabled) { return; }
+
+		for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+			L.DomEvent.on(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);
+		}
+
+		this._enabled = true;
+	},
+
+	disable: function () {
+		if (!this._enabled) { return; }
+
+		for (var i = L.Draggable.START.length - 1; i >= 0; i--) {
+			L.DomEvent.off(this._dragStartTarget, L.Draggable.START[i], this._onDown, this);
+		}
+
+		this._enabled = false;
+		this._moved = false;
+	},
+
+	_onDown: function (e) {
+		if (e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; }
+
+		L.DomEvent
+			.stopPropagation(e);
+
+		if (L.Draggable._disabled) { return; }
+
+		L.DomUtil.disableImageDrag();
+		L.DomUtil.disableTextSelection();
+
+		var first = e.touches ? e.touches[0] : e,
+		    el = first.target;
+
+		// if touching a link, highlight it
+		if (L.Browser.touch && el.tagName.toLowerCase() === 'a') {
+			L.DomUtil.addClass(el, 'leaflet-active');
+		}
+
+		this._moved = false;
+
+		if (this._moving) { return; }
+
+		this._startPoint = new L.Point(first.clientX, first.clientY);
+		this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
+
+		L.DomEvent
+		    .on(document, L.Draggable.MOVE[e.type], this._onMove, this)
+		    .on(document, L.Draggable.END[e.type], this._onUp, this);
+	},
+
+	_onMove: function (e) {
+		if (e.touches && e.touches.length > 1) { return; }
+
+		var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e),
+		    newPoint = new L.Point(first.clientX, first.clientY),
+		    offset = newPoint.subtract(this._startPoint);
+
+		if (!offset.x && !offset.y) { return; }
+
+		L.DomEvent.preventDefault(e);
+
+		if (!this._moved) {
+			this.fire('dragstart');
+
+			this._moved = true;
+			this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);
+
+			if (!L.Browser.touch) {
+				L.DomUtil.addClass(document.body, 'leaflet-dragging');
+			}
+		}
+
+		this._newPos = this._startPos.add(offset);
+		this._moving = true;
+
+		L.Util.cancelAnimFrame(this._animRequest);
+		this._animRequest = L.Util.requestAnimFrame(this._updatePosition, this, true, this._dragStartTarget);
+	},
+
+	_updatePosition: function () {
+		this.fire('predrag');
+		L.DomUtil.setPosition(this._element, this._newPos);
+		this.fire('drag');
+	},
+
+	_onUp: function () {
+		if (!L.Browser.touch) {
+			L.DomUtil.removeClass(document.body, 'leaflet-dragging');
+		}
+
+		for (var i in L.Draggable.MOVE) {
+			L.DomEvent
+			    .off(document, L.Draggable.MOVE[i], this._onMove)
+			    .off(document, L.Draggable.END[i], this._onUp);
+		}
+
+		L.DomUtil.enableImageDrag();
+		L.DomUtil.enableTextSelection();
+
+		if (this._moved) {
+			// ensure drag is not fired after dragend
+			L.Util.cancelAnimFrame(this._animRequest);
+
+			this.fire('dragend');
+		}
+
+		this._moving = false;
+	}
+});
+
+
+/*
+	L.Handler is a base class for handler classes that are used internally to inject
+	interaction features like dragging to classes like Map and Marker.
+*/
+
+L.Handler = L.Class.extend({
+	initialize: function (map) {
+		this._map = map;
+	},
+
+	enable: function () {
+		if (this._enabled) { return; }
+
+		this._enabled = true;
+		this.addHooks();
+	},
+
+	disable: function () {
+		if (!this._enabled) { return; }
+
+		this._enabled = false;
+		this.removeHooks();
+	},
+
+	enabled: function () {
+		return !!this._enabled;
+	}
+});
+
+
+/*
+ * L.Handler.MapDrag is used to make the map draggable (with panning inertia), enabled by default.
+ */
+
+L.Map.mergeOptions({
+	dragging: true,
+
+	inertia: !L.Browser.android23,
+	inertiaDeceleration: 3400, // px/s^2
+	inertiaMaxSpeed: Infinity, // px/s
+	inertiaThreshold: L.Browser.touch ? 32 : 18, // ms
+	easeLinearity: 0.25,
+
+	// TODO refactor, move to CRS
+	worldCopyJump: false
+});
+
+L.Map.Drag = L.Handler.extend({
+	addHooks: function () {
+		if (!this._draggable) {
+			var map = this._map;
+
+			this._draggable = new L.Draggable(map._mapPane, map._container);
+
+			this._draggable.on({
+				'dragstart': this._onDragStart,
+				'drag': this._onDrag,
+				'dragend': this._onDragEnd
+			}, this);
+
+			if (map.options.worldCopyJump) {
+				this._draggable.on('predrag', this._onPreDrag, this);
+				map.on('viewreset', this._onViewReset, this);
+
+				this._onViewReset();
+			}
+		}
+		this._draggable.enable();
+	},
+
+	removeHooks: function () {
+		this._draggable.disable();
+	},
+
+	moved: function () {
+		return this._draggable && this._draggable._moved;
+	},
+
+	_onDragStart: function () {
+		var map = this._map;
+
+		if (map._panAnim) {
+			map._panAnim.stop();
+		}
+
+		map
+		    .fire('movestart')
+		    .fire('dragstart');
+
+		if (map.options.inertia) {
+			this._positions = [];
+			this._times = [];
+		}
+	},
+
+	_onDrag: function () {
+		if (this._map.options.inertia) {
+			var time = this._lastTime = +new Date(),
+			    pos = this._lastPos = this._draggable._newPos;
+
+			this._positions.push(pos);
+			this._times.push(time);
+
+			if (time - this._times[0] > 200) {
+				this._positions.shift();
+				this._times.shift();
+			}
+		}
+
+		this._map
+		    .fire('move')
+		    .fire('drag');
+	},
+
+	_onViewReset: function () {
+		// TODO fix hardcoded Earth values
+		var pxCenter = this._map.getSize()._divideBy(2),
+		    pxWorldCenter = this._map.latLngToLayerPoint([0, 0]);
+
+		this._initialWorldOffset = pxWorldCenter.subtract(pxCenter).x;
+		this._worldWidth = this._map.project([0, 180]).x;
+	},
+
+	_onPreDrag: function () {
+		// TODO refactor to be able to adjust map pane position after zoom
+		var worldWidth = this._worldWidth,
+		    halfWidth = Math.round(worldWidth / 2),
+		    dx = this._initialWorldOffset,
+		    x = this._draggable._newPos.x,
+		    newX1 = (x - halfWidth + dx) % worldWidth + halfWidth - dx,
+		    newX2 = (x + halfWidth + dx) % worldWidth - halfWidth - dx,
+		    newX = Math.abs(newX1 + dx) < Math.abs(newX2 + dx) ? newX1 : newX2;
+
+		this._draggable._newPos.x = newX;
+	},
+
+	_onDragEnd: function () {
+		var map = this._map,
+		    options = map.options,
+		    delay = +new Date() - this._lastTime,
+
+		    noInertia = !options.inertia || delay > options.inertiaThreshold || !this._positions[0];
+
+		map.fire('dragend');
+
+		if (noInertia) {
+			map.fire('moveend');
+
+		} else {
+
+			var direction = this._lastPos.subtract(this._positions[0]),
+			    duration = (this._lastTime + delay - this._times[0]) / 1000,
+			    ease = options.easeLinearity,
+
+			    speedVector = direction.multiplyBy(ease / duration),
+			    speed = speedVector.distanceTo([0, 0]),
+
+			    limitedSpeed = Math.min(options.inertiaMaxSpeed, speed),
+			    limitedSpeedVector = speedVector.multiplyBy(limitedSpeed / speed),
+
+			    decelerationDuration = limitedSpeed / (options.inertiaDeceleration * ease),
+			    offset = limitedSpeedVector.multiplyBy(-decelerationDuration / 2).round();
+
+			if (!offset.x || !offset.y) {
+				map.fire('moveend');
+
+			} else {
+				L.Util.requestAnimFrame(function () {
+					map.panBy(offset, {
+						duration: decelerationDuration,
+						easeLinearity: ease,
+						noMoveStart: true
+					});
+				});
+			}
+		}
+	}
+});
+
+L.Map.addInitHook('addHandler', 'dragging', L.Map.Drag);
+
+
+/*
+ * L.Handler.DoubleClickZoom is used to handle double-click zoom on the map, enabled by default.
+ */
+
+L.Map.mergeOptions({
+	doubleClickZoom: true
+});
+
+L.Map.DoubleClickZoom = L.Handler.extend({
+	addHooks: function () {
+		this._map.on('dblclick', this._onDoubleClick);
+	},
+
+	removeHooks: function () {
+		this._map.off('dblclick', this._onDoubleClick);
+	},
+
+	_onDoubleClick: function (e) {
+		this.setZoomAround(e.containerPoint, this._zoom + 1);
+	}
+});
+
+L.Map.addInitHook('addHandler', 'doubleClickZoom', L.Map.DoubleClickZoom);
+
+
+/*
+ * L.Handler.ScrollWheelZoom is used by L.Map to enable mouse scroll wheel zoom on the map.
+ */
+
+L.Map.mergeOptions({
+	scrollWheelZoom: true
+});
+
+L.Map.ScrollWheelZoom = L.Handler.extend({
+	addHooks: function () {
+		L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
+		L.DomEvent.on(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);
+		this._delta = 0;
+	},
+
+	removeHooks: function () {
+		L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
+		L.DomEvent.off(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);
+	},
+
+	_onWheelScroll: function (e) {
+		var delta = L.DomEvent.getWheelDelta(e);
+
+		this._delta += delta;
+		this._lastMousePos = this._map.mouseEventToContainerPoint(e);
+
+		if (!this._startTime) {
+			this._startTime = +new Date();
+		}
+
+		var left = Math.max(40 - (+new Date() - this._startTime), 0);
+
+		clearTimeout(this._timer);
+		this._timer = setTimeout(L.bind(this._performZoom, this), left);
+
+		L.DomEvent.preventDefault(e);
+		L.DomEvent.stopPropagation(e);
+	},
+
+	_performZoom: function () {
+		var map = this._map,
+		    delta = this._delta,
+		    zoom = map.getZoom();
+
+		delta = delta > 0 ? Math.ceil(delta) : Math.floor(delta);
+		delta = Math.max(Math.min(delta, 4), -4);
+		delta = map._limitZoom(zoom + delta) - zoom;
+
+		this._delta = 0;
+		this._startTime = null;
+
+		if (!delta) { return; }
+
+		map.setZoomAround(this._lastMousePos, zoom + delta);
+	}
+});
+
+L.Map.addInitHook('addHandler', 'scrollWheelZoom', L.Map.ScrollWheelZoom);
+
+
+/*
+ * Extends the event handling code with double tap support for mobile browsers.
+ */
+
+L.extend(L.DomEvent, {
+
+	_touchstart: L.Browser.msTouch ? 'MSPointerDown' : 'touchstart',
+	_touchend: L.Browser.msTouch ? 'MSPointerUp' : 'touchend',
+
+	// inspired by Zepto touch code by Thomas Fuchs
+	addDoubleTapListener: function (obj, handler, id) {
+		var last,
+		    doubleTap = false,
+		    delay = 250,
+		    touch,
+		    pre = '_leaflet_',
+		    touchstart = this._touchstart,
+		    touchend = this._touchend,
+		    trackedTouches = [];
+
+		function onTouchStart(e) {
+			var count;
+
+			if (L.Browser.msTouch) {
+				trackedTouches.push(e.pointerId);
+				count = trackedTouches.length;
+			} else {
+				count = e.touches.length;
+			}
+			if (count > 1) {
+				return;
+			}
+
+			var now = Date.now(),
+				delta = now - (last || now);
+
+			touch = e.touches ? e.touches[0] : e;
+			doubleTap = (delta > 0 && delta <= delay);
+			last = now;
+		}
+
+		function onTouchEnd(e) {
+			if (L.Browser.msTouch) {
+				var idx = trackedTouches.indexOf(e.pointerId);
+				if (idx === -1) {
+					return;
+				}
+				trackedTouches.splice(idx, 1);
+			}
+
+			if (doubleTap) {
+				if (L.Browser.msTouch) {
+					// work around .type being readonly with MSPointer* events
+					var newTouch = { },
+						prop;
+
+					// jshint forin:false
+					for (var i in touch) {
+						prop = touch[i];
+						if (typeof prop === 'function') {
+							newTouch[i] = prop.bind(touch);
+						} else {
+							newTouch[i] = prop;
+						}
+					}
+					touch = newTouch;
+				}
+				touch.type = 'dblclick';
+				handler(touch);
+				last = null;
+			}
+		}
+		obj[pre + touchstart + id] = onTouchStart;
+		obj[pre + touchend + id] = onTouchEnd;
+
+		// on msTouch we need to listen on the document, otherwise a drag starting on the map and moving off screen
+		// will not come through to us, so we will lose track of how many touches are ongoing
+		var endElement = L.Browser.msTouch ? document.documentElement : obj;
+
+		obj.addEventListener(touchstart, onTouchStart, false);
+		endElement.addEventListener(touchend, onTouchEnd, false);
+
+		if (L.Browser.msTouch) {
+			endElement.addEventListener('MSPointerCancel', onTouchEnd, false);
+		}
+
+		return this;
+	},
+
+	removeDoubleTapListener: function (obj, id) {
+		var pre = '_leaflet_';
+
+		obj.removeEventListener(this._touchstart, obj[pre + this._touchstart + id], false);
+		(L.Browser.msTouch ? document.documentElement : obj).removeEventListener(
+		        this._touchend, obj[pre + this._touchend + id], false);
+
+		if (L.Browser.msTouch) {
+			document.documentElement.removeEventListener('MSPointerCancel', obj[pre + this._touchend + id], false);
+		}
+
+		return this;
+	}
+});
+
+
+/*
+ * Extends L.DomEvent to provide touch support for Internet Explorer and Windows-based devices.
+ */
+
+L.extend(L.DomEvent, {
+
+	_msTouches: [],
+	_msDocumentListener: false,
+
+	// Provides a touch events wrapper for msPointer events.
+	// Based on changes by veproza https://github.com/CloudMade/Leaflet/pull/1019
+
+	addMsTouchListener: function (obj, type, handler, id) {
+
+		switch (type) {
+		case 'touchstart':
+			return this.addMsTouchListenerStart(obj, type, handler, id);
+		case 'touchend':
+			return this.addMsTouchListenerEnd(obj, type, handler, id);
+		case 'touchmove':
+			return this.addMsTouchListenerMove(obj, type, handler, id);
+		default:
+			throw 'Unknown touch event type';
+		}
+	},
+
+	addMsTouchListenerStart: function (obj, type, handler, id) {
+		var pre = '_leaflet_',
+		    touches = this._msTouches;
+
+		var cb = function (e) {
+
+			var alreadyInArray = false;
+			for (var i = 0; i < touches.length; i++) {
+				if (touches[i].pointerId === e.pointerId) {
+					alreadyInArray = true;
+					break;
+				}
+			}
+			if (!alreadyInArray) {
+				touches.push(e);
+			}
+
+			e.touches = touches.slice();
+			e.changedTouches = [e];
+
+			handler(e);
+		};
+
+		obj[pre + 'touchstart' + id] = cb;
+		obj.addEventListener('MSPointerDown', cb, false);
+
+		// need to also listen for end events to keep the _msTouches list accurate
+		// this needs to be on the body and never go away
+		if (!this._msDocumentListener) {
+			var internalCb = function (e) {
+				for (var i = 0; i < touches.length; i++) {
+					if (touches[i].pointerId === e.pointerId) {
+						touches.splice(i, 1);
+						break;
+					}
+				}
+			};
+			//We listen on the documentElement as any drags that end by moving the touch off the screen get fired there
+			document.documentElement.addEventListener('MSPointerUp', internalCb, false);
+			document.documentElement.addEventListener('MSPointerCancel', internalCb, false);
+
+			this._msDocumentListener = true;
+		}
+
+		return this;
+	},
+
+	addMsTouchListenerMove: function (obj, type, handler, id) {
+		var pre = '_leaflet_',
+		    touches = this._msTouches;
+
+		function cb(e) {
+
+			// don't fire touch moves when mouse isn't down
+			if (e.pointerType === e.MSPOINTER_TYPE_MOUSE && e.buttons === 0) { return; }
+
+			for (var i = 0; i < touches.length; i++) {
+				if (touches[i].pointerId === e.pointerId) {
+					touches[i] = e;
+					break;
+				}
+			}
+
+			e.touches = touches.slice();
+			e.changedTouches = [e];
+
+			handler(e);
+		}
+
+		obj[pre + 'touchmove' + id] = cb;
+		obj.addEventListener('MSPointerMove', cb, false);
+
+		return this;
+	},
+
+	addMsTouchListenerEnd: function (obj, type, handler, id) {
+		var pre = '_leaflet_',
+		    touches = this._msTouches;
+
+		var cb = function (e) {
+			for (var i = 0; i < touches.length; i++) {
+				if (touches[i].pointerId === e.pointerId) {
+					touches.splice(i, 1);
+					break;
+				}
+			}
+
+			e.touches = touches.slice();
+			e.changedTouches = [e];
+
+			handler(e);
+		};
+
+		obj[pre + 'touchend' + id] = cb;
+		obj.addEventListener('MSPointerUp', cb, false);
+		obj.addEventListener('MSPointerCancel', cb, false);
+
+		return this;
+	},
+
+	removeMsTouchListener: function (obj, type, id) {
+		var pre = '_leaflet_',
+		    cb = obj[pre + type + id];
+
+		switch (type) {
+		case 'touchstart':
+			obj.removeEventListener('MSPointerDown', cb, false);
+			break;
+		case 'touchmove':
+			obj.removeEventListener('MSPointerMove', cb, false);
+			break;
+		case 'touchend':
+			obj.removeEventListener('MSPointerUp', cb, false);
+			obj.removeEventListener('MSPointerCancel', cb, false);
+			break;
+		}
+
+		return this;
+	}
+});
+
+
+/*
+ * L.Handler.TouchZoom is used by L.Map to add pinch zoom on supported mobile browsers.
+ */
+
+L.Map.mergeOptions({
+	touchZoom: L.Browser.touch && !L.Browser.android23
+});
+
+L.Map.TouchZoom = L.Handler.extend({
+	addHooks: function () {
+		L.DomEvent.on(this._map._container, 'touchstart', this._onTouchStart, this);
+	},
+
+	removeHooks: function () {
+		L.DomEvent.off(this._map._container, 'touchstart', this._onTouchStart, this);
+	},
+
+	_onTouchStart: function (e) {
+		var map = this._map;
+
+		if (!e.touches || e.touches.length !== 2 || map._animatingZoom || this._zooming) { return; }
+
+		var p1 = map.mouseEventToLayerPoint(e.touches[0]),
+		    p2 = map.mouseEventToLayerPoint(e.touches[1]),
+		    viewCenter = map._getCenterLayerPoint();
+
+		this._startCenter = p1.add(p2)._divideBy(2);
+		this._startDist = p1.distanceTo(p2);
+
+		this._moved = false;
+		this._zooming = true;
+
+		this._centerOffset = viewCenter.subtract(this._startCenter);
+
+		if (map._panAnim) {
+			map._panAnim.stop();
+		}
+
+		L.DomEvent
+		    .on(document, 'touchmove', this._onTouchMove, this)
+		    .on(document, 'touchend', this._onTouchEnd, this);
+
+		L.DomEvent.preventDefault(e);
+	},
+
+	_onTouchMove: function (e) {
+		var map = this._map;
+
+		if (!e.touches || e.touches.length !== 2 || !this._zooming) { return; }
+
+		var p1 = map.mouseEventToLayerPoint(e.touches[0]),
+		    p2 = map.mouseEventToLayerPoint(e.touches[1]);
+
+		this._scale = p1.distanceTo(p2) / this._startDist;
+		this._delta = p1._add(p2)._divideBy(2)._subtract(this._startCenter);
+
+		if (this._scale === 1) { return; }
+
+		if (!this._moved) {
+			L.DomUtil.addClass(map._mapPane, 'leaflet-touching');
+
+			map
+			    .fire('movestart')
+			    .fire('zoomstart');
+
+			this._moved = true;
+		}
+
+		L.Util.cancelAnimFrame(this._animRequest);
+		this._animRequest = L.Util.requestAnimFrame(
+		        this._updateOnMove, this, true, this._map._container);
+
+		L.DomEvent.preventDefault(e);
+	},
+
+	_updateOnMove: function () {
+		var map = this._map,
+		    origin = this._getScaleOrigin(),
+		    center = map.layerPointToLatLng(origin),
+		    zoom = map.getScaleZoom(this._scale);
+
+		map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
+	},
+
+	_onTouchEnd: function () {
+		if (!this._moved || !this._zooming) {
+			this._zooming = false;
+			return;
+		}
+
+		var map = this._map;
+
+		this._zooming = false;
+		L.DomUtil.removeClass(map._mapPane, 'leaflet-touching');
+		L.Util.cancelAnimFrame(this._animRequest);
+
+		L.DomEvent
+		    .off(document, 'touchmove', this._onTouchMove)
+		    .off(document, 'touchend', this._onTouchEnd);
+
+		var origin = this._getScaleOrigin(),
+		    center = map.layerPointToLatLng(origin),
+
+		    oldZoom = map.getZoom(),
+		    floatZoomDelta = map.getScaleZoom(this._scale) - oldZoom,
+		    roundZoomDelta = (floatZoomDelta > 0 ?
+		            Math.ceil(floatZoomDelta) : Math.floor(floatZoomDelta)),
+
+		    zoom = map._limitZoom(oldZoom + roundZoomDelta),
+		    scale = map.getZoomScale(zoom) / this._scale;
+
+		map._animateZoom(center, zoom, origin, scale);
+	},
+
+	_getScaleOrigin: function () {
+		var centerOffset = this._centerOffset.subtract(this._delta).divideBy(this._scale);
+		return this._startCenter.add(centerOffset);
+	}
+});
+
+L.Map.addInitHook('addHandler', 'touchZoom', L.Map.TouchZoom);
+
+
+/*
+ * L.Map.Tap is used to enable mobile hacks like quick taps and long hold.
+ */
+
+L.Map.mergeOptions({
+	tap: true,
+	tapTolerance: 15
+});
+
+L.Map.Tap = L.Handler.extend({
+	addHooks: function () {
+		L.DomEvent.on(this._map._container, 'touchstart', this._onDown, this);
+	},
+
+	removeHooks: function () {
+		L.DomEvent.off(this._map._container, 'touchstart', this._onDown, this);
+	},
+
+	_onDown: function (e) {
+		if (!e.touches) { return; }
+
+		L.DomEvent.preventDefault(e);
+
+		this._fireClick = true;
+
+		// don't simulate click or track longpress if more than 1 touch
+		if (e.touches.length > 1) {
+			this._fireClick = false;
+			clearTimeout(this._holdTimeout);
+			return;
+		}
+
+		var first = e.touches[0],
+		    el = first.target;
+
+		this._startPos = this._newPos = new L.Point(first.clientX, first.clientY);
+
+		// if touching a link, highlight it
+		if (el.tagName.toLowerCase() === 'a') {
+			L.DomUtil.addClass(el, 'leaflet-active');
+		}
+
+		// simulate long hold but setting a timeout
+		this._holdTimeout = setTimeout(L.bind(function () {
+			if (this._isTapValid()) {
+				this._fireClick = false;
+				this._onUp();
+				this._simulateEvent('contextmenu', first);
+			}
+		}, this), 1000);
+
+		L.DomEvent
+			.on(document, 'touchmove', this._onMove, this)
+			.on(document, 'touchend', this._onUp, this);
+	},
+
+	_onUp: function (e) {
+		clearTimeout(this._holdTimeout);
+
+		L.DomEvent
+			.off(document, 'touchmove', this._onMove, this)
+			.off(document, 'touchend', this._onUp, this);
+
+		if (this._fireClick && e && e.changedTouches) {
+
+			var first = e.changedTouches[0],
+			    el = first.target;
+
+			if (el.tagName.toLowerCase() === 'a') {
+				L.DomUtil.removeClass(el, 'leaflet-active');
+			}
+
+			// simulate click if the touch didn't move too much
+			if (this._isTapValid()) {
+				this._simulateEvent('click', first);
+			}
+		}
+	},
+
+	_isTapValid: function () {
+		return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
+	},
+
+	_onMove: function (e) {
+		var first = e.touches[0];
+		this._newPos = new L.Point(first.clientX, first.clientY);
+	},
+
+	_simulateEvent: function (type, e) {
+		var simulatedEvent = document.createEvent('MouseEvents');
+
+		simulatedEvent._simulated = true;
+		e.target._simulatedClick = true;
+
+		simulatedEvent.initMouseEvent(
+		        type, true, true, window, 1,
+		        e.screenX, e.screenY,
+		        e.clientX, e.clientY,
+		        false, false, false, false, 0, null);
+
+		e.target.dispatchEvent(simulatedEvent);
+	}
+});
+
+if (L.Browser.touch && !L.Browser.msTouch) {
+	L.Map.addInitHook('addHandler', 'tap', L.Map.Tap);
+}
+
+
+/*
+ * L.Handler.ShiftDragZoom is used to add shift-drag zoom interaction to the map
+  * (zoom to a selected bounding box), enabled by default.
+ */
+
+L.Map.mergeOptions({
+	boxZoom: true
+});
+
+L.Map.BoxZoom = L.Handler.extend({
+	initialize: function (map) {
+		this._map = map;
+		this._container = map._container;
+		this._pane = map._panes.overlayPane;
+	},
+
+	addHooks: function () {
+		L.DomEvent.on(this._container, 'mousedown', this._onMouseDown, this);
+	},
+
+	removeHooks: function () {
+		L.DomEvent.off(this._container, 'mousedown', this._onMouseDown);
+	},
+
+	_onMouseDown: function (e) {
+		if (!e.shiftKey || ((e.which !== 1) && (e.button !== 1))) { return false; }
+
+		L.DomUtil.disableTextSelection();
+		L.DomUtil.disableImageDrag();
+
+		this._startLayerPoint = this._map.mouseEventToLayerPoint(e);
+
+		this._box = L.DomUtil.create('div', 'leaflet-zoom-box', this._pane);
+		L.DomUtil.setPosition(this._box, this._startLayerPoint);
+
+		//TODO refactor: move cursor to styles
+		this._container.style.cursor = 'crosshair';
+
+		L.DomEvent
+		    .on(document, 'mousemove', this._onMouseMove, this)
+		    .on(document, 'mouseup', this._onMouseUp, this)
+		    .on(document, 'keydown', this._onKeyDown, this);
+
+		this._map.fire('boxzoomstart');
+	},
+
+	_onMouseMove: function (e) {
+		var startPoint = this._startLayerPoint,
+		    box = this._box,
+
+		    layerPoint = this._map.mouseEventToLayerPoint(e),
+		    offset = layerPoint.subtract(startPoint),
+
+		    newPos = new L.Point(
+		        Math.min(layerPoint.x, startPoint.x),
+		        Math.min(layerPoint.y, startPoint.y));
+
+		L.DomUtil.setPosition(box, newPos);
+
+		// TODO refactor: remove hardcoded 4 pixels
+		box.style.width  = (Math.max(0, Math.abs(offset.x) - 4)) + 'px';
+		box.style.height = (Math.max(0, Math.abs(offset.y) - 4)) + 'px';
+	},
+
+	_finish: function () {
+		this._pane.removeChild(this._box);
+		this._container.style.cursor = '';
+
+		L.DomUtil.enableTextSelection();
+		L.DomUtil.enableImageDrag();
+
+		L.DomEvent
+		    .off(document, 'mousemove', this._onMouseMove)
+		    .off(document, 'mouseup', this._onMouseUp)
+		    .off(document, 'keydown', this._onKeyDown);
+	},
+
+	_onMouseUp: function (e) {
+
+		this._finish();
+
+		var map = this._map,
+		    layerPoint = map.mouseEventToLayerPoint(e);
+
+		if (this._startLayerPoint.equals(layerPoint)) { return; }
+
+		var bounds = new L.LatLngBounds(
+		        map.layerPointToLatLng(this._startLayerPoint),
+		        map.layerPointToLatLng(layerPoint));
+
+		map.fitBounds(bounds);
+
+		map.fire('boxzoomend', {
+			boxZoomBounds: bounds
+		});
+	},
+
+	_onKeyDown: function (e) {
+		if (e.keyCode === 27) {
+			this._finish();
+		}
+	}
+});
+
+L.Map.addInitHook('addHandler', 'boxZoom', L.Map.BoxZoom);
+
+
+/*
+ * L.Map.Keyboard is handling keyboard interaction with the map, enabled by default.
+ */
+
+L.Map.mergeOptions({
+	keyboard: true,
+	keyboardPanOffset: 80,
+	keyboardZoomOffset: 1
+});
+
+L.Map.Keyboard = L.Handler.extend({
+
+	keyCodes: {
+		left:    [37],
+		right:   [39],
+		down:    [40],
+		up:      [38],
+		zoomIn:  [187, 107, 61],
+		zoomOut: [189, 109, 173]
+	},
+
+	initialize: function (map) {
+		this._map = map;
+
+		this._setPanOffset(map.options.keyboardPanOffset);
+		this._setZoomOffset(map.options.keyboardZoomOffset);
+	},
+
+	addHooks: function () {
+		var container = this._map._container;
+
+		// make the container focusable by tabbing
+		if (container.tabIndex === -1) {
+			container.tabIndex = '0';
+		}
+
+		L.DomEvent
+		    .on(container, 'focus', this._onFocus, this)
+		    .on(container, 'blur', this._onBlur, this)
+		    .on(container, 'mousedown', this._onMouseDown, this);
+
+		this._map
+		    .on('focus', this._addHooks, this)
+		    .on('blur', this._removeHooks, this);
+	},
+
+	removeHooks: function () {
+		this._removeHooks();
+
+		var container = this._map._container;
+
+		L.DomEvent
+		    .off(container, 'focus', this._onFocus, this)
+		    .off(container, 'blur', this._onBlur, this)
+		    .off(container, 'mousedown', this._onMouseDown, this);
+
+		this._map
+		    .off('focus', this._addHooks, this)
+		    .off('blur', this._removeHooks, this);
+	},
+
+	_onMouseDown: function () {
+		if (this._focused) { return; }
+
+		var body = document.body,
+		    docEl = document.documentElement,
+		    top = body.scrollTop || docEl.scrollTop,
+		    left = body.scrollLeft || docEl.scrollLeft;
+
+		this._map._container.focus();
+
+		window.scrollTo(left, top);
+	},
+
+	_onFocus: function () {
+		this._focused = true;
+		this._map.fire('focus');
+	},
+
+	_onBlur: function () {
+		this._focused = false;
+		this._map.fire('blur');
+	},
+
+	_setPanOffset: function (pan) {
+		var keys = this._panKeys = {},
+		    codes = this.keyCodes,
+		    i, len;
+
+		for (i = 0, len = codes.left.length; i < len; i++) {
+			keys[codes.left[i]] = [-1 * pan, 0];
+		}
+		for (i = 0, len = codes.right.length; i < len; i++) {
+			keys[codes.right[i]] = [pan, 0];
+		}
+		for (i = 0, len = codes.down.length; i < len; i++) {
+			keys[codes.down[i]] = [0, pan];
+		}
+		for (i = 0, len = codes.up.length; i < len; i++) {
+			keys[codes.up[i]] = [0, -1 * pan];
+		}
+	},
+
+	_setZoomOffset: function (zoom) {
+		var keys = this._zoomKeys = {},
+		    codes = this.keyCodes,
+		    i, len;
+
+		for (i = 0, len = codes.zoomIn.length; i < len; i++) {
+			keys[codes.zoomIn[i]] = zoom;
+		}
+		for (i = 0, len = codes.zoomOut.length; i < len; i++) {
+			keys[codes.zoomOut[i]] = -zoom;
+		}
+	},
+
+	_addHooks: function () {
+		L.DomEvent.on(document, 'keydown', this._onKeyDown, this);
+	},
+
+	_removeHooks: function () {
+		L.DomEvent.off(document, 'keydown', this._onKeyDown, this);
+	},
+
+	_onKeyDown: function (e) {
+		var key = e.keyCode,
+		    map = this._map;
+
+		if (key in this._panKeys) {
+
+			if (map._panAnim && map._panAnim._inProgress) { return; }
+
+			map.panBy(this._panKeys[key]);
+
+			if (map.options.maxBounds) {
+				map.panInsideBounds(map.options.maxBounds);
+			}
+
+		} else if (key in this._zoomKeys) {
+			map.setZoom(map.getZoom() + this._zoomKeys[key]);
+
+		} else {
+			return;
+		}
+
+		L.DomEvent.stop(e);
+	}
+});
+
+L.Map.addInitHook('addHandler', 'keyboard', L.Map.Keyboard);
+
+
+/*
+ * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable.
+ */
+
+L.Handler.MarkerDrag = L.Handler.extend({
+	initialize: function (marker) {
+		this._marker = marker;
+	},
+
+	addHooks: function () {
+		var icon = this._marker._icon;
+		if (!this._draggable) {
+			this._draggable = new L.Draggable(icon, icon);
+		}
+
+		this._draggable
+			.on('dragstart', this._onDragStart, this)
+			.on('drag', this._onDrag, this)
+			.on('dragend', this._onDragEnd, this);
+		this._draggable.enable();
+	},
+
+	removeHooks: function () {
+		this._draggable
+			.off('dragstart', this._onDragStart, this)
+			.off('drag', this._onDrag, this)
+			.off('dragend', this._onDragEnd, this);
+
+		this._draggable.disable();
+	},
+
+	moved: function () {
+		return this._draggable && this._draggable._moved;
+	},
+
+	_onDragStart: function () {
+		this._marker
+		    .closePopup()
+		    .fire('movestart')
+		    .fire('dragstart');
+	},
+
+	_onDrag: function () {
+		var marker = this._marker,
+		    shadow = marker._shadow,
+		    iconPos = L.DomUtil.getPosition(marker._icon),
+		    latlng = marker._map.layerPointToLatLng(iconPos);
+
+		// update shadow position
+		if (shadow) {
+			L.DomUtil.setPosition(shadow, iconPos);
+		}
+
+		marker._latlng = latlng;
+
+		marker
+		    .fire('move', {latlng: latlng})
+		    .fire('drag');
+	},
+
+	_onDragEnd: function () {
+		this._marker
+		    .fire('moveend')
+		    .fire('dragend');
+	}
+});
+
+
+/*
+ * L.Control is a base class for implementing map controls. Handles positioning.
+ * All other controls extend from this class.
+ */
+
+L.Control = L.Class.extend({
+	options: {
+		position: 'topright'
+	},
+
+	initialize: function (options) {
+		L.setOptions(this, options);
+	},
+
+	getPosition: function () {
+		return this.options.position;
+	},
+
+	setPosition: function (position) {
+		var map = this._map;
+
+		if (map) {
+			map.removeControl(this);
+		}
+
+		this.options.position = position;
+
+		if (map) {
+			map.addControl(this);
+		}
+
+		return this;
+	},
+
+	getContainer: function () {
+		return this._container;
+	},
+
+	addTo: function (map) {
+		this._map = map;
+
+		var container = this._container = this.onAdd(map),
+		    pos = this.getPosition(),
+		    corner = map._controlCorners[pos];
+
+		L.DomUtil.addClass(container, 'leaflet-control');
+
+		if (pos.indexOf('bottom') !== -1) {
+			corner.insertBefore(container, corner.firstChild);
+		} else {
+			corner.appendChild(container);
+		}
+
+		return this;
+	},
+
+	removeFrom: function (map) {
+		var pos = this.getPosition(),
+		    corner = map._controlCorners[pos];
+
+		corner.removeChild(this._container);
+		this._map = null;
+
+		if (this.onRemove) {
+			this.onRemove(map);
+		}
+
+		return this;
+	}
+});
+
+L.control = function (options) {
+	return new L.Control(options);
+};
+
+
+// adds control-related methods to L.Map
+
+L.Map.include({
+	addControl: function (control) {
+		control.addTo(this);
+		return this;
+	},
+
+	removeControl: function (control) {
+		control.removeFrom(this);
+		return this;
+	},
+
+	_initControlPos: function () {
+		var corners = this._controlCorners = {},
+		    l = 'leaflet-',
+		    container = this._controlContainer =
+		            L.DomUtil.create('div', l + 'control-container', this._container);
+
+		function createCorner(vSide, hSide) {
+			var className = l + vSide + ' ' + l + hSide;
+
+			corners[vSide + hSide] = L.DomUtil.create('div', className, container);
+		}
+
+		createCorner('top', 'left');
+		createCorner('top', 'right');
+		createCorner('bottom', 'left');
+		createCorner('bottom', 'right');
+	},
+
+	_clearControlPos: function () {
+		this._container.removeChild(this._controlContainer);
+	}
+});
+
+
+/*
+ * L.Control.Zoom is used for the default zoom buttons on the map.
+ */
+
+L.Control.Zoom = L.Control.extend({
+	options: {
+		position: 'topleft'
+	},
+
+	onAdd: function (map) {
+		var zoomName = 'leaflet-control-zoom',
+		    container = L.DomUtil.create('div', zoomName + ' leaflet-bar');
+
+		this._map = map;
+
+		this._zoomInButton  = this._createButton(
+		        '+', 'Zoom in',  zoomName + '-in',  container, this._zoomIn,  this);
+		this._zoomOutButton = this._createButton(
+		        '-', 'Zoom out', zoomName + '-out', container, this._zoomOut, this);
+
+		map.on('zoomend zoomlevelschange', this._updateDisabled, this);
+
+		return container;
+	},
+
+	onRemove: function (map) {
+		map.off('zoomend zoomlevelschange', this._updateDisabled, this);
+	},
+
+	_zoomIn: function (e) {
+		this._map.zoomIn(e.shiftKey ? 3 : 1);
+	},
+
+	_zoomOut: function (e) {
+		this._map.zoomOut(e.shiftKey ? 3 : 1);
+	},
+
+	_createButton: function (html, title, className, container, fn, context) {
+		var link = L.DomUtil.create('a', className, container);
+		link.innerHTML = html;
+		link.href = '#';
+		link.title = title;
+
+		var stop = L.DomEvent.stopPropagation;
+
+		L.DomEvent
+		    .on(link, 'click', stop)
+		    .on(link, 'mousedown', stop)
+		    .on(link, 'dblclick', stop)
+		    .on(link, 'click', L.DomEvent.preventDefault)
+		    .on(link, 'click', fn, context);
+
+		return link;
+	},
+
+	_updateDisabled: function () {
+		var map = this._map,
+			className = 'leaflet-disabled';
+
+		L.DomUtil.removeClass(this._zoomInButton, className);
+		L.DomUtil.removeClass(this._zoomOutButton, className);
+
+		if (map._zoom === map.getMinZoom()) {
+			L.DomUtil.addClass(this._zoomOutButton, className);
+		}
+		if (map._zoom === map.getMaxZoom()) {
+			L.DomUtil.addClass(this._zoomInButton, className);
+		}
+	}
+});
+
+L.Map.mergeOptions({
+	zoomControl: true
+});
+
+L.Map.addInitHook(function () {
+	if (this.options.zoomControl) {
+		this.zoomControl = new L.Control.Zoom();
+		this.addControl(this.zoomControl);
+	}
+});
+
+L.control.zoom = function (options) {
+	return new L.Control.Zoom(options);
+};
+
+
+
+/*
+ * L.Control.Attribution is used for displaying attribution on the map (added by default).
+ */
+
+L.Control.Attribution = L.Control.extend({
+	options: {
+		position: 'bottomright',
+		prefix: '<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'
+	},
+
+	initialize: function (options) {
+		L.setOptions(this, options);
+
+		this._attributions = {};
+	},
+
+	onAdd: function (map) {
+		this._container = L.DomUtil.create('div', 'leaflet-control-attribution');
+		L.DomEvent.disableClickPropagation(this._container);
+
+		map
+		    .on('layeradd', this._onLayerAdd, this)
+		    .on('layerremove', this._onLayerRemove, this);
+
+		this._update();
+
+		return this._container;
+	},
+
+	onRemove: function (map) {
+		map
+		    .off('layeradd', this._onLayerAdd)
+		    .off('layerremove', this._onLayerRemove);
+
+	},
+
+	setPrefix: function (prefix) {
+		this.options.prefix = prefix;
+		this._update();
+		return this;
+	},
+
+	addAttribution: function (text) {
+		if (!text) { return; }
+
+		if (!this._attributions[text]) {
+			this._attributions[text] = 0;
+		}
+		this._attributions[text]++;
+
+		this._update();
+
+		return this;
+	},
+
+	removeAttribution: function (text) {
+		if (!text) { return; }
+
+		if (this._attributions[text]) {
+			this._attributions[text]--;
+			this._update();
+		}
+
+		return this;
+	},
+
+	_update: function () {
+		if (!this._map) { return; }
+
+		var attribs = [];
+
+		for (var i in this._attributions) {
+			if (this._attributions[i]) {
+				attribs.push(i);
+			}
+		}
+
+		var prefixAndAttribs = [];
+
+		if (this.options.prefix) {
+			prefixAndAttribs.push(this.options.prefix);
+		}
+		if (attribs.length) {
+			prefixAndAttribs.push(attribs.join(', '));
+		}
+
+		this._container.innerHTML = prefixAndAttribs.join(' | ');
+	},
+
+	_onLayerAdd: function (e) {
+		if (e.layer.getAttribution) {
+			this.addAttribution(e.layer.getAttribution());
+		}
+	},
+
+	_onLayerRemove: function (e) {
+		if (e.layer.getAttribution) {
+			this.removeAttribution(e.layer.getAttribution());
+		}
+	}
+});
+
+L.Map.mergeOptions({
+	attributionControl: true
+});
+
+L.Map.addInitHook(function () {
+	if (this.options.attributionControl) {
+		this.attributionControl = (new L.Control.Attribution()).addTo(this);
+	}
+});
+
+L.control.attribution = function (options) {
+	return new L.Control.Attribution(options);
+};
+
+
+/*
+ * L.Control.Scale is used for displaying metric/imperial scale on the map.
+ */
+
+L.Control.Scale = L.Control.extend({
+	options: {
+		position: 'bottomleft',
+		maxWidth: 100,
+		metric: true,
+		imperial: true,
+		updateWhenIdle: false
+	},
+
+	onAdd: function (map) {
+		this._map = map;
+
+		var className = 'leaflet-control-scale',
+		    container = L.DomUtil.create('div', className),
+		    options = this.options;
+
+		this._addScales(options, className, container);
+
+		map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+		map.whenReady(this._update, this);
+
+		return container;
+	},
+
+	onRemove: function (map) {
+		map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this);
+	},
+
+	_addScales: function (options, className, container) {
+		if (options.metric) {
+			this._mScale = L.DomUtil.create('div', className + '-line', container);
+		}
+		if (options.imperial) {
+			this._iScale = L.DomUtil.create('div', className + '-line', container);
+		}
+	},
+
+	_update: function () {
+		var bounds = this._map.getBounds(),
+		    centerLat = bounds.getCenter().lat,
+		    halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180),
+		    dist = halfWorldMeters * (bounds.getNorthEast().lng - bounds.getSouthWest().lng) / 180,
+
+		    size = this._map.getSize(),
+		    options = this.options,
+		    maxMeters = 0;
+
+		if (size.x > 0) {
+			maxMeters = dist * (options.maxWidth / size.x);
+		}
+
+		this._updateScales(options, maxMeters);
+	},
+
+	_updateScales: function (options, maxMeters) {
+		if (options.metric && maxMeters) {
+			this._updateMetric(maxMeters);
+		}
+
+		if (options.imperial && maxMeters) {
+			this._updateImperial(maxMeters);
+		}
+	},
+
+	_updateMetric: function (maxMeters) {
+		var meters = this._getRoundNum(maxMeters);
+
+		this._mScale.style.width = this._getScaleWidth(meters / maxMeters) + 'px';
+		this._mScale.innerHTML = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km';
+	},
+
+	_updateImperial: function (maxMeters) {
+		var maxFeet = maxMeters * 3.2808399,
+		    scale = this._iScale,
+		    maxMiles, miles, feet;
+
+		if (maxFeet > 5280) {
+			maxMiles = maxFeet / 5280;
+			miles = this._getRoundNum(maxMiles);
+
+			scale.style.width = this._getScaleWidth(miles / maxMiles) + 'px';
+			scale.innerHTML = miles + ' mi';
+
+		} else {
+			feet = this._getRoundNum(maxFeet);
+
+			scale.style.width = this._getScaleWidth(feet / maxFeet) + 'px';
+			scale.innerHTML = feet + ' ft';
+		}
+	},
+
+	_getScaleWidth: function (ratio) {
+		return Math.round(this.options.maxWidth * ratio) - 10;
+	},
+
+	_getRoundNum: function (num) {
+		var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1),
+		    d = num / pow10;
+
+		d = d >= 10 ? 10 : d >= 5 ? 5 : d >= 3 ? 3 : d >= 2 ? 2 : 1;
+
+		return pow10 * d;
+	}
+});
+
+L.control.scale = function (options) {
+	return new L.Control.Scale(options);
+};
+
+
+/*
+ * L.Control.Layers is a control to allow users to switch between different layers on the map.
+ */
+
+L.Control.Layers = L.Control.extend({
+	options: {
+		collapsed: true,
+		position: 'topright',
+		autoZIndex: true
+	},
+
+	initialize: function (baseLayers, overlays, options) {
+		L.setOptions(this, options);
+
+		this._layers = {};
+		this._lastZIndex = 0;
+		this._handlingClick = false;
+
+		for (var i in baseLayers) {
+			this._addLayer(baseLayers[i], i);
+		}
+
+		for (i in overlays) {
+			this._addLayer(overlays[i], i, true);
+		}
+	},
+
+	onAdd: function (map) {
+		this._initLayout();
+		this._update();
+
+		map
+		    .on('layeradd', this._onLayerChange, this)
+		    .on('layerremove', this._onLayerChange, this);
+
+		return this._container;
+	},
+
+	onRemove: function (map) {
+		map
+		    .off('layeradd', this._onLayerChange)
+		    .off('layerremove', this._onLayerChange);
+	},
+
+	addBaseLayer: function (layer, name) {
+		this._addLayer(layer, name);
+		this._update();
+		return this;
+	},
+
+	addOverlay: function (layer, name) {
+		this._addLayer(layer, name, true);
+		this._update();
+		return this;
+	},
+
+	removeLayer: function (layer) {
+		var id = L.stamp(layer);
+		delete this._layers[id];
+		this._update();
+		return this;
+	},
+
+	_initLayout: function () {
+		var className = 'leaflet-control-layers',
+		    container = this._container = L.DomUtil.create('div', className);
+
+		//Makes this work on IE10 Touch devices by stopping it from firing a mouseout event when the touch is released
+		container.setAttribute('aria-haspopup', true);
+
+		if (!L.Browser.touch) {
+			L.DomEvent.disableClickPropagation(container);
+			L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation);
+		} else {
+			L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
+		}
+
+		var form = this._form = L.DomUtil.create('form', className + '-list');
+
+		if (this.options.collapsed) {
+			if (!L.Browser.android) {
+				L.DomEvent
+				    .on(container, 'mouseover', this._expand, this)
+				    .on(container, 'mouseout', this._collapse, this);
+			}
+			var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
+			link.href = '#';
+			link.title = 'Layers';
+
+			if (L.Browser.touch) {
+				L.DomEvent
+				    .on(link, 'click', L.DomEvent.stop)
+				    .on(link, 'click', this._expand, this);
+			}
+			else {
+				L.DomEvent.on(link, 'focus', this._expand, this);
+			}
+
+			this._map.on('click', this._collapse, this);
+			// TODO keyboard accessibility
+		} else {
+			this._expand();
+		}
+
+		this._baseLayersList = L.DomUtil.create('div', className + '-base', form);
+		this._separator = L.DomUtil.create('div', className + '-separator', form);
+		this._overlaysList = L.DomUtil.create('div', className + '-overlays', form);
+
+		container.appendChild(form);
+	},
+
+	_addLayer: function (layer, name, overlay) {
+		var id = L.stamp(layer);
+
+		this._layers[id] = {
+			layer: layer,
+			name: name,
+			overlay: overlay
+		};
+
+		if (this.options.autoZIndex && layer.setZIndex) {
+			this._lastZIndex++;
+			layer.setZIndex(this._lastZIndex);
+		}
+	},
+
+	_update: function () {
+		if (!this._container) {
+			return;
+		}
+
+		this._baseLayersList.innerHTML = '';
+		this._overlaysList.innerHTML = '';
+
+		var baseLayersPresent = false,
+		    overlaysPresent = false,
+		    i, obj;
+
+		for (i in this._layers) {
+			obj = this._layers[i];
+			this._addItem(obj);
+			overlaysPresent = overlaysPresent || obj.overlay;
+			baseLayersPresent = baseLayersPresent || !obj.overlay;
+		}
+
+		this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none';
+	},
+
+	_onLayerChange: function (e) {
+		var obj = this._layers[L.stamp(e.layer)];
+
+		if (!obj) { return; }
+
+		if (!this._handlingClick) {
+			this._update();
+		}
+
+		var type = obj.overlay ?
+			(e.type === 'layeradd' ? 'overlayadd' : 'overlayremove') :
+			(e.type === 'layeradd' ? 'baselayerchange' : null);
+
+		if (type) {
+			this._map.fire(type, obj);
+		}
+	},
+
+	// IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see http://bit.ly/PqYLBe)
+	_createRadioElement: function (name, checked) {
+
+		var radioHtml = '<input type="radio" class="leaflet-control-layers-selector" name="' + name + '"';
+		if (checked) {
+			radioHtml += ' checked="checked"';
+		}
+		radioHtml += '/>';
+
+		var radioFragment = document.createElement('div');
+		radioFragment.innerHTML = radioHtml;
+
+		return radioFragment.firstChild;
+	},
+
+	_addItem: function (obj) {
+		var label = document.createElement('label'),
+		    input,
+		    checked = this._map.hasLayer(obj.layer);
+
+		if (obj.overlay) {
+			input = document.createElement('input');
+			input.type = 'checkbox';
+			input.className = 'leaflet-control-layers-selector';
+			input.defaultChecked = checked;
+		} else {
+			input = this._createRadioElement('leaflet-base-layers', checked);
+		}
+
+		input.layerId = L.stamp(obj.layer);
+
+		L.DomEvent.on(input, 'click', this._onInputClick, this);
+
+		var name = document.createElement('span');
+		name.innerHTML = ' ' + obj.name;
+
+		label.appendChild(input);
+		label.appendChild(name);
+
+		var container = obj.overlay ? this._overlaysList : this._baseLayersList;
+		container.appendChild(label);
+
+		return label;
+	},
+
+	_onInputClick: function () {
+		var i, input, obj,
+		    inputs = this._form.getElementsByTagName('input'),
+		    inputsLen = inputs.length;
+
+		this._handlingClick = true;
+
+		for (i = 0; i < inputsLen; i++) {
+			input = inputs[i];
+			obj = this._layers[input.layerId];
+
+			if (input.checked && !this._map.hasLayer(obj.layer)) {
+				this._map.addLayer(obj.layer);
+
+			} else if (!input.checked && this._map.hasLayer(obj.layer)) {
+				this._map.removeLayer(obj.layer);
+			}
+		}
+
+		this._handlingClick = false;
+	},
+
+	_expand: function () {
+		L.DomUtil.addClass(this._container, 'leaflet-control-layers-expanded');
+	},
+
+	_collapse: function () {
+		this._container.className = this._container.className.replace(' leaflet-control-layers-expanded', '');
+	}
+});
+
+L.control.layers = function (baseLayers, overlays, options) {
+	return new L.Control.Layers(baseLayers, overlays, options);
+};
+
+
+/*
+ * L.PosAnimation is used by Leaflet internally for pan animations.
+ */
+
+L.PosAnimation = L.Class.extend({
+	includes: L.Mixin.Events,
+
+	run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
+		this.stop();
+
+		this._el = el;
+		this._inProgress = true;
+		this._newPos = newPos;
+
+		this.fire('start');
+
+		el.style[L.DomUtil.TRANSITION] = 'all ' + (duration || 0.25) +
+		        's cubic-bezier(0,0,' + (easeLinearity || 0.5) + ',1)';
+
+		L.DomEvent.on(el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
+		L.DomUtil.setPosition(el, newPos);
+
+		// toggle reflow, Chrome flickers for some reason if you don't do this
+		L.Util.falseFn(el.offsetWidth);
+
+		// there's no native way to track value updates of transitioned properties, so we imitate this
+		this._stepTimer = setInterval(L.bind(this._onStep, this), 50);
+	},
+
+	stop: function () {
+		if (!this._inProgress) { return; }
+
+		// if we just removed the transition property, the element would jump to its final position,
+		// so we need to make it stay at the current position
+
+		L.DomUtil.setPosition(this._el, this._getPos());
+		this._onTransitionEnd();
+		L.Util.falseFn(this._el.offsetWidth); // force reflow in case we are about to start a new animation
+	},
+
+	_onStep: function () {
+		var stepPos = this._getPos();
+		if (!stepPos) {
+			this._onTransitionEnd();
+			return;
+		}
+		// jshint camelcase: false
+		// make L.DomUtil.getPosition return intermediate position value during animation
+		this._el._leaflet_pos = stepPos;
+
+		this.fire('step');
+	},
+
+	// you can't easily get intermediate values of properties animated with CSS3 Transitions,
+	// we need to parse computed style (in case of transform it returns matrix string)
+
+	_transformRe: /([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,
+
+	_getPos: function () {
+		var left, top, matches,
+		    el = this._el,
+		    style = window.getComputedStyle(el);
+
+		if (L.Browser.any3d) {
+			matches = style[L.DomUtil.TRANSFORM].match(this._transformRe);
+			if (!matches) { return; }
+			left = parseFloat(matches[1]);
+			top  = parseFloat(matches[2]);
+		} else {
+			left = parseFloat(style.left);
+			top  = parseFloat(style.top);
+		}
+
+		return new L.Point(left, top, true);
+	},
+
+	_onTransitionEnd: function () {
+		L.DomEvent.off(this._el, L.DomUtil.TRANSITION_END, this._onTransitionEnd, this);
+
+		if (!this._inProgress) { return; }
+		this._inProgress = false;
+
+		this._el.style[L.DomUtil.TRANSITION] = '';
+
+		// jshint camelcase: false
+		// make sure L.DomUtil.getPosition returns the final position value after animation
+		this._el._leaflet_pos = this._newPos;
+
+		clearInterval(this._stepTimer);
+
+		this.fire('step').fire('end');
+	}
+
+});
+
+
+/*
+ * Extends L.Map to handle panning animations.
+ */
+
+L.Map.include({
+
+	setView: function (center, zoom, options) {
+
+		zoom = this._limitZoom(zoom);
+		center = L.latLng(center);
+		options = options || {};
+
+		if (this._panAnim) {
+			this._panAnim.stop();
+		}
+
+		if (this._loaded && !options.reset && options !== true) {
+
+			if (options.animate !== undefined) {
+				options.zoom = L.extend({animate: options.animate}, options.zoom);
+				options.pan = L.extend({animate: options.animate}, options.pan);
+			}
+
+			// try animating pan or zoom
+			var animated = (this._zoom !== zoom) ?
+				this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) :
+				this._tryAnimatedPan(center, options.pan);
+
+			if (animated) {
+				// prevent resize handler call, the view will refresh after animation anyway
+				clearTimeout(this._sizeTimer);
+				return this;
+			}
+		}
+
+		// animation didn't start, just reset the map view
+		this._resetView(center, zoom);
+
+		return this;
+	},
+
+	panBy: function (offset, options) {
+		offset = L.point(offset).round();
+		options = options || {};
+
+		if (!offset.x && !offset.y) {
+			return this;
+		}
+
+		if (!this._panAnim) {
+			this._panAnim = new L.PosAnimation();
+
+			this._panAnim.on({
+				'step': this._onPanTransitionStep,
+				'end': this._onPanTransitionEnd
+			}, this);
+		}
+
+		// don't fire movestart if animating inertia
+		if (!options.noMoveStart) {
+			this.fire('movestart');
+		}
+
+		// animate pan unless animate: false specified
+		if (options.animate !== false) {
+			L.DomUtil.addClass(this._mapPane, 'leaflet-pan-anim');
+
+			var newPos = this._getMapPanePos().subtract(offset);
+			this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity);
+		} else {
+			this._rawPanBy(offset);
+			this.fire('move').fire('moveend');
+		}
+
+		return this;
+	},
+
+	_onPanTransitionStep: function () {
+		this.fire('move');
+	},
+
+	_onPanTransitionEnd: function () {
+		L.DomUtil.removeClass(this._mapPane, 'leaflet-pan-anim');
+		this.fire('moveend');
+	},
+
+	_tryAnimatedPan: function (center, options) {
+		// difference between the new and current centers in pixels
+		var offset = this._getCenterOffset(center)._floor();
+
+		// don't animate too far unless animate: true specified in options
+		if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; }
+
+		this.panBy(offset, options);
+
+		return true;
+	}
+});
+
+
+/*
+ * L.PosAnimation fallback implementation that powers Leaflet pan animations
+ * in browsers that don't support CSS3 Transitions.
+ */
+
+L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : L.PosAnimation.extend({
+
+	run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, Point[, Number, Number])
+		this.stop();
+
+		this._el = el;
+		this._inProgress = true;
+		this._duration = duration || 0.25;
+		this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+
+		this._startPos = L.DomUtil.getPosition(el);
+		this._offset = newPos.subtract(this._startPos);
+		this._startTime = +new Date();
+
+		this.fire('start');
+
+		this._animate();
+	},
+
+	stop: function () {
+		if (!this._inProgress) { return; }
+
+		this._step();
+		this._complete();
+	},
+
+	_animate: function () {
+		// animation loop
+		this._animId = L.Util.requestAnimFrame(this._animate, this);
+		this._step();
+	},
+
+	_step: function () {
+		var elapsed = (+new Date()) - this._startTime,
+		    duration = this._duration * 1000;
+
+		if (elapsed < duration) {
+			this._runFrame(this._easeOut(elapsed / duration));
+		} else {
+			this._runFrame(1);
+			this._complete();
+		}
+	},
+
+	_runFrame: function (progress) {
+		var pos = this._startPos.add(this._offset.multiplyBy(progress));
+		L.DomUtil.setPosition(this._el, pos);
+
+		this.fire('step');
+	},
+
+	_complete: function () {
+		L.Util.cancelAnimFrame(this._animId);
+
+		this._inProgress = false;
+		this.fire('end');
+	},
+
+	_easeOut: function (t) {
+		return 1 - Math.pow(1 - t, this._easeOutPower);
+	}
+});
+
+
+/*
+ * Extends L.Map to handle zoom animations.
+ */
+
+L.Map.mergeOptions({
+	zoomAnimation: true,
+	zoomAnimationThreshold: 4
+});
+
+if (L.DomUtil.TRANSITION) {
+
+	L.Map.addInitHook(function () {
+		// don't animate on browsers without hardware-accelerated transitions or old Android/Opera
+		this._zoomAnimated = this.options.zoomAnimation && L.DomUtil.TRANSITION &&
+				L.Browser.any3d && !L.Browser.android23 && !L.Browser.mobileOpera;
+
+		// zoom transitions run with the same duration for all layers, so if one of transitionend events
+		// happens after starting zoom animation (propagating to the map pane), we know that it ended globally
+		if (this._zoomAnimated) {
+			L.DomEvent.on(this._mapPane, L.DomUtil.TRANSITION_END, this._catchTransitionEnd, this);
+		}
+	});
+}
+
+L.Map.include(!L.DomUtil.TRANSITION ? {} : {
+
+	_catchTransitionEnd: function () {
+		if (this._animatingZoom) {
+			this._onZoomTransitionEnd();
+		}
+	},
+
+	_nothingToAnimate: function () {
+		return !this._container.getElementsByClassName('leaflet-zoom-animated').length;
+	},
+
+	_tryAnimatedZoom: function (center, zoom, options) {
+
+		if (this._animatingZoom) { return true; }
+
+		options = options || {};
+
+		// don't animate if disabled, not supported or zoom difference is too large
+		if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() ||
+		        Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; }
+
+		// offset is the pixel coords of the zoom origin relative to the current center
+		var scale = this.getZoomScale(zoom),
+		    offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale),
+			origin = this._getCenterLayerPoint()._add(offset);
+
+		// don't animate if the zoom origin isn't within one screen from the current center, unless forced
+		if (options.animate !== true && !this.getSize().contains(offset)) { return false; }
+
+		this
+		    .fire('movestart')
+		    .fire('zoomstart');
+
+		this._animateZoom(center, zoom, origin, scale, null, true);
+
+		return true;
+	},
+
+	_animateZoom: function (center, zoom, origin, scale, delta, backwards) {
+
+		this._animatingZoom = true;
+
+		// put transform transition on all layers with leaflet-zoom-animated class
+		L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
+
+		// remember what center/zoom to set after animation
+		this._animateToCenter = center;
+		this._animateToZoom = zoom;
+
+		// disable any dragging during animation
+		if (L.Draggable) {
+			L.Draggable._disabled = true;
+		}
+
+		this.fire('zoomanim', {
+			center: center,
+			zoom: zoom,
+			origin: origin,
+			scale: scale,
+			delta: delta,
+			backwards: backwards
+		});
+	},
+
+	_onZoomTransitionEnd: function () {
+
+		this._animatingZoom = false;
+
+		L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
+
+		this._resetView(this._animateToCenter, this._animateToZoom, true, true);
+
+		if (L.Draggable) {
+			L.Draggable._disabled = false;
+		}
+	}
+});
+
+
+/*
+	Zoom animation logic for L.TileLayer.
+*/
+
+L.TileLayer.include({
+	_animateZoom: function (e) {
+		if (!this._animating) {
+			this._animating = true;
+			this._prepareBgBuffer();
+		}
+
+		var bg = this._bgBuffer,
+		    transform = L.DomUtil.TRANSFORM,
+		    initialTransform = e.delta ? L.DomUtil.getTranslateString(e.delta) : bg.style[transform],
+		    scaleStr = L.DomUtil.getScaleString(e.scale, e.origin);
+
+		bg.style[transform] = e.backwards ?
+				scaleStr + ' ' + initialTransform :
+				initialTransform + ' ' + scaleStr;
+	},
+
+	_endZoomAnim: function () {
+		var front = this._tileContainer,
+		    bg = this._bgBuffer;
+
+		front.style.visibility = '';
+		front.parentNode.appendChild(front); // Bring to fore
+
+		// force reflow
+		L.Util.falseFn(bg.offsetWidth);
+
+		this._animating = false;
+	},
+
+	_clearBgBuffer: function () {
+		var map = this._map;
+
+		if (map && !map._animatingZoom && !map.touchZoom._zooming) {
+			this._bgBuffer.innerHTML = '';
+			this._bgBuffer.style[L.DomUtil.TRANSFORM] = '';
+		}
+	},
+
+	_prepareBgBuffer: function () {
+
+		var front = this._tileContainer,
+		    bg = this._bgBuffer;
+
+		// if foreground layer doesn't have many tiles but bg layer does,
+		// keep the existing bg layer and just zoom it some more
+
+		var bgLoaded = this._getLoadedTilesPercentage(bg),
+		    frontLoaded = this._getLoadedTilesPercentage(front);
+
+		if (bg && bgLoaded > 0.5 && frontLoaded < 0.5) {
+
+			front.style.visibility = 'hidden';
+			this._stopLoadingImages(front);
+			return;
+		}
+
+		// prepare the buffer to become the front tile pane
+		bg.style.visibility = 'hidden';
+		bg.style[L.DomUtil.TRANSFORM] = '';
+
+		// switch out the current layer to be the new bg layer (and vice-versa)
+		this._tileContainer = bg;
+		bg = this._bgBuffer = front;
+
+		this._stopLoadingImages(bg);
+
+		//prevent bg buffer from clearing right after zoom
+		clearTimeout(this._clearBgBufferTimer);
+	},
+
+	_getLoadedTilesPercentage: function (container) {
+		var tiles = container.getElementsByTagName('img'),
+		    i, len, count = 0;
+
+		for (i = 0, len = tiles.length; i < len; i++) {
+			if (tiles[i].complete) {
+				count++;
+			}
+		}
+		return count / len;
+	},
+
+	// stops loading all tiles in the background layer
+	_stopLoadingImages: function (container) {
+		var tiles = Array.prototype.slice.call(container.getElementsByTagName('img')),
+		    i, len, tile;
+
+		for (i = 0, len = tiles.length; i < len; i++) {
+			tile = tiles[i];
+
+			if (!tile.complete) {
+				tile.onload = L.Util.falseFn;
+				tile.onerror = L.Util.falseFn;
+				tile.src = L.Util.emptyImageUrl;
+
+				tile.parentNode.removeChild(tile);
+			}
+		}
+	}
+});
+
+
+/*
+ * Provides L.Map with convenient shortcuts for using browser geolocation features.
+ */
+
+L.Map.include({
+	_defaultLocateOptions: {
+		watch: false,
+		setView: false,
+		maxZoom: Infinity,
+		timeout: 10000,
+		maximumAge: 0,
+		enableHighAccuracy: false
+	},
+
+	locate: function (/*Object*/ options) {
+
+		options = this._locateOptions = L.extend(this._defaultLocateOptions, options);
+
+		if (!navigator.geolocation) {
+			this._handleGeolocationError({
+				code: 0,
+				message: 'Geolocation not supported.'
+			});
+			return this;
+		}
+
+		var onResponse = L.bind(this._handleGeolocationResponse, this),
+			onError = L.bind(this._handleGeolocationError, this);
+
+		if (options.watch) {
+			this._locationWatchId =
+			        navigator.geolocation.watchPosition(onResponse, onError, options);
+		} else {
+			navigator.geolocation.getCurrentPosition(onResponse, onError, options);
+		}
+		return this;
+	},
+
+	stopLocate: function () {
+		if (navigator.geolocation) {
+			navigator.geolocation.clearWatch(this._locationWatchId);
+		}
+		if (this._locateOptions) {
+			this._locateOptions.setView = false;
+		}
+		return this;
+	},
+
+	_handleGeolocationError: function (error) {
+		var c = error.code,
+		    message = error.message ||
+		            (c === 1 ? 'permission denied' :
+		            (c === 2 ? 'position unavailable' : 'timeout'));
+
+		if (this._locateOptions.setView && !this._loaded) {
+			this.fitWorld();
+		}
+
+		this.fire('locationerror', {
+			code: c,
+			message: 'Geolocation error: ' + message + '.'
+		});
+	},
+
+	_handleGeolocationResponse: function (pos) {
+		var lat = pos.coords.latitude,
+		    lng = pos.coords.longitude,
+		    latlng = new L.LatLng(lat, lng),
+
+		    latAccuracy = 180 * pos.coords.accuracy / 40075017,
+		    lngAccuracy = latAccuracy / Math.cos(L.LatLng.DEG_TO_RAD * lat),
+
+		    bounds = L.latLngBounds(
+		            [lat - latAccuracy, lng - lngAccuracy],
+		            [lat + latAccuracy, lng + lngAccuracy]),
+
+		    options = this._locateOptions;
+
+		if (options.setView) {
+			var zoom = Math.min(this.getBoundsZoom(bounds), options.maxZoom);
+			this.setView(latlng, zoom);
+		}
+
+		var data = {
+			latlng: latlng,
+			bounds: bounds
+		};
+
+		for (var i in pos.coords) {
+			if (typeof pos.coords[i] === 'number') {
+				data[i] = pos.coords[i];
+			}
+		}
+
+		this.fire('locationfound', data);
+	}
+});
+
+
+}(window, document));
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/leaflet.css b/src/main/webapp/client/js/lib/leaflet.css
new file mode 100644
index 00000000..7e77da34
--- /dev/null
+++ b/src/main/webapp/client/js/lib/leaflet.css
@@ -0,0 +1,467 @@
+/* required styles */
+
+.leaflet-map-pane,
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow,
+.leaflet-tile-pane,
+.leaflet-tile-container,
+.leaflet-overlay-pane,
+.leaflet-shadow-pane,
+.leaflet-marker-pane,
+.leaflet-popup-pane,
+.leaflet-overlay-pane svg,
+.leaflet-zoom-box,
+.leaflet-image-layer,
+.leaflet-layer {
+	position: absolute;
+	left: 0;
+	top: 0;
+	}
+.leaflet-container {
+	overflow: hidden;
+	-ms-touch-action: none;
+	}
+.leaflet-tile,
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	-webkit-user-select: none;
+	   -moz-user-select: none;
+	        user-select: none;
+	-webkit-user-drag: none;
+	}
+.leaflet-marker-icon,
+.leaflet-marker-shadow {
+	display: block;
+	}
+/* map is broken in FF if you have max-width: 100% on tiles */
+.leaflet-container img {
+	max-width: none !important;
+	}
+/* stupid Android 2 doesn't understand "max-width: none" properly */
+.leaflet-container img.leaflet-image-layer {
+	max-width: 15000px !important;
+	}
+.leaflet-tile {
+	filter: inherit;
+	visibility: hidden;
+	}
+.leaflet-tile-loaded {
+	visibility: inherit;
+	}
+.leaflet-zoom-box {
+	width: 0;
+	height: 0;
+	}
+/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
+.leaflet-overlay-pane svg {
+	-moz-user-select: none;
+	}
+
+.leaflet-tile-pane    { z-index: 2; }
+.leaflet-objects-pane { z-index: 3; }
+.leaflet-overlay-pane { z-index: 4; }
+.leaflet-shadow-pane  { z-index: 5; }
+.leaflet-marker-pane  { z-index: 6; }
+.leaflet-popup-pane   { z-index: 7; }
+
+
+/* control positioning */
+
+.leaflet-control {
+	position: relative;
+	z-index: 7;
+	pointer-events: auto;
+	}
+.leaflet-top,
+.leaflet-bottom {
+	position: absolute;
+	z-index: 1000;
+	pointer-events: none;
+	}
+.leaflet-top {
+	top: 0;
+	}
+.leaflet-right {
+	right: 0;
+	}
+.leaflet-bottom {
+	bottom: 0;
+	}
+.leaflet-left {
+	left: 0;
+	}
+.leaflet-control {
+	float: left;
+	clear: both;
+	}
+.leaflet-right .leaflet-control {
+	float: right;
+	}
+.leaflet-top .leaflet-control {
+	margin-top: 10px;
+	}
+.leaflet-bottom .leaflet-control {
+	margin-bottom: 10px;
+	}
+.leaflet-left .leaflet-control {
+	margin-left: 10px;
+	}
+.leaflet-right .leaflet-control {
+	margin-right: 10px;
+	}
+
+
+/* zoom and fade animations */
+
+.leaflet-fade-anim .leaflet-tile,
+.leaflet-fade-anim .leaflet-popup {
+	opacity: 0;
+	-webkit-transition: opacity 0.2s linear;
+	   -moz-transition: opacity 0.2s linear;
+	     -o-transition: opacity 0.2s linear;
+	        transition: opacity 0.2s linear;
+	}
+.leaflet-fade-anim .leaflet-tile-loaded,
+.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
+	opacity: 1;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-animated {
+	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
+	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
+	     -o-transition:      -o-transform 0.25s cubic-bezier(0,0,0.25,1);
+	        transition:         transform 0.25s cubic-bezier(0,0,0.25,1);
+	}
+.leaflet-zoom-anim .leaflet-tile,
+.leaflet-pan-anim .leaflet-tile,
+.leaflet-touching .leaflet-zoom-animated {
+	-webkit-transition: none;
+	   -moz-transition: none;
+	     -o-transition: none;
+	        transition: none;
+	}
+
+.leaflet-zoom-anim .leaflet-zoom-hide {
+	visibility: hidden;
+	}
+
+
+/* cursors */
+
+.leaflet-clickable {
+	cursor: pointer;
+	}
+.leaflet-container {
+	cursor: -webkit-grab;
+	cursor:    -moz-grab;
+	}
+.leaflet-popup-pane,
+.leaflet-control {
+	cursor: auto;
+	}
+.leaflet-dragging,
+.leaflet-dragging .leaflet-clickable,
+.leaflet-dragging .leaflet-container {
+	cursor: move;
+	cursor: -webkit-grabbing;
+	cursor:    -moz-grabbing;
+	}
+
+
+/* visual tweaks */
+
+.leaflet-container {
+	background: #ddd;
+	outline: 0;
+	}
+.leaflet-container a {
+	color: #0078A8;
+	}
+.leaflet-container a.leaflet-active {
+	outline: 2px solid orange;
+	}
+.leaflet-zoom-box {
+	border: 2px dotted #05f;
+	background: white;
+	opacity: 0.5;
+	}
+
+
+/* general typography */
+.leaflet-container {
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	}
+
+
+/* general toolbar styles */
+
+.leaflet-bar {
+	box-shadow: 0 1px 7px rgba(0,0,0,0.65);
+	-webkit-border-radius: 4px;
+	        border-radius: 4px;
+	}
+.leaflet-bar a, .leaflet-bar a:hover {
+	background-color: #fff;
+	border-bottom: 1px solid #ccc;
+	width: 26px;
+	height: 26px;
+	line-height: 26px;
+	display: block;
+	text-align: center;
+	text-decoration: none;
+	color: black;
+	}
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	display: block;
+	}
+.leaflet-bar a:hover {
+	background-color: #f4f4f4;
+	}
+.leaflet-bar a:first-child {
+	-webkit-border-top-left-radius: 4px;
+	        border-top-left-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	        border-top-right-radius: 4px;
+	}
+.leaflet-bar a:last-child {
+	-webkit-border-bottom-left-radius: 4px;
+	        border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	        border-bottom-right-radius: 4px;
+	border-bottom: none;
+	}
+.leaflet-bar a.leaflet-disabled {
+	cursor: default;
+	background-color: #f4f4f4;
+	color: #bbb;
+	}
+
+.leaflet-touch .leaflet-bar {
+	-webkit-border-radius: 10px;
+	        border-radius: 10px;
+	}
+.leaflet-touch .leaflet-bar a {
+	width: 30px;
+	height: 30px;
+	}
+.leaflet-touch .leaflet-bar a:first-child {
+	-webkit-border-top-left-radius: 7px;
+	        border-top-left-radius: 7px;
+	-webkit-border-top-right-radius: 7px;
+	        border-top-right-radius: 7px;
+	}
+.leaflet-touch .leaflet-bar a:last-child {
+	-webkit-border-bottom-left-radius: 7px;
+	        border-bottom-left-radius: 7px;
+	-webkit-border-bottom-right-radius: 7px;
+	        border-bottom-right-radius: 7px;
+	border-bottom: none;
+	}
+
+
+/* zoom control */
+
+.leaflet-control-zoom-in {
+	font: bold 18px 'Lucida Console', Monaco, monospace;
+	}
+.leaflet-control-zoom-out {
+	font: bold 22px 'Lucida Console', Monaco, monospace;
+	}
+
+.leaflet-touch .leaflet-control-zoom-in {
+	font-size: 22px;
+	line-height: 30px;
+	}
+.leaflet-touch .leaflet-control-zoom-out {
+	font-size: 28px;
+	line-height: 30px;
+	}
+
+
+/* layers control */
+
+.leaflet-control-layers {
+	box-shadow: 0 1px 7px rgba(0,0,0,0.4);
+	background: #f8f8f9;
+	-webkit-border-radius: 5px;
+	        border-radius: 5px;
+	}
+.leaflet-control-layers-toggle {
+	background-image: url(images/layers.png);
+	width: 36px;
+	height: 36px;
+	}
+.leaflet-retina .leaflet-control-layers-toggle {
+	background-image: url(images/layers-2x.png);
+	background-size: 26px 26px;
+	}
+.leaflet-touch .leaflet-control-layers-toggle {
+	width: 44px;
+	height: 44px;
+	}
+.leaflet-control-layers .leaflet-control-layers-list,
+.leaflet-control-layers-expanded .leaflet-control-layers-toggle {
+	display: none;
+	}
+.leaflet-control-layers-expanded .leaflet-control-layers-list {
+	display: block;
+	position: relative;
+	}
+.leaflet-control-layers-expanded {
+	padding: 6px 10px 6px 6px;
+	color: #333;
+	background: #fff;
+	}
+.leaflet-control-layers-selector {
+	margin-top: 2px;
+	position: relative;
+	top: 1px;
+	}
+.leaflet-control-layers label {
+	display: block;
+	}
+.leaflet-control-layers-separator {
+	height: 0;
+	border-top: 1px solid #ddd;
+	margin: 5px -10px 5px -6px;
+	}
+
+
+/* attribution and scale controls */
+
+.leaflet-container .leaflet-control-attribution {
+	background-color: rgba(255, 255, 255, 0.7);
+	box-shadow: 0 0 5px #bbb;
+	margin: 0;
+	}
+.leaflet-control-attribution,
+.leaflet-control-scale-line {
+	padding: 0 5px;
+	color: #333;
+	}
+.leaflet-container .leaflet-control-attribution,
+.leaflet-container .leaflet-control-scale {
+	font-size: 11px;
+	}
+.leaflet-left .leaflet-control-scale {
+	margin-left: 5px;
+	}
+.leaflet-bottom .leaflet-control-scale {
+	margin-bottom: 5px;
+	}
+.leaflet-control-scale-line {
+	border: 2px solid #777;
+	border-top: none;
+	color: black;
+	line-height: 1.1;
+	padding: 2px 5px 1px;
+	font-size: 11px;
+	text-shadow: 1px 1px 1px #fff;
+	background-color: rgba(255, 255, 255, 0.5);
+	box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.2);
+	white-space: nowrap;
+	overflow: hidden;
+	}
+.leaflet-control-scale-line:not(:first-child) {
+	border-top: 2px solid #777;
+	border-bottom: none;
+	margin-top: -2px;
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+	}
+.leaflet-control-scale-line:not(:first-child):not(:last-child) {
+	border-bottom: 2px solid #777;
+	}
+
+.leaflet-touch .leaflet-control-attribution,
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	box-shadow: none;
+	}
+.leaflet-touch .leaflet-control-layers,
+.leaflet-touch .leaflet-bar {
+	border: 4px solid rgba(0,0,0,0.3);
+	}
+
+
+/* popup */
+
+.leaflet-popup {
+	position: absolute;
+	text-align: center;
+	}
+.leaflet-popup-content-wrapper {
+	padding: 1px;
+	text-align: left;
+	-webkit-border-radius: 12px;
+	        border-radius: 12px;
+	}
+.leaflet-popup-content {
+	margin: 13px 19px;
+	line-height: 1.4;
+	}
+.leaflet-popup-content p {
+	margin: 18px 0;
+	}
+.leaflet-popup-tip-container {
+	margin: 0 auto;
+	width: 40px;
+	height: 20px;
+	position: relative;
+	overflow: hidden;
+	}
+.leaflet-popup-tip {
+	width: 17px;
+	height: 17px;
+	padding: 1px;
+
+	margin: -10px auto 0;
+
+	-webkit-transform: rotate(45deg);
+	   -moz-transform: rotate(45deg);
+	    -ms-transform: rotate(45deg);
+	     -o-transform: rotate(45deg);
+	        transform: rotate(45deg);
+	}
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {
+	background: white;
+
+	box-shadow: 0 3px 14px rgba(0,0,0,0.4);
+	}
+.leaflet-container a.leaflet-popup-close-button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding: 4px 4px 0 0;
+	text-align: center;
+	width: 18px;
+	height: 14px;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
+	color: #c3c3c3;
+	text-decoration: none;
+	font-weight: bold;
+	background: transparent;
+	}
+.leaflet-container a.leaflet-popup-close-button:hover {
+	color: #999;
+	}
+.leaflet-popup-scrolled {
+	overflow: auto;
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	}
+
+
+/* div icon */
+
+.leaflet-div-icon {
+	background: #fff;
+	border: 1px solid #666;
+	}
+.leaflet-editing-icon {
+	-webkit-border-radius: 2px;
+	        border-radius: 2px;
+	}
diff --git a/src/main/webapp/client/js/lib/leaflet.ie.css b/src/main/webapp/client/js/lib/leaflet.ie.css
new file mode 100644
index 00000000..f3daf1f3
--- /dev/null
+++ b/src/main/webapp/client/js/lib/leaflet.ie.css
@@ -0,0 +1,51 @@
+.leaflet-vml-shape {
+	width: 1px;
+	height: 1px;
+	}
+.lvml {
+	behavior: url(#default#VML);
+	display: inline-block;
+	position: absolute;
+	}
+
+.leaflet-control {
+	display: inline;
+	}
+
+.leaflet-popup-tip {
+	width: 21px;
+	_width: 27px;
+	margin: 0 auto;
+	_margin-top: -3px;
+
+	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
+	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
+	}
+.leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
+.leaflet-popup-content-wrapper, .leaflet-popup-tip {
+	border: 1px solid #999;
+	}
+.leaflet-popup-content-wrapper {
+	zoom: 1;
+	}
+
+.leaflet-control-zoom,
+.leaflet-control-layers {
+	border: 3px solid #999;
+	}
+.leaflet-control-layers-toggle {
+	}
+.leaflet-control-attribution,
+.leaflet-control-layers,
+.leaflet-control-scale-line {
+	background: white;
+	}
+.leaflet-zoom-box {
+	filter: alpha(opacity=50);
+	}
+.leaflet-control-attribution {
+	border-top: 1px solid #bbb;
+	border-left: 1px solid #bbb;
+	}
diff --git a/src/main/webapp/client/js/lib/leaflet.js b/src/main/webapp/client/js/lib/leaflet.js
new file mode 100644
index 00000000..1d4c6e54
--- /dev/null
+++ b/src/main/webapp/client/js/lib/leaflet.js
@@ -0,0 +1,9 @@
+/*
+ Leaflet, a JavaScript library for mobile-friendly interactive maps. http://leafletjs.com
+ (c) 2010-2013, Vladimir Agafonkin
+ (c) 2010-2011, CloudMade
+*/
+!function(t,e,i){var n=t.L,o={};o.version="0.6.4","object"==typeof module&&"object"==typeof module.exports?module.exports=o:"function"==typeof define&&define.amd&&define(o),o.noConflict=function(){return t.L=n,this},t.L=o,o.Util={extend:function(t){var e,i,n,o,s=Array.prototype.slice.call(arguments,1);for(i=0,n=s.length;n>i;i++){o=s[i]||{};for(e in o)o.hasOwnProperty(e)&&(t[e]=o[e])}return t},bind:function(t,e){var i=arguments.length>2?Array.prototype.slice.call(arguments,2):null;return function(){return t.apply(e,i||arguments)}},stamp:function(){var t=0,e="_leaflet_id";return function(i){return i[e]=i[e]||++t,i[e]}}(),invokeEach:function(t,e,i){var n,o;if("object"==typeof t){o=Array.prototype.slice.call(arguments,3);for(n in t)e.apply(i,[n,t[n]].concat(o));return!0}return!1},limitExecByInterval:function(t,e,i){var n,o;return function s(){var a=arguments;return n?(o=!0,void 0):(n=!0,setTimeout(function(){n=!1,o&&(s.apply(i,a),o=!1)},e),t.apply(i,a),void 0)}},falseFn:function(){return!1},formatNum:function(t,e){var i=Math.pow(10,e||5);return Math.round(t*i)/i},trim:function(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")},splitWords:function(t){return o.Util.trim(t).split(/\s+/)},setOptions:function(t,e){return t.options=o.extend({},t.options,e),t.options},getParamString:function(t,e,i){var n=[];for(var o in t)n.push(encodeURIComponent(i?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(e&&-1!==e.indexOf("?")?"&":"?")+n.join("&")},template:function(t,e){return t.replace(/\{ *([\w_]+) *\}/g,function(t,n){var o=e[n];if(o===i)throw new Error("No value provided for variable "+t);return"function"==typeof o&&(o=o(e)),o})},isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)},emptyImageUrl:"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="},function(){function e(e){var i,n,o=["webkit","moz","o","ms"];for(i=0;i<o.length&&!n;i++)n=t[o[i]+e];return n}function i(e){var i=+new Date,o=Math.max(0,16-(i-n));return n=i+o,t.setTimeout(e,o)}var n=0,s=t.requestAnimationFrame||e("RequestAnimationFrame")||i,a=t.cancelAnimationFrame||e("CancelAnimationFrame")||e("CancelRequestAnimationFrame")||function(e){t.clearTimeout(e)};o.Util.requestAnimFrame=function(e,n,a,r){return e=o.bind(e,n),a&&s===i?(e(),void 0):s.call(t,e,r)},o.Util.cancelAnimFrame=function(e){e&&a.call(t,e)}}(),o.extend=o.Util.extend,o.bind=o.Util.bind,o.stamp=o.Util.stamp,o.setOptions=o.Util.setOptions,o.Class=function(){},o.Class.extend=function(t){var e=function(){this.initialize&&this.initialize.apply(this,arguments),this._initHooks&&this.callInitHooks()},i=function(){};i.prototype=this.prototype;var n=new i;n.constructor=e,e.prototype=n;for(var s in this)this.hasOwnProperty(s)&&"prototype"!==s&&(e[s]=this[s]);t.statics&&(o.extend(e,t.statics),delete t.statics),t.includes&&(o.Util.extend.apply(null,[n].concat(t.includes)),delete t.includes),t.options&&n.options&&(t.options=o.extend({},n.options,t.options)),o.extend(n,t),n._initHooks=[];var a=this;return e.__super__=a.prototype,n.callInitHooks=function(){if(!this._initHooksCalled){a.prototype.callInitHooks&&a.prototype.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,e=n._initHooks.length;e>t;t++)n._initHooks[t].call(this)}},e},o.Class.include=function(t){o.extend(this.prototype,t)},o.Class.mergeOptions=function(t){o.extend(this.prototype.options,t)},o.Class.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i)};var s="_leaflet_events";o.Mixin={},o.Mixin.Events={addEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d=this[s]=this[s]||{},p=i&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)r={action:e,context:i||this},h=t[n],i?(l=h+"_idx",u=l+"_len",c=d[l]=d[l]||{},c[p]||(c[p]=[],d[u]=(d[u]||0)+1),c[p].push(r)):(d[h]=d[h]||[],d[h].push(r));return this},hasEventListeners:function(t){var e=this[s];return!!e&&(t in e&&e[t].length>0||t+"_idx"in e&&e[t+"_idx_len"]>0)},removeEventListener:function(t,e,i){if(!this[s])return this;if(!t)return this.clearAllEventListeners();if(o.Util.invokeEach(t,this.removeEventListener,this,e,i))return this;var n,a,r,h,l,u,c,d,p,_=this[s],m=i&&o.stamp(i);for(t=o.Util.splitWords(t),n=0,a=t.length;a>n;n++)if(r=t[n],u=r+"_idx",c=u+"_len",d=_[u],e){if(h=i&&d?d[m]:_[r]){for(l=h.length-1;l>=0;l--)h[l].action!==e||i&&h[l].context!==i||(p=h.splice(l,1),p[0].action=o.Util.falseFn);i&&d&&0===h.length&&(delete d[m],_[c]--)}}else delete _[r],delete _[u];return this},clearAllEventListeners:function(){return delete this[s],this},fireEvent:function(t,e){if(!this.hasEventListeners(t))return this;var i,n,a,r,h,l=o.Util.extend({},e,{type:t,target:this}),u=this[s];if(u[t])for(i=u[t].slice(),n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context||this,l);r=u[t+"_idx"];for(h in r)if(i=r[h].slice())for(n=0,a=i.length;a>n;n++)i[n].action.call(i[n].context||this,l);return this},addOneTimeEventListener:function(t,e,i){if(o.Util.invokeEach(t,this.addOneTimeEventListener,this,e,i))return this;var n=o.bind(function(){this.removeEventListener(t,e,i).removeEventListener(t,n,i)},this);return this.addEventListener(t,e,i).addEventListener(t,n,i)}},o.Mixin.Events.on=o.Mixin.Events.addEventListener,o.Mixin.Events.off=o.Mixin.Events.removeEventListener,o.Mixin.Events.once=o.Mixin.Events.addOneTimeEventListener,o.Mixin.Events.fire=o.Mixin.Events.fireEvent,function(){var n=!!t.ActiveXObject,s=n&&!t.XMLHttpRequest,a=n&&!e.querySelector,r=n&&!e.addEventListener,h=navigator.userAgent.toLowerCase(),l=-1!==h.indexOf("webkit"),u=-1!==h.indexOf("chrome"),c=-1!==h.indexOf("phantom"),d=-1!==h.indexOf("android"),p=-1!==h.search("android [23]"),_=typeof orientation!=i+"",m=t.navigator&&t.navigator.msPointerEnabled&&t.navigator.msMaxTouchPoints,f="devicePixelRatio"in t&&t.devicePixelRatio>1||"matchMedia"in t&&t.matchMedia("(min-resolution:144dpi)")&&t.matchMedia("(min-resolution:144dpi)").matches,g=e.documentElement,v=n&&"transition"in g.style,y="WebKitCSSMatrix"in t&&"m11"in new t.WebKitCSSMatrix,L="MozPerspective"in g.style,P="OTransition"in g.style,x=!t.L_DISABLE_3D&&(v||y||L||P)&&!c,w=!t.L_NO_TOUCH&&!c&&function(){var t="ontouchstart";if(m||t in g)return!0;var i=e.createElement("div"),n=!1;return i.setAttribute?(i.setAttribute(t,"return;"),"function"==typeof i[t]&&(n=!0),i.removeAttribute(t),i=null,n):!1}();o.Browser={ie:n,ie6:s,ie7:a,ielt9:r,webkit:l,android:d,android23:p,chrome:u,ie3d:v,webkit3d:y,gecko3d:L,opera3d:P,any3d:x,mobile:_,mobileWebkit:_&&l,mobileWebkit3d:_&&y,mobileOpera:_&&t.opera,touch:w,msTouch:m,retina:f}}(),o.Point=function(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e},o.Point.prototype={clone:function(){return new o.Point(this.x,this.y)},add:function(t){return this.clone()._add(o.point(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(o.point(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},distanceTo:function(t){t=o.point(t);var e=t.x-this.x,i=t.y-this.y;return Math.sqrt(e*e+i*i)},equals:function(t){return t=o.point(t),t.x===this.x&&t.y===this.y},contains:function(t){return t=o.point(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+o.Util.formatNum(this.x)+", "+o.Util.formatNum(this.y)+")"}},o.point=function(t,e,n){return t instanceof o.Point?t:o.Util.isArray(t)?new o.Point(t[0],t[1]):t===i||null===t?t:new o.Point(t,e,n)},o.Bounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.Bounds.prototype={extend:function(t){return t=o.point(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new o.Point((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new o.Point(this.min.x,this.max.y)},getTopRight:function(){return new o.Point(this.max.x,this.min.y)},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return t="number"==typeof t[0]||t instanceof o.Point?o.point(t):o.bounds(t),t instanceof o.Bounds?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=o.bounds(t);var e=this.min,i=this.max,n=t.min,s=t.max,a=s.x>=e.x&&n.x<=i.x,r=s.y>=e.y&&n.y<=i.y;return a&&r},isValid:function(){return!(!this.min||!this.max)}},o.bounds=function(t,e){return!t||t instanceof o.Bounds?t:new o.Bounds(t,e)},o.Transformation=function(t,e,i,n){this._a=t,this._b=e,this._c=i,this._d=n},o.Transformation.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return e=e||1,t.x=e*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return e=e||1,new o.Point((t.x/e-this._b)/this._a,(t.y/e-this._d)/this._c)}},o.DomUtil={get:function(t){return"string"==typeof t?e.getElementById(t):t},getStyle:function(t,i){var n=t.style[i];if(!n&&t.currentStyle&&(n=t.currentStyle[i]),(!n||"auto"===n)&&e.defaultView){var o=e.defaultView.getComputedStyle(t,null);n=o?o[i]:null}return"auto"===n?null:n},getViewportOffset:function(t){var i,n=0,s=0,a=t,r=e.body,h=e.documentElement,l=o.Browser.ie7;do{if(n+=a.offsetTop||0,s+=a.offsetLeft||0,n+=parseInt(o.DomUtil.getStyle(a,"borderTopWidth"),10)||0,s+=parseInt(o.DomUtil.getStyle(a,"borderLeftWidth"),10)||0,i=o.DomUtil.getStyle(a,"position"),a.offsetParent===r&&"absolute"===i)break;if("fixed"===i){n+=r.scrollTop||h.scrollTop||0,s+=r.scrollLeft||h.scrollLeft||0;break}if("relative"===i&&!a.offsetLeft){var u=o.DomUtil.getStyle(a,"width"),c=o.DomUtil.getStyle(a,"max-width"),d=a.getBoundingClientRect();("none"!==u||"none"!==c)&&(s+=d.left+a.clientLeft),n+=d.top+(r.scrollTop||h.scrollTop||0);break}a=a.offsetParent}while(a);a=t;do{if(a===r)break;n-=a.scrollTop||0,s-=a.scrollLeft||0,o.DomUtil.documentIsLtr()||!o.Browser.webkit&&!l||(s+=a.scrollWidth-a.clientWidth,l&&"hidden"!==o.DomUtil.getStyle(a,"overflow-y")&&"hidden"!==o.DomUtil.getStyle(a,"overflow")&&(s+=17)),a=a.parentNode}while(a);return new o.Point(s,n)},documentIsLtr:function(){return o.DomUtil._docIsLtrCached||(o.DomUtil._docIsLtrCached=!0,o.DomUtil._docIsLtr="ltr"===o.DomUtil.getStyle(e.body,"direction")),o.DomUtil._docIsLtr},create:function(t,i,n){var o=e.createElement(t);return o.className=i,n&&n.appendChild(o),o},hasClass:function(t,e){return t.className.length>0&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(t.className)},addClass:function(t,e){o.DomUtil.hasClass(t,e)||(t.className+=(t.className?" ":"")+e)},removeClass:function(t,e){t.className=o.Util.trim((" "+t.className+" ").replace(" "+e+" "," "))},setOpacity:function(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(o){if(1===e)return}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}},testProp:function(t){for(var i=e.documentElement.style,n=0;n<t.length;n++)if(t[n]in i)return t[n];return!1},getTranslateString:function(t){var e=o.Browser.webkit3d,i="translate"+(e?"3d":"")+"(",n=(e?",0":"")+")";return i+t.x+"px,"+t.y+"px"+n},getScaleString:function(t,e){var i=o.DomUtil.getTranslateString(e.add(e.multiplyBy(-1*t))),n=" scale("+t+") ";return i+n},setPosition:function(t,e,i){t._leaflet_pos=e,!i&&o.Browser.any3d?(t.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(e),o.Browser.mobileWebkit3d&&(t.style.WebkitBackfaceVisibility="hidden")):(t.style.left=e.x+"px",t.style.top=e.y+"px")},getPosition:function(t){return t._leaflet_pos}},o.DomUtil.TRANSFORM=o.DomUtil.testProp(["transform","WebkitTransform","OTransform","MozTransform","msTransform"]),o.DomUtil.TRANSITION=o.DomUtil.testProp(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),o.DomUtil.TRANSITION_END="webkitTransition"===o.DomUtil.TRANSITION||"OTransition"===o.DomUtil.TRANSITION?o.DomUtil.TRANSITION+"End":"transitionend",function(){var i=o.DomUtil.testProp(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]);o.extend(o.DomUtil,{disableTextSelection:function(){if(o.DomEvent.on(t,"selectstart",o.DomEvent.preventDefault),i){var n=e.documentElement.style;this._userSelect=n[i],n[i]="none"}},enableTextSelection:function(){o.DomEvent.off(t,"selectstart",o.DomEvent.preventDefault),i&&(e.documentElement.style[i]=this._userSelect,delete this._userSelect)},disableImageDrag:function(){o.DomEvent.on(t,"dragstart",o.DomEvent.preventDefault)},enableImageDrag:function(){o.DomEvent.off(t,"dragstart",o.DomEvent.preventDefault)}})}(),o.LatLng=function(t,e){var i=parseFloat(t),n=parseFloat(e);if(isNaN(i)||isNaN(n))throw new Error("Invalid LatLng object: ("+t+", "+e+")");this.lat=i,this.lng=n},o.extend(o.LatLng,{DEG_TO_RAD:Math.PI/180,RAD_TO_DEG:180/Math.PI,MAX_MARGIN:1e-9}),o.LatLng.prototype={equals:function(t){if(!t)return!1;t=o.latLng(t);var e=Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng));return e<=o.LatLng.MAX_MARGIN},toString:function(t){return"LatLng("+o.Util.formatNum(this.lat,t)+", "+o.Util.formatNum(this.lng,t)+")"},distanceTo:function(t){t=o.latLng(t);var e=6378137,i=o.LatLng.DEG_TO_RAD,n=(t.lat-this.lat)*i,s=(t.lng-this.lng)*i,a=this.lat*i,r=t.lat*i,h=Math.sin(n/2),l=Math.sin(s/2),u=h*h+l*l*Math.cos(a)*Math.cos(r);return 2*e*Math.atan2(Math.sqrt(u),Math.sqrt(1-u))},wrap:function(t,e){var i=this.lng;return t=t||-180,e=e||180,i=(i+e)%(e-t)+(t>i||i===e?e:t),new o.LatLng(this.lat,i)}},o.latLng=function(t,e){return t instanceof o.LatLng?t:o.Util.isArray(t)?new o.LatLng(t[0],t[1]):t===i||null===t?t:"object"==typeof t&&"lat"in t?new o.LatLng(t.lat,"lng"in t?t.lng:t.lon):new o.LatLng(t,e)},o.LatLngBounds=function(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;o>n;n++)this.extend(i[n])},o.LatLngBounds.prototype={extend:function(t){return t?(t="number"==typeof t[0]||"string"==typeof t[0]||t instanceof o.LatLng?o.latLng(t):o.latLngBounds(t),t instanceof o.LatLng?this._southWest||this._northEast?(this._southWest.lat=Math.min(t.lat,this._southWest.lat),this._southWest.lng=Math.min(t.lng,this._southWest.lng),this._northEast.lat=Math.max(t.lat,this._northEast.lat),this._northEast.lng=Math.max(t.lng,this._northEast.lng)):(this._southWest=new o.LatLng(t.lat,t.lng),this._northEast=new o.LatLng(t.lat,t.lng)):t instanceof o.LatLngBounds&&(this.extend(t._southWest),this.extend(t._northEast)),this):this},pad:function(t){var e=this._southWest,i=this._northEast,n=Math.abs(e.lat-i.lat)*t,s=Math.abs(e.lng-i.lng)*t;return new o.LatLngBounds(new o.LatLng(e.lat-n,e.lng-s),new o.LatLng(i.lat+n,i.lng+s))},getCenter:function(){return new o.LatLng((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new o.LatLng(this.getNorth(),this.getWest())},getSouthEast:function(){return new o.LatLng(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof o.LatLng?o.latLng(t):o.latLngBounds(t);var e,i,n=this._southWest,s=this._northEast;return t instanceof o.LatLngBounds?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=n.lat&&i.lat<=s.lat&&e.lng>=n.lng&&i.lng<=s.lng},intersects:function(t){t=o.latLngBounds(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),s=t.getNorthEast(),a=s.lat>=e.lat&&n.lat<=i.lat,r=s.lng>=e.lng&&n.lng<=i.lng;return a&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t){return t?(t=o.latLngBounds(t),this._southWest.equals(t.getSouthWest())&&this._northEast.equals(t.getNorthEast())):!1},isValid:function(){return!(!this._southWest||!this._northEast)}},o.latLngBounds=function(t,e){return!t||t instanceof o.LatLngBounds?t:new o.LatLngBounds(t,e)},o.Projection={},o.Projection.SphericalMercator={MAX_LATITUDE:85.0511287798,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=t.lng*e,a=n*e;return a=Math.log(Math.tan(Math.PI/4+a/2)),new o.Point(s,a)},unproject:function(t){var e=o.LatLng.RAD_TO_DEG,i=t.x*e,n=(2*Math.atan(Math.exp(t.y))-Math.PI/2)*e;return new o.LatLng(n,i)}},o.Projection.LonLat={project:function(t){return new o.Point(t.lng,t.lat)},unproject:function(t){return new o.LatLng(t.y,t.x)}},o.CRS={latLngToPoint:function(t,e){var i=this.projection.project(t),n=this.scale(e);return this.transformation._transform(i,n)},pointToLatLng:function(t,e){var i=this.scale(e),n=this.transformation.untransform(t,i);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},scale:function(t){return 256*Math.pow(2,t)}},o.CRS.Simple=o.extend({},o.CRS,{projection:o.Projection.LonLat,transformation:new o.Transformation(1,0,-1,0),scale:function(t){return Math.pow(2,t)}}),o.CRS.EPSG3857=o.extend({},o.CRS,{code:"EPSG:3857",projection:o.Projection.SphericalMercator,transformation:new o.Transformation(.5/Math.PI,.5,-.5/Math.PI,.5),project:function(t){var e=this.projection.project(t),i=6378137;return e.multiplyBy(i)}}),o.CRS.EPSG900913=o.extend({},o.CRS.EPSG3857,{code:"EPSG:900913"}),o.CRS.EPSG4326=o.extend({},o.CRS,{code:"EPSG:4326",projection:o.Projection.LonLat,transformation:new o.Transformation(1/360,.5,-1/360,.5)}),o.Map=o.Class.extend({includes:o.Mixin.Events,options:{crs:o.CRS.EPSG3857,fadeAnimation:o.DomUtil.TRANSITION&&!o.Browser.android23,trackResize:!0,markerZoomAnimation:o.DomUtil.TRANSITION&&o.Browser.any3d},initialize:function(t,e){e=o.setOptions(this,e),this._initContainer(t),this._initLayout(),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),e.center&&e.zoom!==i&&this.setView(o.latLng(e.center),e.zoom,{reset:!0}),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._tileLayersNum=0,this.callInitHooks(),this._addLayers(e.layers)},setView:function(t,e){return this._resetView(o.latLng(t),this._limitZoom(e)),this},setZoom:function(t,e){return this.setView(this.getCenter(),t,{zoom:e})},zoomIn:function(t,e){return this.setZoom(this._zoom+(t||1),e)},zoomOut:function(t,e){return this.setZoom(this._zoom-(t||1),e)},setZoomAround:function(t,e,i){var n=this.getZoomScale(e),s=this.getSize().divideBy(2),a=t instanceof o.Point?t:this.latLngToContainerPoint(t),r=a.subtract(s).multiplyBy(1-1/n),h=this.containerPointToLatLng(s.add(r));return this.setView(h,e,{zoom:i})},fitBounds:function(t,e){e=e||{},t=t.getBounds?t.getBounds():o.latLngBounds(t);var i=o.point(e.paddingTopLeft||e.padding||[0,0]),n=o.point(e.paddingBottomRight||e.padding||[0,0]),s=this.getBoundsZoom(t,!1,i.add(n)),a=n.subtract(i).divideBy(2),r=this.project(t.getSouthWest(),s),h=this.project(t.getNorthEast(),s),l=this.unproject(r.add(h).divideBy(2).add(a),s);return this.setView(l,s,e)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,e){return this.setView(t,this._zoom,{pan:e})},panBy:function(t){return this.fire("movestart"),this._rawPanBy(o.point(t)),this.fire("move"),this.fire("moveend")},setMaxBounds:function(t,e){if(t=o.latLngBounds(t),this.options.maxBounds=t,!t)return this._boundsMinZoom=null,this.off("moveend",this._panInsideMaxBounds,this),this;var i=this.getBoundsZoom(t,!0);return this._boundsMinZoom=i,this._loaded&&(this._zoom<i?this.setView(t.getCenter(),i,e):this.panInsideBounds(t)),this.on("moveend",this._panInsideMaxBounds,this),this},panInsideBounds:function(t){t=o.latLngBounds(t);var e=this.getPixelBounds(),i=e.getBottomLeft(),n=e.getTopRight(),s=this.project(t.getSouthWest()),a=this.project(t.getNorthEast()),r=0,h=0;return n.y<a.y&&(h=Math.ceil(a.y-n.y)),n.x>a.x&&(r=Math.floor(a.x-n.x)),i.y>s.y&&(h=Math.floor(s.y-i.y)),i.x<s.x&&(r=Math.ceil(s.x-i.x)),r||h?this.panBy([r,h]):this},addLayer:function(t){var e=o.stamp(t);return this._layers[e]?this:(this._layers[e]=t,!t.options||isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[e]=t,this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum++,this._tileLayersToLoad++,t.on("load",this._onTileLayerLoad,this)),this._loaded&&this._layerAdd(t),this)},removeLayer:function(t){var e=o.stamp(t);if(this._layers[e])return this._loaded&&t.onRemove(this),delete this._layers[e],this._loaded&&this.fire("layerremove",{layer:t}),this._zoomBoundLayers[e]&&(delete this._zoomBoundLayers[e],this._updateZoomLevels()),this.options.zoomAnimation&&o.TileLayer&&t instanceof o.TileLayer&&(this._tileLayersNum--,this._tileLayersToLoad--,t.off("load",this._onTileLayerLoad,this)),this},hasLayer:function(t){return t?o.stamp(t)in this._layers:!1},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},invalidateSize:function(t){t=o.extend({animate:!1,pan:!0},t===!0?{animate:!0}:t);var e=this.getSize();if(this._sizeChanged=!0,this.options.maxBounds&&this.setMaxBounds(this.options.maxBounds),!this._loaded)return this;var i=this.getSize(),n=e.subtract(i).divideBy(2).round();return n.x||n.y?(t.animate&&t.pan?this.panBy(n):(t.pan&&this._rawPanBy(n),this.fire("move"),clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(o.bind(this.fire,this,"moveend"),200)),this.fire("resize",{oldSize:e,newSize:i})):this},addHandler:function(t,e){if(e){var i=this[t]=new e(this);return this._handlers.push(i),this.options[t]&&i.enable(),this}},remove:function(){return this._loaded&&this.fire("unload"),this._initEvents("off"),delete this._container._leaflet,this._clearPanes(),this._clearControlPos&&this._clearControlPos(),this._clearHandlers(),this},getCenter:function(){return this._checkIfLoaded(),this._moved()?this.layerPointToLatLng(this._getCenterLayerPoint()):this._initialCenter},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds(),e=this.unproject(t.getBottomLeft()),i=this.unproject(t.getTopRight());return new o.LatLngBounds(e,i)},getMinZoom:function(){var t=this._layersMinZoom===i?0:this._layersMinZoom,e=this._boundsMinZoom===i?0:this._boundsMinZoom;return this.options.minZoom===i?Math.max(t,e):this.options.minZoom},getMaxZoom:function(){return this.options.maxZoom===i?this._layersMaxZoom===i?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=o.latLngBounds(t);var n,s=this.getMinZoom()-(e?1:0),a=this.getMaxZoom(),r=this.getSize(),h=t.getNorthWest(),l=t.getSouthEast(),u=!0;i=o.point(i||[0,0]);do s++,n=this.project(l,s).subtract(this.project(h,s)).add(i),u=e?n.x<r.x||n.y<r.y:r.contains(n);while(u&&a>=s);return u&&e?null:e?s:s-1},getSize:function(){return(!this._size||this._sizeChanged)&&(this._size=new o.Point(this._container.clientWidth,this._container.clientHeight),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(){var t=this._getTopLeftPoint();return new o.Bounds(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._initialTopLeftPoint},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t){var e=this.options.crs;return e.scale(t)/e.scale(this._zoom)},getScaleZoom:function(t){return this._zoom+Math.log(t)/Math.LN2},project:function(t,e){return e=e===i?this._zoom:e,this.options.crs.latLngToPoint(o.latLng(t),e)},unproject:function(t,e){return e=e===i?this._zoom:e,this.options.crs.pointToLatLng(o.point(t),e)},layerPointToLatLng:function(t){var e=o.point(t).add(this.getPixelOrigin());return this.unproject(e)},latLngToLayerPoint:function(t){var e=this.project(o.latLng(t))._round();return e._subtract(this.getPixelOrigin())},containerPointToLayerPoint:function(t){return o.point(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return o.point(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var e=this.containerPointToLayerPoint(o.point(t));return this.layerPointToLatLng(e)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(o.latLng(t)))},mouseEventToContainerPoint:function(t){return o.DomEvent.getMousePosition(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var e=this._container=o.DomUtil.get(t);if(!e)throw new Error("Map container not found.");if(e._leaflet)throw new Error("Map container is already initialized.");e._leaflet=!0},_initLayout:function(){var t=this._container;o.DomUtil.addClass(t,"leaflet-container"+(o.Browser.touch?" leaflet-touch":"")+(o.Browser.retina?" leaflet-retina":"")+(this.options.fadeAnimation?" leaflet-fade-anim":""));var e=o.DomUtil.getStyle(t,"position");"absolute"!==e&&"relative"!==e&&"fixed"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._mapPane=t.mapPane=this._createPane("leaflet-map-pane",this._container),this._tilePane=t.tilePane=this._createPane("leaflet-tile-pane",this._mapPane),t.objectsPane=this._createPane("leaflet-objects-pane",this._mapPane),t.shadowPane=this._createPane("leaflet-shadow-pane"),t.overlayPane=this._createPane("leaflet-overlay-pane"),t.markerPane=this._createPane("leaflet-marker-pane"),t.popupPane=this._createPane("leaflet-popup-pane");var e=" leaflet-zoom-hide";this.options.markerZoomAnimation||(o.DomUtil.addClass(t.markerPane,e),o.DomUtil.addClass(t.shadowPane,e),o.DomUtil.addClass(t.popupPane,e))},_createPane:function(t,e){return o.DomUtil.create("div",t,e||this._panes.objectsPane)},_clearPanes:function(){this._container.removeChild(this._mapPane)},_addLayers:function(t){t=t?o.Util.isArray(t)?t:[t]:[];for(var e=0,i=t.length;i>e;e++)this.addLayer(t[e])},_resetView:function(t,e,i,n){var s=this._zoom!==e;n||(this.fire("movestart"),s&&this.fire("zoomstart")),this._zoom=e,this._initialCenter=t,this._initialTopLeftPoint=this._getNewTopLeftPoint(t),i?this._initialTopLeftPoint._add(this._getMapPanePos()):o.DomUtil.setPosition(this._mapPane,new o.Point(0,0)),this._tileLayersToLoad=this._tileLayersNum;var a=!this._loaded;this._loaded=!0,a&&(this.fire("load"),this.eachLayer(this._layerAdd,this)),this.fire("viewreset",{hard:!i}),this.fire("move"),(s||n)&&this.fire("zoomend"),this.fire("moveend",{hard:!i})},_rawPanBy:function(t){o.DomUtil.setPosition(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_updateZoomLevels:function(){var t,e=1/0,n=-1/0,o=this._getZoomSpan();for(t in this._zoomBoundLayers){var s=this._zoomBoundLayers[t];isNaN(s.options.minZoom)||(e=Math.min(e,s.options.minZoom)),isNaN(s.options.maxZoom)||(n=Math.max(n,s.options.maxZoom))}t===i?this._layersMaxZoom=this._layersMinZoom=i:(this._layersMaxZoom=n,this._layersMinZoom=e),o!==this._getZoomSpan()&&this.fire("zoomlevelschange")},_panInsideMaxBounds:function(){this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(e){if(o.DomEvent){e=e||"on",o.DomEvent[e](this._container,"click",this._onMouseClick,this);var i,n,s=["dblclick","mousedown","mouseup","mouseenter","mouseleave","mousemove","contextmenu"];for(i=0,n=s.length;n>i;i++)o.DomEvent[e](this._container,s[i],this._fireMouseEvent,this);this.options.trackResize&&o.DomEvent[e](t,"resize",this._onResize,this)}},_onResize:function(){o.Util.cancelAnimFrame(this._resizeRequest),this._resizeRequest=o.Util.requestAnimFrame(this.invalidateSize,this,!1,this._container)},_onMouseClick:function(t){!this._loaded||!t._simulated&&this.dragging&&this.dragging.moved()||o.DomEvent._skipped(t)||(this.fire("preclick"),this._fireMouseEvent(t))},_fireMouseEvent:function(t){if(this._loaded&&!o.DomEvent._skipped(t)){var e=t.type;if(e="mouseenter"===e?"mouseover":"mouseleave"===e?"mouseout":e,this.hasEventListeners(e)){"contextmenu"===e&&o.DomEvent.preventDefault(t);var i=this.mouseEventToContainerPoint(t),n=this.containerPointToLayerPoint(i),s=this.layerPointToLatLng(n);this.fire(e,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t})}}},_onTileLayerLoad:function(){this._tileLayersToLoad--,this._tileLayersNum&&!this._tileLayersToLoad&&this.fire("tilelayersload")},_clearHandlers:function(){for(var t=0,e=this._handlers.length;e>t;t++)this._handlers[t].disable()},whenReady:function(t,e){return this._loaded?t.call(e||this,this):this.on("load",t,e),this},_layerAdd:function(t){t.onAdd(this),this.fire("layeradd",{layer:t})},_getMapPanePos:function(){return o.DomUtil.getPosition(this._mapPane)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(){return this.getPixelOrigin().subtract(this._getMapPanePos())},_getNewTopLeftPoint:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._round()},_latLngToNewLayerPoint:function(t,e,i){var n=this._getNewTopLeftPoint(i,e).add(this._getMapPanePos());return this.project(t,e)._subtract(n)},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom();return Math.max(e,Math.min(i,t))}}),o.map=function(t,e){return new o.Map(t,e)},o.Projection.Mercator={MAX_LATITUDE:85.0840591556,R_MINOR:6356752.314245179,R_MAJOR:6378137,project:function(t){var e=o.LatLng.DEG_TO_RAD,i=this.MAX_LATITUDE,n=Math.max(Math.min(i,t.lat),-i),s=this.R_MAJOR,a=this.R_MINOR,r=t.lng*e*s,h=n*e,l=a/s,u=Math.sqrt(1-l*l),c=u*Math.sin(h);c=Math.pow((1-c)/(1+c),.5*u);var d=Math.tan(.5*(.5*Math.PI-h))/c;return h=-s*Math.log(d),new o.Point(r,h)},unproject:function(t){for(var e,i=o.LatLng.RAD_TO_DEG,n=this.R_MAJOR,s=this.R_MINOR,a=t.x*i/n,r=s/n,h=Math.sqrt(1-r*r),l=Math.exp(-t.y/n),u=Math.PI/2-2*Math.atan(l),c=15,d=1e-7,p=c,_=.1;Math.abs(_)>d&&--p>0;)e=h*Math.sin(u),_=Math.PI/2-2*Math.atan(l*Math.pow((1-e)/(1+e),.5*h))-u,u+=_;return new o.LatLng(u*i,a)}},o.CRS.EPSG3395=o.extend({},o.CRS,{code:"EPSG:3395",projection:o.Projection.Mercator,transformation:function(){var t=o.Projection.Mercator,e=t.R_MAJOR,i=t.R_MINOR;return new o.Transformation(.5/(Math.PI*e),.5,-.5/(Math.PI*i),.5)}()}),o.TileLayer=o.Class.extend({includes:o.Mixin.Events,options:{minZoom:0,maxZoom:18,tileSize:256,subdomains:"abc",errorTileUrl:"",attribution:"",zoomOffset:0,opacity:1,unloadInvisibleTiles:o.Browser.mobile,updateWhenIdle:o.Browser.mobile},initialize:function(t,e){e=o.setOptions(this,e),e.detectRetina&&o.Browser.retina&&e.maxZoom>0&&(e.tileSize=Math.floor(e.tileSize/2),e.zoomOffset++,e.minZoom>0&&e.minZoom--,this.options.maxZoom--),e.bounds&&(e.bounds=o.latLngBounds(e.bounds)),this._url=t;var i=this.options.subdomains;"string"==typeof i&&(this.options.subdomains=i.split(""))},onAdd:function(t){this._map=t,this._animated=t._zoomAnimated,this._initContainer(),this._createTileProto(),t.on({viewreset:this._reset,moveend:this._update},this),this._animated&&t.on({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||(this._limitedUpdate=o.Util.limitExecByInterval(this._update,150,this),t.on("move",this._limitedUpdate,this)),this._reset(),this._update()
+},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this._container.parentNode.removeChild(this._container),t.off({viewreset:this._reset,moveend:this._update},this),this._animated&&t.off({zoomanim:this._animateZoom,zoomend:this._endZoomAnim},this),this.options.updateWhenIdle||t.off("move",this._limitedUpdate,this),this._container=null,this._map=null},bringToFront:function(){var t=this._map._panes.tilePane;return this._container&&(t.appendChild(this._container),this._setAutoZIndex(t,Math.max)),this},bringToBack:function(){var t=this._map._panes.tilePane;return this._container&&(t.insertBefore(this._container,t.firstChild),this._setAutoZIndex(t,Math.min)),this},getAttribution:function(){return this.options.attribution},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},setUrl:function(t,e){return this._url=t,e||this.redraw(),this},redraw:function(){return this._map&&(this._reset({hard:!0}),this._update()),this},_updateZIndex:function(){this._container&&this.options.zIndex!==i&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t,e){var i,n,o,s=t.children,a=-e(1/0,-1/0);for(n=0,o=s.length;o>n;n++)s[n]!==this._container&&(i=parseInt(s[n].style.zIndex,10),isNaN(i)||(a=e(a,i)));this.options.zIndex=this._container.style.zIndex=(isFinite(a)?a:0)+e(1,-1)},_updateOpacity:function(){var t,e=this._tiles;if(o.Browser.ielt9)for(t in e)o.DomUtil.setOpacity(e[t],this.options.opacity);else o.DomUtil.setOpacity(this._container,this.options.opacity)},_initContainer:function(){var t=this._map._panes.tilePane;if(!this._container){if(this._container=o.DomUtil.create("div","leaflet-layer"),this._updateZIndex(),this._animated){var e="leaflet-tile-container leaflet-zoom-animated";this._bgBuffer=o.DomUtil.create("div",e,this._container),this._tileContainer=o.DomUtil.create("div",e,this._container)}else this._tileContainer=this._container;t.appendChild(this._container),this.options.opacity<1&&this._updateOpacity()}},_reset:function(t){for(var e in this._tiles)this.fire("tileunload",{tile:this._tiles[e]});this._tiles={},this._tilesToLoad=0,this.options.reuseTiles&&(this._unusedTiles=[]),this._tileContainer.innerHTML="",this._animated&&t&&t.hard&&this._clearBgBuffer(),this._initContainer()},_update:function(){if(this._map){var t=this._map.getPixelBounds(),e=this._map.getZoom(),i=this.options.tileSize;if(!(e>this.options.maxZoom||e<this.options.minZoom)){var n=o.bounds(t.min.divideBy(i)._floor(),t.max.divideBy(i)._floor());this._addTilesFromCenterOut(n),(this.options.unloadInvisibleTiles||this.options.reuseTiles)&&this._removeOtherTiles(n)}}},_addTilesFromCenterOut:function(t){var i,n,s,a=[],r=t.getCenter();for(i=t.min.y;i<=t.max.y;i++)for(n=t.min.x;n<=t.max.x;n++)s=new o.Point(n,i),this._tileShouldBeLoaded(s)&&a.push(s);var h=a.length;if(0!==h){a.sort(function(t,e){return t.distanceTo(r)-e.distanceTo(r)});var l=e.createDocumentFragment();for(this._tilesToLoad||this.fire("loading"),this._tilesToLoad+=h,n=0;h>n;n++)this._addTile(a[n],l);this._tileContainer.appendChild(l)}},_tileShouldBeLoaded:function(t){if(t.x+":"+t.y in this._tiles)return!1;var e=this.options;if(!e.continuousWorld){var i=this._getWrapTileNum();if(e.noWrap&&(t.x<0||t.x>=i)||t.y<0||t.y>=i)return!1}if(e.bounds){var n=e.tileSize,o=t.multiplyBy(n),s=o.add([n,n]),a=this._map.unproject(o),r=this._map.unproject(s);if(e.continuousWorld||e.noWrap||(a=a.wrap(),r=r.wrap()),!e.bounds.intersects([a,r]))return!1}return!0},_removeOtherTiles:function(t){var e,i,n,o;for(o in this._tiles)e=o.split(":"),i=parseInt(e[0],10),n=parseInt(e[1],10),(i<t.min.x||i>t.max.x||n<t.min.y||n>t.max.y)&&this._removeTile(o)},_removeTile:function(t){var e=this._tiles[t];this.fire("tileunload",{tile:e,url:e.src}),this.options.reuseTiles?(o.DomUtil.removeClass(e,"leaflet-tile-loaded"),this._unusedTiles.push(e)):e.parentNode===this._tileContainer&&this._tileContainer.removeChild(e),o.Browser.android||(e.onload=null,e.src=o.Util.emptyImageUrl),delete this._tiles[t]},_addTile:function(t,e){var i=this._getTilePos(t),n=this._getTile();o.DomUtil.setPosition(n,i,o.Browser.chrome||o.Browser.android23),this._tiles[t.x+":"+t.y]=n,this._loadTile(n,t),n.parentNode!==this._tileContainer&&e.appendChild(n)},_getZoomForUrl:function(){var t=this.options,e=this._map.getZoom();return t.zoomReverse&&(e=t.maxZoom-e),e+t.zoomOffset},_getTilePos:function(t){var e=this._map.getPixelOrigin(),i=this.options.tileSize;return t.multiplyBy(i).subtract(e)},getTileUrl:function(t){return o.Util.template(this._url,o.extend({s:this._getSubdomain(t),z:t.z,x:t.x,y:t.y},this.options))},_getWrapTileNum:function(){return Math.pow(2,this._getZoomForUrl())},_adjustTilePoint:function(t){var e=this._getWrapTileNum();this.options.continuousWorld||this.options.noWrap||(t.x=(t.x%e+e)%e),this.options.tms&&(t.y=e-t.y-1),t.z=this._getZoomForUrl()},_getSubdomain:function(t){var e=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[e]},_createTileProto:function(){var t=this._tileImg=o.DomUtil.create("img","leaflet-tile");t.style.width=t.style.height=this.options.tileSize+"px",t.galleryimg="no"},_getTile:function(){if(this.options.reuseTiles&&this._unusedTiles.length>0){var t=this._unusedTiles.pop();return this._resetTile(t),t}return this._createTile()},_resetTile:function(){},_createTile:function(){var t=this._tileImg.cloneNode(!1);return t.onselectstart=t.onmousemove=o.Util.falseFn,o.Browser.ielt9&&this.options.opacity!==i&&o.DomUtil.setOpacity(t,this.options.opacity),t},_loadTile:function(t,e){t._layer=this,t.onload=this._tileOnLoad,t.onerror=this._tileOnError,this._adjustTilePoint(e),t.src=this.getTileUrl(e)},_tileLoaded:function(){this._tilesToLoad--,this._tilesToLoad||(this.fire("load"),this._animated&&(clearTimeout(this._clearBgBufferTimer),this._clearBgBufferTimer=setTimeout(o.bind(this._clearBgBuffer,this),500)))},_tileOnLoad:function(){var t=this._layer;this.src!==o.Util.emptyImageUrl&&(o.DomUtil.addClass(this,"leaflet-tile-loaded"),t.fire("tileload",{tile:this,url:this.src})),t._tileLoaded()},_tileOnError:function(){var t=this._layer;t.fire("tileerror",{tile:this,url:this.src});var e=t.options.errorTileUrl;e&&(this.src=e),t._tileLoaded()}}),o.tileLayer=function(t,e){return new o.TileLayer(t,e)},o.TileLayer.WMS=o.TileLayer.extend({defaultWmsParams:{service:"WMS",request:"GetMap",version:"1.1.1",layers:"",styles:"",format:"image/jpeg",transparent:!1},initialize:function(t,e){this._url=t;var i=o.extend({},this.defaultWmsParams),n=e.tileSize||this.options.tileSize;i.width=i.height=e.detectRetina&&o.Browser.retina?2*n:n;for(var s in e)this.options.hasOwnProperty(s)||"crs"===s||(i[s]=e[s]);this.wmsParams=i,o.setOptions(this,e)},onAdd:function(t){this._crs=this.options.crs||t.options.crs;var e=parseFloat(this.wmsParams.version)>=1.3?"crs":"srs";this.wmsParams[e]=this._crs.code,o.TileLayer.prototype.onAdd.call(this,t)},getTileUrl:function(t,e){var i=this._map,n=this.options.tileSize,s=t.multiplyBy(n),a=s.add([n,n]),r=this._crs.project(i.unproject(s,e)),h=this._crs.project(i.unproject(a,e)),l=[r.x,h.y,h.x,r.y].join(","),u=o.Util.template(this._url,{s:this._getSubdomain(t)});return u+o.Util.getParamString(this.wmsParams,u,!0)+"&BBOX="+l},setParams:function(t,e){return o.extend(this.wmsParams,t),e||this.redraw(),this}}),o.tileLayer.wms=function(t,e){return new o.TileLayer.WMS(t,e)},o.TileLayer.Canvas=o.TileLayer.extend({options:{async:!1},initialize:function(t){o.setOptions(this,t)},redraw:function(){this._map&&(this._reset({hard:!0}),this._update());for(var t in this._tiles)this._redrawTile(this._tiles[t]);return this},_redrawTile:function(t){this.drawTile(t,t._tilePoint,this._map._zoom)},_createTileProto:function(){var t=this._canvasProto=o.DomUtil.create("canvas","leaflet-tile");t.width=t.height=this.options.tileSize},_createTile:function(){var t=this._canvasProto.cloneNode(!1);return t.onselectstart=t.onmousemove=o.Util.falseFn,t},_loadTile:function(t,e){t._layer=this,t._tilePoint=e,this._redrawTile(t),this.options.async||this.tileDrawn(t)},drawTile:function(){},tileDrawn:function(t){this._tileOnLoad.call(t)}}),o.tileLayer.canvas=function(t){return new o.TileLayer.Canvas(t)},o.ImageOverlay=o.Class.extend({includes:o.Mixin.Events,options:{opacity:1},initialize:function(t,e,i){this._url=t,this._bounds=o.latLngBounds(e),o.setOptions(this,i)},onAdd:function(t){this._map=t,this._image||this._initImage(),t._panes.overlayPane.appendChild(this._image),t.on("viewreset",this._reset,this),t.options.zoomAnimation&&o.Browser.any3d&&t.on("zoomanim",this._animateZoom,this),this._reset()},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._image),t.off("viewreset",this._reset,this),t.options.zoomAnimation&&t.off("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},bringToFront:function(){return this._image&&this._map._panes.overlayPane.appendChild(this._image),this},bringToBack:function(){var t=this._map._panes.overlayPane;return this._image&&t.insertBefore(this._image,t.firstChild),this},_initImage:function(){this._image=o.DomUtil.create("img","leaflet-image-layer"),this._map.options.zoomAnimation&&o.Browser.any3d?o.DomUtil.addClass(this._image,"leaflet-zoom-animated"):o.DomUtil.addClass(this._image,"leaflet-zoom-hide"),this._updateOpacity(),o.extend(this._image,{galleryimg:"no",onselectstart:o.Util.falseFn,onmousemove:o.Util.falseFn,onload:o.bind(this._onImageLoad,this),src:this._url})},_animateZoom:function(t){var e=this._map,i=this._image,n=e.getZoomScale(t.zoom),s=this._bounds.getNorthWest(),a=this._bounds.getSouthEast(),r=e._latLngToNewLayerPoint(s,t.zoom,t.center),h=e._latLngToNewLayerPoint(a,t.zoom,t.center)._subtract(r),l=r._add(h._multiplyBy(.5*(1-1/n)));i.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(l)+" scale("+n+") "},_reset:function(){var t=this._image,e=this._map.latLngToLayerPoint(this._bounds.getNorthWest()),i=this._map.latLngToLayerPoint(this._bounds.getSouthEast())._subtract(e);o.DomUtil.setPosition(t,e),t.style.width=i.x+"px",t.style.height=i.y+"px"},_onImageLoad:function(){this.fire("load")},_updateOpacity:function(){o.DomUtil.setOpacity(this._image,this.options.opacity)}}),o.imageOverlay=function(t,e,i){return new o.ImageOverlay(t,e,i)},o.Icon=o.Class.extend({options:{className:""},initialize:function(t){o.setOptions(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,e){var i=this._getIconUrl(t);if(!i){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n;return n=e&&"IMG"===e.tagName?this._createImg(i,e):this._createImg(i),this._setIconStyles(n,t),n},_setIconStyles:function(t,e){var i,n=this.options,s=o.point(n[e+"Size"]);i="shadow"===e?o.point(n.shadowAnchor||n.iconAnchor):o.point(n.iconAnchor),!i&&s&&(i=s.divideBy(2,!0)),t.className="leaflet-marker-"+e+" "+n.className,i&&(t.style.marginLeft=-i.x+"px",t.style.marginTop=-i.y+"px"),s&&(t.style.width=s.x+"px",t.style.height=s.y+"px")},_createImg:function(t,i){return o.Browser.ie6?(i||(i=e.createElement("div")),i.style.filter='progid:DXImageTransform.Microsoft.AlphaImageLoader(src="'+t+'")'):(i||(i=e.createElement("img")),i.src=t),i},_getIconUrl:function(t){return o.Browser.retina&&this.options[t+"RetinaUrl"]?this.options[t+"RetinaUrl"]:this.options[t+"Url"]}}),o.icon=function(t){return new o.Icon(t)},o.Icon.Default=o.Icon.extend({options:{iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],shadowSize:[41,41]},_getIconUrl:function(t){var e=t+"Url";if(this.options[e])return this.options[e];o.Browser.retina&&"icon"===t&&(t+="-2x");var i=o.Icon.Default.imagePath;if(!i)throw new Error("Couldn't autodetect L.Icon.Default.imagePath, set it manually.");return i+"/marker-"+t+".png"}}),o.Icon.Default.imagePath=function(){var t,i,n,o,s,a=e.getElementsByTagName("script"),r=/[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;for(t=0,i=a.length;i>t;t++)if(n=a[t].src,o=n.match(r))return s=n.split(r)[0],(s?s+"/":"")+"images"}(),o.Marker=o.Class.extend({includes:o.Mixin.Events,options:{icon:new o.Icon.Default,title:"",clickable:!0,draggable:!1,keyboard:!0,zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250},initialize:function(t,e){o.setOptions(this,e),this._latlng=o.latLng(t)},onAdd:function(t){this._map=t,t.on("viewreset",this.update,this),this._initIcon(),this.update(),t.options.zoomAnimation&&t.options.markerZoomAnimation&&t.on("zoomanim",this._animateZoom,this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){this.dragging&&this.dragging.disable(),this._removeIcon(),this._removeShadow(),this.fire("remove"),t.off({viewreset:this.update,zoomanim:this._animateZoom},this),this._map=null},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=o.latLng(t),this.update(),this.fire("move",{latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update(),this},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this},update:function(){if(this._icon){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,e=this._map,i=e.options.zoomAnimation&&e.options.markerZoomAnimation,n=i?"leaflet-zoom-animated":"leaflet-zoom-hide",s=t.icon.createIcon(this._icon),a=!1;s!==this._icon&&(this._icon&&this._removeIcon(),a=!0,t.title&&(s.title=t.title)),o.DomUtil.addClass(s,n),t.keyboard&&(s.tabIndex="0"),this._icon=s,this._initInteraction(),t.riseOnHover&&o.DomEvent.on(s,"mouseover",this._bringToFront,this).on(s,"mouseout",this._resetZIndex,this);var r=t.icon.createShadow(this._shadow),h=!1;r!==this._shadow&&(this._removeShadow(),h=!0),r&&o.DomUtil.addClass(r,n),this._shadow=r,t.opacity<1&&this._updateOpacity();var l=this._map._panes;a&&l.markerPane.appendChild(this._icon),r&&h&&l.shadowPane.appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&o.DomEvent.off(this._icon,"mouseover",this._bringToFront).off(this._icon,"mouseout",this._resetZIndex),this._map._panes.markerPane.removeChild(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&this._map._panes.shadowPane.removeChild(this._shadow),this._shadow=null},_setPos:function(t){o.DomUtil.setPosition(this._icon,t),this._shadow&&o.DomUtil.setPosition(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon.style.zIndex=this._zIndex+t},_animateZoom:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);this._setPos(e)},_initInteraction:function(){if(this.options.clickable){var t=this._icon,e=["dblclick","mousedown","mouseover","mouseout","contextmenu"];o.DomUtil.addClass(t,"leaflet-clickable"),o.DomEvent.on(t,"click",this._onMouseClick,this),o.DomEvent.on(t,"keypress",this._onKeyPress,this);for(var i=0;i<e.length;i++)o.DomEvent.on(t,e[i],this._fireMouseEvent,this);o.Handler.MarkerDrag&&(this.dragging=new o.Handler.MarkerDrag(this),this.options.draggable&&this.dragging.enable())}},_onMouseClick:function(t){var e=this.dragging&&this.dragging.moved();(this.hasEventListeners(t.type)||e)&&o.DomEvent.stopPropagation(t),e||(this.dragging&&this.dragging._enabled||!this._map.dragging||!this._map.dragging.moved())&&this.fire(t.type,{originalEvent:t,latlng:this._latlng})},_onKeyPress:function(t){13===t.keyCode&&this.fire("click",{originalEvent:t,latlng:this._latlng})},_fireMouseEvent:function(t){this.fire(t.type,{originalEvent:t,latlng:this._latlng}),"contextmenu"===t.type&&this.hasEventListeners(t.type)&&o.DomEvent.preventDefault(t),"mousedown"!==t.type?o.DomEvent.stopPropagation(t):o.DomEvent.preventDefault(t)},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},_updateOpacity:function(){o.DomUtil.setOpacity(this._icon,this.options.opacity),this._shadow&&o.DomUtil.setOpacity(this._shadow,this.options.opacity)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)}}),o.marker=function(t,e){return new o.Marker(t,e)},o.DivIcon=o.Icon.extend({options:{iconSize:[12,12],className:"leaflet-div-icon",html:!1},createIcon:function(t){var i=t&&"DIV"===t.tagName?t:e.createElement("div"),n=this.options;return i.innerHTML=n.html!==!1?n.html:"",n.bgPos&&(i.style.backgroundPosition=-n.bgPos.x+"px "+-n.bgPos.y+"px"),this._setIconStyles(i,"icon"),i},createShadow:function(){return null}}),o.divIcon=function(t){return new o.DivIcon(t)},o.Map.mergeOptions({closePopupOnClick:!0}),o.Popup=o.Class.extend({includes:o.Mixin.Events,options:{minWidth:50,maxWidth:300,maxHeight:null,autoPan:!0,closeButton:!0,offset:[0,7],autoPanPadding:[5,5],keepInView:!1,className:"",zoomAnimation:!0},initialize:function(t,e){o.setOptions(this,t),this._source=e,this._animated=o.Browser.any3d&&this.options.zoomAnimation,this._isOpen=!1},onAdd:function(t){this._map=t,this._container||this._initLayout(),this._updateContent();var e=t.options.fadeAnimation;e&&o.DomUtil.setOpacity(this._container,0),t._panes.popupPane.appendChild(this._container),t.on(this._getEvents(),this),this._update(),e&&o.DomUtil.setOpacity(this._container,1),this.fire("open"),t.fire("popupopen",{popup:this}),this._source&&this._source.fire("popupopen",{popup:this})},addTo:function(t){return t.addLayer(this),this},openOn:function(t){return t.openPopup(this),this},onRemove:function(t){t._panes.popupPane.removeChild(this._container),o.Util.falseFn(this._container.offsetWidth),t.off(this._getEvents(),this),t.options.fadeAnimation&&o.DomUtil.setOpacity(this._container,0),this._map=null,this.fire("close"),t.fire("popupclose",{popup:this}),this._source&&this._source.fire("popupclose",{popup:this})},setLatLng:function(t){return this._latlng=o.latLng(t),this._update(),this},setContent:function(t){return this._content=t,this._update(),this},_getEvents:function(){var t={viewreset:this._updatePosition};return this._animated&&(t.zoomanim=this._zoomAnimation),("closeOnClick"in this.options?this.options.closeOnClick:this._map.options.closePopupOnClick)&&(t.preclick=this._close),this.options.keepInView&&(t.moveend=this._adjustPan),t},_close:function(){this._map&&this._map.closePopup(this)},_initLayout:function(){var t,e="leaflet-popup",i=e+" "+this.options.className+" leaflet-zoom-"+(this._animated?"animated":"hide"),n=this._container=o.DomUtil.create("div",i);this.options.closeButton&&(t=this._closeButton=o.DomUtil.create("a",e+"-close-button",n),t.href="#close",t.innerHTML="&#215;",o.DomEvent.disableClickPropagation(t),o.DomEvent.on(t,"click",this._onCloseButtonClick,this));var s=this._wrapper=o.DomUtil.create("div",e+"-content-wrapper",n);o.DomEvent.disableClickPropagation(s),this._contentNode=o.DomUtil.create("div",e+"-content",s),o.DomEvent.on(this._contentNode,"mousewheel",o.DomEvent.stopPropagation),o.DomEvent.on(this._contentNode,"MozMousePixelScroll",o.DomEvent.stopPropagation),o.DomEvent.on(s,"contextmenu",o.DomEvent.stopPropagation),this._tipContainer=o.DomUtil.create("div",e+"-tip-container",n),this._tip=o.DomUtil.create("div",e+"-tip",this._tipContainer)},_update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},_updateContent:function(){if(this._content){if("string"==typeof this._content)this._contentNode.innerHTML=this._content;else{for(;this._contentNode.hasChildNodes();)this._contentNode.removeChild(this._contentNode.firstChild);this._contentNode.appendChild(this._content)}this.fire("contentupdate")}},_updateLayout:function(){var t=this._contentNode,e=t.style;e.width="",e.whiteSpace="nowrap";var i=t.offsetWidth;i=Math.min(i,this.options.maxWidth),i=Math.max(i,this.options.minWidth),e.width=i+1+"px",e.whiteSpace="",e.height="";var n=t.offsetHeight,s=this.options.maxHeight,a="leaflet-popup-scrolled";s&&n>s?(e.height=s+"px",o.DomUtil.addClass(t,a)):o.DomUtil.removeClass(t,a),this._containerWidth=this._container.offsetWidth},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),e=this._animated,i=o.point(this.options.offset);e&&o.DomUtil.setPosition(this._container,t),this._containerBottom=-i.y-(e?0:t.y),this._containerLeft=-Math.round(this._containerWidth/2)+i.x+(e?0:t.x),this._container.style.bottom=this._containerBottom+"px",this._container.style.left=this._containerLeft+"px"}},_zoomAnimation:function(t){var e=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);o.DomUtil.setPosition(this._container,e)},_adjustPan:function(){if(this.options.autoPan){var t=this._map,e=this._container.offsetHeight,i=this._containerWidth,n=new o.Point(this._containerLeft,-e-this._containerBottom);this._animated&&n._add(o.DomUtil.getPosition(this._container));var s=t.layerPointToContainerPoint(n),a=o.point(this.options.autoPanPadding),r=t.getSize(),h=0,l=0;s.x+i>r.x&&(h=s.x+i-r.x+a.x),s.x-h<0&&(h=s.x-a.x),s.y+e>r.y&&(l=s.y+e-r.y+a.y),s.y-l<0&&(l=s.y-a.y),(h||l)&&t.fire("autopanstart").panBy([h,l])}},_onCloseButtonClick:function(t){this._close(),o.DomEvent.stop(t)}}),o.popup=function(t,e){return new o.Popup(t,e)},o.Map.include({openPopup:function(t,e,i){if(this.closePopup(),!(t instanceof o.Popup)){var n=t;t=new o.Popup(i).setLatLng(e).setContent(n)}return t._isOpen=!0,this._popup=t,this.addLayer(t)},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&(this.removeLayer(t),t._isOpen=!1),this}}),o.Marker.include({openPopup:function(){return this._popup&&this._map&&!this._map.hasLayer(this._popup)&&(this._popup.setLatLng(this._latlng),this._map.openPopup(this._popup)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(){return this._popup&&(this._popup._isOpen?this.closePopup():this.openPopup()),this},bindPopup:function(t,e){var i=o.point(this.options.icon.options.popupAnchor||[0,0]);return i=i.add(o.Popup.prototype.options.offset),e&&e.offset&&(i=i.add(e.offset)),e=o.extend({offset:i},e),this._popup||this.on("click",this.togglePopup,this).on("remove",this.closePopup,this).on("move",this._movePopup,this),t instanceof o.Popup?(o.setOptions(t,e),this._popup=t):this._popup=new o.Popup(e,this).setContent(t),this},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this.togglePopup).off("remove",this.closePopup).off("move",this._movePopup)),this},_movePopup:function(t){this._popup.setLatLng(t.latlng)}}),o.LayerGroup=o.Class.extend({initialize:function(t){this._layers={};var e,i;if(t)for(e=0,i=t.length;i>e;e++)this.addLayer(t[e])},addLayer:function(t){var e=this.getLayerId(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var e=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[e]&&this._map.removeLayer(this._layers[e]),delete this._layers[e],this},hasLayer:function(t){return t?t in this._layers||this.getLayerId(t)in this._layers:!1},clearLayers:function(){return this.eachLayer(this.removeLayer,this),this},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)i=this._layers[e],i[t]&&i[t].apply(i,n);return this},onAdd:function(t){this._map=t,this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t),this._map=null},addTo:function(t){return t.addLayer(this),this},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];for(var e in this._layers)t.push(this._layers[e]);return t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return o.stamp(t)}}),o.layerGroup=function(t){return new o.LayerGroup(t)},o.FeatureGroup=o.LayerGroup.extend({includes:o.Mixin.Events,statics:{EVENTS:"click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose"},addLayer:function(t){return this.hasLayer(t)?this:(t.on(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.addLayer.call(this,t),this._popupContent&&t.bindPopup&&t.bindPopup(this._popupContent,this._popupOptions),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.off(o.FeatureGroup.EVENTS,this._propagateEvent,this),o.LayerGroup.prototype.removeLayer.call(this,t),this._popupContent&&this.invoke("unbindPopup"),this.fire("layerremove",{layer:t})):this},bindPopup:function(t,e){return this._popupContent=t,this._popupOptions=e,this.invoke("bindPopup",t,e)},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new o.LatLngBounds;return this.eachLayer(function(e){t.extend(e instanceof o.Marker?e.getLatLng():e.getBounds())}),t},_propagateEvent:function(t){t.layer||(t.layer=t.target),t.target=this,this.fire(t.type,t)}}),o.featureGroup=function(t){return new o.FeatureGroup(t)},o.Path=o.Class.extend({includes:[o.Mixin.Events],statics:{CLIP_PADDING:function(){var e=o.Browser.mobile?1280:2e3,i=(e/Math.max(t.outerWidth,t.outerHeight)-1)/2;return Math.max(0,Math.min(.5,i))}()},options:{stroke:!0,color:"#0033ff",dashArray:null,weight:5,opacity:.5,fill:!1,fillColor:null,fillOpacity:.2,clickable:!0},initialize:function(t){o.setOptions(this,t)},onAdd:function(t){this._map=t,this._container||(this._initElements(),this._initEvents()),this.projectLatlngs(),this._updatePath(),this._container&&this._map._pathRoot.appendChild(this._container),this.fire("add"),t.on({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},addTo:function(t){return t.addLayer(this),this},onRemove:function(t){t._pathRoot.removeChild(this._container),this.fire("remove"),this._map=null,o.Browser.vml&&(this._container=null,this._stroke=null,this._fill=null),t.off({viewreset:this.projectLatlngs,moveend:this._updatePath},this)},projectLatlngs:function(){},setStyle:function(t){return o.setOptions(this,t),this._container&&this._updateStyle(),this},redraw:function(){return this._map&&(this.projectLatlngs(),this._updatePath()),this}}),o.Map.include({_updatePathViewport:function(){var t=o.Path.CLIP_PADDING,e=this.getSize(),i=o.DomUtil.getPosition(this._mapPane),n=i.multiplyBy(-1)._subtract(e.multiplyBy(t)._round()),s=n.add(e.multiplyBy(1+2*t)._round());this._pathViewport=new o.Bounds(n,s)}}),o.Path.SVG_NS="http://www.w3.org/2000/svg",o.Browser.svg=!(!e.createElementNS||!e.createElementNS(o.Path.SVG_NS,"svg").createSVGRect),o.Path=o.Path.extend({statics:{SVG:o.Browser.svg},bringToFront:function(){var t=this._map._pathRoot,e=this._container;return e&&t.lastChild!==e&&t.appendChild(e),this},bringToBack:function(){var t=this._map._pathRoot,e=this._container,i=t.firstChild;return e&&i!==e&&t.insertBefore(e,i),this},getPathString:function(){},_createElement:function(t){return e.createElementNS(o.Path.SVG_NS,t)},_initElements:function(){this._map._initPathRoot(),this._initPath(),this._initStyle()},_initPath:function(){this._container=this._createElement("g"),this._path=this._createElement("path"),this._container.appendChild(this._path)},_initStyle:function(){this.options.stroke&&(this._path.setAttribute("stroke-linejoin","round"),this._path.setAttribute("stroke-linecap","round")),this.options.fill&&this._path.setAttribute("fill-rule","evenodd"),this.options.pointerEvents&&this._path.setAttribute("pointer-events",this.options.pointerEvents),this.options.clickable||this.options.pointerEvents||this._path.setAttribute("pointer-events","none"),this._updateStyle()},_updateStyle:function(){this.options.stroke?(this._path.setAttribute("stroke",this.options.color),this._path.setAttribute("stroke-opacity",this.options.opacity),this._path.setAttribute("stroke-width",this.options.weight),this.options.dashArray?this._path.setAttribute("stroke-dasharray",this.options.dashArray):this._path.removeAttribute("stroke-dasharray")):this._path.setAttribute("stroke","none"),this.options.fill?(this._path.setAttribute("fill",this.options.fillColor||this.options.color),this._path.setAttribute("fill-opacity",this.options.fillOpacity)):this._path.setAttribute("fill","none")},_updatePath:function(){var t=this.getPathString();t||(t="M0 0"),this._path.setAttribute("d",t)},_initEvents:function(){if(this.options.clickable){(o.Browser.svg||!o.Browser.vml)&&this._path.setAttribute("class","leaflet-clickable"),o.DomEvent.on(this._container,"click",this._onMouseClick,this);for(var t=["dblclick","mousedown","mouseover","mouseout","mousemove","contextmenu"],e=0;e<t.length;e++)o.DomEvent.on(this._container,t[e],this._fireMouseEvent,this)}},_onMouseClick:function(t){this._map.dragging&&this._map.dragging.moved()||this._fireMouseEvent(t)},_fireMouseEvent:function(t){if(this.hasEventListeners(t.type)){var e=this._map,i=e.mouseEventToContainerPoint(t),n=e.containerPointToLayerPoint(i),s=e.layerPointToLatLng(n);this.fire(t.type,{latlng:s,layerPoint:n,containerPoint:i,originalEvent:t}),"contextmenu"===t.type&&o.DomEvent.preventDefault(t),"mousemove"!==t.type&&o.DomEvent.stopPropagation(t)}}}),o.Map.include({_initPathRoot:function(){this._pathRoot||(this._pathRoot=o.Path.prototype._createElement("svg"),this._panes.overlayPane.appendChild(this._pathRoot),this.options.zoomAnimation&&o.Browser.any3d?(this._pathRoot.setAttribute("class"," leaflet-zoom-animated"),this.on({zoomanim:this._animatePathZoom,zoomend:this._endPathZoom})):this._pathRoot.setAttribute("class"," leaflet-zoom-hide"),this.on("moveend",this._updateSvgViewport),this._updateSvgViewport())},_animatePathZoom:function(t){var e=this.getZoomScale(t.zoom),i=this._getCenterOffset(t.center)._multiplyBy(-e)._add(this._pathViewport.min);this._pathRoot.style[o.DomUtil.TRANSFORM]=o.DomUtil.getTranslateString(i)+" scale("+e+") ",this._pathZooming=!0},_endPathZoom:function(){this._pathZooming=!1},_updateSvgViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max,n=i.x-e.x,s=i.y-e.y,a=this._pathRoot,r=this._panes.overlayPane;o.Browser.mobileWebkit&&r.removeChild(a),o.DomUtil.setPosition(a,e),a.setAttribute("width",n),a.setAttribute("height",s),a.setAttribute("viewBox",[e.x,e.y,n,s].join(" ")),o.Browser.mobileWebkit&&r.appendChild(a)}}}),o.Path.include({bindPopup:function(t,e){return t instanceof o.Popup?this._popup=t:((!this._popup||e)&&(this._popup=new o.Popup(e,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on("click",this._openPopup,this).on("remove",this.closePopup,this),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this._popup=null,this.off("click",this._openPopup).off("remove",this.closePopup),this._popupHandlersAdded=!1),this},openPopup:function(t){return this._popup&&(t=t||this._latlng||this._latlngs[Math.floor(this._latlngs.length/2)],this._openPopup({latlng:t})),this},closePopup:function(){return this._popup&&this._popup._close(),this},_openPopup:function(t){this._popup.setLatLng(t.latlng),this._map.openPopup(this._popup)}}),o.Browser.vml=!o.Browser.svg&&function(){try{var t=e.createElement("div");t.innerHTML='<v:shape adj="1"/>';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(n){return!1}}(),o.Path=o.Browser.svg||!o.Browser.vml?o.Path:o.Path.extend({statics:{VML:!0,CLIP_PADDING:.02},_createElement:function(){try{return e.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return e.createElement("<lvml:"+t+' class="lvml">')}}catch(t){return function(t){return e.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),_initPath:function(){var t=this._container=this._createElement("shape");
+o.DomUtil.addClass(t,"leaflet-vml-shape"),this.options.clickable&&o.DomUtil.addClass(t,"leaflet-clickable"),t.coordsize="1 1",this._path=this._createElement("path"),t.appendChild(this._path),this._map._pathRoot.appendChild(t)},_initStyle:function(){this._updateStyle()},_updateStyle:function(){var t=this._stroke,e=this._fill,i=this.options,n=this._container;n.stroked=i.stroke,n.filled=i.fill,i.stroke?(t||(t=this._stroke=this._createElement("stroke"),t.endcap="round",n.appendChild(t)),t.weight=i.weight+"px",t.color=i.color,t.opacity=i.opacity,t.dashStyle=i.dashArray?i.dashArray instanceof Array?i.dashArray.join(" "):i.dashArray.replace(/( *, *)/g," "):""):t&&(n.removeChild(t),this._stroke=null),i.fill?(e||(e=this._fill=this._createElement("fill"),n.appendChild(e)),e.color=i.fillColor||i.color,e.opacity=i.fillOpacity):e&&(n.removeChild(e),this._fill=null)},_updatePath:function(){var t=this._container.style;t.display="none",this._path.v=this.getPathString()+" ",t.display=""}}),o.Map.include(o.Browser.svg||!o.Browser.vml?{}:{_initPathRoot:function(){if(!this._pathRoot){var t=this._pathRoot=e.createElement("div");t.className="leaflet-vml-container",this._panes.overlayPane.appendChild(t),this.on("moveend",this._updatePathViewport),this._updatePathViewport()}}}),o.Browser.canvas=function(){return!!e.createElement("canvas").getContext}(),o.Path=o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?o.Path:o.Path.extend({statics:{CANVAS:!0,SVG:!1},redraw:function(){return this._map&&(this.projectLatlngs(),this._requestUpdate()),this},setStyle:function(t){return o.setOptions(this,t),this._map&&(this._updateStyle(),this._requestUpdate()),this},onRemove:function(t){t.off("viewreset",this.projectLatlngs,this).off("moveend",this._updatePath,this),this.options.clickable&&(this._map.off("click",this._onClick,this),this._map.off("mousemove",this._onMouseMove,this)),this._requestUpdate(),this._map=null},_requestUpdate:function(){this._map&&!o.Path._updateRequest&&(o.Path._updateRequest=o.Util.requestAnimFrame(this._fireMapMoveEnd,this._map))},_fireMapMoveEnd:function(){o.Path._updateRequest=null,this.fire("moveend")},_initElements:function(){this._map._initPathRoot(),this._ctx=this._map._canvasCtx},_updateStyle:function(){var t=this.options;t.stroke&&(this._ctx.lineWidth=t.weight,this._ctx.strokeStyle=t.color),t.fill&&(this._ctx.fillStyle=t.fillColor||t.color)},_drawPath:function(){var t,e,i,n,s,a;for(this._ctx.beginPath(),t=0,i=this._parts.length;i>t;t++){for(e=0,n=this._parts[t].length;n>e;e++)s=this._parts[t][e],a=(0===e?"move":"line")+"To",this._ctx[a](s.x,s.y);this instanceof o.Polygon&&this._ctx.closePath()}},_checkIfEmpty:function(){return!this._parts.length},_updatePath:function(){if(!this._checkIfEmpty()){var t=this._ctx,e=this.options;this._drawPath(),t.save(),this._updateStyle(),e.fill&&(t.globalAlpha=e.fillOpacity,t.fill()),e.stroke&&(t.globalAlpha=e.opacity,t.stroke()),t.restore()}},_initEvents:function(){this.options.clickable&&(this._map.on("mousemove",this._onMouseMove,this),this._map.on("click",this._onClick,this))},_onClick:function(t){this._containsPoint(t.layerPoint)&&this.fire("click",t)},_onMouseMove:function(t){this._map&&!this._map._animatingZoom&&(this._containsPoint(t.layerPoint)?(this._ctx.canvas.style.cursor="pointer",this._mouseInside=!0,this.fire("mouseover",t)):this._mouseInside&&(this._ctx.canvas.style.cursor="",this._mouseInside=!1,this.fire("mouseout",t)))}}),o.Map.include(o.Path.SVG&&!t.L_PREFER_CANVAS||!o.Browser.canvas?{}:{_initPathRoot:function(){var t,i=this._pathRoot;i||(i=this._pathRoot=e.createElement("canvas"),i.style.position="absolute",t=this._canvasCtx=i.getContext("2d"),t.lineCap="round",t.lineJoin="round",this._panes.overlayPane.appendChild(i),this.options.zoomAnimation&&(this._pathRoot.className="leaflet-zoom-animated",this.on("zoomanim",this._animatePathZoom),this.on("zoomend",this._endPathZoom)),this.on("moveend",this._updateCanvasViewport),this._updateCanvasViewport())},_updateCanvasViewport:function(){if(!this._pathZooming){this._updatePathViewport();var t=this._pathViewport,e=t.min,i=t.max.subtract(e),n=this._pathRoot;o.DomUtil.setPosition(n,e),n.width=i.x,n.height=i.y,n.getContext("2d").translate(-e.x,-e.y)}}}),o.LineUtil={simplify:function(t,e){if(!e||!t.length)return t.slice();var i=e*e;return t=this._reducePoints(t,i),t=this._simplifyDP(t,i)},pointToSegmentDistance:function(t,e,i){return Math.sqrt(this._sqClosestPointOnSegment(t,e,i,!0))},closestPointOnSegment:function(t,e,i){return this._sqClosestPointOnSegment(t,e,i)},_simplifyDP:function(t,e){var n=t.length,o=typeof Uint8Array!=i+""?Uint8Array:Array,s=new o(n);s[0]=s[n-1]=1,this._simplifyDPStep(t,s,e,0,n-1);var a,r=[];for(a=0;n>a;a++)s[a]&&r.push(t[a]);return r},_simplifyDPStep:function(t,e,i,n,o){var s,a,r,h=0;for(a=n+1;o-1>=a;a++)r=this._sqClosestPointOnSegment(t[a],t[n],t[o],!0),r>h&&(s=a,h=r);h>i&&(e[s]=1,this._simplifyDPStep(t,e,i,n,s),this._simplifyDPStep(t,e,i,s,o))},_reducePoints:function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;s>n;n++)this._sqDist(t[n],t[o])>e&&(i.push(t[n]),o=n);return s-1>o&&i.push(t[s-1]),i},clipSegment:function(t,e,i,n){var o,s,a,r=n?this._lastCode:this._getBitCode(t,i),h=this._getBitCode(e,i);for(this._lastCode=h;;){if(!(r|h))return[t,e];if(r&h)return!1;o=r||h,s=this._getEdgeIntersection(t,e,o,i),a=this._getBitCode(s,i),o===r?(t=s,r=a):(e=s,h=a)}},_getEdgeIntersection:function(t,e,i,n){var s=e.x-t.x,a=e.y-t.y,r=n.min,h=n.max;return 8&i?new o.Point(t.x+s*(h.y-t.y)/a,h.y):4&i?new o.Point(t.x+s*(r.y-t.y)/a,r.y):2&i?new o.Point(h.x,t.y+a*(h.x-t.x)/s):1&i?new o.Point(r.x,t.y+a*(r.x-t.x)/s):void 0},_getBitCode:function(t,e){var i=0;return t.x<e.min.x?i|=1:t.x>e.max.x&&(i|=2),t.y<e.min.y?i|=4:t.y>e.max.y&&(i|=8),i},_sqDist:function(t,e){var i=e.x-t.x,n=e.y-t.y;return i*i+n*n},_sqClosestPointOnSegment:function(t,e,i,n){var s,a=e.x,r=e.y,h=i.x-a,l=i.y-r,u=h*h+l*l;return u>0&&(s=((t.x-a)*h+(t.y-r)*l)/u,s>1?(a=i.x,r=i.y):s>0&&(a+=h*s,r+=l*s)),h=t.x-a,l=t.y-r,n?h*h+l*l:new o.Point(a,r)}},o.Polyline=o.Path.extend({initialize:function(t,e){o.Path.prototype.initialize.call(this,e),this._latlngs=this._convertLatLngs(t)},options:{smoothFactor:1,noClip:!1},projectLatlngs:function(){this._originalPoints=[];for(var t=0,e=this._latlngs.length;e>t;t++)this._originalPoints[t]=this._map.latLngToLayerPoint(this._latlngs[t])},getPathString:function(){for(var t=0,e=this._parts.length,i="";e>t;t++)i+=this._getPathPartStr(this._parts[t]);return i},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._latlngs=this._convertLatLngs(t),this.redraw()},addLatLng:function(t){return this._latlngs.push(o.latLng(t)),this.redraw()},spliceLatLngs:function(){var t=[].splice.apply(this._latlngs,arguments);return this._convertLatLngs(this._latlngs,!0),this.redraw(),t},closestLayerPoint:function(t){for(var e,i,n=1/0,s=this._parts,a=null,r=0,h=s.length;h>r;r++)for(var l=s[r],u=1,c=l.length;c>u;u++){e=l[u-1],i=l[u];var d=o.LineUtil._sqClosestPointOnSegment(t,e,i,!0);n>d&&(n=d,a=o.LineUtil._sqClosestPointOnSegment(t,e,i))}return a&&(a.distance=Math.sqrt(n)),a},getBounds:function(){return new o.LatLngBounds(this.getLatLngs())},_convertLatLngs:function(t,e){var i,n,s=e?t:[];for(i=0,n=t.length;n>i;i++){if(o.Util.isArray(t[i])&&"number"!=typeof t[i][0])return;s[i]=o.latLng(t[i])}return s},_initEvents:function(){o.Path.prototype._initEvents.call(this)},_getPathPartStr:function(t){for(var e,i=o.Path.VML,n=0,s=t.length,a="";s>n;n++)e=t[n],i&&e._round(),a+=(n?"L":"M")+e.x+" "+e.y;return a},_clipPoints:function(){var t,e,i,n=this._originalPoints,s=n.length;if(this.options.noClip)return this._parts=[n],void 0;this._parts=[];var a=this._parts,r=this._map._pathViewport,h=o.LineUtil;for(t=0,e=0;s-1>t;t++)i=h.clipSegment(n[t],n[t+1],r,t),i&&(a[e]=a[e]||[],a[e].push(i[0]),(i[1]!==n[t+1]||t===s-2)&&(a[e].push(i[1]),e++))},_simplifyPoints:function(){for(var t=this._parts,e=o.LineUtil,i=0,n=t.length;n>i;i++)t[i]=e.simplify(t[i],this.options.smoothFactor)},_updatePath:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),o.Path.prototype._updatePath.call(this))}}),o.polyline=function(t,e){return new o.Polyline(t,e)},o.PolyUtil={},o.PolyUtil.clipPolygon=function(t,e){var i,n,s,a,r,h,l,u,c,d=[1,4,2,8],p=o.LineUtil;for(n=0,l=t.length;l>n;n++)t[n]._code=p._getBitCode(t[n],e);for(a=0;4>a;a++){for(u=d[a],i=[],n=0,l=t.length,s=l-1;l>n;s=n++)r=t[n],h=t[s],r._code&u?h._code&u||(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)):(h._code&u&&(c=p._getEdgeIntersection(h,r,u,e),c._code=p._getBitCode(c,e),i.push(c)),i.push(r));t=i}return t},o.Polygon=o.Polyline.extend({options:{fill:!0},initialize:function(t,e){var i,n,s;if(o.Polyline.prototype.initialize.call(this,t,e),t&&o.Util.isArray(t[0])&&"number"!=typeof t[0][0])for(this._latlngs=this._convertLatLngs(t[0]),this._holes=t.slice(1),i=0,n=this._holes.length;n>i;i++)s=this._holes[i]=this._convertLatLngs(this._holes[i]),s[0].equals(s[s.length-1])&&s.pop();t=this._latlngs,t.length>=2&&t[0].equals(t[t.length-1])&&t.pop()},projectLatlngs:function(){if(o.Polyline.prototype.projectLatlngs.call(this),this._holePoints=[],this._holes){var t,e,i,n;for(t=0,i=this._holes.length;i>t;t++)for(this._holePoints[t]=[],e=0,n=this._holes[t].length;n>e;e++)this._holePoints[t][e]=this._map.latLngToLayerPoint(this._holes[t][e])}},_clipPoints:function(){var t=this._originalPoints,e=[];if(this._parts=[t].concat(this._holePoints),!this.options.noClip){for(var i=0,n=this._parts.length;n>i;i++){var s=o.PolyUtil.clipPolygon(this._parts[i],this._map._pathViewport);s.length&&e.push(s)}this._parts=e}},_getPathPartStr:function(t){var e=o.Polyline.prototype._getPathPartStr.call(this,t);return e+(o.Browser.svg?"z":"x")}}),o.polygon=function(t,e){return new o.Polygon(t,e)},function(){function t(t){return o.FeatureGroup.extend({initialize:function(t,e){this._layers={},this._options=e,this.setLatLngs(t)},setLatLngs:function(e){var i=0,n=e.length;for(this.eachLayer(function(t){n>i?t.setLatLngs(e[i++]):this.removeLayer(t)},this);n>i;)this.addLayer(new t(e[i++],this._options));return this},getLatLngs:function(){var t=[];return this.eachLayer(function(e){t.push(e.getLatLngs())}),t}})}o.MultiPolyline=t(o.Polyline),o.MultiPolygon=t(o.Polygon),o.multiPolyline=function(t,e){return new o.MultiPolyline(t,e)},o.multiPolygon=function(t,e){return new o.MultiPolygon(t,e)}}(),o.Rectangle=o.Polygon.extend({initialize:function(t,e){o.Polygon.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return t=o.latLngBounds(t),[t.getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}}),o.rectangle=function(t,e){return new o.Rectangle(t,e)},o.Circle=o.Path.extend({initialize:function(t,e,i){o.Path.prototype.initialize.call(this,i),this._latlng=o.latLng(t),this._mRadius=e},options:{fill:!0},setLatLng:function(t){return this._latlng=o.latLng(t),this.redraw()},setRadius:function(t){return this._mRadius=t,this.redraw()},projectLatlngs:function(){var t=this._getLngRadius(),e=this._latlng,i=this._map.latLngToLayerPoint([e.lat,e.lng-t]);this._point=this._map.latLngToLayerPoint(e),this._radius=Math.max(this._point.x-i.x,1)},getBounds:function(){var t=this._getLngRadius(),e=360*(this._mRadius/40075017),i=this._latlng;return new o.LatLngBounds([i.lat-e,i.lng-t],[i.lat+e,i.lng+t])},getLatLng:function(){return this._latlng},getPathString:function(){var t=this._point,e=this._radius;return this._checkIfEmpty()?"":o.Browser.svg?"M"+t.x+","+(t.y-e)+"A"+e+","+e+",0,1,1,"+(t.x-.1)+","+(t.y-e)+" z":(t._round(),e=Math.round(e),"AL "+t.x+","+t.y+" "+e+","+e+" 0,"+23592600)},getRadius:function(){return this._mRadius},_getLatRadius:function(){return 360*(this._mRadius/40075017)},_getLngRadius:function(){return this._getLatRadius()/Math.cos(o.LatLng.DEG_TO_RAD*this._latlng.lat)},_checkIfEmpty:function(){if(!this._map)return!1;var t=this._map._pathViewport,e=this._radius,i=this._point;return i.x-e>t.max.x||i.y-e>t.max.y||i.x+e<t.min.x||i.y+e<t.min.y}}),o.circle=function(t,e,i){return new o.Circle(t,e,i)},o.CircleMarker=o.Circle.extend({options:{radius:10,weight:2},initialize:function(t,e){o.Circle.prototype.initialize.call(this,t,null,e),this._radius=this.options.radius},projectLatlngs:function(){this._point=this._map.latLngToLayerPoint(this._latlng)},_updateStyle:function(){o.Circle.prototype._updateStyle.call(this),this.setRadius(this.options.radius)},setRadius:function(t){return this.options.radius=this._radius=t,this.redraw()}}),o.circleMarker=function(t,e){return new o.CircleMarker(t,e)},o.Polyline.include(o.Path.CANVAS?{_containsPoint:function(t,e){var i,n,s,a,r,h,l,u=this.options.weight/2;for(o.Browser.touch&&(u+=10),i=0,a=this._parts.length;a>i;i++)for(l=this._parts[i],n=0,r=l.length,s=r-1;r>n;s=n++)if((e||0!==n)&&(h=o.LineUtil.pointToSegmentDistance(t,l[s],l[n]),u>=h))return!0;return!1}}:{}),o.Polygon.include(o.Path.CANVAS?{_containsPoint:function(t){var e,i,n,s,a,r,h,l,u=!1;if(o.Polyline.prototype._containsPoint.call(this,t,!0))return!0;for(s=0,h=this._parts.length;h>s;s++)for(e=this._parts[s],a=0,l=e.length,r=l-1;l>a;r=a++)i=e[a],n=e[r],i.y>t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(u=!u);return u}}:{}),o.Circle.include(o.Path.CANVAS?{_drawPath:function(){var t=this._point;this._ctx.beginPath(),this._ctx.arc(t.x,t.y,this._radius,0,2*Math.PI,!1)},_containsPoint:function(t){var e=this._point,i=this.options.stroke?this.options.weight/2:0;return t.distanceTo(e)<=this._radius+i}}:{}),o.CircleMarker.include(o.Path.CANVAS?{_updateStyle:function(){o.Path.prototype._updateStyle.call(this)}}:{}),o.GeoJSON=o.FeatureGroup.extend({initialize:function(t,e){o.setOptions(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,s=o.Util.isArray(t)?t:t.features;if(s){for(e=0,i=s.length;i>e;e++)n=s[e],(n.geometries||n.geometry||n.features||n.coordinates)&&this.addData(s[e]);return this}var a=this.options;if(!a.filter||a.filter(t)){var r=o.GeoJSON.geometryToLayer(t,a.pointToLayer,a.coordsToLatLng);return r.feature=o.GeoJSON.asFeature(t),r.defaultOptions=r.options,this.resetStyle(r),a.onEachFeature&&a.onEachFeature(t,r),this.addLayer(r)}},resetStyle:function(t){var e=this.options.style;e&&(o.Util.extend(t.options,t.defaultOptions),this._setLayerStyle(t,e))},setStyle:function(t){this.eachLayer(function(e){this._setLayerStyle(e,t)},this)},_setLayerStyle:function(t,e){"function"==typeof e&&(e=e(t.feature)),t.setStyle&&t.setStyle(e)}}),o.extend(o.GeoJSON,{geometryToLayer:function(t,e,i){var n,s,a,r,h,l="Feature"===t.type?t.geometry:t,u=l.coordinates,c=[];switch(i=i||this.coordsToLatLng,l.type){case"Point":return n=i(u),e?e(t,n):new o.Marker(n);case"MultiPoint":for(a=0,r=u.length;r>a;a++)n=i(u[a]),h=e?e(t,n):new o.Marker(n),c.push(h);return new o.FeatureGroup(c);case"LineString":return s=this.coordsToLatLngs(u,0,i),new o.Polyline(s);case"Polygon":return s=this.coordsToLatLngs(u,1,i),new o.Polygon(s);case"MultiLineString":return s=this.coordsToLatLngs(u,1,i),new o.MultiPolyline(s);case"MultiPolygon":return s=this.coordsToLatLngs(u,2,i),new o.MultiPolygon(s);case"GeometryCollection":for(a=0,r=l.geometries.length;r>a;a++)h=this.geometryToLayer({geometry:l.geometries[a],type:"Feature",properties:t.properties},e,i),c.push(h);return new o.FeatureGroup(c);default:throw new Error("Invalid GeoJSON object.")}},coordsToLatLng:function(t){return new o.LatLng(t[1],t[0])},coordsToLatLngs:function(t,e,i){var n,o,s,a=[];for(o=0,s=t.length;s>o;o++)n=e?this.coordsToLatLngs(t[o],e-1,i):(i||this.coordsToLatLng)(t[o]),a.push(n);return a},latLngToCoords:function(t){return[t.lng,t.lat]},latLngsToCoords:function(t){for(var e=[],i=0,n=t.length;n>i;i++)e.push(o.GeoJSON.latLngToCoords(t[i]));return e},getFeature:function(t,e){return t.feature?o.extend({},t.feature,{geometry:e}):o.GeoJSON.asFeature(e)},asFeature:function(t){return"Feature"===t.type?t:{type:"Feature",properties:{},geometry:t}}});var a={toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"Point",coordinates:o.GeoJSON.latLngToCoords(this.getLatLng())})}};o.Marker.include(a),o.Circle.include(a),o.CircleMarker.include(a),o.Polyline.include({toGeoJSON:function(){return o.GeoJSON.getFeature(this,{type:"LineString",coordinates:o.GeoJSON.latLngsToCoords(this.getLatLngs())})}}),o.Polygon.include({toGeoJSON:function(){var t,e,i,n=[o.GeoJSON.latLngsToCoords(this.getLatLngs())];if(n[0].push(n[0][0]),this._holes)for(t=0,e=this._holes.length;e>t;t++)i=o.GeoJSON.latLngsToCoords(this._holes[t]),i.push(i[0]),n.push(i);return o.GeoJSON.getFeature(this,{type:"Polygon",coordinates:n})}}),function(){function t(t,e){t.include({toGeoJSON:function(){var t=[];return this.eachLayer(function(e){t.push(e.toGeoJSON().geometry.coordinates)}),o.GeoJSON.getFeature(this,{type:e,coordinates:t})}})}t(o.MultiPolyline,"MultiLineString"),t(o.MultiPolygon,"MultiPolygon")}(),o.LayerGroup.include({toGeoJSON:function(){var t=[];return this.eachLayer(function(e){e.toGeoJSON&&t.push(o.GeoJSON.asFeature(e.toGeoJSON()))}),{type:"FeatureCollection",features:t}}}),o.geoJson=function(t,e){return new o.GeoJSON(t,e)},o.DomEvent={addListener:function(t,e,i,n){var s,a,r,h=o.stamp(i),l="_leaflet_"+e+h;return t[l]?this:(s=function(e){return i.call(n||t,e||o.DomEvent._getEvent())},o.Browser.msTouch&&0===e.indexOf("touch")?this.addMsTouchListener(t,e,s,h):(o.Browser.touch&&"dblclick"===e&&this.addDoubleTapListener&&this.addDoubleTapListener(t,s,h),"addEventListener"in t?"mousewheel"===e?(t.addEventListener("DOMMouseScroll",s,!1),t.addEventListener(e,s,!1)):"mouseenter"===e||"mouseleave"===e?(a=s,r="mouseenter"===e?"mouseover":"mouseout",s=function(e){return o.DomEvent._checkMouse(t,e)?a(e):void 0},t.addEventListener(r,s,!1)):"click"===e&&o.Browser.android?(a=s,s=function(t){return o.DomEvent._filterClick(t,a)},t.addEventListener(e,s,!1)):t.addEventListener(e,s,!1):"attachEvent"in t&&t.attachEvent("on"+e,s),t[l]=s,this))},removeListener:function(t,e,i){var n=o.stamp(i),s="_leaflet_"+e+n,a=t[s];return a?(o.Browser.msTouch&&0===e.indexOf("touch")?this.removeMsTouchListener(t,e,n):o.Browser.touch&&"dblclick"===e&&this.removeDoubleTapListener?this.removeDoubleTapListener(t,n):"removeEventListener"in t?"mousewheel"===e?(t.removeEventListener("DOMMouseScroll",a,!1),t.removeEventListener(e,a,!1)):"mouseenter"===e||"mouseleave"===e?t.removeEventListener("mouseenter"===e?"mouseover":"mouseout",a,!1):t.removeEventListener(e,a,!1):"detachEvent"in t&&t.detachEvent("on"+e,a),t[s]=null,this):this},stopPropagation:function(t){return t.stopPropagation?t.stopPropagation():t.cancelBubble=!0,this},disableClickPropagation:function(t){for(var e=o.DomEvent.stopPropagation,i=o.Draggable.START.length-1;i>=0;i--)o.DomEvent.addListener(t,o.Draggable.START[i],e);return o.DomEvent.addListener(t,"click",o.DomEvent._fakeStop).addListener(t,"dblclick",e)},preventDefault:function(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this},stop:function(t){return o.DomEvent.preventDefault(t).stopPropagation(t)},getMousePosition:function(t,i){var n=o.Browser.ie7,s=e.body,a=e.documentElement,r=t.pageX?t.pageX-s.scrollLeft-a.scrollLeft:t.clientX,h=t.pageY?t.pageY-s.scrollTop-a.scrollTop:t.clientY,l=new o.Point(r,h),u=i.getBoundingClientRect(),c=u.left-i.clientLeft,d=u.top-i.clientTop;return o.DomUtil.documentIsLtr()||!o.Browser.webkit&&!n||(c+=i.scrollWidth-i.clientWidth,n&&"hidden"!==o.DomUtil.getStyle(i,"overflow-y")&&"hidden"!==o.DomUtil.getStyle(i,"overflow")&&(c+=17)),l._subtract(new o.Point(c,d))},getWheelDelta:function(t){var e=0;return t.wheelDelta&&(e=t.wheelDelta/120),t.detail&&(e=-t.detail/3),e},_skipEvents:{},_fakeStop:function(t){o.DomEvent._skipEvents[t.type]=!0},_skipped:function(t){var e=this._skipEvents[t.type];return this._skipEvents[t.type]=!1,e},_checkMouse:function(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(n){return!1}return i!==t},_getEvent:function(){var e=t.event;if(!e)for(var i=arguments.callee.caller;i&&(e=i.arguments[0],!e||t.Event!==e.constructor);)i=i.caller;return e},_filterClick:function(t,e){var i=t.timeStamp||t.originalEvent.timeStamp,n=o.DomEvent._lastClick&&i-o.DomEvent._lastClick;return n&&n>100&&1e3>n||t.target._simulatedClick&&!t._simulated?(o.DomEvent.stop(t),void 0):(o.DomEvent._lastClick=i,e(t))}},o.DomEvent.on=o.DomEvent.addListener,o.DomEvent.off=o.DomEvent.removeListener,o.Draggable=o.Class.extend({includes:o.Mixin.Events,statics:{START:o.Browser.touch?["touchstart","mousedown"]:["mousedown"],END:{mousedown:"mouseup",touchstart:"touchend",MSPointerDown:"touchend"},MOVE:{mousedown:"mousemove",touchstart:"touchmove",MSPointerDown:"touchmove"}},initialize:function(t,e){this._element=t,this._dragStartTarget=e||t},enable:function(){if(!this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.on(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!0}},disable:function(){if(this._enabled){for(var t=o.Draggable.START.length-1;t>=0;t--)o.DomEvent.off(this._dragStartTarget,o.Draggable.START[t],this._onDown,this);this._enabled=!1,this._moved=!1}},_onDown:function(t){if(!t.shiftKey&&(1===t.which||1===t.button||t.touches)&&(o.DomEvent.stopPropagation(t),!o.Draggable._disabled)){o.DomUtil.disableImageDrag(),o.DomUtil.disableTextSelection();var i=t.touches?t.touches[0]:t,n=i.target;o.Browser.touch&&"a"===n.tagName.toLowerCase()&&o.DomUtil.addClass(n,"leaflet-active"),this._moved=!1,this._moving||(this._startPoint=new o.Point(i.clientX,i.clientY),this._startPos=this._newPos=o.DomUtil.getPosition(this._element),o.DomEvent.on(e,o.Draggable.MOVE[t.type],this._onMove,this).on(e,o.Draggable.END[t.type],this._onUp,this))}},_onMove:function(t){if(!(t.touches&&t.touches.length>1)){var i=t.touches&&1===t.touches.length?t.touches[0]:t,n=new o.Point(i.clientX,i.clientY),s=n.subtract(this._startPoint);(s.x||s.y)&&(o.DomEvent.preventDefault(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=o.DomUtil.getPosition(this._element).subtract(s),o.Browser.touch||o.DomUtil.addClass(e.body,"leaflet-dragging")),this._newPos=this._startPos.add(s),this._moving=!0,o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updatePosition,this,!0,this._dragStartTarget))}},_updatePosition:function(){this.fire("predrag"),o.DomUtil.setPosition(this._element,this._newPos),this.fire("drag")},_onUp:function(){o.Browser.touch||o.DomUtil.removeClass(e.body,"leaflet-dragging");for(var t in o.Draggable.MOVE)o.DomEvent.off(e,o.Draggable.MOVE[t],this._onMove).off(e,o.Draggable.END[t],this._onUp);o.DomUtil.enableImageDrag(),o.DomUtil.enableTextSelection(),this._moved&&(o.Util.cancelAnimFrame(this._animRequest),this.fire("dragend")),this._moving=!1}}),o.Handler=o.Class.extend({initialize:function(t){this._map=t},enable:function(){this._enabled||(this._enabled=!0,this.addHooks())},disable:function(){this._enabled&&(this._enabled=!1,this.removeHooks())},enabled:function(){return!!this._enabled}}),o.Map.mergeOptions({dragging:!0,inertia:!o.Browser.android23,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,inertiaThreshold:o.Browser.touch?32:18,easeLinearity:.25,worldCopyJump:!1}),o.Map.Drag=o.Handler.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new o.Draggable(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDrag,this),t.on("viewreset",this._onViewReset,this),this._onViewReset())}this._draggable.enable()},removeHooks:function(){this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){var t=this._map;t._panAnim&&t._panAnim.stop(),t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(){if(this._map.options.inertia){var t=this._lastTime=+new Date,e=this._lastPos=this._draggable._newPos;this._positions.push(e),this._times.push(t),t-this._times[0]>200&&(this._positions.shift(),this._times.shift())}this._map.fire("move").fire("drag")},_onViewReset:function(){var t=this._map.getSize()._divideBy(2),e=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.project([0,180]).x},_onPreDrag:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,s=(n+e+i)%t-e-i,a=Math.abs(o+i)<Math.abs(s+i)?o:s;this._draggable._newPos.x=a},_onDragEnd:function(){var t=this._map,e=t.options,i=+new Date-this._lastTime,n=!e.inertia||i>e.inertiaThreshold||!this._positions[0];if(t.fire("dragend"),n)t.fire("moveend");else{var s=this._lastPos.subtract(this._positions[0]),a=(this._lastTime+i-this._times[0])/1e3,r=e.easeLinearity,h=s.multiplyBy(r/a),l=h.distanceTo([0,0]),u=Math.min(e.inertiaMaxSpeed,l),c=h.multiplyBy(u/l),d=u/(e.inertiaDeceleration*r),p=c.multiplyBy(-d/2).round();p.x&&p.y?o.Util.requestAnimFrame(function(){t.panBy(p,{duration:d,easeLinearity:r,noMoveStart:!0})}):t.fire("moveend")}}}),o.Map.addInitHook("addHandler","dragging",o.Map.Drag),o.Map.mergeOptions({doubleClickZoom:!0}),o.Map.DoubleClickZoom=o.Handler.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick)},_onDoubleClick:function(t){this.setZoomAround(t.containerPoint,this._zoom+1)}}),o.Map.addInitHook("addHandler","doubleClickZoom",o.Map.DoubleClickZoom),o.Map.mergeOptions({scrollWheelZoom:!0}),o.Map.ScrollWheelZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"mousewheel",this._onWheelScroll,this),o.DomEvent.on(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault),this._delta=0},removeHooks:function(){o.DomEvent.off(this._map._container,"mousewheel",this._onWheelScroll),o.DomEvent.off(this._map._container,"MozMousePixelScroll",o.DomEvent.preventDefault)},_onWheelScroll:function(t){var e=o.DomEvent.getWheelDelta(t);this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var i=Math.max(40-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(o.bind(this._performZoom,this),i),o.DomEvent.preventDefault(t),o.DomEvent.stopPropagation(t)},_performZoom:function(){var t=this._map,e=this._delta,i=t.getZoom();e=e>0?Math.ceil(e):Math.floor(e),e=Math.max(Math.min(e,4),-4),e=t._limitZoom(i+e)-i,this._delta=0,this._startTime=null,e&&t.setZoomAround(this._lastMousePos,i+e)}}),o.Map.addInitHook("addHandler","scrollWheelZoom",o.Map.ScrollWheelZoom),o.extend(o.DomEvent,{_touchstart:o.Browser.msTouch?"MSPointerDown":"touchstart",_touchend:o.Browser.msTouch?"MSPointerUp":"touchend",addDoubleTapListener:function(t,i,n){function s(t){var e;if(o.Browser.msTouch?(_.push(t.pointerId),e=_.length):e=t.touches.length,!(e>1)){var i=Date.now(),n=i-(r||i);h=t.touches?t.touches[0]:t,l=n>0&&u>=n,r=i}}function a(t){if(o.Browser.msTouch){var e=_.indexOf(t.pointerId);if(-1===e)return;_.splice(e,1)}if(l){if(o.Browser.msTouch){var n,s={};for(var a in h)n=h[a],s[a]="function"==typeof n?n.bind(h):n;h=s}h.type="dblclick",i(h),r=null}}var r,h,l=!1,u=250,c="_leaflet_",d=this._touchstart,p=this._touchend,_=[];t[c+d+n]=s,t[c+p+n]=a;var m=o.Browser.msTouch?e.documentElement:t;return t.addEventListener(d,s,!1),m.addEventListener(p,a,!1),o.Browser.msTouch&&m.addEventListener("MSPointerCancel",a,!1),this},removeDoubleTapListener:function(t,i){var n="_leaflet_";return t.removeEventListener(this._touchstart,t[n+this._touchstart+i],!1),(o.Browser.msTouch?e.documentElement:t).removeEventListener(this._touchend,t[n+this._touchend+i],!1),o.Browser.msTouch&&e.documentElement.removeEventListener("MSPointerCancel",t[n+this._touchend+i],!1),this}}),o.extend(o.DomEvent,{_msTouches:[],_msDocumentListener:!1,addMsTouchListener:function(t,e,i,n){switch(e){case"touchstart":return this.addMsTouchListenerStart(t,e,i,n);case"touchend":return this.addMsTouchListenerEnd(t,e,i,n);case"touchmove":return this.addMsTouchListenerMove(t,e,i,n);default:throw"Unknown touch event type"}},addMsTouchListenerStart:function(t,i,n,o){var s="_leaflet_",a=this._msTouches,r=function(t){for(var e=!1,i=0;i<a.length;i++)if(a[i].pointerId===t.pointerId){e=!0;break}e||a.push(t),t.touches=a.slice(),t.changedTouches=[t],n(t)};if(t[s+"touchstart"+o]=r,t.addEventListener("MSPointerDown",r,!1),!this._msDocumentListener){var h=function(t){for(var e=0;e<a.length;e++)if(a[e].pointerId===t.pointerId){a.splice(e,1);break}};e.documentElement.addEventListener("MSPointerUp",h,!1),e.documentElement.addEventListener("MSPointerCancel",h,!1),this._msDocumentListener=!0}return this},addMsTouchListenerMove:function(t,e,i,n){function o(t){if(t.pointerType!==t.MSPOINTER_TYPE_MOUSE||0!==t.buttons){for(var e=0;e<a.length;e++)if(a[e].pointerId===t.pointerId){a[e]=t;break}t.touches=a.slice(),t.changedTouches=[t],i(t)}}var s="_leaflet_",a=this._msTouches;return t[s+"touchmove"+n]=o,t.addEventListener("MSPointerMove",o,!1),this},addMsTouchListenerEnd:function(t,e,i,n){var o="_leaflet_",s=this._msTouches,a=function(t){for(var e=0;e<s.length;e++)if(s[e].pointerId===t.pointerId){s.splice(e,1);break}t.touches=s.slice(),t.changedTouches=[t],i(t)};return t[o+"touchend"+n]=a,t.addEventListener("MSPointerUp",a,!1),t.addEventListener("MSPointerCancel",a,!1),this},removeMsTouchListener:function(t,e,i){var n="_leaflet_",o=t[n+e+i];switch(e){case"touchstart":t.removeEventListener("MSPointerDown",o,!1);break;case"touchmove":t.removeEventListener("MSPointerMove",o,!1);break;case"touchend":t.removeEventListener("MSPointerUp",o,!1),t.removeEventListener("MSPointerCancel",o,!1)}return this}}),o.Map.mergeOptions({touchZoom:o.Browser.touch&&!o.Browser.android23}),o.Map.TouchZoom=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var n=i.mouseEventToLayerPoint(t.touches[0]),s=i.mouseEventToLayerPoint(t.touches[1]),a=i._getCenterLayerPoint();this._startCenter=n.add(s)._divideBy(2),this._startDist=n.distanceTo(s),this._moved=!1,this._zooming=!0,this._centerOffset=a.subtract(this._startCenter),i._panAnim&&i._panAnim.stop(),o.DomEvent.on(e,"touchmove",this._onTouchMove,this).on(e,"touchend",this._onTouchEnd,this),o.DomEvent.preventDefault(t)}},_onTouchMove:function(t){var e=this._map;if(t.touches&&2===t.touches.length&&this._zooming){var i=e.mouseEventToLayerPoint(t.touches[0]),n=e.mouseEventToLayerPoint(t.touches[1]);this._scale=i.distanceTo(n)/this._startDist,this._delta=i._add(n)._divideBy(2)._subtract(this._startCenter),1!==this._scale&&(this._moved||(o.DomUtil.addClass(e._mapPane,"leaflet-touching"),e.fire("movestart").fire("zoomstart"),this._moved=!0),o.Util.cancelAnimFrame(this._animRequest),this._animRequest=o.Util.requestAnimFrame(this._updateOnMove,this,!0,this._map._container),o.DomEvent.preventDefault(t))}},_updateOnMove:function(){var t=this._map,e=this._getScaleOrigin(),i=t.layerPointToLatLng(e),n=t.getScaleZoom(this._scale);t._animateZoom(i,n,this._startCenter,this._scale,this._delta)},_onTouchEnd:function(){if(!this._moved||!this._zooming)return this._zooming=!1,void 0;var t=this._map;this._zooming=!1,o.DomUtil.removeClass(t._mapPane,"leaflet-touching"),o.Util.cancelAnimFrame(this._animRequest),o.DomEvent.off(e,"touchmove",this._onTouchMove).off(e,"touchend",this._onTouchEnd);var i=this._getScaleOrigin(),n=t.layerPointToLatLng(i),s=t.getZoom(),a=t.getScaleZoom(this._scale)-s,r=a>0?Math.ceil(a):Math.floor(a),h=t._limitZoom(s+r),l=t.getZoomScale(h)/this._scale;t._animateZoom(n,h,i,l)},_getScaleOrigin:function(){var t=this._centerOffset.subtract(this._delta).divideBy(this._scale);return this._startCenter.add(t)}}),o.Map.addInitHook("addHandler","touchZoom",o.Map.TouchZoom),o.Map.mergeOptions({tap:!0,tapTolerance:15}),o.Map.Tap=o.Handler.extend({addHooks:function(){o.DomEvent.on(this._map._container,"touchstart",this._onDown,this)
+},removeHooks:function(){o.DomEvent.off(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(o.DomEvent.preventDefault(t),this._fireClick=!0,t.touches.length>1)return this._fireClick=!1,clearTimeout(this._holdTimeout),void 0;var i=t.touches[0],n=i.target;this._startPos=this._newPos=new o.Point(i.clientX,i.clientY),"a"===n.tagName.toLowerCase()&&o.DomUtil.addClass(n,"leaflet-active"),this._holdTimeout=setTimeout(o.bind(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),o.DomEvent.on(e,"touchmove",this._onMove,this).on(e,"touchend",this._onUp,this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),o.DomEvent.off(e,"touchmove",this._onMove,this).off(e,"touchend",this._onUp,this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],n=i.target;"a"===n.tagName.toLowerCase()&&o.DomUtil.removeClass(n,"leaflet-active"),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var e=t.touches[0];this._newPos=new o.Point(e.clientX,e.clientY)},_simulateEvent:function(i,n){var o=e.createEvent("MouseEvents");o._simulated=!0,n.target._simulatedClick=!0,o.initMouseEvent(i,!0,!0,t,1,n.screenX,n.screenY,n.clientX,n.clientY,!1,!1,!1,!1,0,null),n.target.dispatchEvent(o)}}),o.Browser.touch&&!o.Browser.msTouch&&o.Map.addInitHook("addHandler","tap",o.Map.Tap),o.Map.mergeOptions({boxZoom:!0}),o.Map.BoxZoom=o.Handler.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane},addHooks:function(){o.DomEvent.on(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){o.DomEvent.off(this._container,"mousedown",this._onMouseDown)},_onMouseDown:function(t){return!t.shiftKey||1!==t.which&&1!==t.button?!1:(o.DomUtil.disableTextSelection(),o.DomUtil.disableImageDrag(),this._startLayerPoint=this._map.mouseEventToLayerPoint(t),this._box=o.DomUtil.create("div","leaflet-zoom-box",this._pane),o.DomUtil.setPosition(this._box,this._startLayerPoint),this._container.style.cursor="crosshair",o.DomEvent.on(e,"mousemove",this._onMouseMove,this).on(e,"mouseup",this._onMouseUp,this).on(e,"keydown",this._onKeyDown,this),this._map.fire("boxzoomstart"),void 0)},_onMouseMove:function(t){var e=this._startLayerPoint,i=this._box,n=this._map.mouseEventToLayerPoint(t),s=n.subtract(e),a=new o.Point(Math.min(n.x,e.x),Math.min(n.y,e.y));o.DomUtil.setPosition(i,a),i.style.width=Math.max(0,Math.abs(s.x)-4)+"px",i.style.height=Math.max(0,Math.abs(s.y)-4)+"px"},_finish:function(){this._pane.removeChild(this._box),this._container.style.cursor="",o.DomUtil.enableTextSelection(),o.DomUtil.enableImageDrag(),o.DomEvent.off(e,"mousemove",this._onMouseMove).off(e,"mouseup",this._onMouseUp).off(e,"keydown",this._onKeyDown)},_onMouseUp:function(t){this._finish();var e=this._map,i=e.mouseEventToLayerPoint(t);if(!this._startLayerPoint.equals(i)){var n=new o.LatLngBounds(e.layerPointToLatLng(this._startLayerPoint),e.layerPointToLatLng(i));e.fitBounds(n),e.fire("boxzoomend",{boxZoomBounds:n})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}}),o.Map.addInitHook("addHandler","boxZoom",o.Map.BoxZoom),o.Map.mergeOptions({keyboard:!0,keyboardPanOffset:80,keyboardZoomOffset:1}),o.Map.Keyboard=o.Handler.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61],zoomOut:[189,109,173]},initialize:function(t){this._map=t,this._setPanOffset(t.options.keyboardPanOffset),this._setZoomOffset(t.options.keyboardZoomOffset)},addHooks:function(){var t=this._map._container;-1===t.tabIndex&&(t.tabIndex="0"),o.DomEvent.on(t,"focus",this._onFocus,this).on(t,"blur",this._onBlur,this).on(t,"mousedown",this._onMouseDown,this),this._map.on("focus",this._addHooks,this).on("blur",this._removeHooks,this)},removeHooks:function(){this._removeHooks();var t=this._map._container;o.DomEvent.off(t,"focus",this._onFocus,this).off(t,"blur",this._onBlur,this).off(t,"mousedown",this._onMouseDown,this),this._map.off("focus",this._addHooks,this).off("blur",this._removeHooks,this)},_onMouseDown:function(){if(!this._focused){var i=e.body,n=e.documentElement,o=i.scrollTop||n.scrollTop,s=i.scrollLeft||n.scrollLeft;this._map._container.focus(),t.scrollTo(s,o)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanOffset:function(t){var e,i,n=this._panKeys={},o=this.keyCodes;for(e=0,i=o.left.length;i>e;e++)n[o.left[e]]=[-1*t,0];for(e=0,i=o.right.length;i>e;e++)n[o.right[e]]=[t,0];for(e=0,i=o.down.length;i>e;e++)n[o.down[e]]=[0,t];for(e=0,i=o.up.length;i>e;e++)n[o.up[e]]=[0,-1*t]},_setZoomOffset:function(t){var e,i,n=this._zoomKeys={},o=this.keyCodes;for(e=0,i=o.zoomIn.length;i>e;e++)n[o.zoomIn[e]]=t;for(e=0,i=o.zoomOut.length;i>e;e++)n[o.zoomOut[e]]=-t},_addHooks:function(){o.DomEvent.on(e,"keydown",this._onKeyDown,this)},_removeHooks:function(){o.DomEvent.off(e,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){var e=t.keyCode,i=this._map;if(e in this._panKeys){if(i._panAnim&&i._panAnim._inProgress)return;i.panBy(this._panKeys[e]),i.options.maxBounds&&i.panInsideBounds(i.options.maxBounds)}else{if(!(e in this._zoomKeys))return;i.setZoom(i.getZoom()+this._zoomKeys[e])}o.DomEvent.stop(t)}}),o.Map.addInitHook("addHandler","keyboard",o.Map.Keyboard),o.Handler.MarkerDrag=o.Handler.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new o.Draggable(t,t)),this._draggable.on("dragstart",this._onDragStart,this).on("drag",this._onDrag,this).on("dragend",this._onDragEnd,this),this._draggable.enable()},removeHooks:function(){this._draggable.off("dragstart",this._onDragStart,this).off("drag",this._onDrag,this).off("dragend",this._onDragEnd,this),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},_onDragStart:function(){this._marker.closePopup().fire("movestart").fire("dragstart")},_onDrag:function(){var t=this._marker,e=t._shadow,i=o.DomUtil.getPosition(t._icon),n=t._map.layerPointToLatLng(i);e&&o.DomUtil.setPosition(e,i),t._latlng=n,t.fire("move",{latlng:n}).fire("drag")},_onDragEnd:function(){this._marker.fire("moveend").fire("dragend")}}),o.Control=o.Class.extend({options:{position:"topright"},initialize:function(t){o.setOptions(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),n=t._controlCorners[i];return o.DomUtil.addClass(e,"leaflet-control"),-1!==i.indexOf("bottom")?n.insertBefore(e,n.firstChild):n.appendChild(e),this},removeFrom:function(t){var e=this.getPosition(),i=t._controlCorners[e];return i.removeChild(this._container),this._map=null,this.onRemove&&this.onRemove(t),this}}),o.control=function(t){return new o.Control(t)},o.Map.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.removeFrom(this),this},_initControlPos:function(){function t(t,s){var a=i+t+" "+i+s;e[t+s]=o.DomUtil.create("div",a,n)}var e=this._controlCorners={},i="leaflet-",n=this._controlContainer=o.DomUtil.create("div",i+"control-container",this._container);t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){this._container.removeChild(this._controlContainer)}}),o.Control.Zoom=o.Control.extend({options:{position:"topleft"},onAdd:function(t){var e="leaflet-control-zoom",i=o.DomUtil.create("div",e+" leaflet-bar");return this._map=t,this._zoomInButton=this._createButton("+","Zoom in",e+"-in",i,this._zoomIn,this),this._zoomOutButton=this._createButton("-","Zoom out",e+"-out",i,this._zoomOut,this),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},_zoomIn:function(t){this._map.zoomIn(t.shiftKey?3:1)},_zoomOut:function(t){this._map.zoomOut(t.shiftKey?3:1)},_createButton:function(t,e,i,n,s,a){var r=o.DomUtil.create("a",i,n);r.innerHTML=t,r.href="#",r.title=e;var h=o.DomEvent.stopPropagation;return o.DomEvent.on(r,"click",h).on(r,"mousedown",h).on(r,"dblclick",h).on(r,"click",o.DomEvent.preventDefault).on(r,"click",s,a),r},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";o.DomUtil.removeClass(this._zoomInButton,e),o.DomUtil.removeClass(this._zoomOutButton,e),t._zoom===t.getMinZoom()&&o.DomUtil.addClass(this._zoomOutButton,e),t._zoom===t.getMaxZoom()&&o.DomUtil.addClass(this._zoomInButton,e)}}),o.Map.mergeOptions({zoomControl:!0}),o.Map.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new o.Control.Zoom,this.addControl(this.zoomControl))}),o.control.zoom=function(t){return new o.Control.Zoom(t)},o.Control.Attribution=o.Control.extend({options:{position:"bottomright",prefix:'<a href="http://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'},initialize:function(t){o.setOptions(this,t),this._attributions={}},onAdd:function(t){return this._container=o.DomUtil.create("div","leaflet-control-attribution"),o.DomEvent.disableClickPropagation(this._container),t.on("layeradd",this._onLayerAdd,this).on("layerremove",this._onLayerRemove,this),this._update(),this._container},onRemove:function(t){t.off("layeradd",this._onLayerAdd).off("layerremove",this._onLayerRemove)},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t?(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update(),this):void 0},removeAttribution:function(t){return t?(this._attributions[t]&&(this._attributions[t]--,this._update()),this):void 0},_update:function(){if(this._map){var t=[];for(var e in this._attributions)this._attributions[e]&&t.push(e);var i=[];this.options.prefix&&i.push(this.options.prefix),t.length&&i.push(t.join(", ")),this._container.innerHTML=i.join(" | ")}},_onLayerAdd:function(t){t.layer.getAttribution&&this.addAttribution(t.layer.getAttribution())},_onLayerRemove:function(t){t.layer.getAttribution&&this.removeAttribution(t.layer.getAttribution())}}),o.Map.mergeOptions({attributionControl:!0}),o.Map.addInitHook(function(){this.options.attributionControl&&(this.attributionControl=(new o.Control.Attribution).addTo(this))}),o.control.attribution=function(t){return new o.Control.Attribution(t)},o.Control.Scale=o.Control.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0,updateWhenIdle:!1},onAdd:function(t){this._map=t;var e="leaflet-control-scale",i=o.DomUtil.create("div",e),n=this.options;return this._addScales(n,e,i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=o.DomUtil.create("div",e+"-line",i)),t.imperial&&(this._iScale=o.DomUtil.create("div",e+"-line",i))},_update:function(){var t=this._map.getBounds(),e=t.getCenter().lat,i=6378137*Math.PI*Math.cos(e*Math.PI/180),n=i*(t.getNorthEast().lng-t.getSouthWest().lng)/180,o=this._map.getSize(),s=this.options,a=0;o.x>0&&(a=n*(s.maxWidth/o.x)),this._updateScales(s,a)},_updateScales:function(t,e){t.metric&&e&&this._updateMetric(e),t.imperial&&e&&this._updateImperial(e)},_updateMetric:function(t){var e=this._getRoundNum(t);this._mScale.style.width=this._getScaleWidth(e/t)+"px",this._mScale.innerHTML=1e3>e?e+" m":e/1e3+" km"},_updateImperial:function(t){var e,i,n,o=3.2808399*t,s=this._iScale;o>5280?(e=o/5280,i=this._getRoundNum(e),s.style.width=this._getScaleWidth(i/e)+"px",s.innerHTML=i+" mi"):(n=this._getRoundNum(o),s.style.width=this._getScaleWidth(n/o)+"px",s.innerHTML=n+" ft")},_getScaleWidth:function(t){return Math.round(this.options.maxWidth*t)-10},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),i=t/e;return i=i>=10?10:i>=5?5:i>=3?3:i>=2?2:1,e*i}}),o.control.scale=function(t){return new o.Control.Scale(t)},o.Control.Layers=o.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0},initialize:function(t,e,i){o.setOptions(this,i),this._layers={},this._lastZIndex=0,this._handlingClick=!1;for(var n in t)this._addLayer(t[n],n);for(n in e)this._addLayer(e[n],n,!0)},onAdd:function(t){return this._initLayout(),this._update(),t.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(t){t.off("layeradd",this._onLayerChange).off("layerremove",this._onLayerChange)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._update(),this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._update(),this},removeLayer:function(t){var e=o.stamp(t);return delete this._layers[e],this._update(),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=o.DomUtil.create("div",t);e.setAttribute("aria-haspopup",!0),o.Browser.touch?o.DomEvent.on(e,"click",o.DomEvent.stopPropagation):(o.DomEvent.disableClickPropagation(e),o.DomEvent.on(e,"mousewheel",o.DomEvent.stopPropagation));var i=this._form=o.DomUtil.create("form",t+"-list");if(this.options.collapsed){o.Browser.android||o.DomEvent.on(e,"mouseover",this._expand,this).on(e,"mouseout",this._collapse,this);var n=this._layersLink=o.DomUtil.create("a",t+"-toggle",e);n.href="#",n.title="Layers",o.Browser.touch?o.DomEvent.on(n,"click",o.DomEvent.stop).on(n,"click",this._expand,this):o.DomEvent.on(n,"focus",this._expand,this),this._map.on("click",this._collapse,this)}else this._expand();this._baseLayersList=o.DomUtil.create("div",t+"-base",i),this._separator=o.DomUtil.create("div",t+"-separator",i),this._overlaysList=o.DomUtil.create("div",t+"-overlays",i),e.appendChild(i)},_addLayer:function(t,e,i){var n=o.stamp(t);this._layers[n]={layer:t,name:e,overlay:i},this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="";var t,e,i=!1,n=!1;for(t in this._layers)e=this._layers[t],this._addItem(e),n=n||e.overlay,i=i||!e.overlay;this._separator.style.display=n&&i?"":"none"}},_onLayerChange:function(t){var e=this._layers[o.stamp(t.layer)];if(e){this._handlingClick||this._update();var i=e.overlay?"layeradd"===t.type?"overlayadd":"overlayremove":"layeradd"===t.type?"baselayerchange":null;i&&this._map.fire(i,e)}},_createRadioElement:function(t,i){var n='<input type="radio" class="leaflet-control-layers-selector" name="'+t+'"';i&&(n+=' checked="checked"'),n+="/>";var o=e.createElement("div");return o.innerHTML=n,o.firstChild},_addItem:function(t){var i,n=e.createElement("label"),s=this._map.hasLayer(t.layer);t.overlay?(i=e.createElement("input"),i.type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=s):i=this._createRadioElement("leaflet-base-layers",s),i.layerId=o.stamp(t.layer),o.DomEvent.on(i,"click",this._onInputClick,this);var a=e.createElement("span");a.innerHTML=" "+t.name,n.appendChild(i),n.appendChild(a);var r=t.overlay?this._overlaysList:this._baseLayersList;return r.appendChild(n),n},_onInputClick:function(){var t,e,i,n=this._form.getElementsByTagName("input"),o=n.length;for(this._handlingClick=!0,t=0;o>t;t++)e=n[t],i=this._layers[e.layerId],e.checked&&!this._map.hasLayer(i.layer)?this._map.addLayer(i.layer):!e.checked&&this._map.hasLayer(i.layer)&&this._map.removeLayer(i.layer);this._handlingClick=!1},_expand:function(){o.DomUtil.addClass(this._container,"leaflet-control-layers-expanded")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")}}),o.control.layers=function(t,e,i){return new o.Control.Layers(t,e,i)},o.PosAnimation=o.Class.extend({includes:o.Mixin.Events,run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._newPos=e,this.fire("start"),t.style[o.DomUtil.TRANSITION]="all "+(i||.25)+"s cubic-bezier(0,0,"+(n||.5)+",1)",o.DomEvent.on(t,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),o.DomUtil.setPosition(t,e),o.Util.falseFn(t.offsetWidth),this._stepTimer=setInterval(o.bind(this._onStep,this),50)},stop:function(){this._inProgress&&(o.DomUtil.setPosition(this._el,this._getPos()),this._onTransitionEnd(),o.Util.falseFn(this._el.offsetWidth))},_onStep:function(){var t=this._getPos();return t?(this._el._leaflet_pos=t,this.fire("step"),void 0):(this._onTransitionEnd(),void 0)},_transformRe:/([-+]?(?:\d*\.)?\d+)\D*, ([-+]?(?:\d*\.)?\d+)\D*\)/,_getPos:function(){var e,i,n,s=this._el,a=t.getComputedStyle(s);if(o.Browser.any3d){if(n=a[o.DomUtil.TRANSFORM].match(this._transformRe),!n)return;e=parseFloat(n[1]),i=parseFloat(n[2])}else e=parseFloat(a.left),i=parseFloat(a.top);return new o.Point(e,i,!0)},_onTransitionEnd:function(){o.DomEvent.off(this._el,o.DomUtil.TRANSITION_END,this._onTransitionEnd,this),this._inProgress&&(this._inProgress=!1,this._el.style[o.DomUtil.TRANSITION]="",this._el._leaflet_pos=this._newPos,clearInterval(this._stepTimer),this.fire("step").fire("end"))}}),o.Map.include({setView:function(t,e,n){if(e=this._limitZoom(e),t=o.latLng(t),n=n||{},this._panAnim&&this._panAnim.stop(),this._loaded&&!n.reset&&n!==!0){n.animate!==i&&(n.zoom=o.extend({animate:n.animate},n.zoom),n.pan=o.extend({animate:n.animate},n.pan));var s=this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,n.zoom):this._tryAnimatedPan(t,n.pan);if(s)return clearTimeout(this._sizeTimer),this}return this._resetView(t,e),this},panBy:function(t,e){if(t=o.point(t).round(),e=e||{},!t.x&&!t.y)return this;if(this._panAnim||(this._panAnim=new o.PosAnimation,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),e.noMoveStart||this.fire("movestart"),e.animate!==!1){o.DomUtil.addClass(this._mapPane,"leaflet-pan-anim");var i=this._getMapPanePos().subtract(t);this._panAnim.run(this._mapPane,i,e.duration||.25,e.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){o.DomUtil.removeClass(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,e){var i=this._getCenterOffset(t)._floor();return(e&&e.animate)===!0||this.getSize().contains(i)?(this.panBy(i,e),!0):!1}}),o.PosAnimation=o.DomUtil.TRANSITION?o.PosAnimation:o.PosAnimation.extend({run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=o.DomUtil.getPosition(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(),this._complete())},_animate:function(){this._animId=o.Util.requestAnimFrame(this._animate,this),this._step()},_step:function(){var t=+new Date-this._startTime,e=1e3*this._duration;e>t?this._runFrame(this._easeOut(t/e)):(this._runFrame(1),this._complete())},_runFrame:function(t){var e=this._startPos.add(this._offset.multiplyBy(t));o.DomUtil.setPosition(this._el,e),this.fire("step")},_complete:function(){o.Util.cancelAnimFrame(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),o.Map.mergeOptions({zoomAnimation:!0,zoomAnimationThreshold:4}),o.DomUtil.TRANSITION&&o.Map.addInitHook(function(){this._zoomAnimated=this.options.zoomAnimation&&o.DomUtil.TRANSITION&&o.Browser.any3d&&!o.Browser.android23&&!o.Browser.mobileOpera,this._zoomAnimated&&o.DomEvent.on(this._mapPane,o.DomUtil.TRANSITION_END,this._catchTransitionEnd,this)}),o.Map.include(o.DomUtil.TRANSITION?{_catchTransitionEnd:function(){this._animatingZoom&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,e,i){if(this._animatingZoom)return!0;if(i=i||{},!this._zoomAnimated||i.animate===!1||this._nothingToAnimate()||Math.abs(e-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),o=this._getCenterOffset(t)._divideBy(1-1/n),s=this._getCenterLayerPoint()._add(o);return i.animate===!0||this.getSize().contains(o)?(this.fire("movestart").fire("zoomstart"),this._animateZoom(t,e,s,n,null,!0),!0):!1},_animateZoom:function(t,e,i,n,s,a){this._animatingZoom=!0,o.DomUtil.addClass(this._mapPane,"leaflet-zoom-anim"),this._animateToCenter=t,this._animateToZoom=e,o.Draggable&&(o.Draggable._disabled=!0),this.fire("zoomanim",{center:t,zoom:e,origin:i,scale:n,delta:s,backwards:a})},_onZoomTransitionEnd:function(){this._animatingZoom=!1,o.DomUtil.removeClass(this._mapPane,"leaflet-zoom-anim"),this._resetView(this._animateToCenter,this._animateToZoom,!0,!0),o.Draggable&&(o.Draggable._disabled=!1)}}:{}),o.TileLayer.include({_animateZoom:function(t){this._animating||(this._animating=!0,this._prepareBgBuffer());var e=this._bgBuffer,i=o.DomUtil.TRANSFORM,n=t.delta?o.DomUtil.getTranslateString(t.delta):e.style[i],s=o.DomUtil.getScaleString(t.scale,t.origin);e.style[i]=t.backwards?s+" "+n:n+" "+s},_endZoomAnim:function(){var t=this._tileContainer,e=this._bgBuffer;t.style.visibility="",t.parentNode.appendChild(t),o.Util.falseFn(e.offsetWidth),this._animating=!1},_clearBgBuffer:function(){var t=this._map;!t||t._animatingZoom||t.touchZoom._zooming||(this._bgBuffer.innerHTML="",this._bgBuffer.style[o.DomUtil.TRANSFORM]="")},_prepareBgBuffer:function(){var t=this._tileContainer,e=this._bgBuffer,i=this._getLoadedTilesPercentage(e),n=this._getLoadedTilesPercentage(t);return e&&i>.5&&.5>n?(t.style.visibility="hidden",this._stopLoadingImages(t),void 0):(e.style.visibility="hidden",e.style[o.DomUtil.TRANSFORM]="",this._tileContainer=e,e=this._bgBuffer=t,this._stopLoadingImages(e),clearTimeout(this._clearBgBufferTimer),void 0)},_getLoadedTilesPercentage:function(t){var e,i,n=t.getElementsByTagName("img"),o=0;for(e=0,i=n.length;i>e;e++)n[e].complete&&o++;return o/i},_stopLoadingImages:function(t){var e,i,n,s=Array.prototype.slice.call(t.getElementsByTagName("img"));for(e=0,i=s.length;i>e;e++)n=s[e],n.complete||(n.onload=o.Util.falseFn,n.onerror=o.Util.falseFn,n.src=o.Util.emptyImageUrl,n.parentNode.removeChild(n))}}),o.Map.include({_defaultLocateOptions:{watch:!1,setView:!1,maxZoom:1/0,timeout:1e4,maximumAge:0,enableHighAccuracy:!1},locate:function(t){if(t=this._locateOptions=o.extend(this._defaultLocateOptions,t),!navigator.geolocation)return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var e=o.bind(this._handleGeolocationResponse,this),i=o.bind(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e=t.code,i=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+i+"."})},_handleGeolocationResponse:function(t){var e=t.coords.latitude,i=t.coords.longitude,n=new o.LatLng(e,i),s=180*t.coords.accuracy/40075017,a=s/Math.cos(o.LatLng.DEG_TO_RAD*e),r=o.latLngBounds([e-s,i-a],[e+s,i+a]),h=this._locateOptions;if(h.setView){var l=Math.min(this.getBoundsZoom(r),h.maxZoom);this.setView(n,l)}var u={latlng:n,bounds:r};for(var c in t.coords)"number"==typeof t.coords[c]&&(u[c]=t.coords[c]);this.fire("locationfound",u)}})}(window,document);
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/mappicker.js b/src/main/webapp/client/js/lib/mappicker.js
new file mode 100644
index 00000000..d5314575
--- /dev/null
+++ b/src/main/webapp/client/js/lib/mappicker.js
@@ -0,0 +1,111 @@
+//leaflet map
+var map;
+
+//leaflet marker
+var marker;
+
+// id of latitude element
+var latId;
+
+//id of longitude element
+var lonId;
+
+/**
+ * Displays a modal dialog with the current (input fields) geo coordinates.
+ * If there are no coords, default coords are used (germany).
+ * 
+ * @param latId latitude id
+ * @param lonId longitude id
+ */
+function showMap(latId, lonId) {
+
+    this.latId = latId;
+    this.lonId = lonId;
+    
+    //show modal dialog
+    $('#mappicker').modal();
+    
+    if (!map) {
+        //init map
+        initializeMap();
+    }
+    
+    //set only new values, if there are some
+    if (latCoord != "" && lonCoord != "") {
+
+        var latCoord = getValueFromGeofield(latId);
+        var lonCoord = getValueFromGeofield(lonId);
+        var zoom = 13;
+        
+        var latlng = new L.LatLng(latCoord, lonCoord);
+        console.log("set new coordinates: " + latlng.toString());
+
+        map.setView(latlng, zoom, true);
+        marker.setLatLng(latlng);
+        marker.bindPopup("Coordinates: " + latlng.toString()).openPopup();
+        marker.update();
+    }
+}
+
+/**
+ *  Update for input fields and hide the dialog.
+ */
+function selectCoordinates() {
+    
+    console.log("Update field " + latId + " with value: " + marker.getLatLng().lat);
+    console.log("Update field " + lonId + " with value: " + marker.getLatLng().lng);
+    
+    //update input fields
+    $('#' + latId).attr('value',marker.getLatLng().lat);
+    $('#' + lonId).attr('value',marker.getLatLng().lng);
+    
+    //hide dialog
+    $('#mappicker').modal('hide');
+}
+
+/**
+ * Get the value (lat / lon) from input field, by given id.
+ * 
+ * @param id
+ */
+function getValueFromGeofield(id) {
+
+    return $('#' + id).attr('value');
+}
+
+
+function initializeMap() {
+
+    //init mappicker for germany
+    var latCoord = 51.0;
+    var lonCoord = 10.0;
+    var zoom = 6;
+    
+    // create new map
+    map = new L.Map('map', {
+        center: [latCoord, lonCoord],
+        zoom: zoom
+    });
+
+    var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+    var osmAttrib='Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://cloudmade.com">CloudMade</a>';
+    var osm = new L.tileLayer(osmUrl,{
+        minZoom:4,
+        maxZoom:18,
+        attribution:osmAttrib
+    });
+
+    map.addLayer(osm);
+
+    var latlng = new L.LatLng(latCoord, lonCoord);
+    console.log("init marker with coordinates: " + latlng.toString());
+    
+    marker = new L.marker(latlng, {draggable: true}).addTo(map);
+    marker.bindPopup("Select geolocation").openPopup();
+    marker.on('dragend', function(){
+        marker.bindPopup("Coordinates: " + marker.getLatLng().toString()).openPopup();
+    });
+}
+
+
+
diff --git a/src/main/webapp/client/js/lib/modernizr.custom.00395.js b/src/main/webapp/client/js/lib/modernizr.custom.00395.js
new file mode 100644
index 00000000..a5b43546
--- /dev/null
+++ b/src/main/webapp/client/js/lib/modernizr.custom.00395.js
@@ -0,0 +1,815 @@
+/* Modernizr 2.6.2 (Custom Build) | MIT & BSD
+ * Build: http://modernizr.com/download/#-fontface-backgroundsize-borderimage-borderradius-boxshadow-flexbox-flexbox_legacy-hsla-multiplebgs-opacity-rgba-textshadow-cssanimations-csscolumns-generatedcontent-cssgradients-cssreflections-csstransforms-csstransforms3d-csstransitions-applicationcache-canvas-canvastext-draganddrop-hashchange-history-audio-video-indexeddb-input-inputtypes-localstorage-postmessage-sessionstorage-websockets-websqldatabase-webworkers-geolocation-inlinesvg-smil-svg-svgclippaths-touch-webgl-shiv-cssclasses-addtest-prefixed-teststyles-testprop-testallprops-hasevent-prefixes-domprefixes-load
+ */
+;
+
+
+
+window.Modernizr = (function( window, document, undefined ) {
+
+    var version = '2.6.2',
+
+    Modernizr = {},
+
+    enableClasses = true,
+
+    docElement = document.documentElement,
+
+    mod = 'modernizr',
+    modElem = document.createElement(mod),
+    mStyle = modElem.style,
+
+    inputElem  = document.createElement('input')  ,
+
+    smile = ':)',
+
+    toString = {}.toString,
+
+    prefixes = ' -webkit- -moz- -o- -ms- '.split(' '),
+
+
+
+    omPrefixes = 'Webkit Moz O ms',
+
+    cssomPrefixes = omPrefixes.split(' '),
+
+    domPrefixes = omPrefixes.toLowerCase().split(' '),
+
+    ns = {'svg': 'http://www.w3.org/2000/svg'},
+
+    tests = {},
+    inputs = {},
+    attrs = {},
+
+    classes = [],
+
+    slice = classes.slice,
+
+    featureName, 
+
+
+    injectElementWithStyles = function( rule, callback, nodes, testnames ) {
+
+      var style, ret, node, docOverflow,
+          div = document.createElement('div'),
+                body = document.body,
+                fakeBody = body || document.createElement('body');
+
+      if ( parseInt(nodes, 10) ) {
+                      while ( nodes-- ) {
+              node = document.createElement('div');
+              node.id = testnames ? testnames[nodes] : mod + (nodes + 1);
+              div.appendChild(node);
+          }
+      }
+
+                style = ['&#173;','<style id="s', mod, '">', rule, '</style>'].join('');
+      div.id = mod;
+          (body ? div : fakeBody).innerHTML += style;
+      fakeBody.appendChild(div);
+      if ( !body ) {
+                fakeBody.style.background = '';
+                fakeBody.style.overflow = 'hidden';
+          docOverflow = docElement.style.overflow;
+          docElement.style.overflow = 'hidden';
+          docElement.appendChild(fakeBody);
+      }
+
+      ret = callback(div, rule);
+        if ( !body ) {
+          fakeBody.parentNode.removeChild(fakeBody);
+          docElement.style.overflow = docOverflow;
+      } else {
+          div.parentNode.removeChild(div);
+      }
+
+      return !!ret;
+
+    },
+
+
+
+    isEventSupported = (function() {
+
+      var TAGNAMES = {
+        'select': 'input', 'change': 'input',
+        'submit': 'form', 'reset': 'form',
+        'error': 'img', 'load': 'img', 'abort': 'img'
+      };
+
+      function isEventSupported( eventName, element ) {
+
+        element = element || document.createElement(TAGNAMES[eventName] || 'div');
+        eventName = 'on' + eventName;
+
+            var isSupported = eventName in element;
+
+        if ( !isSupported ) {
+                if ( !element.setAttribute ) {
+            element = document.createElement('div');
+          }
+          if ( element.setAttribute && element.removeAttribute ) {
+            element.setAttribute(eventName, '');
+            isSupported = is(element[eventName], 'function');
+
+                    if ( !is(element[eventName], 'undefined') ) {
+              element[eventName] = undefined;
+            }
+            element.removeAttribute(eventName);
+          }
+        }
+
+        element = null;
+        return isSupported;
+      }
+      return isEventSupported;
+    })(),
+
+
+    _hasOwnProperty = ({}).hasOwnProperty, hasOwnProp;
+
+    if ( !is(_hasOwnProperty, 'undefined') && !is(_hasOwnProperty.call, 'undefined') ) {
+      hasOwnProp = function (object, property) {
+        return _hasOwnProperty.call(object, property);
+      };
+    }
+    else {
+      hasOwnProp = function (object, property) { 
+        return ((property in object) && is(object.constructor.prototype[property], 'undefined'));
+      };
+    }
+
+
+    if (!Function.prototype.bind) {
+      Function.prototype.bind = function bind(that) {
+
+        var target = this;
+
+        if (typeof target != "function") {
+            throw new TypeError();
+        }
+
+        var args = slice.call(arguments, 1),
+            bound = function () {
+
+            if (this instanceof bound) {
+
+              var F = function(){};
+              F.prototype = target.prototype;
+              var self = new F();
+
+              var result = target.apply(
+                  self,
+                  args.concat(slice.call(arguments))
+              );
+              if (Object(result) === result) {
+                  return result;
+              }
+              return self;
+
+            } else {
+
+              return target.apply(
+                  that,
+                  args.concat(slice.call(arguments))
+              );
+
+            }
+
+        };
+
+        return bound;
+      };
+    }
+
+    function setCss( str ) {
+        mStyle.cssText = str;
+    }
+
+    function setCssAll( str1, str2 ) {
+        return setCss(prefixes.join(str1 + ';') + ( str2 || '' ));
+    }
+
+    function is( obj, type ) {
+        return typeof obj === type;
+    }
+
+    function contains( str, substr ) {
+        return !!~('' + str).indexOf(substr);
+    }
+
+    function testProps( props, prefixed ) {
+        for ( var i in props ) {
+            var prop = props[i];
+            if ( !contains(prop, "-") && mStyle[prop] !== undefined ) {
+                return prefixed == 'pfx' ? prop : true;
+            }
+        }
+        return false;
+    }
+
+    function testDOMProps( props, obj, elem ) {
+        for ( var i in props ) {
+            var item = obj[props[i]];
+            if ( item !== undefined) {
+
+                            if (elem === false) return props[i];
+
+                            if (is(item, 'function')){
+                                return item.bind(elem || obj);
+                }
+
+                            return item;
+            }
+        }
+        return false;
+    }
+
+    function testPropsAll( prop, prefixed, elem ) {
+
+        var ucProp  = prop.charAt(0).toUpperCase() + prop.slice(1),
+            props   = (prop + ' ' + cssomPrefixes.join(ucProp + ' ') + ucProp).split(' ');
+
+            if(is(prefixed, "string") || is(prefixed, "undefined")) {
+          return testProps(props, prefixed);
+
+            } else {
+          props = (prop + ' ' + (domPrefixes).join(ucProp + ' ') + ucProp).split(' ');
+          return testDOMProps(props, prefixed, elem);
+        }
+    }    tests['flexbox'] = function() {
+      return testPropsAll('flexWrap');
+    };    tests['canvas'] = function() {
+        var elem = document.createElement('canvas');
+        return !!(elem.getContext && elem.getContext('2d'));
+    };
+
+    tests['canvastext'] = function() {
+        return !!(Modernizr['canvas'] && is(document.createElement('canvas').getContext('2d').fillText, 'function'));
+    };
+
+
+
+    tests['webgl'] = function() {
+        return !!window.WebGLRenderingContext;
+    };
+
+
+    tests['touch'] = function() {
+        var bool;
+
+        if(('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch) {
+          bool = true;
+        } else {
+          injectElementWithStyles(['@media (',prefixes.join('touch-enabled),('),mod,')','{#modernizr{top:9px;position:absolute}}'].join(''), function( node ) {
+            bool = node.offsetTop === 9;
+          });
+        }
+
+        return bool;
+    };
+
+
+
+    tests['geolocation'] = function() {
+        return 'geolocation' in navigator;
+    };
+
+
+    tests['postmessage'] = function() {
+      return !!window.postMessage;
+    };
+
+
+    tests['websqldatabase'] = function() {
+      return !!window.openDatabase;
+    };
+
+    tests['indexedDB'] = function() {
+      return !!testPropsAll("indexedDB", window);
+    };
+
+    tests['hashchange'] = function() {
+      return isEventSupported('hashchange', window) && (document.documentMode === undefined || document.documentMode > 7);
+    };
+
+    tests['history'] = function() {
+      return !!(window.history && history.pushState);
+    };
+
+    tests['draganddrop'] = function() {
+        var div = document.createElement('div');
+        return ('draggable' in div) || ('ondragstart' in div && 'ondrop' in div);
+    };
+
+    tests['websockets'] = function() {
+        return 'WebSocket' in window || 'MozWebSocket' in window;
+    };
+
+
+    tests['rgba'] = function() {
+        setCss('background-color:rgba(150,255,150,.5)');
+
+        return contains(mStyle.backgroundColor, 'rgba');
+    };
+
+    tests['hsla'] = function() {
+            setCss('background-color:hsla(120,40%,100%,.5)');
+
+        return contains(mStyle.backgroundColor, 'rgba') || contains(mStyle.backgroundColor, 'hsla');
+    };
+
+    tests['multiplebgs'] = function() {
+                setCss('background:url(https://),url(https://),red url(https://)');
+
+            return (/(url\s*\(.*?){3}/).test(mStyle.background);
+    };    tests['backgroundsize'] = function() {
+        return testPropsAll('backgroundSize');
+    };
+
+    tests['borderimage'] = function() {
+        return testPropsAll('borderImage');
+    };
+
+
+
+    tests['borderradius'] = function() {
+        return testPropsAll('borderRadius');
+    };
+
+    tests['boxshadow'] = function() {
+        return testPropsAll('boxShadow');
+    };
+
+    tests['textshadow'] = function() {
+        return document.createElement('div').style.textShadow === '';
+    };
+
+
+    tests['opacity'] = function() {
+                setCssAll('opacity:.55');
+
+                    return (/^0.55$/).test(mStyle.opacity);
+    };
+
+
+    tests['cssanimations'] = function() {
+        return testPropsAll('animationName');
+    };
+
+
+    tests['csscolumns'] = function() {
+        return testPropsAll('columnCount');
+    };
+
+
+    tests['cssgradients'] = function() {
+        var str1 = 'background-image:',
+            str2 = 'gradient(linear,left top,right bottom,from(#9f9),to(white));',
+            str3 = 'linear-gradient(left top,#9f9, white);';
+
+        setCss(
+                       (str1 + '-webkit- '.split(' ').join(str2 + str1) +
+                       prefixes.join(str3 + str1)).slice(0, -str1.length)
+        );
+
+        return contains(mStyle.backgroundImage, 'gradient');
+    };
+
+
+    tests['cssreflections'] = function() {
+        return testPropsAll('boxReflect');
+    };
+
+
+    tests['csstransforms'] = function() {
+        return !!testPropsAll('transform');
+    };
+
+
+    tests['csstransforms3d'] = function() {
+
+        var ret = !!testPropsAll('perspective');
+
+                        if ( ret && 'webkitPerspective' in docElement.style ) {
+
+                      injectElementWithStyles('@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}', function( node, rule ) {
+            ret = node.offsetLeft === 9 && node.offsetHeight === 3;
+          });
+        }
+        return ret;
+    };
+
+
+    tests['csstransitions'] = function() {
+        return testPropsAll('transition');
+    };
+
+
+
+    tests['fontface'] = function() {
+        var bool;
+
+        injectElementWithStyles('@font-face {font-family:"font";src:url("https://")}', function( node, rule ) {
+          var style = document.getElementById('smodernizr'),
+              sheet = style.sheet || style.styleSheet,
+              cssText = sheet ? (sheet.cssRules && sheet.cssRules[0] ? sheet.cssRules[0].cssText : sheet.cssText || '') : '';
+
+          bool = /src/i.test(cssText) && cssText.indexOf(rule.split(' ')[0]) === 0;
+        });
+
+        return bool;
+    };
+
+    tests['generatedcontent'] = function() {
+        var bool;
+
+        injectElementWithStyles(['#',mod,'{font:0/0 a}#',mod,':after{content:"',smile,'";visibility:hidden;font:3px/1 a}'].join(''), function( node ) {
+          bool = node.offsetHeight >= 3;
+        });
+
+        return bool;
+    };
+    tests['video'] = function() {
+        var elem = document.createElement('video'),
+            bool = false;
+
+            try {
+            if ( bool = !!elem.canPlayType ) {
+                bool      = new Boolean(bool);
+                bool.ogg  = elem.canPlayType('video/ogg; codecs="theora"')      .replace(/^no$/,'');
+
+                            bool.h264 = elem.canPlayType('video/mp4; codecs="avc1.42E01E"') .replace(/^no$/,'');
+
+                bool.webm = elem.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,'');
+            }
+
+        } catch(e) { }
+
+        return bool;
+    };
+
+    tests['audio'] = function() {
+        var elem = document.createElement('audio'),
+            bool = false;
+
+        try {
+            if ( bool = !!elem.canPlayType ) {
+                bool      = new Boolean(bool);
+                bool.ogg  = elem.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,'');
+                bool.mp3  = elem.canPlayType('audio/mpeg;')               .replace(/^no$/,'');
+
+                                                    bool.wav  = elem.canPlayType('audio/wav; codecs="1"')     .replace(/^no$/,'');
+                bool.m4a  = ( elem.canPlayType('audio/x-m4a;')            ||
+                              elem.canPlayType('audio/aac;'))             .replace(/^no$/,'');
+            }
+        } catch(e) { }
+
+        return bool;
+    };
+
+
+    tests['localstorage'] = function() {
+        try {
+            localStorage.setItem(mod, mod);
+            localStorage.removeItem(mod);
+            return true;
+        } catch(e) {
+            return false;
+        }
+    };
+
+    tests['sessionstorage'] = function() {
+        try {
+            sessionStorage.setItem(mod, mod);
+            sessionStorage.removeItem(mod);
+            return true;
+        } catch(e) {
+            return false;
+        }
+    };
+
+
+    tests['webworkers'] = function() {
+        return !!window.Worker;
+    };
+
+
+    tests['applicationcache'] = function() {
+        return !!window.applicationCache;
+    };
+
+
+    tests['svg'] = function() {
+        return !!document.createElementNS && !!document.createElementNS(ns.svg, 'svg').createSVGRect;
+    };
+
+    tests['inlinesvg'] = function() {
+      var div = document.createElement('div');
+      div.innerHTML = '<svg/>';
+      return (div.firstChild && div.firstChild.namespaceURI) == ns.svg;
+    };
+
+    tests['smil'] = function() {
+        return !!document.createElementNS && /SVGAnimate/.test(toString.call(document.createElementNS(ns.svg, 'animate')));
+    };
+
+
+    tests['svgclippaths'] = function() {
+        return !!document.createElementNS && /SVGClipPath/.test(toString.call(document.createElementNS(ns.svg, 'clipPath')));
+    };
+
+    function webforms() {
+                                            Modernizr['input'] = (function( props ) {
+            for ( var i = 0, len = props.length; i < len; i++ ) {
+                attrs[ props[i] ] = !!(props[i] in inputElem);
+            }
+            if (attrs.list){
+                                  attrs.list = !!(document.createElement('datalist') && window.HTMLDataListElement);
+            }
+            return attrs;
+        })('autocomplete autofocus list placeholder max min multiple pattern required step'.split(' '));
+                            Modernizr['inputtypes'] = (function(props) {
+
+            for ( var i = 0, bool, inputElemType, defaultView, len = props.length; i < len; i++ ) {
+
+                inputElem.setAttribute('type', inputElemType = props[i]);
+                bool = inputElem.type !== 'text';
+
+                                                    if ( bool ) {
+
+                    inputElem.value         = smile;
+                    inputElem.style.cssText = 'position:absolute;visibility:hidden;';
+
+                    if ( /^range$/.test(inputElemType) && inputElem.style.WebkitAppearance !== undefined ) {
+
+                      docElement.appendChild(inputElem);
+                      defaultView = document.defaultView;
+
+                                        bool =  defaultView.getComputedStyle &&
+                              defaultView.getComputedStyle(inputElem, null).WebkitAppearance !== 'textfield' &&
+                                                                                  (inputElem.offsetHeight !== 0);
+
+                      docElement.removeChild(inputElem);
+
+                    } else if ( /^(search|tel)$/.test(inputElemType) ){
+                                                                                    } else if ( /^(url|email)$/.test(inputElemType) ) {
+                                        bool = inputElem.checkValidity && inputElem.checkValidity() === false;
+
+                    } else {
+                                        bool = inputElem.value != smile;
+                    }
+                }
+
+                inputs[ props[i] ] = !!bool;
+            }
+            return inputs;
+        })('search tel url email datetime date month week time datetime-local number range color'.split(' '));
+        }
+    for ( var feature in tests ) {
+        if ( hasOwnProp(tests, feature) ) {
+                                    featureName  = feature.toLowerCase();
+            Modernizr[featureName] = tests[feature]();
+
+            classes.push((Modernizr[featureName] ? '' : 'no-') + featureName);
+        }
+    }
+
+    Modernizr.input || webforms();
+
+
+     Modernizr.addTest = function ( feature, test ) {
+       if ( typeof feature == 'object' ) {
+         for ( var key in feature ) {
+           if ( hasOwnProp( feature, key ) ) {
+             Modernizr.addTest( key, feature[ key ] );
+           }
+         }
+       } else {
+
+         feature = feature.toLowerCase();
+
+         if ( Modernizr[feature] !== undefined ) {
+                                              return Modernizr;
+         }
+
+         test = typeof test == 'function' ? test() : test;
+
+         if (typeof enableClasses !== "undefined" && enableClasses) {
+           docElement.className += ' ' + (test ? '' : 'no-') + feature;
+         }
+         Modernizr[feature] = test;
+
+       }
+
+       return Modernizr; 
+     };
+
+
+    setCss('');
+    modElem = inputElem = null;
+
+    ;(function(window, document) {
+        var options = window.html5 || {};
+
+        var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i;
+
+        var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i;
+
+        var supportsHtml5Styles;
+
+        var expando = '_html5shiv';
+
+        var expanID = 0;
+
+        var expandoData = {};
+
+        var supportsUnknownElements;
+
+      (function() {
+        try {
+            var a = document.createElement('a');
+            a.innerHTML = '<xyz></xyz>';
+                    supportsHtml5Styles = ('hidden' in a);
+
+            supportsUnknownElements = a.childNodes.length == 1 || (function() {
+                        (document.createElement)('a');
+              var frag = document.createDocumentFragment();
+              return (
+                typeof frag.cloneNode == 'undefined' ||
+                typeof frag.createDocumentFragment == 'undefined' ||
+                typeof frag.createElement == 'undefined'
+              );
+            }());
+        } catch(e) {
+          supportsHtml5Styles = true;
+          supportsUnknownElements = true;
+        }
+
+      }());        function addStyleSheet(ownerDocument, cssText) {
+        var p = ownerDocument.createElement('p'),
+            parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement;
+
+        p.innerHTML = 'x<style>' + cssText + '</style>';
+        return parent.insertBefore(p.lastChild, parent.firstChild);
+      }
+
+        function getElements() {
+        var elements = html5.elements;
+        return typeof elements == 'string' ? elements.split(' ') : elements;
+      }
+
+          function getExpandoData(ownerDocument) {
+        var data = expandoData[ownerDocument[expando]];
+        if (!data) {
+            data = {};
+            expanID++;
+            ownerDocument[expando] = expanID;
+            expandoData[expanID] = data;
+        }
+        return data;
+      }
+
+        function createElement(nodeName, ownerDocument, data){
+        if (!ownerDocument) {
+            ownerDocument = document;
+        }
+        if(supportsUnknownElements){
+            return ownerDocument.createElement(nodeName);
+        }
+        if (!data) {
+            data = getExpandoData(ownerDocument);
+        }
+        var node;
+
+        if (data.cache[nodeName]) {
+            node = data.cache[nodeName].cloneNode();
+        } else if (saveClones.test(nodeName)) {
+            node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode();
+        } else {
+            node = data.createElem(nodeName);
+        }
+
+                                    return node.canHaveChildren && !reSkip.test(nodeName) ? data.frag.appendChild(node) : node;
+      }
+
+        function createDocumentFragment(ownerDocument, data){
+        if (!ownerDocument) {
+            ownerDocument = document;
+        }
+        if(supportsUnknownElements){
+            return ownerDocument.createDocumentFragment();
+        }
+        data = data || getExpandoData(ownerDocument);
+        var clone = data.frag.cloneNode(),
+            i = 0,
+            elems = getElements(),
+            l = elems.length;
+        for(;i<l;i++){
+            clone.createElement(elems[i]);
+        }
+        return clone;
+      }
+
+        function shivMethods(ownerDocument, data) {
+        if (!data.cache) {
+            data.cache = {};
+            data.createElem = ownerDocument.createElement;
+            data.createFrag = ownerDocument.createDocumentFragment;
+            data.frag = data.createFrag();
+        }
+
+
+        ownerDocument.createElement = function(nodeName) {
+                if (!html5.shivMethods) {
+              return data.createElem(nodeName);
+          }
+          return createElement(nodeName, ownerDocument, data);
+        };
+
+        ownerDocument.createDocumentFragment = Function('h,f', 'return function(){' +
+          'var n=f.cloneNode(),c=n.createElement;' +
+          'h.shivMethods&&(' +
+                    getElements().join().replace(/\w+/g, function(nodeName) {
+              data.createElem(nodeName);
+              data.frag.createElement(nodeName);
+              return 'c("' + nodeName + '")';
+            }) +
+          ');return n}'
+        )(html5, data.frag);
+      }        function shivDocument(ownerDocument) {
+        if (!ownerDocument) {
+            ownerDocument = document;
+        }
+        var data = getExpandoData(ownerDocument);
+
+        if (html5.shivCSS && !supportsHtml5Styles && !data.hasCSS) {
+          data.hasCSS = !!addStyleSheet(ownerDocument,
+                    'article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}' +
+                    'mark{background:#FF0;color:#000}'
+          );
+        }
+        if (!supportsUnknownElements) {
+          shivMethods(ownerDocument, data);
+        }
+        return ownerDocument;
+      }        var html5 = {
+
+            'elements': options.elements || 'abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video',
+
+            'shivCSS': (options.shivCSS !== false),
+
+            'supportsUnknownElements': supportsUnknownElements,
+
+            'shivMethods': (options.shivMethods !== false),
+
+            'type': 'default',
+
+            'shivDocument': shivDocument,
+
+            createElement: createElement,
+
+            createDocumentFragment: createDocumentFragment
+      };        window.html5 = html5;
+
+        shivDocument(document);
+
+    }(this, document));
+
+    Modernizr._version      = version;
+
+    Modernizr._prefixes     = prefixes;
+    Modernizr._domPrefixes  = domPrefixes;
+    Modernizr._cssomPrefixes  = cssomPrefixes;
+
+
+    Modernizr.hasEvent      = isEventSupported;
+
+    Modernizr.testProp      = function(prop){
+        return testProps([prop]);
+    };
+
+    Modernizr.testAllProps  = testPropsAll;
+
+
+    Modernizr.testStyles    = injectElementWithStyles;
+    Modernizr.prefixed      = function(prop, obj, elem){
+      if(!obj) {
+        return testPropsAll(prop, 'pfx');
+      } else {
+            return testPropsAll(prop, obj, elem);
+      }
+    };
+
+
+    docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2') +
+
+                                                    (enableClasses ? ' js ' + classes.join(' ') : '');
+
+    return Modernizr;
+
+})(this, this.document);
+/*yepnope1.5.4|WTFPL*/
+(function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f<d;f++)g=a[f].split("="),(e=z[g.shift()])&&(c=e(c,g));for(f=0;f<b;f++)c=x[f](c);return c}function g(a,e,f,g,h){var i=b(a),j=i.autoCallback;i.url.split(".").pop().split("?").shift(),i.bypass||(e&&(e=d(e)?e:e[a]||e[g]||e[a.split("/").pop().split("?")[0]]),i.instead?i.instead(a,e,f,g,h):(y[i.url]?i.noexec=!0:y[i.url]=1,f.load(i.url,i.forceCSS||!i.forceJS&&"css"==i.url.split(".").pop().split("?").shift()?"c":c,i.noexec,i.attrs,i.timeout),(d(e)||d(j))&&f.load(function(){k(),e&&e(i.origUrl,h,g),j&&j(i.origUrl,h,g),y[i.url]=2})))}function h(a,b){function c(a,c){if(a){if(e(a))c||(j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}),g(a,j,b,0,h);else if(Object(a)===a)for(n in m=function(){var b=0,c;for(c in a)a.hasOwnProperty(c)&&b++;return b}(),a)a.hasOwnProperty(n)&&(!c&&!--m&&(d(j)?j=function(){var a=[].slice.call(arguments);k.apply(this,a),l()}:j[n]=function(a){return function(){var b=[].slice.call(arguments);a&&a.apply(this,b),l()}}(k[n])),g(a[n],j,b,n,h))}else!c&&l()}var h=!!a.test,i=a.load||a.both,j=a.callback||f,k=j,l=a.complete||f,m,n;c(h?a.yep:a.nope,!!i),i&&c(i)}var i,j,l=this.yepnope.loader;if(e(a))g(a,0,l,0);else if(w(a))for(i=0;i<a.length;i++)j=a[i],e(j)?g(j,0,l,0):w(j)?B(j):Object(j)===j&&h(j,l);else Object(a)===a&&h(a,l)},B.addPrefix=function(a,b){z[a]=b},B.addFilter=function(a){x.push(a)},B.errorTimeout=1e4,null==b.readyState&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",A=function(){b.removeEventListener("DOMContentLoaded",A,0),b.readyState="complete"},0)),a.yepnope=k(),a.yepnope.executeStack=h,a.yepnope.injectJs=function(a,c,d,e,i,j){var k=b.createElement("script"),l,o,e=e||B.errorTimeout;k.src=a;for(o in d)k.setAttribute(o,d[o]);c=j?h:c||f,k.onreadystatechange=k.onload=function(){!l&&g(k.readyState)&&(l=1,c(),k.onload=k.onreadystatechange=null)},m(function(){l||(l=1,c(1))},e),i?k.onload():n.parentNode.insertBefore(k,n)},a.yepnope.injectCss=function(a,c,d,e,g,i){var e=b.createElement("link"),j,c=i?h:c||f;e.href=a,e.rel="stylesheet",e.type="text/css";for(j in d)e.setAttribute(j,d[j]);g||(n.parentNode.insertBefore(e,n),m(c,0))}})(this,document);
+Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0));};
+;
\ No newline at end of file
diff --git a/src/main/webapp/client/js/lib/select2-spinner.gif b/src/main/webapp/client/js/lib/select2-spinner.gif
new file mode 100644
index 00000000..5b33f7e5
Binary files /dev/null and b/src/main/webapp/client/js/lib/select2-spinner.gif differ
diff --git a/src/main/webapp/client/js/lib/select2.css b/src/main/webapp/client/js/lib/select2.css
new file mode 100644
index 00000000..2b32ed6f
--- /dev/null
+++ b/src/main/webapp/client/js/lib/select2.css
@@ -0,0 +1,615 @@
+/*
+Version: 3.4.5 Timestamp: Mon Nov  4 08:22:42 PST 2013
+*/
+.select2-container {
+    margin: 0;
+    position: relative;
+    display: inline-block;
+    /* inline-block for ie7 */
+    zoom: 1;
+    *display: inline;
+    vertical-align: middle;
+}
+
+.select2-container,
+.select2-drop,
+.select2-search,
+.select2-search input {
+  /*
+    Force border-box so that % widths fit the parent
+    container without overlap because of margin/padding.
+
+    More Info : http://www.quirksmode.org/css/box.html
+  */
+  -webkit-box-sizing: border-box; /* webkit */
+     -moz-box-sizing: border-box; /* firefox */
+          box-sizing: border-box; /* css3 */
+}
+
+.select2-container .select2-choice {
+    display: block;
+    height: 26px;
+    padding: 0 0 0 8px;
+    overflow: hidden;
+    position: relative;
+
+    border: 1px solid #aaa;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+
+    border-radius: 4px;
+
+    background-clip: padding-box;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff));
+    background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%);
+    background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0);
+    background-image: linear-gradient(top, #fff 0%, #eee 50%);
+}
+
+.select2-container.select2-drop-above .select2-choice {
+    border-bottom-color: #aaa;
+
+    border-radius: 0 0 4px 4px;
+
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.9, #fff));
+    background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%);
+    background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);
+    background-image: linear-gradient(top, #eee 0%, #fff 90%);
+}
+
+.select2-container.select2-allowclear .select2-choice .select2-chosen {
+    margin-right: 42px;
+}
+
+.select2-container .select2-choice > .select2-chosen {
+    margin-right: 26px;
+    display: block;
+    overflow: hidden;
+
+    white-space: nowrap;
+
+    text-overflow: ellipsis;
+}
+
+.select2-container .select2-choice abbr {
+    display: none;
+    width: 12px;
+    height: 12px;
+    position: absolute;
+    right: 24px;
+    top: 8px;
+
+    font-size: 1px;
+    text-decoration: none;
+
+    border: 0;
+    background: url('select2.png') right top no-repeat;
+    cursor: pointer;
+    outline: 0;
+}
+
+.select2-container.select2-allowclear .select2-choice abbr {
+    display: inline-block;
+}
+
+.select2-container .select2-choice abbr:hover {
+    background-position: right -11px;
+    cursor: pointer;
+}
+
+.select2-drop-mask {
+    border: 0;
+    margin: 0;
+    padding: 0;
+    position: fixed;
+    left: 0;
+    top: 0;
+    min-height: 100%;
+    min-width: 100%;
+    height: auto;
+    width: auto;
+    opacity: 0;
+    z-index: 9998;
+    /* styles required for IE to work */
+    background-color: #fff;
+    filter: alpha(opacity=0);
+}
+
+.select2-drop {
+    width: 100%;
+    margin-top: -1px;
+    position: absolute;
+    z-index: 9999;
+    top: 100%;
+
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    border-top: 0;
+
+    border-radius: 0 0 4px 4px;
+
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+            box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-drop-auto-width {
+    border-top: 1px solid #aaa;
+    width: auto;
+}
+
+.select2-drop-auto-width .select2-search {
+    padding-top: 4px;
+}
+
+.select2-drop.select2-drop-above {
+    margin-top: 1px;
+    border-top: 1px solid #aaa;
+    border-bottom: 0;
+
+    border-radius: 4px 4px 0 0;
+
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+            box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-drop-active {
+    border: 1px solid #5897fb;
+    border-top: none;
+}
+
+.select2-drop.select2-drop-above.select2-drop-active {
+    border-top: 1px solid #5897fb;
+}
+
+.select2-container .select2-choice .select2-arrow {
+    display: inline-block;
+    width: 18px;
+    height: 100%;
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    border-left: 1px solid #aaa;
+    border-radius: 0 4px 4px 0;
+
+    background-clip: padding-box;
+
+    background: #ccc;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0);
+    background-image: linear-gradient(top, #ccc 0%, #eee 60%);
+}
+
+.select2-container .select2-choice .select2-arrow b {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: url('select2.png') no-repeat 0 1px;
+}
+
+.select2-search {
+    display: inline-block;
+    width: 100%;
+    min-height: 26px;
+    margin: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+
+    position: relative;
+    z-index: 10000;
+
+    white-space: nowrap;
+}
+
+.select2-search input {
+    width: 100%;
+    height: auto !important;
+    min-height: 26px;
+    padding: 4px 20px 4px 5px;
+    margin: 0;
+
+    outline: 0;
+    font-family: sans-serif;
+    font-size: 1em;
+
+    border: 1px solid #aaa;
+    border-radius: 0;
+
+    -webkit-box-shadow: none;
+            box-shadow: none;
+
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
+}
+
+.select2-drop.select2-drop-above .select2-search input {
+    margin-top: 4px;
+}
+
+.select2-search input.select2-active {
+    background: #fff url('select2-spinner.gif') no-repeat 100%;
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
+}
+
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+}
+
+.select2-dropdown-open .select2-choice {
+    border-bottom-color: transparent;
+    -webkit-box-shadow: 0 1px 0 #fff inset;
+            box-shadow: 0 1px 0 #fff inset;
+
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+
+    background-color: #eee;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.5, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%);
+    background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
+    background-image: linear-gradient(top, #fff 0%, #eee 50%);
+}
+
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices {
+    border: 1px solid #5897fb;
+    border-top-color: transparent;
+
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(0.5, #eee));
+    background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%);
+    background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
+    background-image: linear-gradient(bottom, #fff 0%, #eee 50%);
+}
+
+.select2-dropdown-open .select2-choice .select2-arrow {
+    background: transparent;
+    border-left: none;
+    filter: none;
+}
+.select2-dropdown-open .select2-choice .select2-arrow b {
+    background-position: -18px 1px;
+}
+
+/* results */
+.select2-results {
+    max-height: 200px;
+    padding: 0 0 0 4px;
+    margin: 4px 4px 4px 0;
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+.select2-results ul.select2-result-sub {
+    margin: 0;
+    padding-left: 0;
+}
+
+.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
+.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
+
+.select2-results li {
+    list-style: none;
+    display: list-item;
+    background-image: none;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+    font-weight: bold;
+}
+
+.select2-results .select2-result-label {
+    padding: 3px 7px 4px;
+    margin: 0;
+    cursor: pointer;
+
+    min-height: 1em;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+}
+
+.select2-results .select2-highlighted {
+    background: #3875d7;
+    color: #fff;
+}
+
+.select2-results li em {
+    background: #feffde;
+    font-style: normal;
+}
+
+.select2-results .select2-highlighted em {
+    background: transparent;
+}
+
+.select2-results .select2-highlighted ul {
+    background: #fff;
+    color: #000;
+}
+
+
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+    background: #f4f4f4;
+    display: list-item;
+}
+
+/*
+disabled look for disabled choices in the results dropdown
+*/
+.select2-results .select2-disabled.select2-highlighted {
+    color: #666;
+    background: #f4f4f4;
+    display: list-item;
+    cursor: default;
+}
+.select2-results .select2-disabled {
+  background: #f4f4f4;
+  display: list-item;
+  cursor: default;
+}
+
+.select2-results .select2-selected {
+    display: none;
+}
+
+.select2-more-results.select2-active {
+    background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%;
+}
+
+.select2-more-results {
+    background: #f4f4f4;
+    display: list-item;
+}
+
+/* disabled styles */
+
+.select2-container.select2-container-disabled .select2-choice {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container.select2-container-disabled .select2-choice .select2-arrow {
+    background-color: #f4f4f4;
+    background-image: none;
+    border-left: 0;
+}
+
+.select2-container.select2-container-disabled .select2-choice abbr {
+    display: none;
+}
+
+
+/* multiselect */
+
+.select2-container-multi .select2-choices {
+    height: auto !important;
+    height: 1%;
+    margin: 0;
+    padding: 0;
+    position: relative;
+
+    border: 1px solid #aaa;
+    cursor: text;
+    overflow: hidden;
+
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff));
+    background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%);
+    background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%);
+    background-image: linear-gradient(top, #eee 1%, #fff 15%);
+}
+
+.select2-locked {
+  padding: 3px 5px 3px 5px !important;
+}
+
+.select2-container-multi .select2-choices {
+    min-height: 26px;
+}
+
+.select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+}
+.select2-container-multi .select2-choices li {
+    float: left;
+    list-style: none;
+}
+.select2-container-multi .select2-choices .select2-search-field {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+    padding: 5px;
+    margin: 1px 0;
+
+    font-family: sans-serif;
+    font-size: 100%;
+    color: #666;
+    outline: 0;
+    border: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+    background: transparent !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('select2-spinner.gif') no-repeat 100% !important;
+}
+
+.select2-default {
+    color: #999 !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 18px;
+    margin: 3px 0 3px 5px;
+    position: relative;
+
+    line-height: 13px;
+    color: #333;
+    cursor: default;
+    border: 1px solid #aaaaaa;
+
+    border-radius: 3px;
+
+    -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+            box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+
+    background-clip: padding-box;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+
+    background-color: #e4e4e4;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+.select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
+    cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+    background: #d4d4d4;
+}
+
+.select2-search-choice-close {
+    display: block;
+    width: 12px;
+    height: 13px;
+    position: absolute;
+    right: 3px;
+    top: 4px;
+
+    font-size: 1px;
+    outline: none;
+    background: url('select2.png') right top no-repeat;
+}
+
+.select2-container-multi .select2-search-choice-close {
+    left: 3px;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
+  background-position: right -11px;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
+    background-position: right -11px;
+}
+
+/* disabled styles */
+.select2-container-multi.select2-container-disabled .select2-choices {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 5px;
+    border: 1px solid #ddd;
+    background-image: none;
+    background-color: #f4f4f4;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {    display: none;
+    background: none;
+}
+/* end multiselect */
+
+
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-match {
+    text-decoration: underline;
+}
+
+.select2-offscreen, .select2-offscreen:focus {
+    clip: rect(0 0 0 0) !important;
+    width: 1px !important;
+    height: 1px !important;
+    border: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+    position: absolute !important;
+    outline: 0 !important;
+    left: 0px !important;
+    top: 0px !important;
+}
+
+.select2-display-none {
+    display: none;
+}
+
+.select2-measure-scrollbar {
+    position: absolute;
+    top: -10000px;
+    left: -10000px;
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+}
+/* Retina-ize icons */
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi)  {
+  .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b {
+      background-image: url('select2x2.png') !important;
+      background-repeat: no-repeat !important;
+      background-size: 60px 40px !important;
+  }
+  .select2-search input {
+      background-position: 100% -21px !important;
+  }
+}
diff --git a/src/main/webapp/client/js/lib/select2.js b/src/main/webapp/client/js/lib/select2.js
new file mode 100644
index 00000000..3b5e8e28
--- /dev/null
+++ b/src/main/webapp/client/js/lib/select2.js
@@ -0,0 +1,3255 @@
+/*
+Copyright 2012 Igor Vaynberg
+
+Version: 3.4.5 Timestamp: Mon Nov  4 08:22:42 PST 2013
+
+This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
+General Public License version 2 (the "GPL License"). You may choose either license to govern your
+use of this software only upon the condition that you accept all of the terms of either the Apache
+License or the GPL License.
+
+You may obtain a copy of the Apache License and the GPL License at:
+
+    http://www.apache.org/licenses/LICENSE-2.0
+    http://www.gnu.org/licenses/gpl-2.0.html
+
+Unless required by applicable law or agreed to in writing, software distributed under the
+Apache License or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for
+the specific language governing permissions and limitations under the Apache License and the GPL License.
+*/
+(function ($) {
+    if(typeof $.fn.each2 == "undefined") {
+        $.extend($.fn, {
+            /*
+            * 4-10 times faster .each replacement
+            * use it carefully, as it overrides jQuery context of element on each iteration
+            */
+            each2 : function (c) {
+                var j = $([0]), i = -1, l = this.length;
+                while (
+                    ++i < l
+                    && (j.context = j[0] = this[i])
+                    && c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
+                );
+                return this;
+            }
+        });
+    }
+})(jQuery);
+
+(function ($, undefined) {
+    "use strict";
+    /*global document, window, jQuery, console */
+
+    if (window.Select2 !== undefined) {
+        return;
+    }
+
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer,
+        lastMousePosition={x:0,y:0}, $document, scrollBarDimensions,
+
+    KEY = {
+        TAB: 9,
+        ENTER: 13,
+        ESC: 27,
+        SPACE: 32,
+        LEFT: 37,
+        UP: 38,
+        RIGHT: 39,
+        DOWN: 40,
+        SHIFT: 16,
+        CTRL: 17,
+        ALT: 18,
+        PAGE_UP: 33,
+        PAGE_DOWN: 34,
+        HOME: 36,
+        END: 35,
+        BACKSPACE: 8,
+        DELETE: 46,
+        isArrow: function (k) {
+            k = k.which ? k.which : k;
+            switch (k) {
+            case KEY.LEFT:
+            case KEY.RIGHT:
+            case KEY.UP:
+            case KEY.DOWN:
+                return true;
+            }
+            return false;
+        },
+        isControl: function (e) {
+            var k = e.which;
+            switch (k) {
+            case KEY.SHIFT:
+            case KEY.CTRL:
+            case KEY.ALT:
+                return true;
+            }
+
+            if (e.metaKey) return true;
+
+            return false;
+        },
+        isFunctionKey: function (k) {
+            k = k.which ? k.which : k;
+            return k >= 112 && k <= 123;
+        }
+    },
+    MEASURE_SCROLLBAR_TEMPLATE = "<div class='select2-measure-scrollbar'></div>",
+
+    DIACRITICS = {"\u24B6":"A","\uFF21":"A","\u00C0":"A","\u00C1":"A","\u00C2":"A","\u1EA6":"A","\u1EA4":"A","\u1EAA":"A","\u1EA8":"A","\u00C3":"A","\u0100":"A","\u0102":"A","\u1EB0":"A","\u1EAE":"A","\u1EB4":"A","\u1EB2":"A","\u0226":"A","\u01E0":"A","\u00C4":"A","\u01DE":"A","\u1EA2":"A","\u00C5":"A","\u01FA":"A","\u01CD":"A","\u0200":"A","\u0202":"A","\u1EA0":"A","\u1EAC":"A","\u1EB6":"A","\u1E00":"A","\u0104":"A","\u023A":"A","\u2C6F":"A","\uA732":"AA","\u00C6":"AE","\u01FC":"AE","\u01E2":"AE","\uA734":"AO","\uA736":"AU","\uA738":"AV","\uA73A":"AV","\uA73C":"AY","\u24B7":"B","\uFF22":"B","\u1E02":"B","\u1E04":"B","\u1E06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24B8":"C","\uFF23":"C","\u0106":"C","\u0108":"C","\u010A":"C","\u010C":"C","\u00C7":"C","\u1E08":"C","\u0187":"C","\u023B":"C","\uA73E":"C","\u24B9":"D","\uFF24":"D","\u1E0A":"D","\u010E":"D","\u1E0C":"D","\u1E10":"D","\u1E12":"D","\u1E0E":"D","\u0110":"D","\u018B":"D","\u018A":"D","\u0189":"D","\uA779":"D","\u01F1":"DZ","\u01C4":"DZ","\u01F2":"Dz","\u01C5":"Dz","\u24BA":"E","\uFF25":"E","\u00C8":"E","\u00C9":"E","\u00CA":"E","\u1EC0":"E","\u1EBE":"E","\u1EC4":"E","\u1EC2":"E","\u1EBC":"E","\u0112":"E","\u1E14":"E","\u1E16":"E","\u0114":"E","\u0116":"E","\u00CB":"E","\u1EBA":"E","\u011A":"E","\u0204":"E","\u0206":"E","\u1EB8":"E","\u1EC6":"E","\u0228":"E","\u1E1C":"E","\u0118":"E","\u1E18":"E","\u1E1A":"E","\u0190":"E","\u018E":"E","\u24BB":"F","\uFF26":"F","\u1E1E":"F","\u0191":"F","\uA77B":"F","\u24BC":"G","\uFF27":"G","\u01F4":"G","\u011C":"G","\u1E20":"G","\u011E":"G","\u0120":"G","\u01E6":"G","\u0122":"G","\u01E4":"G","\u0193":"G","\uA7A0":"G","\uA77D":"G","\uA77E":"G","\u24BD":"H","\uFF28":"H","\u0124":"H","\u1E22":"H","\u1E26":"H","\u021E":"H","\u1E24":"H","\u1E28":"H","\u1E2A":"H","\u0126":"H","\u2C67":"H","\u2C75":"H","\uA78D":"H","\u24BE":"I","\uFF29":"I","\u00CC":"I","\u00CD":"I","\u00CE":"I","\u0128":"I","\u012A":"I","\u012C":"I","\u0130":"I","\u00CF":"I","\u1E2E":"I","\u1EC8":"I","\u01CF":"I","\u0208":"I","\u020A":"I","\u1ECA":"I","\u012E":"I","\u1E2C":"I","\u0197":"I","\u24BF":"J","\uFF2A":"J","\u0134":"J","\u0248":"J","\u24C0":"K","\uFF2B":"K","\u1E30":"K","\u01E8":"K","\u1E32":"K","\u0136":"K","\u1E34":"K","\u0198":"K","\u2C69":"K","\uA740":"K","\uA742":"K","\uA744":"K","\uA7A2":"K","\u24C1":"L","\uFF2C":"L","\u013F":"L","\u0139":"L","\u013D":"L","\u1E36":"L","\u1E38":"L","\u013B":"L","\u1E3C":"L","\u1E3A":"L","\u0141":"L","\u023D":"L","\u2C62":"L","\u2C60":"L","\uA748":"L","\uA746":"L","\uA780":"L","\u01C7":"LJ","\u01C8":"Lj","\u24C2":"M","\uFF2D":"M","\u1E3E":"M","\u1E40":"M","\u1E42":"M","\u2C6E":"M","\u019C":"M","\u24C3":"N","\uFF2E":"N","\u01F8":"N","\u0143":"N","\u00D1":"N","\u1E44":"N","\u0147":"N","\u1E46":"N","\u0145":"N","\u1E4A":"N","\u1E48":"N","\u0220":"N","\u019D":"N","\uA790":"N","\uA7A4":"N","\u01CA":"NJ","\u01CB":"Nj","\u24C4":"O","\uFF2F":"O","\u00D2":"O","\u00D3":"O","\u00D4":"O","\u1ED2":"O","\u1ED0":"O","\u1ED6":"O","\u1ED4":"O","\u00D5":"O","\u1E4C":"O","\u022C":"O","\u1E4E":"O","\u014C":"O","\u1E50":"O","\u1E52":"O","\u014E":"O","\u022E":"O","\u0230":"O","\u00D6":"O","\u022A":"O","\u1ECE":"O","\u0150":"O","\u01D1":"O","\u020C":"O","\u020E":"O","\u01A0":"O","\u1EDC":"O","\u1EDA":"O","\u1EE0":"O","\u1EDE":"O","\u1EE2":"O","\u1ECC":"O","\u1ED8":"O","\u01EA":"O","\u01EC":"O","\u00D8":"O","\u01FE":"O","\u0186":"O","\u019F":"O","\uA74A":"O","\uA74C":"O","\u01A2":"OI","\uA74E":"OO","\u0222":"OU","\u24C5":"P","\uFF30":"P","\u1E54":"P","\u1E56":"P","\u01A4":"P","\u2C63":"P","\uA750":"P","\uA752":"P","\uA754":"P","\u24C6":"Q","\uFF31":"Q","\uA756":"Q","\uA758":"Q","\u024A":"Q","\u24C7":"R","\uFF32":"R","\u0154":"R","\u1E58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1E5A":"R","\u1E5C":"R","\u0156":"R","\u1E5E":"R","\u024C":"R","\u2C64":"R","\uA75A":"R","\uA7A6":"R","\uA782":"R","\u24C8":"S","\uFF33":"S","\u1E9E":"S","\u015A":"S","\u1E64":"S","\u015C":"S","\u1E60":"S","\u0160":"S","\u1E66":"S","\u1E62":"S","\u1E68":"S","\u0218":"S","\u015E":"S","\u2C7E":"S","\uA7A8":"S","\uA784":"S","\u24C9":"T","\uFF34":"T","\u1E6A":"T","\u0164":"T","\u1E6C":"T","\u021A":"T","\u0162":"T","\u1E70":"T","\u1E6E":"T","\u0166":"T","\u01AC":"T","\u01AE":"T","\u023E":"T","\uA786":"T","\uA728":"TZ","\u24CA":"U","\uFF35":"U","\u00D9":"U","\u00DA":"U","\u00DB":"U","\u0168":"U","\u1E78":"U","\u016A":"U","\u1E7A":"U","\u016C":"U","\u00DC":"U","\u01DB":"U","\u01D7":"U","\u01D5":"U","\u01D9":"U","\u1EE6":"U","\u016E":"U","\u0170":"U","\u01D3":"U","\u0214":"U","\u0216":"U","\u01AF":"U","\u1EEA":"U","\u1EE8":"U","\u1EEE":"U","\u1EEC":"U","\u1EF0":"U","\u1EE4":"U","\u1E72":"U","\u0172":"U","\u1E76":"U","\u1E74":"U","\u0244":"U","\u24CB":"V","\uFF36":"V","\u1E7C":"V","\u1E7E":"V","\u01B2":"V","\uA75E":"V","\u0245":"V","\uA760":"VY","\u24CC":"W","\uFF37":"W","\u1E80":"W","\u1E82":"W","\u0174":"W","\u1E86":"W","\u1E84":"W","\u1E88":"W","\u2C72":"W","\u24CD":"X","\uFF38":"X","\u1E8A":"X","\u1E8C":"X","\u24CE":"Y","\uFF39":"Y","\u1EF2":"Y","\u00DD":"Y","\u0176":"Y","\u1EF8":"Y","\u0232":"Y","\u1E8E":"Y","\u0178":"Y","\u1EF6":"Y","\u1EF4":"Y","\u01B3":"Y","\u024E":"Y","\u1EFE":"Y","\u24CF":"Z","\uFF3A":"Z","\u0179":"Z","\u1E90":"Z","\u017B":"Z","\u017D":"Z","\u1E92":"Z","\u1E94":"Z","\u01B5":"Z","\u0224":"Z","\u2C7F":"Z","\u2C6B":"Z","\uA762":"Z","\u24D0":"a","\uFF41":"a","\u1E9A":"a","\u00E0":"a","\u00E1":"a","\u00E2":"a","\u1EA7":"a","\u1EA5":"a","\u1EAB":"a","\u1EA9":"a","\u00E3":"a","\u0101":"a","\u0103":"a","\u1EB1":"a","\u1EAF":"a","\u1EB5":"a","\u1EB3":"a","\u0227":"a","\u01E1":"a","\u00E4":"a","\u01DF":"a","\u1EA3":"a","\u00E5":"a","\u01FB":"a","\u01CE":"a","\u0201":"a","\u0203":"a","\u1EA1":"a","\u1EAD":"a","\u1EB7":"a","\u1E01":"a","\u0105":"a","\u2C65":"a","\u0250":"a","\uA733":"aa","\u00E6":"ae","\u01FD":"ae","\u01E3":"ae","\uA735":"ao","\uA737":"au","\uA739":"av","\uA73B":"av","\uA73D":"ay","\u24D1":"b","\uFF42":"b","\u1E03":"b","\u1E05":"b","\u1E07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24D2":"c","\uFF43":"c","\u0107":"c","\u0109":"c","\u010B":"c","\u010D":"c","\u00E7":"c","\u1E09":"c","\u0188":"c","\u023C":"c","\uA73F":"c","\u2184":"c","\u24D3":"d","\uFF44":"d","\u1E0B":"d","\u010F":"d","\u1E0D":"d","\u1E11":"d","\u1E13":"d","\u1E0F":"d","\u0111":"d","\u018C":"d","\u0256":"d","\u0257":"d","\uA77A":"d","\u01F3":"dz","\u01C6":"dz","\u24D4":"e","\uFF45":"e","\u00E8":"e","\u00E9":"e","\u00EA":"e","\u1EC1":"e","\u1EBF":"e","\u1EC5":"e","\u1EC3":"e","\u1EBD":"e","\u0113":"e","\u1E15":"e","\u1E17":"e","\u0115":"e","\u0117":"e","\u00EB":"e","\u1EBB":"e","\u011B":"e","\u0205":"e","\u0207":"e","\u1EB9":"e","\u1EC7":"e","\u0229":"e","\u1E1D":"e","\u0119":"e","\u1E19":"e","\u1E1B":"e","\u0247":"e","\u025B":"e","\u01DD":"e","\u24D5":"f","\uFF46":"f","\u1E1F":"f","\u0192":"f","\uA77C":"f","\u24D6":"g","\uFF47":"g","\u01F5":"g","\u011D":"g","\u1E21":"g","\u011F":"g","\u0121":"g","\u01E7":"g","\u0123":"g","\u01E5":"g","\u0260":"g","\uA7A1":"g","\u1D79":"g","\uA77F":"g","\u24D7":"h","\uFF48":"h","\u0125":"h","\u1E23":"h","\u1E27":"h","\u021F":"h","\u1E25":"h","\u1E29":"h","\u1E2B":"h","\u1E96":"h","\u0127":"h","\u2C68":"h","\u2C76":"h","\u0265":"h","\u0195":"hv","\u24D8":"i","\uFF49":"i","\u00EC":"i","\u00ED":"i","\u00EE":"i","\u0129":"i","\u012B":"i","\u012D":"i","\u00EF":"i","\u1E2F":"i","\u1EC9":"i","\u01D0":"i","\u0209":"i","\u020B":"i","\u1ECB":"i","\u012F":"i","\u1E2D":"i","\u0268":"i","\u0131":"i","\u24D9":"j","\uFF4A":"j","\u0135":"j","\u01F0":"j","\u0249":"j","\u24DA":"k","\uFF4B":"k","\u1E31":"k","\u01E9":"k","\u1E33":"k","\u0137":"k","\u1E35":"k","\u0199":"k","\u2C6A":"k","\uA741":"k","\uA743":"k","\uA745":"k","\uA7A3":"k","\u24DB":"l","\uFF4C":"l","\u0140":"l","\u013A":"l","\u013E":"l","\u1E37":"l","\u1E39":"l","\u013C":"l","\u1E3D":"l","\u1E3B":"l","\u017F":"l","\u0142":"l","\u019A":"l","\u026B":"l","\u2C61":"l","\uA749":"l","\uA781":"l","\uA747":"l","\u01C9":"lj","\u24DC":"m","\uFF4D":"m","\u1E3F":"m","\u1E41":"m","\u1E43":"m","\u0271":"m","\u026F":"m","\u24DD":"n","\uFF4E":"n","\u01F9":"n","\u0144":"n","\u00F1":"n","\u1E45":"n","\u0148":"n","\u1E47":"n","\u0146":"n","\u1E4B":"n","\u1E49":"n","\u019E":"n","\u0272":"n","\u0149":"n","\uA791":"n","\uA7A5":"n","\u01CC":"nj","\u24DE":"o","\uFF4F":"o","\u00F2":"o","\u00F3":"o","\u00F4":"o","\u1ED3":"o","\u1ED1":"o","\u1ED7":"o","\u1ED5":"o","\u00F5":"o","\u1E4D":"o","\u022D":"o","\u1E4F":"o","\u014D":"o","\u1E51":"o","\u1E53":"o","\u014F":"o","\u022F":"o","\u0231":"o","\u00F6":"o","\u022B":"o","\u1ECF":"o","\u0151":"o","\u01D2":"o","\u020D":"o","\u020F":"o","\u01A1":"o","\u1EDD":"o","\u1EDB":"o","\u1EE1":"o","\u1EDF":"o","\u1EE3":"o","\u1ECD":"o","\u1ED9":"o","\u01EB":"o","\u01ED":"o","\u00F8":"o","\u01FF":"o","\u0254":"o","\uA74B":"o","\uA74D":"o","\u0275":"o","\u01A3":"oi","\u0223":"ou","\uA74F":"oo","\u24DF":"p","\uFF50":"p","\u1E55":"p","\u1E57":"p","\u01A5":"p","\u1D7D":"p","\uA751":"p","\uA753":"p","\uA755":"p","\u24E0":"q","\uFF51":"q","\u024B":"q","\uA757":"q","\uA759":"q","\u24E1":"r","\uFF52":"r","\u0155":"r","\u1E59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1E5B":"r","\u1E5D":"r","\u0157":"r","\u1E5F":"r","\u024D":"r","\u027D":"r","\uA75B":"r","\uA7A7":"r","\uA783":"r","\u24E2":"s","\uFF53":"s","\u00DF":"s","\u015B":"s","\u1E65":"s","\u015D":"s","\u1E61":"s","\u0161":"s","\u1E67":"s","\u1E63":"s","\u1E69":"s","\u0219":"s","\u015F":"s","\u023F":"s","\uA7A9":"s","\uA785":"s","\u1E9B":"s","\u24E3":"t","\uFF54":"t","\u1E6B":"t","\u1E97":"t","\u0165":"t","\u1E6D":"t","\u021B":"t","\u0163":"t","\u1E71":"t","\u1E6F":"t","\u0167":"t","\u01AD":"t","\u0288":"t","\u2C66":"t","\uA787":"t","\uA729":"tz","\u24E4":"u","\uFF55":"u","\u00F9":"u","\u00FA":"u","\u00FB":"u","\u0169":"u","\u1E79":"u","\u016B":"u","\u1E7B":"u","\u016D":"u","\u00FC":"u","\u01DC":"u","\u01D8":"u","\u01D6":"u","\u01DA":"u","\u1EE7":"u","\u016F":"u","\u0171":"u","\u01D4":"u","\u0215":"u","\u0217":"u","\u01B0":"u","\u1EEB":"u","\u1EE9":"u","\u1EEF":"u","\u1EED":"u","\u1EF1":"u","\u1EE5":"u","\u1E73":"u","\u0173":"u","\u1E77":"u","\u1E75":"u","\u0289":"u","\u24E5":"v","\uFF56":"v","\u1E7D":"v","\u1E7F":"v","\u028B":"v","\uA75F":"v","\u028C":"v","\uA761":"vy","\u24E6":"w","\uFF57":"w","\u1E81":"w","\u1E83":"w","\u0175":"w","\u1E87":"w","\u1E85":"w","\u1E98":"w","\u1E89":"w","\u2C73":"w","\u24E7":"x","\uFF58":"x","\u1E8B":"x","\u1E8D":"x","\u24E8":"y","\uFF59":"y","\u1EF3":"y","\u00FD":"y","\u0177":"y","\u1EF9":"y","\u0233":"y","\u1E8F":"y","\u00FF":"y","\u1EF7":"y","\u1E99":"y","\u1EF5":"y","\u01B4":"y","\u024F":"y","\u1EFF":"y","\u24E9":"z","\uFF5A":"z","\u017A":"z","\u1E91":"z","\u017C":"z","\u017E":"z","\u1E93":"z","\u1E95":"z","\u01B6":"z","\u0225":"z","\u0240":"z","\u2C6C":"z","\uA763":"z"};
+
+    $document = $(document);
+
+    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
+
+
+    function stripDiacritics(str) {
+        var ret, i, l, c;
+
+        if (!str || str.length < 1) return str;
+
+        ret = "";
+        for (i = 0, l = str.length; i < l; i++) {
+            c = str.charAt(i);
+            ret += DIACRITICS[c] || c;
+        }
+        return ret;
+    }
+
+    function indexOf(value, array) {
+        var i = 0, l = array.length;
+        for (; i < l; i = i + 1) {
+            if (equal(value, array[i])) return i;
+        }
+        return -1;
+    }
+
+    function measureScrollbar () {
+        var $template = $( MEASURE_SCROLLBAR_TEMPLATE );
+        $template.appendTo('body');
+
+        var dim = {
+            width: $template.width() - $template[0].clientWidth,
+            height: $template.height() - $template[0].clientHeight
+        };
+        $template.remove();
+
+        return dim;
+    }
+
+    /**
+     * Compares equality of a and b
+     * @param a
+     * @param b
+     */
+    function equal(a, b) {
+        if (a === b) return true;
+        if (a === undefined || b === undefined) return false;
+        if (a === null || b === null) return false;
+        // Check whether 'a' or 'b' is a string (primitive or object).
+        // The concatenation of an empty string (+'') converts its argument to a string's primitive.
+        if (a.constructor === String) return a+'' === b+''; // a+'' - in case 'a' is a String object
+        if (b.constructor === String) return b+'' === a+''; // b+'' - in case 'b' is a String object
+        return false;
+    }
+
+    /**
+     * Splits the string into an array of values, trimming each value. An empty array is returned for nulls or empty
+     * strings
+     * @param string
+     * @param separator
+     */
+    function splitVal(string, separator) {
+        var val, i, l;
+        if (string === null || string.length < 1) return [];
+        val = string.split(separator);
+        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
+        return val;
+    }
+
+    function getSideBorderPadding(element) {
+        return element.outerWidth(false) - element.width();
+    }
+
+    function installKeyUpChangeEvent(element) {
+        var key="keyup-change-value";
+        element.on("keydown", function () {
+            if ($.data(element, key) === undefined) {
+                $.data(element, key, element.val());
+            }
+        });
+        element.on("keyup", function () {
+            var val= $.data(element, key);
+            if (val !== undefined && element.val() !== val) {
+                $.removeData(element, key);
+                element.trigger("keyup-change");
+            }
+        });
+    }
+
+    $document.on("mousemove", function (e) {
+        lastMousePosition.x = e.pageX;
+        lastMousePosition.y = e.pageY;
+    });
+
+    /**
+     * filters mouse events so an event is fired only if the mouse moved.
+     *
+     * filters out mouse events that occur when mouse is stationary but
+     * the elements under the pointer are scrolled.
+     */
+    function installFilteredMouseMove(element) {
+        element.on("mousemove", function (e) {
+            var lastpos = lastMousePosition;
+            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
+                $(e.target).trigger("mousemove-filtered", e);
+            }
+        });
+    }
+
+    /**
+     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
+     * within the last quietMillis milliseconds.
+     *
+     * @param quietMillis number of milliseconds to wait before invoking fn
+     * @param fn function to be debounced
+     * @param ctx object to be used as this reference within fn
+     * @return debounced version of fn
+     */
+    function debounce(quietMillis, fn, ctx) {
+        ctx = ctx || undefined;
+        var timeout;
+        return function () {
+            var args = arguments;
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function() {
+                fn.apply(ctx, args);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * A simple implementation of a thunk
+     * @param formula function used to lazily initialize the thunk
+     * @return {Function}
+     */
+    function thunk(formula) {
+        var evaluated = false,
+            value;
+        return function() {
+            if (evaluated === false) { value = formula(); evaluated = true; }
+            return value;
+        };
+    };
+
+    function installDebouncedScroll(threshold, element) {
+        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
+        element.on("scroll", function (e) {
+            if (indexOf(e.target, element.get()) >= 0) notify(e);
+        });
+    }
+
+    function focus($el) {
+        if ($el[0] === document.activeElement) return;
+
+        /* set the focus in a 0 timeout - that way the focus is set after the processing
+            of the current event has finished - which seems like the only reliable way
+            to set focus */
+        window.setTimeout(function() {
+            var el=$el[0], pos=$el.val().length, range;
+
+            $el.focus();
+
+            /* make sure el received focus so we do not error out when trying to manipulate the caret.
+                sometimes modals or others listeners may steal it after its set */
+            if ($el.is(":visible") && el === document.activeElement) {
+
+                /* after the focus is set move the caret to the end, necessary when we val()
+                    just before setting focus */
+                if(el.setSelectionRange)
+                {
+                    el.setSelectionRange(pos, pos);
+                }
+                else if (el.createTextRange) {
+                    range = el.createTextRange();
+                    range.collapse(false);
+                    range.select();
+                }
+            }
+        }, 0);
+    }
+
+    function getCursorInfo(el) {
+        el = $(el)[0];
+        var offset = 0;
+        var length = 0;
+        if ('selectionStart' in el) {
+            offset = el.selectionStart;
+            length = el.selectionEnd - offset;
+        } else if ('selection' in document) {
+            el.focus();
+            var sel = document.selection.createRange();
+            length = document.selection.createRange().text.length;
+            sel.moveStart('character', -el.value.length);
+            offset = sel.text.length - length;
+        }
+        return { offset: offset, length: length };
+    }
+
+    function killEvent(event) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+    function killEventImmediately(event) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+    }
+
+    function measureTextWidth(e) {
+        if (!sizer){
+            var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
+            sizer = $(document.createElement("div")).css({
+                position: "absolute",
+                left: "-10000px",
+                top: "-10000px",
+                display: "none",
+                fontSize: style.fontSize,
+                fontFamily: style.fontFamily,
+                fontStyle: style.fontStyle,
+                fontWeight: style.fontWeight,
+                letterSpacing: style.letterSpacing,
+                textTransform: style.textTransform,
+                whiteSpace: "nowrap"
+            });
+            sizer.attr("class","select2-sizer");
+            $("body").append(sizer);
+        }
+        sizer.text(e.val());
+        return sizer.width();
+    }
+
+    function syncCssClasses(dest, src, adapter) {
+        var classes, replacements = [], adapted;
+
+        classes = dest.attr("class");
+        if (classes) {
+            classes = '' + classes; // for IE which returns object
+            $(classes.split(" ")).each2(function() {
+                if (this.indexOf("select2-") === 0) {
+                    replacements.push(this);
+                }
+            });
+        }
+        classes = src.attr("class");
+        if (classes) {
+            classes = '' + classes; // for IE which returns object
+            $(classes.split(" ")).each2(function() {
+                if (this.indexOf("select2-") !== 0) {
+                    adapted = adapter(this);
+                    if (adapted) {
+                        replacements.push(adapted);
+                    }
+                }
+            });
+        }
+        dest.attr("class", replacements.join(" "));
+    }
+
+
+    function markMatch(text, term, markup, escapeMarkup) {
+        var match=stripDiacritics(text.toUpperCase()).indexOf(stripDiacritics(term.toUpperCase())),
+            tl=term.length;
+
+        if (match<0) {
+            markup.push(escapeMarkup(text));
+            return;
+        }
+
+        markup.push(escapeMarkup(text.substring(0, match)));
+        markup.push("<span class='select2-match'>");
+        markup.push(escapeMarkup(text.substring(match, match + tl)));
+        markup.push("</span>");
+        markup.push(escapeMarkup(text.substring(match + tl, text.length)));
+    }
+
+    function defaultEscapeMarkup(markup) {
+        var replace_map = {
+            '\\': '&#92;',
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#39;',
+            "/": '&#47;'
+        };
+
+        return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
+            return replace_map[match];
+        });
+    }
+
+    /**
+     * Produces an ajax-based query function
+     *
+     * @param options object containing configuration paramters
+     * @param options.params parameter map for the transport ajax call, can contain such options as cache, jsonpCallback, etc. see $.ajax
+     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
+     * @param options.url url for the data
+     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
+     * @param options.dataType request data type: ajax, jsonp, other datatatypes supported by jQuery's $.ajax function or the transport function if specified
+     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
+     * @param options.results a function(remoteData, pageNumber) that converts data returned form the remote request to the format expected by Select2.
+     *      The expected format is an object containing the following keys:
+     *      results array of objects that will be used as choices
+     *      more (optional) boolean indicating whether there are more results available
+     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
+     */
+    function ajax(options) {
+        var timeout, // current scheduled but not yet executed request
+            handler = null,
+            quietMillis = options.quietMillis || 100,
+            ajaxUrl = options.url,
+            self = this;
+
+        return function (query) {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function () {
+                var data = options.data, // ajax data function
+                    url = ajaxUrl, // ajax url string or function
+                    transport = options.transport || $.fn.select2.ajaxDefaults.transport,
+                    // deprecated - to be removed in 4.0  - use params instead
+                    deprecated = {
+                        type: options.type || 'GET', // set type of request (GET or POST)
+                        cache: options.cache || false,
+                        jsonpCallback: options.jsonpCallback||undefined,
+                        dataType: options.dataType||"json"
+                    },
+                    params = $.extend({}, $.fn.select2.ajaxDefaults.params, deprecated);
+
+                data = data ? data.call(self, query.term, query.page, query.context) : null;
+                url = (typeof url === 'function') ? url.call(self, query.term, query.page, query.context) : url;
+
+                if (handler) { handler.abort(); }
+
+                if (options.params) {
+                    if ($.isFunction(options.params)) {
+                        $.extend(params, options.params.call(self));
+                    } else {
+                        $.extend(params, options.params);
+                    }
+                }
+
+                $.extend(params, {
+                    url: url,
+                    dataType: options.dataType,
+                    data: data,
+                    success: function (data) {
+                        // TODO - replace query.page with query so users have access to term, page, etc.
+                        var results = options.results(data, query.page);
+                        query.callback(results);
+                    }
+                });
+                handler = transport.call(self, params);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * Produces a query function that works with a local array
+     *
+     * @param options object containing configuration parameters. The options parameter can either be an array or an
+     * object.
+     *
+     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
+     *
+     * If the object form is used ti is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
+     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
+     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
+     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
+     * the text.
+     */
+    function local(options) {
+        var data = options, // data elements
+            dataText,
+            tmp,
+            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
+
+         if ($.isArray(data)) {
+            tmp = data;
+            data = { results: tmp };
+        }
+
+         if ($.isFunction(data) === false) {
+            tmp = data;
+            data = function() { return tmp; };
+        }
+
+        var dataItem = data();
+        if (dataItem.text) {
+            text = dataItem.text;
+            // if text is not a function we assume it to be a key name
+            if (!$.isFunction(text)) {
+                dataText = dataItem.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
+                text = function (item) { return item[dataText]; };
+            }
+        }
+
+        return function (query) {
+            var t = query.term, filtered = { results: [] }, process;
+            if (t === "") {
+                query.callback(data());
+                return;
+            }
+
+            process = function(datum, collection) {
+                var group, attr;
+                datum = datum[0];
+                if (datum.children) {
+                    group = {};
+                    for (attr in datum) {
+                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
+                    }
+                    group.children=[];
+                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
+                    if (group.children.length || query.matcher(t, text(group), datum)) {
+                        collection.push(group);
+                    }
+                } else {
+                    if (query.matcher(t, text(datum), datum)) {
+                        collection.push(datum);
+                    }
+                }
+            };
+
+            $(data().results).each2(function(i, datum) { process(datum, filtered.results); });
+            query.callback(filtered);
+        };
+    }
+
+    // TODO javadoc
+    function tags(data) {
+        var isFunc = $.isFunction(data);
+        return function (query) {
+            var t = query.term, filtered = {results: []};
+            $(isFunc ? data() : data).each(function () {
+                var isObject = this.text !== undefined,
+                    text = isObject ? this.text : this;
+                if (t === "" || query.matcher(t, text)) {
+                    filtered.results.push(isObject ? this : {id: this, text: this});
+                }
+            });
+            query.callback(filtered);
+        };
+    }
+
+    /**
+     * Checks if the formatter function should be used.
+     *
+     * Throws an error if it is not a function. Returns true if it should be used,
+     * false if no formatting should be performed.
+     *
+     * @param formatter
+     */
+    function checkFormatter(formatter, formatterName) {
+        if ($.isFunction(formatter)) return true;
+        if (!formatter) return false;
+        throw new Error(formatterName +" must be a function or a falsy value");
+    }
+
+    function evaluate(val) {
+        return $.isFunction(val) ? val() : val;
+    }
+
+    function countResults(results) {
+        var count = 0;
+        $.each(results, function(i, item) {
+            if (item.children) {
+                count += countResults(item.children);
+            } else {
+                count++;
+            }
+        });
+        return count;
+    }
+
+    /**
+     * Default tokenizer. This function uses breaks the input on substring match of any string from the
+     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
+     * two options have to be defined in order for the tokenizer to work.
+     *
+     * @param input text user has typed so far or pasted into the search field
+     * @param selection currently selected choices
+     * @param selectCallback function(choice) callback tho add the choice to selection
+     * @param opts select2's opts
+     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
+     */
+    function defaultTokenizer(input, selection, selectCallback, opts) {
+        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
+            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
+            token, // token
+            index, // position at which the separator was found
+            i, l, // looping variables
+            separator; // the matched separator
+
+        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
+
+        while (true) {
+            index = -1;
+
+            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
+                separator = opts.tokenSeparators[i];
+                index = input.indexOf(separator);
+                if (index >= 0) break;
+            }
+
+            if (index < 0) break; // did not find any token separator in the input string, bail
+
+            token = input.substring(0, index);
+            input = input.substring(index + separator.length);
+
+            if (token.length > 0) {
+                token = opts.createSearchChoice.call(this, token, selection);
+                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
+                    dupe = false;
+                    for (i = 0, l = selection.length; i < l; i++) {
+                        if (equal(opts.id(token), opts.id(selection[i]))) {
+                            dupe = true; break;
+                        }
+                    }
+
+                    if (!dupe) selectCallback(token);
+                }
+            }
+        }
+
+        if (original!==input) return input;
+    }
+
+    /**
+     * Creates a new class
+     *
+     * @param superClass
+     * @param methods
+     */
+    function clazz(SuperClass, methods) {
+        var constructor = function () {};
+        constructor.prototype = new SuperClass;
+        constructor.prototype.constructor = constructor;
+        constructor.prototype.parent = SuperClass.prototype;
+        constructor.prototype = $.extend(constructor.prototype, methods);
+        return constructor;
+    }
+
+    AbstractSelect2 = clazz(Object, {
+
+        // abstract
+        bind: function (func) {
+            var self = this;
+            return function () {
+                func.apply(self, arguments);
+            };
+        },
+
+        // abstract
+        init: function (opts) {
+            var results, search, resultsSelector = ".select2-results";
+
+            // prepare options
+            this.opts = opts = this.prepareOpts(opts);
+
+            this.id=opts.id;
+
+            // destroy if called on an existing component
+            if (opts.element.data("select2") !== undefined &&
+                opts.element.data("select2") !== null) {
+                opts.element.data("select2").destroy();
+            }
+
+            this.container = this.createContainer();
+
+            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
+            this.containerSelector="#"+this.containerId.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+            this.container.attr("id", this.containerId);
+
+            // cache the body so future lookups are cheap
+            this.body = thunk(function() { return opts.element.closest("body"); });
+
+            syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
+
+            this.container.attr("style", opts.element.attr("style"));
+            this.container.css(evaluate(opts.containerCss));
+            this.container.addClass(evaluate(opts.containerCssClass));
+
+            this.elementTabIndex = this.opts.element.attr("tabindex");
+
+            // swap container for the element
+            this.opts.element
+                .data("select2", this)
+                .attr("tabindex", "-1")
+                .before(this.container)
+                .on("click.select2", killEvent); // do not leak click events
+
+            this.container.data("select2", this);
+
+            this.dropdown = this.container.find(".select2-drop");
+
+            syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
+
+            this.dropdown.addClass(evaluate(opts.dropdownCssClass));
+            this.dropdown.data("select2", this);
+            this.dropdown.on("click", killEvent);
+
+            this.results = results = this.container.find(resultsSelector);
+            this.search = search = this.container.find("input.select2-input");
+
+            this.queryCount = 0;
+            this.resultsPage = 0;
+            this.context = null;
+
+            // initialize the container
+            this.initContainer();
+
+            this.container.on("click", killEvent);
+
+            installFilteredMouseMove(this.results);
+            this.dropdown.on("mousemove-filtered touchstart touchmove touchend", resultsSelector, this.bind(this.highlightUnderEvent));
+
+            installDebouncedScroll(80, this.results);
+            this.dropdown.on("scroll-debounced", resultsSelector, this.bind(this.loadMoreIfNeeded));
+
+            // do not propagate change event from the search field out of the component
+            $(this.container).on("change", ".select2-input", function(e) {e.stopPropagation();});
+            $(this.dropdown).on("change", ".select2-input", function(e) {e.stopPropagation();});
+
+            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
+            if ($.fn.mousewheel) {
+                results.mousewheel(function (e, delta, deltaX, deltaY) {
+                    var top = results.scrollTop();
+                    if (deltaY > 0 && top - deltaY <= 0) {
+                        results.scrollTop(0);
+                        killEvent(e);
+                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
+                        results.scrollTop(results.get(0).scrollHeight - results.height());
+                        killEvent(e);
+                    }
+                });
+            }
+
+            installKeyUpChangeEvent(search);
+            search.on("keyup-change input paste", this.bind(this.updateResults));
+            search.on("focus", function () { search.addClass("select2-focused"); });
+            search.on("blur", function () { search.removeClass("select2-focused");});
+
+            this.dropdown.on("mouseup", resultsSelector, this.bind(function (e) {
+                if ($(e.target).closest(".select2-result-selectable").length > 0) {
+                    this.highlightUnderEvent(e);
+                    this.selectHighlighted(e);
+                }
+            }));
+
+            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
+            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
+            // dom it will trigger the popup close, which is not what we want
+            this.dropdown.on("click mouseup mousedown", function (e) { e.stopPropagation(); });
+
+            if ($.isFunction(this.opts.initSelection)) {
+                // initialize selection based on the current value of the source element
+                this.initSelection();
+
+                // if the user has provided a function that can set selection based on the value of the source element
+                // we monitor the change event on the element and trigger it, allowing for two way synchronization
+                this.monitorSource();
+            }
+
+            if (opts.maximumInputLength !== null) {
+                this.search.attr("maxlength", opts.maximumInputLength);
+            }
+
+            var disabled = opts.element.prop("disabled");
+            if (disabled === undefined) disabled = false;
+            this.enable(!disabled);
+
+            var readonly = opts.element.prop("readonly");
+            if (readonly === undefined) readonly = false;
+            this.readonly(readonly);
+
+            // Calculate size of scrollbar
+            scrollBarDimensions = scrollBarDimensions || measureScrollbar();
+
+            this.autofocus = opts.element.prop("autofocus");
+            opts.element.prop("autofocus", false);
+            if (this.autofocus) this.focus();
+
+            this.nextSearchTerm = undefined;
+        },
+
+        // abstract
+        destroy: function () {
+            var element=this.opts.element, select2 = element.data("select2");
+
+            this.close();
+
+            if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
+
+            if (select2 !== undefined) {
+                select2.container.remove();
+                select2.dropdown.remove();
+                element
+                    .removeClass("select2-offscreen")
+                    .removeData("select2")
+                    .off(".select2")
+                    .prop("autofocus", this.autofocus || false);
+                if (this.elementTabIndex) {
+                    element.attr({tabindex: this.elementTabIndex});
+                } else {
+                    element.removeAttr("tabindex");
+                }
+                element.show();
+            }
+        },
+
+        // abstract
+        optionToData: function(element) {
+            if (element.is("option")) {
+                return {
+                    id:element.prop("value"),
+                    text:element.text(),
+                    element: element.get(),
+                    css: element.attr("class"),
+                    disabled: element.prop("disabled"),
+                    locked: equal(element.attr("locked"), "locked") || equal(element.data("locked"), true)
+                };
+            } else if (element.is("optgroup")) {
+                return {
+                    text:element.attr("label"),
+                    children:[],
+                    element: element.get(),
+                    css: element.attr("class")
+                };
+            }
+        },
+
+        // abstract
+        prepareOpts: function (opts) {
+            var element, select, idKey, ajaxUrl, self = this;
+
+            element = opts.element;
+
+            if (element.get(0).tagName.toLowerCase() === "select") {
+                this.select = select = opts.element;
+            }
+
+            if (select) {
+                // these options are not allowed when attached to a select because they are picked up off the element itself
+                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
+                    if (this in opts) {
+                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
+                    }
+                });
+            }
+
+            opts = $.extend({}, {
+                populateResults: function(container, results, query) {
+                    var populate, id=this.opts.id;
+
+                    populate=function(results, container, depth) {
+
+                        var i, l, result, selectable, disabled, compound, node, label, innerContainer, formatted;
+
+                        results = opts.sortResults(results, container, query);
+
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
+
+                            result=results[i];
+
+                            disabled = (result.disabled === true);
+                            selectable = (!disabled) && (id(result) !== undefined);
+
+                            compound=result.children && result.children.length > 0;
+
+                            node=$("<li></li>");
+                            node.addClass("select2-results-dept-"+depth);
+                            node.addClass("select2-result");
+                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
+                            if (disabled) { node.addClass("select2-disabled"); }
+                            if (compound) { node.addClass("select2-result-with-children"); }
+                            node.addClass(self.opts.formatResultCssClass(result));
+
+                            label=$(document.createElement("div"));
+                            label.addClass("select2-result-label");
+
+                            formatted=opts.formatResult(result, label, query, self.opts.escapeMarkup);
+                            if (formatted!==undefined) {
+                                label.html(formatted);
+                            }
+
+                            node.append(label);
+
+                            if (compound) {
+
+                                innerContainer=$("<ul></ul>");
+                                innerContainer.addClass("select2-result-sub");
+                                populate(result.children, innerContainer, depth+1);
+                                node.append(innerContainer);
+                            }
+
+                            node.data("select2-data", result);
+                            container.append(node);
+                        }
+                    };
+
+                    populate(results, container, 0);
+                }
+            }, $.fn.select2.defaults, opts);
+
+            if (typeof(opts.id) !== "function") {
+                idKey = opts.id;
+                opts.id = function (e) { return e[idKey]; };
+            }
+
+            if ($.isArray(opts.element.data("select2Tags"))) {
+                if ("tags" in opts) {
+                    throw "tags specified as both an attribute 'data-select2-tags' and in options of Select2 " + opts.element.attr("id");
+                }
+                opts.tags=opts.element.data("select2Tags");
+            }
+
+            if (select) {
+                opts.query = this.bind(function (query) {
+                    var data = { results: [], more: false },
+                        term = query.term,
+                        children, placeholderOption, process;
+
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text(), element)) {
+                                collection.push(self.optionToData(element));
+                            }
+                        } else if (element.is("optgroup")) {
+                            group=self.optionToData(element);
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
+                            }
+                        }
+                    };
+
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        placeholderOption = this.getPlaceholderOption();
+                        if (placeholderOption) {
+                            children=children.not(placeholderOption);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
+
+                    query.callback(data);
+                });
+                // this is needed because inside val() we construct choices from options and there id is hardcoded
+                opts.id=function(e) { return e.id; };
+                opts.formatResultCssClass = function(data) { return data.css; };
+            } else {
+                if (!("query" in opts)) {
+
+                    if ("ajax" in opts) {
+                        ajaxUrl = opts.element.data("ajax-url");
+                        if (ajaxUrl && ajaxUrl.length > 0) {
+                            opts.ajax.url = ajaxUrl;
+                        }
+                        opts.query = ajax.call(opts.element, opts.ajax);
+                    } else if ("data" in opts) {
+                        opts.query = local(opts.data);
+                    } else if ("tags" in opts) {
+                        opts.query = tags(opts.tags);
+                        if (opts.createSearchChoice === undefined) {
+                            opts.createSearchChoice = function (term) { return {id: $.trim(term), text: $.trim(term)}; };
+                        }
+                        if (opts.initSelection === undefined) {
+                            opts.initSelection = function (element, callback) {
+                                var data = [];
+                                $(splitVal(element.val(), opts.separator)).each(function () {
+                                    var obj = { id: this, text: this },
+                                        tags = opts.tags;
+                                    if ($.isFunction(tags)) tags=tags();
+                                    $(tags).each(function() { if (equal(this.id, obj.id)) { obj = this; return false; } });
+                                    data.push(obj);
+                                });
+
+                                callback(data);
+                            };
+                        }
+                    }
+                }
+            }
+            if (typeof(opts.query) !== "function") {
+                throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
+
+            return opts;
+        },
+
+        /**
+         * Monitor the original element for changes and update select2 accordingly
+         */
+        // abstract
+        monitorSource: function () {
+            var el = this.opts.element, sync, observer;
+
+            el.on("change.select2", this.bind(function (e) {
+                if (this.opts.element.data("select2-change-triggered") !== true) {
+                    this.initSelection();
+                }
+            }));
+
+            sync = this.bind(function () {
+
+                // sync enabled state
+                var disabled = el.prop("disabled");
+                if (disabled === undefined) disabled = false;
+                this.enable(!disabled);
+
+                var readonly = el.prop("readonly");
+                if (readonly === undefined) readonly = false;
+                this.readonly(readonly);
+
+                syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
+                this.container.addClass(evaluate(this.opts.containerCssClass));
+
+                syncCssClasses(this.dropdown, this.opts.element, this.opts.adaptDropdownCssClass);
+                this.dropdown.addClass(evaluate(this.opts.dropdownCssClass));
+
+            });
+
+            // IE8-10
+            el.on("propertychange.select2", sync);
+
+            // hold onto a reference of the callback to work around a chromium bug
+            if (this.mutationCallback === undefined) {
+                this.mutationCallback = function (mutations) {
+                    mutations.forEach(sync);
+                }
+            }
+
+            // safari, chrome, firefox, IE11
+            observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
+            if (observer !== undefined) {
+                if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
+                this.propertyObserver = new observer(this.mutationCallback);
+                this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
+            }
+        },
+
+        // abstract
+        triggerSelect: function(data) {
+            var evt = $.Event("select2-selecting", { val: this.id(data), object: data });
+            this.opts.element.trigger(evt);
+            return !evt.isDefaultPrevented();
+        },
+
+        /**
+         * Triggers the change event on the source element
+         */
+        // abstract
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
+            this.opts.element.data("select2-change-triggered", true);
+            this.opts.element.trigger(details);
+            this.opts.element.data("select2-change-triggered", false);
+
+            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
+            // so here we trigger the click event manually
+            this.opts.element.click();
+
+            // ValidationEngine ignorea the change event and listens instead to blur
+            // so here we trigger the blur event manually if so desired
+            if (this.opts.blurOnChange)
+                this.opts.element.blur();
+        },
+
+        //abstract
+        isInterfaceEnabled: function()
+        {
+            return this.enabledInterface === true;
+        },
+
+        // abstract
+        enableInterface: function() {
+            var enabled = this._enabled && !this._readonly,
+                disabled = !enabled;
+
+            if (enabled === this.enabledInterface) return false;
+
+            this.container.toggleClass("select2-container-disabled", disabled);
+            this.close();
+            this.enabledInterface = enabled;
+
+            return true;
+        },
+
+        // abstract
+        enable: function(enabled) {
+            if (enabled === undefined) enabled = true;
+            if (this._enabled === enabled) return;
+            this._enabled = enabled;
+
+            this.opts.element.prop("disabled", !enabled);
+            this.enableInterface();
+        },
+
+        // abstract
+        disable: function() {
+            this.enable(false);
+        },
+
+        // abstract
+        readonly: function(enabled) {
+            if (enabled === undefined) enabled = false;
+            if (this._readonly === enabled) return false;
+            this._readonly = enabled;
+
+            this.opts.element.prop("readonly", enabled);
+            this.enableInterface();
+            return true;
+        },
+
+        // abstract
+        opened: function () {
+            return this.container.hasClass("select2-dropdown-open");
+        },
+
+        // abstract
+        positionDropdown: function() {
+            var $dropdown = this.dropdown,
+                offset = this.container.offset(),
+                height = this.container.outerHeight(false),
+                width = this.container.outerWidth(false),
+                dropHeight = $dropdown.outerHeight(false),
+                $window = $(window),
+                windowWidth = $window.width(),
+                windowHeight = $window.height(),
+                viewPortRight = $window.scrollLeft() + windowWidth,
+                viewportBottom = $window.scrollTop() + windowHeight,
+                dropTop = offset.top + height,
+                dropLeft = offset.left,
+                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
+                enoughRoomAbove = (offset.top - dropHeight) >= this.body().scrollTop(),
+                dropWidth = $dropdown.outerWidth(false),
+                enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight,
+                aboveNow = $dropdown.hasClass("select2-drop-above"),
+                bodyOffset,
+                above,
+                changeDirection,
+                css,
+                resultsListNode;
+
+            // always prefer the current above/below alignment, unless there is not enough room
+            if (aboveNow) {
+                above = true;
+                if (!enoughRoomAbove && enoughRoomBelow) {
+                    changeDirection = true;
+                    above = false;
+                }
+            } else {
+                above = false;
+                if (!enoughRoomBelow && enoughRoomAbove) {
+                    changeDirection = true;
+                    above = true;
+                }
+            }
+
+            //if we are changing direction we need to get positions when dropdown is hidden;
+            if (changeDirection) {
+                $dropdown.hide();
+                offset = this.container.offset();
+                height = this.container.outerHeight(false);
+                width = this.container.outerWidth(false);
+                dropHeight = $dropdown.outerHeight(false);
+                viewPortRight = $window.scrollLeft() + windowWidth;
+                viewportBottom = $window.scrollTop() + windowHeight;
+                dropTop = offset.top + height;
+                dropLeft = offset.left;
+                dropWidth = $dropdown.outerWidth(false);
+                enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
+                $dropdown.show();
+            }
+
+            if (this.opts.dropdownAutoWidth) {
+                resultsListNode = $('.select2-results', $dropdown)[0];
+                $dropdown.addClass('select2-drop-auto-width');
+                $dropdown.css('width', '');
+                // Add scrollbar width to dropdown if vertical scrollbar is present
+                dropWidth = $dropdown.outerWidth(false) + (resultsListNode.scrollHeight === resultsListNode.clientHeight ? 0 : scrollBarDimensions.width);
+                dropWidth > width ? width = dropWidth : dropWidth = width;
+                enoughRoomOnRight = dropLeft + dropWidth <= viewPortRight;
+            }
+            else {
+                this.container.removeClass('select2-drop-auto-width');
+            }
+
+            //console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
+            //console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove);
+
+            // fix positioning when body has an offset and is not position: static
+            if (this.body().css('position') !== 'static') {
+                bodyOffset = this.body().offset();
+                dropTop -= bodyOffset.top;
+                dropLeft -= bodyOffset.left;
+            }
+
+            if (!enoughRoomOnRight) {
+               dropLeft = offset.left + width - dropWidth;
+            }
+
+            css =  {
+                left: dropLeft,
+                width: width
+            };
+
+            if (above) {
+                css.bottom = windowHeight - offset.top;
+                css.top = 'auto';
+                this.container.addClass("select2-drop-above");
+                $dropdown.addClass("select2-drop-above");
+            }
+            else {
+                css.top = dropTop;
+                css.bottom = 'auto';
+                this.container.removeClass("select2-drop-above");
+                $dropdown.removeClass("select2-drop-above");
+            }
+            css = $.extend(css, evaluate(this.opts.dropdownCss));
+
+            $dropdown.css(css);
+        },
+
+        // abstract
+        shouldOpen: function() {
+            var event;
+
+            if (this.opened()) return false;
+
+            if (this._enabled === false || this._readonly === true) return false;
+
+            event = $.Event("select2-opening");
+            this.opts.element.trigger(event);
+            return !event.isDefaultPrevented();
+        },
+
+        // abstract
+        clearDropdownAlignmentPreference: function() {
+            // clear the classes used to figure out the preference of where the dropdown should be opened
+            this.container.removeClass("select2-drop-above");
+            this.dropdown.removeClass("select2-drop-above");
+        },
+
+        /**
+         * Opens the dropdown
+         *
+         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
+         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
+         */
+        // abstract
+        open: function () {
+
+            if (!this.shouldOpen()) return false;
+
+            this.opening();
+
+            return true;
+        },
+
+        /**
+         * Performs the opening of the dropdown
+         */
+        // abstract
+        opening: function() {
+            var cid = this.containerId,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid,
+                mask;
+
+            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+
+            this.clearDropdownAlignmentPreference();
+
+            if(this.dropdown[0] !== this.body().children().last()[0]) {
+                this.dropdown.detach().appendTo(this.body());
+            }
+
+            // create the dropdown mask if doesnt already exist
+            mask = $("#select2-drop-mask");
+            if (mask.length == 0) {
+                mask = $(document.createElement("div"));
+                mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
+                mask.hide();
+                mask.appendTo(this.body());
+                mask.on("mousedown touchstart click", function (e) {
+                    var dropdown = $("#select2-drop"), self;
+                    if (dropdown.length > 0) {
+                        self=dropdown.data("select2");
+                        if (self.opts.selectOnBlur) {
+                            self.selectHighlighted({noFocus: true});
+                        }
+                        self.close({focus:true});
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                });
+            }
+
+            // ensure the mask is always right before the dropdown
+            if (this.dropdown.prev()[0] !== mask[0]) {
+                this.dropdown.before(mask);
+            }
+
+            // move the global id to the correct dropdown
+            $("#select2-drop").removeAttr("id");
+            this.dropdown.attr("id", "select2-drop");
+
+            // show the elements
+            mask.show();
+
+            this.positionDropdown();
+            this.dropdown.show();
+            this.positionDropdown();
+
+            this.dropdown.addClass("select2-drop-active");
+
+            // attach listeners to events that can change the position of the container and thus require
+            // the position of the dropdown to be updated as well so it does not come unglued from the container
+            var that = this;
+            this.container.parents().add(window).each(function () {
+                $(this).on(resize+" "+scroll+" "+orient, function (e) {
+                    that.positionDropdown();
+                });
+            });
+
+
+        },
+
+        // abstract
+        close: function () {
+            if (!this.opened()) return;
+
+            var cid = this.containerId,
+                scroll = "scroll." + cid,
+                resize = "resize."+cid,
+                orient = "orientationchange."+cid;
+
+            // unbind event listeners
+            this.container.parents().add(window).each(function () { $(this).off(scroll).off(resize).off(orient); });
+
+            this.clearDropdownAlignmentPreference();
+
+            $("#select2-drop-mask").hide();
+            this.dropdown.removeAttr("id"); // only the active dropdown has the select2-drop id
+            this.dropdown.hide();
+            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
+            this.results.empty();
+
+
+            this.clearSearch();
+            this.search.removeClass("select2-active");
+            this.opts.element.trigger($.Event("select2-close"));
+        },
+
+        /**
+         * Opens control, sets input value, and updates results.
+         */
+        // abstract
+        externalSearch: function (term) {
+            this.open();
+            this.search.val(term);
+            this.updateResults(false);
+        },
+
+        // abstract
+        clearSearch: function () {
+
+        },
+
+        //abstract
+        getMaximumSelectionSize: function() {
+            return evaluate(this.opts.maximumSelectionSize);
+        },
+
+        // abstract
+        ensureHighlightVisible: function () {
+            var results = this.results, children, index, child, hb, rb, y, more;
+
+            index = this.highlight();
+
+            if (index < 0) return;
+
+            if (index == 0) {
+
+                // if the first element is highlighted scroll all the way to the top,
+                // that way any unselectable headers above it will also be scrolled
+                // into view
+
+                results.scrollTop(0);
+                return;
+            }
+
+            children = this.findHighlightableChoices().find('.select2-result-label');
+
+            child = $(children[index]);
+
+            hb = child.offset().top + child.outerHeight(true);
+
+            // if this is the last child lets also make sure select2-more-results is visible
+            if (index === children.length - 1) {
+                more = results.find("li.select2-more-results");
+                if (more.length > 0) {
+                    hb = more.offset().top + more.outerHeight(true);
+                }
+            }
+
+            rb = results.offset().top + results.outerHeight(true);
+            if (hb > rb) {
+                results.scrollTop(results.scrollTop() + (hb - rb));
+            }
+            y = child.offset().top - results.offset().top;
+
+            // make sure the top of the element is visible
+            if (y < 0 && child.css('display') != 'none' ) {
+                results.scrollTop(results.scrollTop() + y); // y is negative
+            }
+        },
+
+        // abstract
+        findHighlightableChoices: function() {
+            return this.results.find(".select2-result-selectable:not(.select2-disabled, .select2-selected)");
+        },
+
+        // abstract
+        moveHighlight: function (delta) {
+            var choices = this.findHighlightableChoices(),
+                index = this.highlight();
+
+            while (index > -1 && index < choices.length) {
+                index += delta;
+                var choice = $(choices[index]);
+                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled") && !choice.hasClass("select2-selected")) {
+                    this.highlight(index);
+                    break;
+                }
+            }
+        },
+
+        // abstract
+        highlight: function (index) {
+            var choices = this.findHighlightableChoices(),
+                choice,
+                data;
+
+            if (arguments.length === 0) {
+                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
+            }
+
+            if (index >= choices.length) index = choices.length - 1;
+            if (index < 0) index = 0;
+
+            this.removeHighlight();
+
+            choice = $(choices[index]);
+            choice.addClass("select2-highlighted");
+
+            this.ensureHighlightVisible();
+
+            data = choice.data("select2-data");
+            if (data) {
+                this.opts.element.trigger({ type: "select2-highlight", val: this.id(data), choice: data });
+            }
+        },
+
+        removeHighlight: function() {
+            this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+        },
+
+        // abstract
+        countSelectableResults: function() {
+            return this.findHighlightableChoices().length;
+        },
+
+        // abstract
+        highlightUnderEvent: function (event) {
+            var el = $(event.target).closest(".select2-result-selectable");
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
+                var choices = this.findHighlightableChoices();
+                this.highlight(choices.index(el));
+            } else if (el.length == 0) {
+                // if we are over an unselectable item remove all highlights
+                this.removeHighlight();
+            }
+        },
+
+        // abstract
+        loadMoreIfNeeded: function () {
+            var results = this.results,
+                more = results.find("li.select2-more-results"),
+                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
+                page = this.resultsPage + 1,
+                self=this,
+                term=this.search.val(),
+                context=this.context;
+
+            if (more.length === 0) return;
+            below = more.offset().top - results.offset().top - results.height();
+
+            if (below <= this.opts.loadMorePadding) {
+                more.addClass("select2-active");
+                this.opts.query({
+                        element: this.opts.element,
+                        term: term,
+                        page: page,
+                        context: context,
+                        matcher: this.opts.matcher,
+                        callback: this.bind(function (data) {
+
+                    // ignore a response if the select2 has been closed before it was received
+                    if (!self.opened()) return;
+
+
+                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
+                    self.postprocessResults(data, false, false);
+
+                    if (data.more===true) {
+                        more.detach().appendTo(results).text(self.opts.formatLoadMore(page+1));
+                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                    } else {
+                        more.remove();
+                    }
+                    self.positionDropdown();
+                    self.resultsPage = page;
+                    self.context = data.context;
+                    this.opts.element.trigger({ type: "select2-loaded", items: data });
+                })});
+            }
+        },
+
+        /**
+         * Default tokenizer function which does nothing
+         */
+        tokenize: function() {
+
+        },
+
+        /**
+         * @param initial whether or not this is the call to this method right after the dropdown has been opened
+         */
+        // abstract
+        updateResults: function (initial) {
+            var search = this.search,
+                results = this.results,
+                opts = this.opts,
+                data,
+                self = this,
+                input,
+                term = search.val(),
+                lastTerm = $.data(this.container, "select2-last-term"),
+                // sequence number used to drop out-of-order responses
+                queryNumber;
+
+            // prevent duplicate queries against the same term
+            if (initial !== true && lastTerm && equal(term, lastTerm)) return;
+
+            $.data(this.container, "select2-last-term", term);
+
+            // if the search is currently hidden we do not alter the results
+            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
+                return;
+            }
+
+            function postRender() {
+                search.removeClass("select2-active");
+                self.positionDropdown();
+            }
+
+            function render(html) {
+                results.html(html);
+                postRender();
+            }
+
+            queryNumber = ++this.queryCount;
+
+            var maxSelSize = this.getMaximumSelectionSize();
+            if (maxSelSize >=1) {
+                data = this.data();
+                if ($.isArray(data) && data.length >= maxSelSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
+                    render("<li class='select2-selection-limit'>" + opts.formatSelectionTooBig(maxSelSize) + "</li>");
+                    return;
+                }
+            }
+
+            if (search.val().length < opts.minimumInputLength) {
+                if (checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
+                    render("<li class='select2-no-results'>" + opts.formatInputTooShort(search.val(), opts.minimumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                if (initial && this.showSearch) this.showSearch(true);
+                return;
+            }
+
+            if (opts.maximumInputLength && search.val().length > opts.maximumInputLength) {
+                if (checkFormatter(opts.formatInputTooLong, "formatInputTooLong")) {
+                    render("<li class='select2-no-results'>" + opts.formatInputTooLong(search.val(), opts.maximumInputLength) + "</li>");
+                } else {
+                    render("");
+                }
+                return;
+            }
+
+            if (opts.formatSearching && this.findHighlightableChoices().length === 0) {
+                render("<li class='select2-searching'>" + opts.formatSearching() + "</li>");
+            }
+
+            search.addClass("select2-active");
+
+            this.removeHighlight();
+
+            // give the tokenizer a chance to pre-process the input
+            input = this.tokenize();
+            if (input != undefined && input != null) {
+                search.val(input);
+            }
+
+            this.resultsPage = 1;
+
+            opts.query({
+                element: opts.element,
+                    term: search.val(),
+                    page: this.resultsPage,
+                    context: null,
+                    matcher: opts.matcher,
+                    callback: this.bind(function (data) {
+                var def; // default choice
+
+                // ignore old responses
+                if (queryNumber != this.queryCount) {
+                  return;
+                }
+
+                // ignore a response if the select2 has been closed before it was received
+                if (!this.opened()) {
+                    this.search.removeClass("select2-active");
+                    return;
+                }
+
+                // save context, if any
+                this.context = (data.context===undefined) ? null : data.context;
+                // create a default choice and prepend it to the list
+                if (this.opts.createSearchChoice && search.val() !== "") {
+                    def = this.opts.createSearchChoice.call(self, search.val(), data.results);
+                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
+                        if ($(data.results).filter(
+                            function () {
+                                return equal(self.id(this), self.id(def));
+                            }).length === 0) {
+                            data.results.unshift(def);
+                        }
+                    }
+                }
+
+                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
+                    render("<li class='select2-no-results'>" + opts.formatNoMatches(search.val()) + "</li>");
+                    return;
+                }
+
+                results.empty();
+                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
+
+                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
+                    results.append("<li class='select2-more-results'>" + self.opts.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
+                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
+
+                this.postprocessResults(data, initial);
+
+                postRender();
+
+                this.opts.element.trigger({ type: "select2-loaded", items: data });
+            })});
+        },
+
+        // abstract
+        cancel: function () {
+            this.close();
+        },
+
+        // abstract
+        blur: function () {
+            // if selectOnBlur == true, select the currently highlighted option
+            if (this.opts.selectOnBlur)
+                this.selectHighlighted({noFocus: true});
+
+            this.close();
+            this.container.removeClass("select2-container-active");
+            // synonymous to .is(':focus'), which is available in jquery >= 1.6
+            if (this.search[0] === document.activeElement) { this.search.blur(); }
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+        },
+
+        // abstract
+        focusSearch: function () {
+            focus(this.search);
+        },
+
+        // abstract
+        selectHighlighted: function (options) {
+            var index=this.highlight(),
+                highlighted=this.results.find(".select2-highlighted"),
+                data = highlighted.closest('.select2-result').data("select2-data");
+
+            if (data) {
+                this.highlight(index);
+                this.onSelect(data, options);
+            } else if (options && options.noFocus) {
+                this.close();
+            }
+        },
+
+        // abstract
+        getPlaceholder: function () {
+            var placeholderOption;
+            return this.opts.element.attr("placeholder") ||
+                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
+                this.opts.element.data("placeholder") ||
+                this.opts.placeholder ||
+                ((placeholderOption = this.getPlaceholderOption()) !== undefined ? placeholderOption.text() : undefined);
+        },
+
+        // abstract
+        getPlaceholderOption: function() {
+            if (this.select) {
+                var firstOption = this.select.children('option').first();
+                if (this.opts.placeholderOption !== undefined ) {
+                    //Determine the placeholder option based on the specified placeholderOption setting
+                    return (this.opts.placeholderOption === "first" && firstOption) ||
+                           (typeof this.opts.placeholderOption === "function" && this.opts.placeholderOption(this.select));
+                } else if (firstOption.text() === "" && firstOption.val() === "") {
+                    //No explicit placeholder option specified, use the first if it's blank
+                    return firstOption;
+                }
+            }
+        },
+
+        /**
+         * Get the desired width for the container element.  This is
+         * derived first from option `width` passed to select2, then
+         * the inline 'style' on the original element, and finally
+         * falls back to the jQuery calculated element width.
+         */
+        // abstract
+        initContainerWidth: function () {
+            function resolveContainerWidth() {
+                var style, attrs, matches, i, l, attr;
+
+                if (this.opts.width === "off") {
+                    return null;
+                } else if (this.opts.width === "element"){
+                    return this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px';
+                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
+                    // check if there is inline style on the element that contains width
+                    style = this.opts.element.attr('style');
+                    if (style !== undefined) {
+                        attrs = style.split(';');
+                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                            attr = attrs[i].replace(/\s/g, '');
+                            matches = attr.match(/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i);
+                            if (matches !== null && matches.length >= 1)
+                                return matches[1];
+                        }
+                    }
+
+                    if (this.opts.width === "resolve") {
+                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
+                        // when attached to input type=hidden or elements hidden via css
+                        style = this.opts.element.css('width');
+                        if (style.indexOf("%") > 0) return style;
+
+                        // finally, fallback on the calculated width of the element
+                        return (this.opts.element.outerWidth(false) === 0 ? 'auto' : this.opts.element.outerWidth(false) + 'px');
+                    }
+
+                    return null;
+                } else if ($.isFunction(this.opts.width)) {
+                    return this.opts.width();
+                } else {
+                    return this.opts.width;
+               }
+            };
+
+            var width = resolveContainerWidth.call(this);
+            if (width !== null) {
+                this.container.css("width", width);
+            }
+        }
+    });
+
+    SingleSelect2 = clazz(AbstractSelect2, {
+
+        // single
+
+        createContainer: function () {
+            var container = $(document.createElement("div")).attr({
+                "class": "select2-container"
+            }).html([
+                "<a href='javascript:void(0)' onclick='return false;' class='select2-choice' tabindex='-1'>",
+                "   <span class='select2-chosen'>&nbsp;</span><abbr class='select2-search-choice-close'></abbr>",
+                "   <span class='select2-arrow'><b></b></span>",
+                "</a>",
+                "<input class='select2-focusser select2-offscreen' type='text'/>",
+                "<div class='select2-drop select2-display-none'>",
+                "   <div class='select2-search'>",
+                "       <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'/>",
+                "   </div>",
+                "   <ul class='select2-results'>",
+                "   </ul>",
+                "</div>"].join(""));
+            return container;
+        },
+
+        // single
+        enableInterface: function() {
+            if (this.parent.enableInterface.apply(this, arguments)) {
+                this.focusser.prop("disabled", !this.isInterfaceEnabled());
+            }
+        },
+
+        // single
+        opening: function () {
+            var el, range, len;
+
+            if (this.opts.minimumResultsForSearch >= 0) {
+                this.showSearch(true);
+            }
+
+            this.parent.opening.apply(this, arguments);
+
+            if (this.showSearchInput !== false) {
+                // IE appends focusser.val() at the end of field :/ so we manually insert it at the beginning using a range
+                // all other browsers handle this just fine
+
+                this.search.val(this.focusser.val());
+            }
+            this.search.focus();
+            // move the cursor to the end after focussing, otherwise it will be at the beginning and
+            // new text will appear *before* focusser.val()
+            el = this.search.get(0);
+            if (el.createTextRange) {
+                range = el.createTextRange();
+                range.collapse(false);
+                range.select();
+            } else if (el.setSelectionRange) {
+                len = this.search.val().length;
+                el.setSelectionRange(len, len);
+            }
+
+            // initializes search's value with nextSearchTerm (if defined by user)
+            // ignore nextSearchTerm if the dropdown is opened by the user pressing a letter
+            if(this.search.val() === "") {
+                if(this.nextSearchTerm != undefined){
+                    this.search.val(this.nextSearchTerm);
+                    this.search.select();
+                }
+            }
+
+            this.focusser.prop("disabled", true).val("");
+            this.updateResults(true);
+            this.opts.element.trigger($.Event("select2-open"));
+        },
+
+        // single
+        close: function (params) {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+
+            params = params || {focus: true};
+            this.focusser.removeAttr("disabled");
+
+            if (params.focus) {
+                this.focusser.focus();
+            }
+        },
+
+        // single
+        focus: function () {
+            if (this.opened()) {
+                this.close();
+            } else {
+                this.focusser.removeAttr("disabled");
+                this.focusser.focus();
+            }
+        },
+
+        // single
+        isFocused: function () {
+            return this.container.hasClass("select2-container-active");
+        },
+
+        // single
+        cancel: function () {
+            this.parent.cancel.apply(this, arguments);
+            this.focusser.removeAttr("disabled");
+            this.focusser.focus();
+        },
+
+        // single
+        destroy: function() {
+            $("label[for='" + this.focusser.attr('id') + "']")
+                .attr('for', this.opts.element.attr("id"));
+            this.parent.destroy.apply(this, arguments);
+        },
+
+        // single
+        initContainer: function () {
+
+            var selection,
+                container = this.container,
+                dropdown = this.dropdown;
+
+            if (this.opts.minimumResultsForSearch < 0) {
+                this.showSearch(false);
+            } else {
+                this.showSearch(true);
+            }
+
+            this.selection = selection = container.find(".select2-choice");
+
+            this.focusser = container.find(".select2-focusser");
+
+            // rewrite labels from original element to focusser
+            this.focusser.attr("id", "s2id_autogen"+nextUid());
+
+            $("label[for='" + this.opts.element.attr("id") + "']")
+                .attr('for', this.focusser.attr('id'));
+
+            this.focusser.attr("tabindex", this.elementTabIndex);
+
+            this.search.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.TAB:
+                        this.selectHighlighted({noFocus: true});
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                }
+            }));
+
+            this.search.on("blur", this.bind(function(e) {
+                // a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
+                // without this the search field loses focus which is annoying
+                if (document.activeElement === this.body().get(0)) {
+                    window.setTimeout(this.bind(function() {
+                        this.search.focus();
+                    }), 0);
+                }
+            }));
+
+            this.focusser.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which == KEY.DOWN || e.which == KEY.UP
+                    || (e.which == KEY.ENTER && this.opts.openOnEnter)) {
+
+                    if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) return;
+
+                    this.open();
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which == KEY.DELETE || e.which == KEY.BACKSPACE) {
+                    if (this.opts.allowClear) {
+                        this.clear();
+                    }
+                    killEvent(e);
+                    return;
+                }
+            }));
+
+
+            installKeyUpChangeEvent(this.focusser);
+            this.focusser.on("keyup-change input", this.bind(function(e) {
+                if (this.opts.minimumResultsForSearch >= 0) {
+                    e.stopPropagation();
+                    if (this.opened()) return;
+                    this.open();
+                }
+            }));
+
+            selection.on("mousedown", "abbr", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+                this.clear();
+                killEventImmediately(e);
+                this.close();
+                this.selection.focus();
+            }));
+
+            selection.on("mousedown", this.bind(function (e) {
+
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+
+                if (this.opened()) {
+                    this.close();
+                } else if (this.isInterfaceEnabled()) {
+                    this.open();
+                }
+
+                killEvent(e);
+            }));
+
+            dropdown.on("mousedown", this.bind(function() { this.search.focus(); }));
+
+            selection.on("focus", this.bind(function(e) {
+                killEvent(e);
+            }));
+
+            this.focusser.on("focus", this.bind(function(){
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+            })).on("blur", this.bind(function() {
+                if (!this.opened()) {
+                    this.container.removeClass("select2-container-active");
+                    this.opts.element.trigger($.Event("select2-blur"));
+                }
+            }));
+            this.search.on("focus", this.bind(function(){
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+            }));
+
+            this.initContainerWidth();
+            this.opts.element.addClass("select2-offscreen");
+            this.setPlaceholder();
+
+        },
+
+        // single
+        clear: function(triggerChange) {
+            var data=this.selection.data("select2-data");
+            if (data) { // guard against queued quick consecutive clicks
+                var evt = $.Event("select2-clearing");
+                this.opts.element.trigger(evt);
+                if (evt.isDefaultPrevented()) {
+                    return;
+                }
+                var placeholderOption = this.getPlaceholderOption();
+                this.opts.element.val(placeholderOption ? placeholderOption.val() : "");
+                this.selection.find(".select2-chosen").empty();
+                this.selection.removeData("select2-data");
+                this.setPlaceholder();
+
+                if (triggerChange !== false){
+                    this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
+                    this.triggerChange({removed:data});
+                }
+            }
+        },
+
+        /**
+         * Sets selection based on source element's value
+         */
+        // single
+        initSelection: function () {
+            var selected;
+            if (this.isPlaceholderOptionSelected()) {
+                this.updateSelection(null);
+                this.close();
+                this.setPlaceholder();
+            } else {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(selected){
+                    if (selected !== undefined && selected !== null) {
+                        self.updateSelection(selected);
+                        self.close();
+                        self.setPlaceholder();
+                    }
+                });
+            }
+        },
+
+        isPlaceholderOptionSelected: function() {
+            var placeholderOption;
+            if (!this.getPlaceholder()) return false; // no placeholder specified so no option should be considered
+            return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected"))
+                || (this.opts.element.val() === "")
+                || (this.opts.element.val() === undefined)
+                || (this.opts.element.val() === null);
+        },
+
+        // single
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments),
+                self=this;
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install the selection initializer
+                opts.initSelection = function (element, callback) {
+                    var selected = element.find("option").filter(function() { return this.selected });
+                    // a single select box always has a value, no need to null check 'selected'
+                    callback(self.optionToData(selected));
+                };
+            } else if ("data" in opts) {
+                // install default initSelection when applied to hidden input and data is local
+                opts.initSelection = opts.initSelection || function (element, callback) {
+                    var id = element.val();
+                    //search in data by id, storing the actual matching item
+                    var match = null;
+                    opts.query({
+                        matcher: function(term, text, el){
+                            var is_match = equal(id, opts.id(el));
+                            if (is_match) {
+                                match = el;
+                            }
+                            return is_match;
+                        },
+                        callback: !$.isFunction(callback) ? $.noop : function() {
+                            callback(match);
+                        }
+                    });
+                };
+            }
+
+            return opts;
+        },
+
+        // single
+        getPlaceholder: function() {
+            // if a placeholder is specified on a single select without a valid placeholder option ignore it
+            if (this.select) {
+                if (this.getPlaceholderOption() === undefined) {
+                    return undefined;
+                }
+            }
+
+            return this.parent.getPlaceholder.apply(this, arguments);
+        },
+
+        // single
+        setPlaceholder: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (this.isPlaceholderOptionSelected() && placeholder !== undefined) {
+
+                // check for a placeholder option if attached to a select
+                if (this.select && this.getPlaceholderOption() === undefined) return;
+
+                this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(placeholder));
+
+                this.selection.addClass("select2-default");
+
+                this.container.removeClass("select2-allowclear");
+            }
+        },
+
+        // single
+        postprocessResults: function (data, initial, noHighlightUpdate) {
+            var selected = 0, self = this, showSearchInput = true;
+
+            // find the selected element in the result list
+
+            this.findHighlightableChoices().each2(function (i, elm) {
+                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
+                    selected = i;
+                    return false;
+                }
+            });
+
+            // and highlight it
+            if (noHighlightUpdate !== false) {
+                if (initial === true && selected >= 0) {
+                    this.highlight(selected);
+                } else {
+                    this.highlight(0);
+                }
+            }
+
+            // hide the search box if this is the first we got the results and there are enough of them for search
+
+            if (initial === true) {
+                var min = this.opts.minimumResultsForSearch;
+                if (min >= 0) {
+                    this.showSearch(countResults(data.results) >= min);
+                }
+            }
+        },
+
+        // single
+        showSearch: function(showSearchInput) {
+            if (this.showSearchInput === showSearchInput) return;
+
+            this.showSearchInput = showSearchInput;
+
+            this.dropdown.find(".select2-search").toggleClass("select2-search-hidden", !showSearchInput);
+            this.dropdown.find(".select2-search").toggleClass("select2-offscreen", !showSearchInput);
+            //add "select2-with-searchbox" to the container if search box is shown
+            $(this.dropdown, this.container).toggleClass("select2-with-searchbox", showSearchInput);
+        },
+
+        // single
+        onSelect: function (data, options) {
+
+            if (!this.triggerSelect(data)) { return; }
+
+            var old = this.opts.element.val(),
+                oldData = this.data();
+
+            this.opts.element.val(this.id(data));
+            this.updateSelection(data);
+
+            this.opts.element.trigger({ type: "select2-selected", val: this.id(data), choice: data });
+
+            this.nextSearchTerm = this.opts.nextSearchTerm(data, this.search.val());
+            this.close();
+
+            if (!options || !options.noFocus)
+                this.focusser.focus();
+
+            if (!equal(old, this.id(data))) { this.triggerChange({added:data,removed:oldData}); }
+        },
+
+        // single
+        updateSelection: function (data) {
+
+            var container=this.selection.find(".select2-chosen"), formatted, cssClass;
+
+            this.selection.data("select2-data", data);
+
+            container.empty();
+            if (data !== null) {
+                formatted=this.opts.formatSelection(data, container, this.opts.escapeMarkup);
+            }
+            if (formatted !== undefined) {
+                container.append(formatted);
+            }
+            cssClass=this.opts.formatSelectionCssClass(data, container);
+            if (cssClass !== undefined) {
+                container.addClass(cssClass);
+            }
+
+            this.selection.removeClass("select2-default");
+
+            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
+                this.container.addClass("select2-allowclear");
+            }
+        },
+
+        // single
+        val: function () {
+            var val,
+                triggerChange = false,
+                data = null,
+                self = this,
+                oldData = this.data();
+
+            if (arguments.length === 0) {
+                return this.opts.element.val();
+            }
+
+            val = arguments[0];
+
+            if (arguments.length > 1) {
+                triggerChange = arguments[1];
+            }
+
+            if (this.select) {
+                this.select
+                    .val(val)
+                    .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
+                        data = self.optionToData(elm);
+                        return false;
+                    });
+                this.updateSelection(data);
+                this.setPlaceholder();
+                if (triggerChange) {
+                    this.triggerChange({added: data, removed:oldData});
+                }
+            } else {
+                // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
+                if (!val && val !== 0) {
+                    this.clear(triggerChange);
+                    return;
+                }
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("cannot call val() if initSelection() is not defined");
+                }
+                this.opts.element.val(val);
+                this.opts.initSelection(this.opts.element, function(data){
+                    self.opts.element.val(!data ? "" : self.id(data));
+                    self.updateSelection(data);
+                    self.setPlaceholder();
+                    if (triggerChange) {
+                        self.triggerChange({added: data, removed:oldData});
+                    }
+                });
+            }
+        },
+
+        // single
+        clearSearch: function () {
+            this.search.val("");
+            this.focusser.val("");
+        },
+
+        // single
+        data: function(value) {
+            var data,
+                triggerChange = false;
+
+            if (arguments.length === 0) {
+                data = this.selection.data("select2-data");
+                if (data == undefined) data = null;
+                return data;
+            } else {
+                if (arguments.length > 1) {
+                    triggerChange = arguments[1];
+                }
+                if (!value) {
+                    this.clear(triggerChange);
+                } else {
+                    data = this.data();
+                    this.opts.element.val(!value ? "" : this.id(value));
+                    this.updateSelection(value);
+                    if (triggerChange) {
+                        this.triggerChange({added: value, removed:data});
+                    }
+                }
+            }
+        }
+    });
+
+    MultiSelect2 = clazz(AbstractSelect2, {
+
+        // multi
+        createContainer: function () {
+            var container = $(document.createElement("div")).attr({
+                "class": "select2-container select2-container-multi"
+            }).html([
+                "<ul class='select2-choices'>",
+                "  <li class='select2-search-field'>",
+                "    <input type='text' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false' class='select2-input'>",
+                "  </li>",
+                "</ul>",
+                "<div class='select2-drop select2-drop-multi select2-display-none'>",
+                "   <ul class='select2-results'>",
+                "   </ul>",
+                "</div>"].join(""));
+            return container;
+        },
+
+        // multi
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments),
+                self=this;
+
+            // TODO validate placeholder is a string if specified
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install sthe selection initializer
+                opts.initSelection = function (element, callback) {
+
+                    var data = [];
+
+                    element.find("option").filter(function() { return this.selected }).each2(function (i, elm) {
+                        data.push(self.optionToData(elm));
+                    });
+                    callback(data);
+                };
+            } else if ("data" in opts) {
+                // install default initSelection when applied to hidden input and data is local
+                opts.initSelection = opts.initSelection || function (element, callback) {
+                    var ids = splitVal(element.val(), opts.separator);
+                    //search in data by array of ids, storing matching items in a list
+                    var matches = [];
+                    opts.query({
+                        matcher: function(term, text, el){
+                            var is_match = $.grep(ids, function(id) {
+                                return equal(id, opts.id(el));
+                            }).length;
+                            if (is_match) {
+                                matches.push(el);
+                            }
+                            return is_match;
+                        },
+                        callback: !$.isFunction(callback) ? $.noop : function() {
+                            // reorder matches based on the order they appear in the ids array because right now
+                            // they are in the order in which they appear in data array
+                            var ordered = [];
+                            for (var i = 0; i < ids.length; i++) {
+                                var id = ids[i];
+                                for (var j = 0; j < matches.length; j++) {
+                                    var match = matches[j];
+                                    if (equal(id, opts.id(match))) {
+                                        ordered.push(match);
+                                        matches.splice(j, 1);
+                                        break;
+                                    }
+                                }
+                            }
+                            callback(ordered);
+                        }
+                    });
+                };
+            }
+
+            return opts;
+        },
+
+        // multi
+        selectChoice: function (choice) {
+
+            var selected = this.container.find(".select2-search-choice-focus");
+            if (selected.length && choice && choice[0] == selected[0]) {
+
+            } else {
+                if (selected.length) {
+                    this.opts.element.trigger("choice-deselected", selected);
+                }
+                selected.removeClass("select2-search-choice-focus");
+                if (choice && choice.length) {
+                    this.close();
+                    choice.addClass("select2-search-choice-focus");
+                    this.opts.element.trigger("choice-selected", choice);
+                }
+            }
+        },
+
+        // multi
+        destroy: function() {
+            $("label[for='" + this.search.attr('id') + "']")
+                .attr('for', this.opts.element.attr("id"));
+            this.parent.destroy.apply(this, arguments);
+        },
+
+        // multi
+        initContainer: function () {
+
+            var selector = ".select2-choices", selection;
+
+            this.searchContainer = this.container.find(".select2-search-field");
+            this.selection = selection = this.container.find(selector);
+
+            var _this = this;
+            this.selection.on("click", ".select2-search-choice:not(.select2-locked)", function (e) {
+                //killEvent(e);
+                _this.search[0].focus();
+                _this.selectChoice($(this));
+            });
+
+            // rewrite labels from original element to focusser
+            this.search.attr("id", "s2id_autogen"+nextUid());
+            $("label[for='" + this.opts.element.attr("id") + "']")
+                .attr('for', this.search.attr('id'));
+
+            this.search.on("input paste", this.bind(function() {
+                if (!this.isInterfaceEnabled()) return;
+                if (!this.opened()) {
+                    this.open();
+                }
+            }));
+
+            this.search.attr("tabindex", this.elementTabIndex);
+
+            this.keydowns = 0;
+            this.search.on("keydown", this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+
+                ++this.keydowns;
+                var selected = selection.find(".select2-search-choice-focus");
+                var prev = selected.prev(".select2-search-choice:not(.select2-locked)");
+                var next = selected.next(".select2-search-choice:not(.select2-locked)");
+                var pos = getCursorInfo(this.search);
+
+                if (selected.length &&
+                    (e.which == KEY.LEFT || e.which == KEY.RIGHT || e.which == KEY.BACKSPACE || e.which == KEY.DELETE || e.which == KEY.ENTER)) {
+                    var selectedChoice = selected;
+                    if (e.which == KEY.LEFT && prev.length) {
+                        selectedChoice = prev;
+                    }
+                    else if (e.which == KEY.RIGHT) {
+                        selectedChoice = next.length ? next : null;
+                    }
+                    else if (e.which === KEY.BACKSPACE) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        selectedChoice = prev.length ? prev : next;
+                    } else if (e.which == KEY.DELETE) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        selectedChoice = next.length ? next : null;
+                    } else if (e.which == KEY.ENTER) {
+                        selectedChoice = null;
+                    }
+
+                    this.selectChoice(selectedChoice);
+                    killEvent(e);
+                    if (!selectedChoice || !selectedChoice.length) {
+                        this.open();
+                    }
+                    return;
+                } else if (((e.which === KEY.BACKSPACE && this.keydowns == 1)
+                    || e.which == KEY.LEFT) && (pos.offset == 0 && !pos.length)) {
+
+                    this.selectChoice(selection.find(".select2-search-choice:not(.select2-locked)").last());
+                    killEvent(e);
+                    return;
+                } else {
+                    this.selectChoice(null);
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.TAB:
+                        this.selectHighlighted({noFocus:true});
+                        this.close();
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                    }
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (e.which === KEY.ENTER) {
+                    if (this.opts.openOnEnter === false) {
+                        return;
+                    } else if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey) {
+                        return;
+                    }
+                }
+
+                this.open();
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                }
+
+                if (e.which === KEY.ENTER) {
+                    // prevent form from being submitted
+                    killEvent(e);
+                }
+
+            }));
+
+            this.search.on("keyup", this.bind(function (e) {
+                this.keydowns = 0;
+                this.resizeSearch();
+            })
+            );
+
+            this.search.on("blur", this.bind(function(e) {
+                this.container.removeClass("select2-container-active");
+                this.search.removeClass("select2-focused");
+                this.selectChoice(null);
+                if (!this.opened()) this.clearSearch();
+                e.stopImmediatePropagation();
+                this.opts.element.trigger($.Event("select2-blur"));
+            }));
+
+            this.container.on("click", selector, this.bind(function (e) {
+                if (!this.isInterfaceEnabled()) return;
+                if ($(e.target).closest(".select2-search-choice").length > 0) {
+                    // clicked inside a select2 search choice, do not open
+                    return;
+                }
+                this.selectChoice(null);
+                this.clearPlaceholder();
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.open();
+                this.focusSearch();
+                e.preventDefault();
+            }));
+
+            this.container.on("focus", selector, this.bind(function () {
+                if (!this.isInterfaceEnabled()) return;
+                if (!this.container.hasClass("select2-container-active")) {
+                    this.opts.element.trigger($.Event("select2-focus"));
+                }
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+                this.clearPlaceholder();
+            }));
+
+            this.initContainerWidth();
+            this.opts.element.addClass("select2-offscreen");
+
+            // set the placeholder if necessary
+            this.clearSearch();
+        },
+
+        // multi
+        enableInterface: function() {
+            if (this.parent.enableInterface.apply(this, arguments)) {
+                this.search.prop("disabled", !this.isInterfaceEnabled());
+            }
+        },
+
+        // multi
+        initSelection: function () {
+            var data;
+            if (this.opts.element.val() === "" && this.opts.element.text() === "") {
+                this.updateSelection([]);
+                this.close();
+                // set the placeholder if necessary
+                this.clearSearch();
+            }
+            if (this.select || this.opts.element.val() !== "") {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(data){
+                    if (data !== undefined && data !== null) {
+                        self.updateSelection(data);
+                        self.close();
+                        // set the placeholder if necessary
+                        self.clearSearch();
+                    }
+                });
+            }
+        },
+
+        // multi
+        clearSearch: function () {
+            var placeholder = this.getPlaceholder(),
+                maxWidth = this.getMaxSearchWidth();
+
+            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
+                this.search.val(placeholder).addClass("select2-default");
+                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
+                // we could call this.resizeSearch(), but we do not because that requires a sizer and we do not want to create one so early because of a firefox bug, see #944
+                this.search.width(maxWidth > 0 ? maxWidth : this.container.css("width"));
+            } else {
+                this.search.val("").width(10);
+            }
+        },
+
+        // multi
+        clearPlaceholder: function () {
+            if (this.search.hasClass("select2-default")) {
+                this.search.val("").removeClass("select2-default");
+            }
+        },
+
+        // multi
+        opening: function () {
+            this.clearPlaceholder(); // should be done before super so placeholder is not used to search
+            this.resizeSearch();
+
+            this.parent.opening.apply(this, arguments);
+
+            this.focusSearch();
+
+            this.updateResults(true);
+            this.search.focus();
+            this.opts.element.trigger($.Event("select2-open"));
+        },
+
+        // multi
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+        },
+
+        // multi
+        focus: function () {
+            this.close();
+            this.search.focus();
+        },
+
+        // multi
+        isFocused: function () {
+            return this.search.hasClass("select2-focused");
+        },
+
+        // multi
+        updateSelection: function (data) {
+            var ids = [], filtered = [], self = this;
+
+            // filter out duplicates
+            $(data).each(function () {
+                if (indexOf(self.id(this), ids) < 0) {
+                    ids.push(self.id(this));
+                    filtered.push(this);
+                }
+            });
+            data = filtered;
+
+            this.selection.find(".select2-search-choice").remove();
+            $(data).each(function () {
+                self.addSelectedChoice(this);
+            });
+            self.postprocessResults();
+        },
+
+        // multi
+        tokenize: function() {
+            var input = this.search.val();
+            input = this.opts.tokenizer.call(this, input, this.data(), this.bind(this.onSelect), this.opts);
+            if (input != null && input != undefined) {
+                this.search.val(input);
+                if (input.length > 0) {
+                    this.open();
+                }
+            }
+
+        },
+
+        // multi
+        onSelect: function (data, options) {
+
+            if (!this.triggerSelect(data)) { return; }
+
+            this.addSelectedChoice(data);
+
+            this.opts.element.trigger({ type: "selected", val: this.id(data), choice: data });
+
+            if (this.select || !this.opts.closeOnSelect) this.postprocessResults(data, false, this.opts.closeOnSelect===true);
+
+            if (this.opts.closeOnSelect) {
+                this.close();
+                this.search.width(10);
+            } else {
+                if (this.countSelectableResults()>0) {
+                    this.search.width(10);
+                    this.resizeSearch();
+                    if (this.getMaximumSelectionSize() > 0 && this.val().length >= this.getMaximumSelectionSize()) {
+                        // if we reached max selection size repaint the results so choices
+                        // are replaced with the max selection reached message
+                        this.updateResults(true);
+                    }
+                    this.positionDropdown();
+                } else {
+                    // if nothing left to select close
+                    this.close();
+                    this.search.width(10);
+                }
+            }
+
+            // since its not possible to select an element that has already been
+            // added we do not need to check if this is a new element before firing change
+            this.triggerChange({ added: data });
+
+            if (!options || !options.noFocus)
+                this.focusSearch();
+        },
+
+        // multi
+        cancel: function () {
+            this.close();
+            this.focusSearch();
+        },
+
+        addSelectedChoice: function (data) {
+            var enableChoice = !data.locked,
+                enabledItem = $(
+                    "<li class='select2-search-choice'>" +
+                    "    <div></div>" +
+                    "    <a href='#' onclick='return false;' class='select2-search-choice-close' tabindex='-1'></a>" +
+                    "</li>"),
+                disabledItem = $(
+                    "<li class='select2-search-choice select2-locked'>" +
+                    "<div></div>" +
+                    "</li>");
+            var choice = enableChoice ? enabledItem : disabledItem,
+                id = this.id(data),
+                val = this.getVal(),
+                formatted,
+                cssClass;
+
+            formatted=this.opts.formatSelection(data, choice.find("div"), this.opts.escapeMarkup);
+            if (formatted != undefined) {
+                choice.find("div").replaceWith("<div>"+formatted+"</div>");
+            }
+            cssClass=this.opts.formatSelectionCssClass(data, choice.find("div"));
+            if (cssClass != undefined) {
+                choice.addClass(cssClass);
+            }
+
+            if(enableChoice){
+              choice.find(".select2-search-choice-close")
+                  .on("mousedown", killEvent)
+                  .on("click dblclick", this.bind(function (e) {
+                  if (!this.isInterfaceEnabled()) return;
+
+                  $(e.target).closest(".select2-search-choice").fadeOut('fast', this.bind(function(){
+                      this.unselect($(e.target));
+                      this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                      this.close();
+                      this.focusSearch();
+                  })).dequeue();
+                  killEvent(e);
+              })).on("focus", this.bind(function () {
+                  if (!this.isInterfaceEnabled()) return;
+                  this.container.addClass("select2-container-active");
+                  this.dropdown.addClass("select2-drop-active");
+              }));
+            }
+
+            choice.data("select2-data", data);
+            choice.insertBefore(this.searchContainer);
+
+            val.push(id);
+            this.setVal(val);
+        },
+
+        // multi
+        unselect: function (selected) {
+            var val = this.getVal(),
+                data,
+                index;
+            selected = selected.closest(".select2-search-choice");
+
+            if (selected.length === 0) {
+                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
+            }
+
+            data = selected.data("select2-data");
+
+            if (!data) {
+                // prevent a race condition when the 'x' is clicked really fast repeatedly the event can be queued
+                // and invoked on an element already removed
+                return;
+            }
+
+            while((index = indexOf(this.id(data), val)) >= 0) {
+                val.splice(index, 1);
+                this.setVal(val);
+                if (this.select) this.postprocessResults();
+            }
+
+            var evt = $.Event("select2-removing");
+            evt.val = this.id(data);
+            evt.choice = data;
+            this.opts.element.trigger(evt);
+
+            if (evt.isDefaultPrevented()) {
+                return;
+            }
+
+            selected.remove();
+
+            this.opts.element.trigger({ type: "select2-removed", val: this.id(data), choice: data });
+            this.triggerChange({ removed: data });
+        },
+
+        // multi
+        postprocessResults: function (data, initial, noHighlightUpdate) {
+            var val = this.getVal(),
+                choices = this.results.find(".select2-result"),
+                compound = this.results.find(".select2-result-with-children"),
+                self = this;
+
+            choices.each2(function (i, choice) {
+                var id = self.id(choice.data("select2-data"));
+                if (indexOf(id, val) >= 0) {
+                    choice.addClass("select2-selected");
+                    // mark all children of the selected parent as selected
+                    choice.find(".select2-result-selectable").addClass("select2-selected");
+                }
+            });
+
+            compound.each2(function(i, choice) {
+                // hide an optgroup if it doesnt have any selectable children
+                if (!choice.is('.select2-result-selectable')
+                    && choice.find(".select2-result-selectable:not(.select2-selected)").length === 0) {
+                    choice.addClass("select2-selected");
+                }
+            });
+
+            if (this.highlight() == -1 && noHighlightUpdate !== false){
+                self.highlight(0);
+            }
+
+            //If all results are chosen render formatNoMAtches
+            if(!this.opts.createSearchChoice && !choices.filter('.select2-result:not(.select2-selected)').length > 0){
+                if(!data || data && !data.more && this.results.find(".select2-no-results").length === 0) {
+                    if (checkFormatter(self.opts.formatNoMatches, "formatNoMatches")) {
+                        this.results.append("<li class='select2-no-results'>" + self.opts.formatNoMatches(self.search.val()) + "</li>");
+                    }
+                }
+            }
+
+        },
+
+        // multi
+        getMaxSearchWidth: function() {
+            return this.selection.width() - getSideBorderPadding(this.search);
+        },
+
+        // multi
+        resizeSearch: function () {
+            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
+                sideBorderPadding = getSideBorderPadding(this.search);
+
+            minimumWidth = measureTextWidth(this.search) + 10;
+
+            left = this.search.offset().left;
+
+            maxWidth = this.selection.width();
+            containerLeft = this.selection.offset().left;
+
+            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
+
+            if (searchWidth < minimumWidth) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth < 40) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth <= 0) {
+              searchWidth = minimumWidth;
+            }
+
+            this.search.width(Math.floor(searchWidth));
+        },
+
+        // multi
+        getVal: function () {
+            var val;
+            if (this.select) {
+                val = this.select.val();
+                return val === null ? [] : val;
+            } else {
+                val = this.opts.element.val();
+                return splitVal(val, this.opts.separator);
+            }
+        },
+
+        // multi
+        setVal: function (val) {
+            var unique;
+            if (this.select) {
+                this.select.val(val);
+            } else {
+                unique = [];
+                // filter out duplicates
+                $(val).each(function () {
+                    if (indexOf(this, unique) < 0) unique.push(this);
+                });
+                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
+            }
+        },
+
+        // multi
+        buildChangeDetails: function (old, current) {
+            var current = current.slice(0),
+                old = old.slice(0);
+
+            // remove intersection from each array
+            for (var i = 0; i < current.length; i++) {
+                for (var j = 0; j < old.length; j++) {
+                    if (equal(this.opts.id(current[i]), this.opts.id(old[j]))) {
+                        current.splice(i, 1);
+                        if(i>0){
+                        	i--;
+                        }
+                        old.splice(j, 1);
+                        j--;
+                    }
+                }
+            }
+
+            return {added: current, removed: old};
+        },
+
+
+        // multi
+        val: function (val, triggerChange) {
+            var oldData, self=this;
+
+            if (arguments.length === 0) {
+                return this.getVal();
+            }
+
+            oldData=this.data();
+            if (!oldData.length) oldData=[];
+
+            // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
+            if (!val && val !== 0) {
+                this.opts.element.val("");
+                this.updateSelection([]);
+                this.clearSearch();
+                if (triggerChange) {
+                    this.triggerChange({added: this.data(), removed: oldData});
+                }
+                return;
+            }
+
+            // val is a list of ids
+            this.setVal(val);
+
+            if (this.select) {
+                this.opts.initSelection(this.select, this.bind(this.updateSelection));
+                if (triggerChange) {
+                    this.triggerChange(this.buildChangeDetails(oldData, this.data()));
+                }
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("val() cannot be called if initSelection() is not defined");
+                }
+
+                this.opts.initSelection(this.opts.element, function(data){
+                    var ids=$.map(data, self.id);
+                    self.setVal(ids);
+                    self.updateSelection(data);
+                    self.clearSearch();
+                    if (triggerChange) {
+                        self.triggerChange(self.buildChangeDetails(oldData, self.data()));
+                    }
+                });
+            }
+            this.clearSearch();
+        },
+
+        // multi
+        onSortStart: function() {
+            if (this.select) {
+                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
+            }
+
+            // collapse search field into 0 width so its container can be collapsed as well
+            this.search.width(0);
+            // hide the container
+            this.searchContainer.hide();
+        },
+
+        // multi
+        onSortEnd:function() {
+
+            var val=[], self=this;
+
+            // show search and move it to the end of the list
+            this.searchContainer.show();
+            // make sure the search container is the last item in the list
+            this.searchContainer.appendTo(this.searchContainer.parent());
+            // since we collapsed the width in dragStarted, we resize it here
+            this.resizeSearch();
+
+            // update selection
+            this.selection.find(".select2-search-choice").each(function() {
+                val.push(self.opts.id($(this).data("select2-data")));
+            });
+            this.setVal(val);
+            this.triggerChange();
+        },
+
+        // multi
+        data: function(values, triggerChange) {
+            var self=this, ids, old;
+            if (arguments.length === 0) {
+                 return this.selection
+                     .find(".select2-search-choice")
+                     .map(function() { return $(this).data("select2-data"); })
+                     .get();
+            } else {
+                old = this.data();
+                if (!values) { values = []; }
+                ids = $.map(values, function(e) { return self.opts.id(e); });
+                this.setVal(ids);
+                this.updateSelection(values);
+                this.clearSearch();
+                if (triggerChange) {
+                    this.triggerChange(this.buildChangeDetails(old, this.data()));
+                }
+            }
+        }
+    });
+
+    $.fn.select2 = function () {
+
+        var args = Array.prototype.slice.call(arguments, 0),
+            opts,
+            select2,
+            method, value, multiple,
+            allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "dropdown", "onSortStart", "onSortEnd", "enable", "disable", "readonly", "positionDropdown", "data", "search"],
+            valueMethods = ["opened", "isFocused", "container", "dropdown"],
+            propertyMethods = ["val", "data"],
+            methodsMap = { search: "externalSearch" };
+
+        this.each(function () {
+            if (args.length === 0 || typeof(args[0]) === "object") {
+                opts = args.length === 0 ? {} : $.extend({}, args[0]);
+                opts.element = $(this);
+
+                if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                    multiple = opts.element.prop("multiple");
+                } else {
+                    multiple = opts.multiple || false;
+                    if ("tags" in opts) {opts.multiple = multiple = true;}
+                }
+
+                select2 = multiple ? new MultiSelect2() : new SingleSelect2();
+                select2.init(opts);
+            } else if (typeof(args[0]) === "string") {
+
+                if (indexOf(args[0], allowedMethods) < 0) {
+                    throw "Unknown method: " + args[0];
+                }
+
+                value = undefined;
+                select2 = $(this).data("select2");
+                if (select2 === undefined) return;
+
+                method=args[0];
+
+                if (method === "container") {
+                    value = select2.container;
+                } else if (method === "dropdown") {
+                    value = select2.dropdown;
+                } else {
+                    if (methodsMap[method]) method = methodsMap[method];
+
+                    value = select2[method].apply(select2, args.slice(1));
+                }
+                if (indexOf(args[0], valueMethods) >= 0
+                    || (indexOf(args[0], propertyMethods) && args.length == 1)) {
+                    return false; // abort the iteration, ready to return first matched value
+                }
+            } else {
+                throw "Invalid arguments to select2 plugin: " + args;
+            }
+        });
+        return (value === undefined) ? this : value;
+    };
+
+    // plugin defaults, accessible to users
+    $.fn.select2.defaults = {
+        width: "copy",
+        loadMorePadding: 0,
+        closeOnSelect: true,
+        openOnEnter: true,
+        containerCss: {},
+        dropdownCss: {},
+        containerCssClass: "",
+        dropdownCssClass: "",
+        formatResult: function(result, container, query, escapeMarkup) {
+            var markup=[];
+            markMatch(result.text, query.term, markup, escapeMarkup);
+            return markup.join("");
+        },
+        formatSelection: function (data, container, escapeMarkup) {
+            return data ? escapeMarkup(data.text) : undefined;
+        },
+        sortResults: function (results, container, query) {
+            return results;
+        },
+        formatResultCssClass: function(data) {return undefined;},
+        formatSelectionCssClass: function(data, container) {return undefined;},
+        formatNoMatches: function () { return "No matches found"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " more character" + (n == 1? "" : "s"); },
+        formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); },
+        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
+        formatLoadMore: function (pageNumber) { return "Loading more results..."; },
+        formatSearching: function () { return "Searching..."; },
+        minimumResultsForSearch: 0,
+        minimumInputLength: 0,
+        maximumInputLength: null,
+        maximumSelectionSize: 0,
+        id: function (e) { return e.id; },
+        matcher: function(term, text) {
+            return stripDiacritics(''+text).toUpperCase().indexOf(stripDiacritics(''+term).toUpperCase()) >= 0;
+        },
+        separator: ",",
+        tokenSeparators: [],
+        tokenizer: defaultTokenizer,
+        escapeMarkup: defaultEscapeMarkup,
+        blurOnChange: false,
+        selectOnBlur: false,
+        adaptContainerCssClass: function(c) { return c; },
+        adaptDropdownCssClass: function(c) { return null; },
+        nextSearchTerm: function(selectedObject, currentSearchTerm) { return undefined; }
+    };
+
+    $.fn.select2.ajaxDefaults = {
+        transport: $.ajax,
+        params: {
+            type: "GET",
+            cache: false,
+            dataType: "json"
+        }
+    };
+
+    // exports
+    window.Select2 = {
+        query: {
+            ajax: ajax,
+            local: local,
+            tags: tags
+        }, util: {
+            debounce: debounce,
+            markMatch: markMatch,
+            escapeMarkup: defaultEscapeMarkup,
+            stripDiacritics: stripDiacritics
+        }, "class": {
+            "abstract": AbstractSelect2,
+            "single": SingleSelect2,
+            "multi": MultiSelect2
+        }
+    };
+
+}(jQuery));
diff --git a/src/main/webapp/client/js/lib/select2.png b/src/main/webapp/client/js/lib/select2.png
new file mode 100644
index 00000000..1d804ffb
Binary files /dev/null and b/src/main/webapp/client/js/lib/select2.png differ
diff --git a/src/main/webapp/client/js/lib/select2x2.png b/src/main/webapp/client/js/lib/select2x2.png
new file mode 100644
index 00000000..4bdd5c96
Binary files /dev/null and b/src/main/webapp/client/js/lib/select2x2.png differ
diff --git a/src/main/webapp/client/js/lib/underscore.js b/src/main/webapp/client/js/lib/underscore.js
new file mode 100644
index 00000000..ca61fdc3
--- /dev/null
+++ b/src/main/webapp/client/js/lib/underscore.js
@@ -0,0 +1,1344 @@
+//     Underscore.js 1.6.0
+//     http://underscorejs.org
+//     (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Underscore may be freely distributed under the MIT license.
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `exports` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Establish the object that gets returned to break out of a loop iteration.
+  var breaker = {};
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var
+    push             = ArrayProto.push,
+    slice            = ArrayProto.slice,
+    concat           = ArrayProto.concat,
+    toString         = ObjProto.toString,
+    hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeForEach      = ArrayProto.forEach,
+    nativeMap          = ArrayProto.map,
+    nativeReduce       = ArrayProto.reduce,
+    nativeReduceRight  = ArrayProto.reduceRight,
+    nativeFilter       = ArrayProto.filter,
+    nativeEvery        = ArrayProto.every,
+    nativeSome         = ArrayProto.some,
+    nativeIndexOf      = ArrayProto.indexOf,
+    nativeLastIndexOf  = ArrayProto.lastIndexOf,
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind;
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object via a string identifier,
+  // for Closure Compiler "advanced" mode.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root._ = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.6.0';
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
+  // Delegates to **ECMAScript 5**'s native `forEach` if available.
+  var each = _.each = _.forEach = function(obj, iterator, context) {
+    if (obj == null) return obj;
+    if (nativeForEach && obj.forEach === nativeForEach) {
+      obj.forEach(iterator, context);
+    } else if (obj.length === +obj.length) {
+      for (var i = 0, length = obj.length; i < length; i++) {
+        if (iterator.call(context, obj[i], i, obj) === breaker) return;
+      }
+    } else {
+      var keys = _.keys(obj);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
+      }
+    }
+    return obj;
+  };
+
+  // Return the results of applying the iterator to each element.
+  // Delegates to **ECMAScript 5**'s native `map` if available.
+  _.map = _.collect = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+    each(obj, function(value, index, list) {
+      results.push(iterator.call(context, value, index, list));
+    });
+    return results;
+  };
+
+  var reduceError = 'Reduce of empty array with no initial value';
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+    }
+    each(obj, function(value, index, list) {
+      if (!initial) {
+        memo = value;
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, value, index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // The right-associative version of reduce, also known as `foldr`.
+  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    }
+    var length = obj.length;
+    if (length !== +length) {
+      var keys = _.keys(obj);
+      length = keys.length;
+    }
+    each(obj, function(value, index, list) {
+      index = keys ? keys[--length] : --length;
+      if (!initial) {
+        memo = obj[index];
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, obj[index], index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, predicate, context) {
+    var result;
+    any(obj, function(value, index, list) {
+      if (predicate.call(context, value, index, list)) {
+        result = value;
+        return true;
+      }
+    });
+    return result;
+  };
+
+  // Return all the elements that pass a truth test.
+  // Delegates to **ECMAScript 5**'s native `filter` if available.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, predicate, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(predicate, context);
+    each(obj, function(value, index, list) {
+      if (predicate.call(context, value, index, list)) results.push(value);
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, predicate, context) {
+    return _.filter(obj, function(value, index, list) {
+      return !predicate.call(context, value, index, list);
+    }, context);
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Delegates to **ECMAScript 5**'s native `every` if available.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, predicate, context) {
+    predicate || (predicate = _.identity);
+    var result = true;
+    if (obj == null) return result;
+    if (nativeEvery && obj.every === nativeEvery) return obj.every(predicate, context);
+    each(obj, function(value, index, list) {
+      if (!(result = result && predicate.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Delegates to **ECMAScript 5**'s native `some` if available.
+  // Aliased as `any`.
+  var any = _.some = _.any = function(obj, predicate, context) {
+    predicate || (predicate = _.identity);
+    var result = false;
+    if (obj == null) return result;
+    if (nativeSome && obj.some === nativeSome) return obj.some(predicate, context);
+    each(obj, function(value, index, list) {
+      if (result || (result = predicate.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if the array or object contains a given value (using `===`).
+  // Aliased as `include`.
+  _.contains = _.include = function(obj, target) {
+    if (obj == null) return false;
+    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+    return any(obj, function(value) {
+      return value === target;
+    });
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
+    return _.map(obj, function(value) {
+      return (isFunc ? method : value[method]).apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, _.property(key));
+  };
+
+  // Convenience version of a common use case of `filter`: selecting only objects
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs) {
+    return _.filter(obj, _.matches(attrs));
+  };
+
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.find(obj, _.matches(attrs));
+  };
+
+  // Return the maximum element or (element-based computation).
+  // Can't optimize arrays of integers longer than 65,535 elements.
+  // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797)
+  _.max = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.max.apply(Math, obj);
+    }
+    var result = -Infinity, lastComputed = -Infinity;
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      if (computed > lastComputed) {
+        result = value;
+        lastComputed = computed;
+      }
+    });
+    return result;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.min.apply(Math, obj);
+    }
+    var result = Infinity, lastComputed = Infinity;
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      if (computed < lastComputed) {
+        result = value;
+        lastComputed = computed;
+      }
+    });
+    return result;
+  };
+
+  // Shuffle an array, using the modern version of the
+  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
+  _.shuffle = function(obj) {
+    var rand;
+    var index = 0;
+    var shuffled = [];
+    each(obj, function(value) {
+      rand = _.random(index++);
+      shuffled[index - 1] = shuffled[rand];
+      shuffled[rand] = value;
+    });
+    return shuffled;
+  };
+
+  // Sample **n** random values from a collection.
+  // If **n** is not specified, returns a single random element.
+  // The internal `guard` argument allows it to work with `map`.
+  _.sample = function(obj, n, guard) {
+    if (n == null || guard) {
+      if (obj.length !== +obj.length) obj = _.values(obj);
+      return obj[_.random(obj.length - 1)];
+    }
+    return _.shuffle(obj).slice(0, Math.max(0, n));
+  };
+
+  // An internal function to generate lookup iterators.
+  var lookupIterator = function(value) {
+    if (value == null) return _.identity;
+    if (_.isFunction(value)) return value;
+    return _.property(value);
+  };
+
+  // Sort the object's values by a criterion produced by an iterator.
+  _.sortBy = function(obj, iterator, context) {
+    iterator = lookupIterator(iterator);
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value: value,
+        index: index,
+        criteria: iterator.call(context, value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
+      }
+      return left.index - right.index;
+    }), 'value');
+  };
+
+  // An internal function used for aggregate "group by" operations.
+  var group = function(behavior) {
+    return function(obj, iterator, context) {
+      var result = {};
+      iterator = lookupIterator(iterator);
+      each(obj, function(value, index) {
+        var key = iterator.call(context, value, index, obj);
+        behavior(result, key, value);
+      });
+      return result;
+    };
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = group(function(result, key, value) {
+    _.has(result, key) ? result[key].push(value) : result[key] = [value];
+  });
+
+  // Indexes the object's values by a criterion, similar to `groupBy`, but for
+  // when you know that your index values will be unique.
+  _.indexBy = group(function(result, key, value) {
+    result[key] = value;
+  });
+
+  // Counts instances of an object that group by a certain criterion. Pass
+  // either a string attribute to count by, or a function that returns the
+  // criterion.
+  _.countBy = group(function(result, key) {
+    _.has(result, key) ? result[key]++ : result[key] = 1;
+  });
+
+  // Use a comparator function to figure out the smallest index at which
+  // an object should be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator, context) {
+    iterator = lookupIterator(iterator);
+    var value = iterator.call(context, obj);
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >>> 1;
+      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
+    }
+    return low;
+  };
+
+  // Safely create a real, live array from anything iterable.
+  _.toArray = function(obj) {
+    if (!obj) return [];
+    if (_.isArray(obj)) return slice.call(obj);
+    if (obj.length === +obj.length) return _.map(obj, _.identity);
+    return _.values(obj);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    if (obj == null) return 0;
+    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head` and `take`. The **guard** check
+  // allows it to work with `_.map`.
+  _.first = _.head = _.take = function(array, n, guard) {
+    if (array == null) return void 0;
+    if ((n == null) || guard) return array[0];
+    if (n < 0) return [];
+    return slice.call(array, 0, n);
+  };
+
+  // Returns everything but the last entry of the array. Especially useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N. The **guard** check allows it to work with
+  // `_.map`.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array. The **guard** check allows it to work with `_.map`.
+  _.last = function(array, n, guard) {
+    if (array == null) return void 0;
+    if ((n == null) || guard) return array[array.length - 1];
+    return slice.call(array, Math.max(array.length - n, 0));
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+  // Especially useful on the arguments object. Passing an **n** will return
+  // the rest N values in the array. The **guard**
+  // check allows it to work with `_.map`.
+  _.rest = _.tail = _.drop = function(array, n, guard) {
+    return slice.call(array, (n == null) || guard ? 1 : n);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, _.identity);
+  };
+
+  // Internal implementation of a recursive `flatten` function.
+  var flatten = function(input, shallow, output) {
+    if (shallow && _.every(input, _.isArray)) {
+      return concat.apply(output, input);
+    }
+    each(input, function(value) {
+      if (_.isArray(value) || _.isArguments(value)) {
+        shallow ? push.apply(output, value) : flatten(value, shallow, output);
+      } else {
+        output.push(value);
+      }
+    });
+    return output;
+  };
+
+  // Flatten out an array, either recursively (by default), or just one level.
+  _.flatten = function(array, shallow) {
+    return flatten(array, shallow, []);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Split an array into two arrays: one whose elements all satisfy the given
+  // predicate, and one whose elements all do not satisfy the predicate.
+  _.partition = function(array, predicate, context) {
+    predicate = lookupIterator(predicate);
+    var pass = [], fail = [];
+    each(array, function(elem) {
+      (predicate.call(context, elem) ? pass : fail).push(elem);
+    });
+    return [pass, fail];
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    if (_.isFunction(isSorted)) {
+      context = iterator;
+      iterator = isSorted;
+      isSorted = false;
+    }
+    var initial = iterator ? _.map(array, iterator, context) : array;
+    var results = [];
+    var seen = [];
+    each(initial, function(value, index) {
+      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
+        seen.push(value);
+        results.push(array[index]);
+      }
+    });
+    return results;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(_.flatten(arguments, true));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays.
+  _.intersection = function(array) {
+    var rest = slice.call(arguments, 1);
+    return _.filter(_.uniq(array), function(item) {
+      return _.every(rest, function(other) {
+        return _.contains(other, item);
+      });
+    });
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.contains(rest, value); });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    var length = _.max(_.pluck(arguments, 'length').concat(0));
+    var results = new Array(length);
+    for (var i = 0; i < length; i++) {
+      results[i] = _.pluck(arguments, '' + i);
+    }
+    return results;
+  };
+
+  // Converts lists into objects. Pass either a single array of `[key, value]`
+  // pairs, or two parallel arrays of the same length -- one of keys, and one of
+  // the corresponding values.
+  _.object = function(list, values) {
+    if (list == null) return {};
+    var result = {};
+    for (var i = 0, length = list.length; i < length; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
+    }
+    return result;
+  };
+
+  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+  // we need this function. Return the position of the first occurrence of an
+  // item in an array, or -1 if the item is not included in the array.
+  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = function(array, item, isSorted) {
+    if (array == null) return -1;
+    var i = 0, length = array.length;
+    if (isSorted) {
+      if (typeof isSorted == 'number') {
+        i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted);
+      } else {
+        i = _.sortedIndex(array, item);
+        return array[i] === item ? i : -1;
+      }
+    }
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
+    for (; i < length; i++) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+  _.lastIndexOf = function(array, item, from) {
+    if (array == null) return -1;
+    var hasIndex = from != null;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
+      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
+    }
+    var i = (hasIndex ? from : array.length);
+    while (i--) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (arguments.length <= 1) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = arguments[2] || 1;
+
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
+    var idx = 0;
+    var range = new Array(length);
+
+    while(idx < length) {
+      range[idx++] = start;
+      start += step;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Reusable constructor function for prototype setting.
+  var ctor = function(){};
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
+  _.bind = function(func, context) {
+    var args, bound;
+    if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError;
+    args = slice.call(arguments, 2);
+    return bound = function() {
+      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+      ctor.prototype = func.prototype;
+      var self = new ctor;
+      ctor.prototype = null;
+      var result = func.apply(self, args.concat(slice.call(arguments)));
+      if (Object(result) === result) return result;
+      return self;
+    };
+  };
+
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context. _ acts
+  // as a placeholder, allowing any combination of arguments to be pre-filled.
+  _.partial = function(func) {
+    var boundArgs = slice.call(arguments, 1);
+    return function() {
+      var position = 0;
+      var args = boundArgs.slice();
+      for (var i = 0, length = args.length; i < length; i++) {
+        if (args[i] === _) args[i] = arguments[position++];
+      }
+      while (position < arguments.length) args.push(arguments[position++]);
+      return func.apply(this, args);
+    };
+  };
+
+  // Bind a number of an object's methods to that object. Remaining arguments
+  // are the method names to be bound. Useful for ensuring that all callbacks
+  // defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var funcs = slice.call(arguments, 1);
+    if (funcs.length === 0) throw new Error('bindAll must be passed function names');
+    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memo = {};
+    hasher || (hasher = _.identity);
+    return function() {
+      var key = hasher.apply(this, arguments);
+      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    };
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){ return func.apply(null, args); }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = function(func) {
+    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+  };
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time. Normally, the throttled function will run
+  // as much as it can, without ever going more than once per `wait` duration;
+  // but if you'd like to disable the execution on the leading edge, pass
+  // `{leading: false}`. To disable execution on the trailing edge, ditto.
+  _.throttle = function(func, wait, options) {
+    var context, args, result;
+    var timeout = null;
+    var previous = 0;
+    options || (options = {});
+    var later = function() {
+      previous = options.leading === false ? 0 : _.now();
+      timeout = null;
+      result = func.apply(context, args);
+      context = args = null;
+    };
+    return function() {
+      var now = _.now();
+      if (!previous && options.leading === false) previous = now;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
+        timeout = null;
+        previous = now;
+        result = func.apply(context, args);
+        context = args = null;
+      } else if (!timeout && options.trailing !== false) {
+        timeout = setTimeout(later, remaining);
+      }
+      return result;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  _.debounce = function(func, wait, immediate) {
+    var timeout, args, context, timestamp, result;
+
+    var later = function() {
+      var last = _.now() - timestamp;
+      if (last < wait) {
+        timeout = setTimeout(later, wait - last);
+      } else {
+        timeout = null;
+        if (!immediate) {
+          result = func.apply(context, args);
+          context = args = null;
+        }
+      }
+    };
+
+    return function() {
+      context = this;
+      args = arguments;
+      timestamp = _.now();
+      var callNow = immediate && !timeout;
+      if (!timeout) {
+        timeout = setTimeout(later, wait);
+      }
+      if (callNow) {
+        result = func.apply(context, args);
+        context = args = null;
+      }
+
+      return result;
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = function(func) {
+    var ran = false, memo;
+    return function() {
+      if (ran) return memo;
+      ran = true;
+      memo = func.apply(this, arguments);
+      func = null;
+      return memo;
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return _.partial(wrapper, func);
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var funcs = arguments;
+    return function() {
+      var args = arguments;
+      for (var i = funcs.length - 1; i >= 0; i--) {
+        args = [funcs[i].apply(this, args)];
+      }
+      return args[0];
+    };
+  };
+
+  // Returns a function that will only be executed after being called N times.
+  _.after = function(times, func) {
+    return function() {
+      if (--times < 1) {
+        return func.apply(this, arguments);
+      }
+    };
+  };
+
+  // Object Functions
+  // ----------------
+
+  // Retrieve the names of an object's properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = function(obj) {
+    if (!_.isObject(obj)) return [];
+    if (nativeKeys) return nativeKeys(obj);
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys.push(key);
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var values = new Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[keys[i]];
+    }
+    return values;
+  };
+
+  // Convert an object into a list of `[key, value]` pairs.
+  _.pairs = function(obj) {
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var pairs = new Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [keys[i], obj[keys[i]]];
+    }
+    return pairs;
+  };
+
+  // Invert the keys and values of an object. The values must be serializable.
+  _.invert = function(obj) {
+    var result = {};
+    var keys = _.keys(obj);
+    for (var i = 0, length = keys.length; i < length; i++) {
+      result[obj[keys[i]]] = keys[i];
+    }
+    return result;
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Return a copy of the object only containing the whitelisted properties.
+  _.pick = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    each(keys, function(key) {
+      if (key in obj) copy[key] = obj[key];
+    });
+    return copy;
+  };
+
+   // Return a copy of the object without the blacklisted properties.
+  _.omit = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    for (var key in obj) {
+      if (!_.contains(keys, key)) copy[key] = obj[key];
+    }
+    return copy;
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          if (obj[prop] === void 0) obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Internal recursive comparison function for `isEqual`.
+  var eq = function(a, b, aStack, bStack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
+    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className != toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, dates, and booleans are compared by value.
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return a == String(b);
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+        // other numeric values.
+        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a == +b;
+      // RegExps are compared by their source patterns and flags.
+      case '[object RegExp]':
+        return a.source == b.source &&
+               a.global == b.global &&
+               a.multiline == b.multiline &&
+               a.ignoreCase == b.ignoreCase;
+    }
+    if (typeof a != 'object' || typeof b != 'object') return false;
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+    var length = aStack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (aStack[length] == a) return bStack[length] == b;
+    }
+    // Objects with different constructors are not equivalent, but `Object`s
+    // from different frames are.
+    var aCtor = a.constructor, bCtor = b.constructor;
+    if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
+                             _.isFunction(bCtor) && (bCtor instanceof bCtor))
+                        && ('constructor' in a && 'constructor' in b)) {
+      return false;
+    }
+    // Add the first object to the stack of traversed objects.
+    aStack.push(a);
+    bStack.push(b);
+    var size = 0, result = true;
+    // Recursively compare objects and arrays.
+    if (className == '[object Array]') {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      size = a.length;
+      result = size == b.length;
+      if (result) {
+        // Deep compare the contents, ignoring non-numeric properties.
+        while (size--) {
+          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
+        }
+      }
+    } else {
+      // Deep compare objects.
+      for (var key in a) {
+        if (_.has(a, key)) {
+          // Count the expected number of properties.
+          size++;
+          // Deep compare each member.
+          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
+        }
+      }
+      // Ensure that both objects contain the same number of properties.
+      if (result) {
+        for (key in b) {
+          if (_.has(b, key) && !(size--)) break;
+        }
+        result = !size;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    aStack.pop();
+    bStack.pop();
+    return result;
+  };
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b, [], []);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (obj == null) return true;
+    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    for (var key in obj) if (_.has(obj, key)) return false;
+    return true;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType === 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) == '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    return obj === Object(obj);
+  };
+
+  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
+  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
+    _['is' + name] = function(obj) {
+      return toString.call(obj) == '[object ' + name + ']';
+    };
+  });
+
+  // Define a fallback version of the method in browsers (ahem, IE), where
+  // there isn't any inspectable "Arguments" type.
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return !!(obj && _.has(obj, 'callee'));
+    };
+  }
+
+  // Optimize `isFunction` if appropriate.
+  if (typeof (/./) !== 'function') {
+    _.isFunction = function(obj) {
+      return typeof obj === 'function';
+    };
+  }
+
+  // Is a given object a finite number?
+  _.isFinite = function(obj) {
+    return isFinite(obj) && !isNaN(parseFloat(obj));
+  };
+
+  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+  _.isNaN = function(obj) {
+    return _.isNumber(obj) && obj != +obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Shortcut function for checking if an object has a given property directly
+  // on itself (in other words, not on a prototype).
+  _.has = function(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iterators.
+  _.identity = function(value) {
+    return value;
+  };
+
+  _.constant = function(value) {
+    return function () {
+      return value;
+    };
+  };
+
+  _.property = function(key) {
+    return function(obj) {
+      return obj[key];
+    };
+  };
+
+  // Returns a predicate for checking whether an object has a given set of `key:value` pairs.
+  _.matches = function(attrs) {
+    return function(obj) {
+      if (obj === attrs) return true; //avoid comparing an object to itself.
+      for (var key in attrs) {
+        if (attrs[key] !== obj[key])
+          return false;
+      }
+      return true;
+    }
+  };
+
+  // Run a function **n** times.
+  _.times = function(n, iterator, context) {
+    var accum = Array(Math.max(0, n));
+    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    return accum;
+  };
+
+  // Return a random integer between min and max (inclusive).
+  _.random = function(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + Math.floor(Math.random() * (max - min + 1));
+  };
+
+  // A (possibly faster) way to get the current timestamp as an integer.
+  _.now = Date.now || function() { return new Date().getTime(); };
+
+  // List of HTML entities for escaping.
+  var entityMap = {
+    escape: {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#x27;'
+    }
+  };
+  entityMap.unescape = _.invert(entityMap.escape);
+
+  // Regexes containing the keys and values listed immediately above.
+  var entityRegexes = {
+    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
+  };
+
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  _.each(['escape', 'unescape'], function(method) {
+    _[method] = function(string) {
+      if (string == null) return '';
+      return ('' + string).replace(entityRegexes[method], function(match) {
+        return entityMap[method][match];
+      });
+    };
+  });
+
+  // If the value of the named `property` is a function then invoke it with the
+  // `object` as context; otherwise, return it.
+  _.result = function(object, property) {
+    if (object == null) return void 0;
+    var value = object[property];
+    return _.isFunction(value) ? value.call(object) : value;
+  };
+
+  // Add your own custom functions to the Underscore object.
+  _.mixin = function(obj) {
+    each(_.functions(obj), function(name) {
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result.call(this, func.apply(_, args));
+      };
+    });
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = ++idCounter + '';
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /(.)^/;
+
+  // Certain characters need to be escaped so that they can be put into a
+  // string literal.
+  var escapes = {
+    "'":      "'",
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\t':     't',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  _.template = function(text, data, settings) {
+    var render;
+    settings = _.defaults({}, settings, _.templateSettings);
+
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = new RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset)
+        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      }
+      if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      }
+      if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
+      index = offset + match.length;
+      return match;
+    });
+    source += "';\n";
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __t,__p='',__j=Array.prototype.join," +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
+      source + "return __p;\n";
+
+    try {
+      render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
+    if (data) return render(data, _);
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+
+    // Provide the compiled function source as a convenience for precompilation.
+    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+
+    return template;
+  };
+
+  // Add a "chain" function, which will delegate to the wrapper.
+  _.chain = function(obj) {
+    return _(obj).chain();
+  };
+
+  // OOP
+  // ---------------
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(obj) {
+    return this._chain ? _(obj).chain() : obj;
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      var obj = this._wrapped;
+      method.apply(obj, arguments);
+      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
+      return result.call(this, obj);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      return result.call(this, method.apply(this._wrapped, arguments));
+    };
+  });
+
+  _.extend(_.prototype, {
+
+    // Start chaining a wrapped Underscore object.
+    chain: function() {
+      this._chain = true;
+      return this;
+    },
+
+    // Extracts the result from a wrapped and chained object.
+    value: function() {
+      return this._wrapped;
+    }
+
+  });
+
+  // AMD registration happens at the end for compatibility with AMD loaders
+  // that may not enforce next-turn semantics on modules. Even though general
+  // practice for AMD registration is to be anonymous, underscore registers
+  // as a named module because, like jQuery, it is a base library that is
+  // popular enough to be bundled in a third party lib, but not be part of
+  // an AMD load request. Those cases could generate an error when an
+  // anonymous define() is called outside of a loader request.
+  if (typeof define === 'function' && define.amd) {
+    define('underscore', [], function() {
+      return _;
+    });
+  }
+}).call(this);
diff --git a/src/main/webapp/client/js/routing/Helper.js b/src/main/webapp/client/js/routing/Helper.js
new file mode 100644
index 00000000..eb760a3b
--- /dev/null
+++ b/src/main/webapp/client/js/routing/Helper.js
@@ -0,0 +1,82 @@
+var Helper = {
+
+    renderCorrectGeolocationView: function (model, el) {
+        if (!model) {
+            el.html("<span title='?'></span>");
+        }
+        else if (model.get("type") === "SEAPORT") {
+            return new SeaportView({el: el, model: model});
+        } else if (model.get("type") === "TERMINAL") {
+            return new TerminalView({el: el, model: model});
+        }
+        // GEOLOCATION AND ADDRESS
+        else {
+            // if we have no nicename but coordinates...
+            if (model.get("niceName") === undefined && model.get("latitude")) {
+                model.set("niceName", model.get("latitude").toFixed(2) + ":" + model.get("longitude").toFixed(2));
+            }
+            return new DetailledAddressView({el: el, model: model});
+        }
+    },
+
+    isDefined: function (name, what) {
+
+        if (name === undefined) {
+            throw "need " + what + " defined .";
+        }
+
+        return name;
+    },
+    formatKM: function (value) {
+        if (value !== undefined && value !== null) {
+            value = value.toFixed(0) + " km";
+        }
+        return value;
+
+    },
+
+    formatDurationInDetail: function (duration) {
+        // given duration: min
+        // to be returned: days, hours (e.g. 02ds 06.03hrs)
+        if (duration !== undefined && duration !== null) {
+            var days = Math.floor(duration / (60 * 24));
+            var hours = Math.floor((duration % (60 * 24)) / 60);
+            var minutes = Math.floor((duration % (60 * 24)) % 60);
+
+            var formattedDuration = "";
+
+            if (days > 0) {
+                formattedDuration += this.setFirstCharToZeroIfSingleCharDuration(days) + "ds ";
+            }
+            formattedDuration += this.setFirstCharToZeroIfSingleCharDuration(hours) + "." + this.setFirstCharToZeroIfSingleCharDuration(minutes) + "hrs";
+
+            return formattedDuration;
+        } else {
+            return "-";
+        }
+    },
+
+    setFirstCharToZeroIfSingleCharDuration: function (time) {
+        if (time !== undefined) {
+
+            if (time < 10) {
+                time = "0" + time;
+            }
+            return time;
+        } else {
+            return "-";
+        }
+    },
+
+    setPopoverOnClickCloseEvent: function (that) {
+        var self = this;
+        that.$(".info").click(function () {
+            self.closeAllPopover();
+        });
+    },
+
+    closeAllPopover: function () {
+        $('.popover').remove();
+    }
+
+};
diff --git a/src/main/webapp/client/js/routing/SelectableAwareCollection.js b/src/main/webapp/client/js/routing/SelectableAwareCollection.js
new file mode 100644
index 00000000..f2ed204a
--- /dev/null
+++ b/src/main/webapp/client/js/routing/SelectableAwareCollection.js
@@ -0,0 +1,89 @@
+var SelectableAwareCollection = Backbone.Collection.extend({
+
+    initialize : function() {
+
+        _.bindAll(this, "modelSelected", "getSelected", "setDefaultToSelected", "defaultChanged");
+
+        this.bind("change:selected", this.modelSelected);
+        this.bind("change:defaultValue", this.defaultChanged);
+    },
+
+    getDefault : function() {
+        var element = this.find(function(e) {
+            return e.get("defaultValue");
+        });
+
+        if (element === undefined && this.size() > 0) {
+            element = this.at(0);
+        }
+
+        return element;
+    },
+
+    valuePredicate : function(v, what) {
+        var field = what;
+        if (! field) {
+            field = "value";
+        }
+        var value = "" + v;
+        return function(e) {
+            // otherwise it does not work for booleans
+            var stringval = "" +  e.get(field);
+            return  value === stringval;
+        };
+    },
+
+    findByValue : function(value, what) {
+        return this.find(this.valuePredicate(value, what));
+    },
+
+    setDefaultByValue : function(value, what) {
+        var e = this.findByValue(value, what);
+        if (e !== undefined) {
+            e.set("defaultValue", true);
+        }
+    },
+
+    setDefaultToSelected : function() {
+        var element = this.getDefault();
+
+        if (element !== undefined) {
+            element.set("selected", true);
+        }
+    },
+
+    getSelected : function() {
+        return this.find(function(e) {
+            return e.get("selected");
+        });
+    },
+
+    modelSelected : function(e) {
+        if (e.get("selected")) {
+
+            this.each(function(m) {
+                if (m !== e) {
+                    m.set("selected", false);
+                }
+            });
+
+            this.trigger("selectedchanged", e);
+        }
+    },
+
+    defaultChanged : function(e) {
+
+        if (e.get("defaultValue")) {
+
+            this.each(function(m) {
+                if (m !== e) {
+                    m.set("defaultValue", false);
+                }
+            });
+
+            this.trigger("defaultchanged", e);
+        }
+    }
+});
+
+
diff --git a/src/main/webapp/client/js/routing/Server.js b/src/main/webapp/client/js/routing/Server.js
new file mode 100644
index 00000000..4da56702
--- /dev/null
+++ b/src/main/webapp/client/js/routing/Server.js
@@ -0,0 +1,145 @@
+var Server = function (contextpath, errorhandler) {
+
+    if (contextpath === undefined) {
+        contextpath = "../";
+    }
+
+    var api = contextpath + "api/";
+    var management = "management/";
+    var countriesUrl = api + "countries";
+    var geoCodeUrl = api + "geocodes/";
+    var seaPortsUrl = api + "seaports";
+    var terminalsUrl = api + "terminals";
+
+    var reportError = errorhandler;
+    if (reportError === undefined) {
+        throw "need errorhandler";
+    }
+
+    var thrownPermanentFailurs = {};
+
+    var req = function (url, callback, what, async, permanentFailureMessage, errorFunction) {
+
+        var mode = true;
+        if (async !== undefined) {
+            mode = async;
+        }
+
+        $.ajax({
+            url: url,
+            success: callback,
+            context: this,
+            dataType: "json",
+            async: mode,
+            cache: false,
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (permanentFailureMessage === undefined) {
+                    if (!what) {
+                        what = "Abfrage des Servers";
+                    }
+                    reportError("Bei " + what + " ist ein Fehler aufgetreten.");
+                }
+                else if (thrownPermanentFailurs[jqXHR.status] === undefined) {
+                    reportError(permanentFailureMessage, true);
+                    thrownPermanentFailurs[jqXHR.status] = jqXHR;
+                }
+                if(typeof  errorFunction === "function"){
+                    errorFunction();
+                }
+
+            }
+        });
+    };
+
+    return {
+        generateDetailsUrl: function (parts) {
+            var containerType = "TWENTY_LIGHT";
+            var routeType = "TRUCK";
+            var containerStatus = "FULL";
+
+            var query = "routedetails?";
+
+            var i = 0;
+
+            parts.each(function (e) {
+                if (e.get("from")) {
+                    query += "data.parts[" + i + "].origin.latitude=" + e.get("from").get("latitude") + "&";
+                    query += "data.parts[" + i + "].origin.longitude=" + e.get("from").get("longitude") + "&";
+                    query += "data.parts[" + i + "].destination.latitude=" + e.get("to").get("latitude") + "&";
+                    query += "data.parts[" + i + "].destination.longitude=" + e.get("to").get("longitude") + "&";
+                    query += "data.parts[" + i + "].containerType=" + containerType + "&";
+                    query += "data.parts[" + i + "].containerState=" + containerStatus + "&";
+                    query += "data.parts[" + i + "].routeType=" + routeType + "&";
+                    i++;
+                }
+            });
+
+            return query;
+        },
+
+        getRouteDetails: function (parts, callback) {
+            var query = api + this.generateDetailsUrl(parts);
+
+            if (parts.size() > 0) {
+
+                req(query, function (data) {
+                    if (data === undefined || data.response === undefined || data.response.route === undefined) {
+                        reportError("invalid response");
+                        return;
+                    }
+                    callback(data.response.route);
+
+                }, "der Dreiecksroutinganfrage", true, "Routing must be checked. Please contact iris@contargo.net for further information.");
+
+            }
+        },
+
+        geoCode: function (request, callback) {
+            var url = geoCodeUrl + "?" + request.getQueryString();
+
+            req(url, function (data) {
+                if (data === undefined || data.geoCodeResponse === undefined
+                    || data.geoCodeResponse.addresses === undefined) {
+                    reportError("invalid response");
+                    return;
+                }
+                callback(data.geoCodeResponse.addresses);
+
+            }, "der Adressauflösung");
+        },
+
+        countries: function (callback) {
+            req(countriesUrl, function (data) {
+
+                if (data === undefined || data.countriesResponse === undefined || data.countriesResponse.countries === undefined) {
+                    reportError("invalid response");
+                    return;
+                }
+                callback(data.countriesResponse.countries);
+
+            }, "dem Abrufen der möglichen Länder", false);
+        },
+
+        getActiveSeaports: function (callback) {
+            req(seaPortsUrl, function (data) {
+                if (data === undefined || data.seaports === undefined) {
+                    reportError("invalid response");
+                    return;
+                }
+                callback(data.seaports);
+
+            }, "dem Abrufen der Seehäfen", false);
+        },
+
+        terminals: function (callback) {
+            req(terminalsUrl, function (data) {
+                if (data === undefined || data.response === undefined || data.response.terminals === undefined) {
+                    reportError("invalid response");
+                    return;
+                }
+                callback(data.response.terminals);
+
+            }, "dem Abrufen der Terminals", false);
+        }
+    };
+};
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/TemplateManager.js b/src/main/webapp/client/js/routing/TemplateManager.js
new file mode 100644
index 00000000..865db66b
--- /dev/null
+++ b/src/main/webapp/client/js/routing/TemplateManager.js
@@ -0,0 +1,63 @@
+var TemplateManager = Backbone.Model.extend({
+
+    defaults  : {
+        prefix : "templates/",
+        postfix : ".html"
+    },
+
+    initialize: function() {
+        this.set("cache", {});
+    },
+
+    getUrl: function(name) {
+        return this.get("prefix") + name + this.get("postfix");
+    },
+
+    loadTemplate: function(url) {
+        var result = "Problem loading the Template from url " + url;
+
+        $.ajax({
+            url: url,
+            context: this,
+            async: false,
+            dataType: "html",
+            cache: false,
+
+            success: function(data) {
+                result = data;
+            },
+            error: function(jqXHR, textStatus, errorThrown) {
+                throw "Could not load template " + url + ": " + textStatus;
+            }
+
+        });
+        return this.getHandleBarsTemplateFromResult(result);
+    },
+
+    getHandleBarsTemplateFromResult : function(result) {
+        return Handlebars.compile(result);
+    },
+
+    getTemplate : function(name) {
+        var url = this.getUrl(name);
+        var template = this.get("cache")[url];
+        if (template === undefined) {
+            template = this.loadTemplate(url);
+            this.get("cache")[url] = template;
+        }
+        return template;
+    }
+});
+
+function exportTemplateManagerAsGlobalFunction(prefix) {
+
+    // define global method getTemplate
+    window.getTemplate = function() {
+        var templateManager = new TemplateManager({
+            prefix : prefix
+        });
+        return function(name) {
+            return templateManager.getTemplate(name);
+        };
+    }();
+}
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/TriangleRoutingApp.js b/src/main/webapp/client/js/routing/TriangleRoutingApp.js
new file mode 100644
index 00000000..db1239ec
--- /dev/null
+++ b/src/main/webapp/client/js/routing/TriangleRoutingApp.js
@@ -0,0 +1,111 @@
+var TriangleRoutingApp = Backbone.Model.extend({
+
+    appname: "r",
+
+    defaults: {
+        contextpath: "/"
+    },
+    initialize: function () {
+
+        console.log("Exporting Application to r");
+        window[this.appname] = this;
+
+        // initializing
+        this.server = new Server(this.get("contextpath"), this.error);
+        this.countries = new SelectableAwareCollection([
+            {name: "Not loaded yet", value: "Not loaded yet"}
+        ]);
+        this.router = new TriangleRoutingRouter({
+            app: this
+        });
+    },
+
+    start: function () {
+
+        // the order of this methods must be in this specific order, PLEASE DO NOT CHANGE
+        this.queryCountries();
+        this.loadTerminals();
+        this.loadSeaports();
+
+        Backbone.history.start({
+            pushState: false,
+            root: "/"
+        });
+    },
+
+    loadTerminals: function () {
+
+        var terminals = new TerminalList();
+        this.terminals = terminals;
+        this.server.terminals(function (data) {
+            terminals.add(data);
+        });
+        terminals.setDefaultValue();
+    },
+
+    loadSeaports: function () {
+
+        var seaports = new SeaportList();
+        this.seaports = seaports;
+
+        this.server.getActiveSeaports(function (data) {
+            seaports.add(data);
+        });
+        seaports.setDefaultValue();
+    },
+
+    showRequest: function (forcenew) {
+
+        if ((!this.triangleModel) || forcenew) {
+
+            this.triangleModel = new TriangleModel({
+                terminals: this.terminals,
+                seaports: this.seaports,
+                server: this.server,
+                countries: this.countries
+            });
+
+            this.triangleView = new TriangleView({
+                el: "#appcontent",
+                model: this.triangleModel
+            });
+        }
+
+        console.log("Currently " + this.triangleModel.get("points").length + " points in triangle.");
+    },
+
+    queryCountries: function () {
+        var countries = this.countries;
+        
+        this.server.countries(function (countryList) {
+            countries.reset(countryList);
+        });
+        
+        countries.setDefaultByValue("DE");
+    },
+
+    /**
+     * boolean permanent, if the notify window will stay and not fadeOut by itself
+     */
+    error: function (msg, permanent) {
+        var fadeOut = true;
+        var closable = true;
+        if (permanent !== undefined) {
+            fadeOut = false;
+            closable = true;
+        }
+
+        // for the ones that aren't closable and don't fade out there is a .close() function.
+        $('.notifications').notify({
+            type: "error",
+            message: {
+                text: msg
+            },
+            fadeOut: {
+                enabled: fadeOut
+            },
+            closable: closable
+        }).show();
+    }
+
+});
diff --git a/src/main/webapp/client/js/routing/TriangleRoutingRouter.js b/src/main/webapp/client/js/routing/TriangleRoutingRouter.js
new file mode 100644
index 00000000..f74a3542
--- /dev/null
+++ b/src/main/webapp/client/js/routing/TriangleRoutingRouter.js
@@ -0,0 +1,21 @@
+var TriangleRoutingRouter = Backbone.Router.extend({
+
+    initialize: function (options) {
+        this.app = options.app;
+    },
+
+    routes: {
+        "*default": "request"
+    },
+
+    request: function () {
+        console.log("ROUTER: request");
+        this.app.showRequest();
+
+        if (window.adjustHelpLink) {
+            adjustHelpLink("trianglerouting");
+        }
+    }
+
+});
+
diff --git a/src/main/webapp/client/js/routing/models/Address.js b/src/main/webapp/client/js/routing/models/Address.js
new file mode 100644
index 00000000..ceaa6c77
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/Address.js
@@ -0,0 +1,113 @@
+var Address = Backbone.Model.extend({
+
+    defaults: {
+        latitude: 0,
+        longitude: 0,
+        displayName: "unknown Place",
+        selected : false,
+        expanded: false
+    },
+
+    initialize: function() {
+        _.bindAll(this, "updateName");
+
+        this.on("change", this.updateName);
+
+    },
+
+    updateName :function() {
+        var name = this.get("niceName");
+
+        if (! name) {
+            name =  this.get("latitude") + ":" + this.get("longitude");
+        }
+        this.set("niceName", name);
+    }
+});
+
+var AddressList = Backbone.Collection.extend({
+    model: Address,
+
+    initialize : function() {
+
+        _.bindAll(this, "addressSelected");
+
+        this.bind("change:selected", this.addressSelected);
+    },
+
+    hasSelected : function() {
+        return this.find(function(e) {
+            return e.get("selected") === true;
+        }) !== undefined;
+    },
+
+    addressSelected : function(e) {
+
+        // trigger change event (if not triggered manually, only a generic 'change' event without reference to member is set off)
+        this.trigger("change:selectedAddressOfAddressList", e);
+    }
+
+});
+
+var AddressListModel = Backbone.Model.extend({
+
+    defaults: {
+        addresses: undefined,
+        name: ""
+    },
+
+    initialize : function(options) {
+
+        _.bindAll(this, "addressSelected");
+
+        this.set("name", options.name);
+
+        var addresses = new AddressList(options.addresses);
+
+        addresses.bind("change:selectedAddressOfAddressList", this.addressSelected);
+
+        this.set("addresses", addresses);
+    },
+    addressSelected : function(e) {
+        this.trigger("change:selectedAddressOfAddressListModel", e);
+    }
+});
+
+var AddressListList = Backbone.Collection.extend({
+    model: AddressListModel,
+
+    defaults : {
+        selectedAddressOfAddressList : undefined
+    },
+
+    initialize : function(options) {
+
+        _.bindAll(this, "addressSelected");
+
+        this.bind("change:selectedAddressOfAddressListModel", this.addressSelected);
+    },
+
+    addressSelected : function(e) {
+
+        // only handle when a new address was selected
+        if (e.get("selected")) {
+            this.each(function(addrList) {
+                addrList.get("addresses").each(function(addr) {
+                    if (addr !== e) {
+                        addr.set("selected", false);
+                    }
+                });
+            });
+
+            // set selected address variable
+            this.selectedAddressOfAddressList = e;
+
+
+        } else {
+            delete this.selectedAddressOfAddressList;
+
+        }
+        // trigger change event (if not triggered manually, only a generic 'change' event without reference to member is set off)
+        this.trigger("change:selectedAddressOfAddressListList", this.selectedAddressOfAddressList);
+    }
+});
diff --git a/src/main/webapp/client/js/routing/models/GeoCodeRequest.js b/src/main/webapp/client/js/routing/models/GeoCodeRequest.js
new file mode 100644
index 00000000..e095ae26
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/GeoCodeRequest.js
@@ -0,0 +1,37 @@
+var GeoCodeRequest = Backbone.Model.extend({
+
+    defaults: {
+        street : "",
+        postalcode :  "",
+        city : "",
+        country : ""
+    },
+
+    initialize: function(options) {
+
+        _.bindAll(this, "getParam", "getQueryString", "isEmpty");
+        this.set('countries', options.countries);
+
+        if(this.get('countries').getSelected() === undefined) {
+            this.get('countries').setDefaultToSelected();
+        }
+
+    },
+
+    getParam : function(param) {
+      var val = this.get(param);
+      if (val !== undefined && (val.length > 0)) {
+          return param + "=" + val+ "&";
+      } else {
+          return "";
+      }
+    },
+
+    getQueryString : function() {
+        return encodeURI(this.getParam("street") + this.getParam("postalcode") + this.getParam("city") + this.getParam("country"));
+    },
+    isEmpty : function() {
+        return ((this.getParam("street") === "") && (this.getParam("postalcode") === "") && (this.getParam("city") === "") && (this.getParam("country") === ""));
+    }
+
+});
diff --git a/src/main/webapp/client/js/routing/models/GeoCoding.js b/src/main/webapp/client/js/routing/models/GeoCoding.js
new file mode 100644
index 00000000..42660d19
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/GeoCoding.js
@@ -0,0 +1,76 @@
+var GeoCoding = Backbone.Model.extend({
+
+    defaults: {
+        request: undefined,
+        results: undefined,
+        server: undefined,
+        countries: undefined,
+        searching: false
+    },
+
+    initialize: function (options) {
+
+        _.bindAll(this, "doSearch", "updateSelected", "resetRequest");
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.server, "server");
+        Helper.isDefined(options.countries, "countries");
+
+        this.server = options.server;
+        this.countries = options.countries;
+
+        var geoCodeRequest = new GeoCodeRequest({countries: options.countries});
+        var addressListResult = new AddressListList();
+
+        geoCodeRequest.bind("change", this.doSearch);
+
+        addressListResult.bind("change:selectedAddressOfAddressListList", this.updateSelected);
+        this.set('request', geoCodeRequest);
+        this.set('results', addressListResult);
+        geoCodeRequest.bind("reset", this.resetRequest);
+    },
+
+    getRequest: function () {
+        return this.get('request');
+    },
+
+    resetRequest: function () {
+        this.get("searchStatus").setHaveSearched(false);
+        this.get('request').set({
+            street: "",
+            postalcode: "",
+            city: "",
+            country: ""
+        });
+        this.get("results").reset();
+    },
+
+
+    getResults: function () {
+        return this.get('results');
+    },
+
+    getSelected: function () {
+        return this.get('geoCodingSelectedAddress');
+    },
+
+    doSearch: function () {
+        var request = this.get('request');
+
+        if (request === undefined || request.isEmpty()) {
+            return;
+        }
+
+        var self = this;
+        self.set("searching", true);
+        this.server.geoCode(request, function (addressLists) {
+            self.get("searchStatus").setHaveSearched(true);
+            self.get('results').reset(addressLists);
+            self.set("searching", false);
+        });
+    },
+
+    updateSelected: function (address) {
+        this.trigger('selectedchanged', address);
+    }
+});
diff --git a/src/main/webapp/client/js/routing/models/Seaport.js b/src/main/webapp/client/js/routing/models/Seaport.js
new file mode 100644
index 00000000..0bf4378e
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/Seaport.js
@@ -0,0 +1,67 @@
+var Seaport = Backbone.Model.extend({
+
+    defaults : {
+        name : "unknown",
+        possibleTypes : undefined,
+        invisible : false
+    },
+    initialize : function() {
+        if (this.get("possibleTypes") === undefined) {
+            this.set("possibleTypes", []);
+        }
+    },
+    canAcceptTransport : function(transport) {
+        // does any of the types support the transport in question?
+        return _.any(this.get("possibleTypes"), function (type) {
+            return type === transport;
+        });
+
+    },
+    isInvisible : function() {
+        return this.get("invisible");
+    }
+});
+
+var SeaportList = SelectableAwareCollection.extend({
+    model : Seaport,
+    filterByPossibleType : function(type) {
+        return new SeaportList(this.filter(function(e) {
+            return e.canAcceptTransport(type);
+        }));
+    },
+    setVisibility : function(type) {
+
+        var sel = false;
+
+        this.each(function(e) {
+            var visible = e.canAcceptTransport(type);
+            e.set("invisible", !visible);
+        });
+
+        this.getDefault().set("defaultValue", true);
+    },
+    modelSelected : function(e) {
+        // override the deselection of other items since seaportlist allows multiple elements to be selected
+    },
+
+    setDefaultValue : function(){
+        if(this.size() > 0){
+            this.first().set("defaultValue", "true");
+        }
+    },
+    comparator : function(model){
+        return model.get("name");
+    },
+    getByName : function (name) {
+        var selected;
+        this.forEach( function(seaport){
+            if(seaport.get('name') === name){
+                selected = seaport;
+                return;
+            }
+        });
+        return selected;
+    }
+
+
+});
diff --git a/src/main/webapp/client/js/routing/models/SearchStatus.js b/src/main/webapp/client/js/routing/models/SearchStatus.js
new file mode 100644
index 00000000..f1cb0d82
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/SearchStatus.js
@@ -0,0 +1,14 @@
+var SearchStatus = Backbone.Model.extend({
+
+    defaults: {
+        haveSearched: false
+    },
+
+    setHaveSearched: function (value) {
+        this.set("haveSearched", value);
+    },
+
+    haveSearched: function () {
+        return this.get("haveSearched");
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/models/Terminal.js b/src/main/webapp/client/js/routing/models/Terminal.js
new file mode 100644
index 00000000..06dcd45b
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/Terminal.js
@@ -0,0 +1,32 @@
+var Terminal = Backbone.Model.extend({
+
+    defaults: {
+        id: undefined,
+        name: undefined
+    }
+});
+
+var TerminalList = Backbone.Collection.extend({
+    model: Terminal,
+
+    setDefaultValue : function(){
+        if(this.size() > 0){
+            this.first().set("defaultValue", "true");
+        }
+    },
+
+    comparator : function (model) {
+        return model.get("name");
+    },
+    getByName : function (name) {
+        var selected;
+        this.forEach( function(terminal){
+            if(terminal.get('name') === name){
+                selected = terminal;
+                return;
+            }
+        });
+        return selected;
+    }
+
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/models/TriangleModel.js b/src/main/webapp/client/js/routing/models/TriangleModel.js
new file mode 100644
index 00000000..aab09cd4
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/TriangleModel.js
@@ -0,0 +1,53 @@
+var TriangleModel = Backbone.Model.extend({
+
+        defaults: {
+            geocoding: undefined,
+            terminals: undefined,
+            seaports: undefined,
+            points: undefined
+
+        },
+
+        initialize: function (options) {
+            _.bindAll(this, "update", "addAddress", "addTerminal", "addSeaport");
+
+            Helper.isDefined(options, "TriangleModel needs options");
+            Helper.isDefined(options.server, "TriangleModel needs options.server");
+            this.server = options.server;
+
+            this.set('geocoding', new GeoCoding({server: this.server, countries: options.countries}));
+            this.set('points', new TrianglePoints([], {server: this.server}));
+            this.get('geocoding').on("selectedchanged", this.addAddress);
+            this.get("terminals").on("selectedadded", this.addTerminal);
+            this.get("seaports").on("selectedadded", this.addSeaport);
+
+        },
+
+        update: function () {
+        },
+
+        addAddress: function (e) {
+            var points = this.get("points");
+            points.add(new Address(e.toJSON()));
+
+            var geocoding = this.get("geocoding");
+            geocoding.resetRequest();
+        },
+
+        addTerminal: function (e) {
+            var points = this.get("points");
+            // we "kindof clone" this to that it can be added more than once to points
+            var t = new Terminal(e.toJSON());
+            t.set("id", undefined);
+            points.add(t);
+        },
+
+        addSeaport: function (e) {
+            // copy seaport to list of points
+            var points = this.get("points");
+            var seaport = new Seaport(e.toJSON());
+            seaport.set("id", undefined);
+            points.add(seaport);
+        }
+    }
+);
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/models/TrianglePoints.js b/src/main/webapp/client/js/routing/models/TrianglePoints.js
new file mode 100644
index 00000000..e31613da
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/TrianglePoints.js
@@ -0,0 +1,116 @@
+var TrianglePoints = Backbone.Collection.extend({
+
+    initialize : function(models, options) {
+
+        _.bindAll(this, "removeitem", "moveItemUp", "moveItemDown", "routeArrived");
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.server, "server");
+
+        this.server = options.server;
+
+        this.pairs = new TriangleRoutePartList();
+        this.pairs.bind("remove", this.removeitem);
+        this.pairs.bind("up", this.moveItemUp);
+        this.pairs.bind("down", this.moveItemDown);
+
+        this.totals = new Backbone.Model({totalDistance: 0, totalToll: 0});
+
+    },
+
+    removeitem: function(route) {
+
+        var to = route.get("to");
+        this.remove(to);
+    },
+
+    moveItemUp : function(item) {
+        var to = item.get("to");
+        var oldpos = this.getPosition(to);
+
+        this.switchPos(to, oldpos, oldpos-1);
+    },
+
+    moveItemDown : function(item) {
+        var to = item.get("to");
+        var oldpos = this.getPosition(to);
+        this.switchPos(to, oldpos, oldpos+1);
+    },
+
+    switchPos : function(item, oldpos, newpos) {
+        if (newpos < this.size() && newpos >=0) {
+            var elements = this.toArray();
+            var other = elements[newpos];
+            elements[newpos] = item;
+            elements[oldpos] = other;
+            this.reset(elements);
+        }
+    },
+
+    getPosition : function(item) {
+
+        for (var i = 0; i < this.size(); i++) {
+            if (this.at(i) === item) {
+                return i;
+            }
+        }
+        throw "item not found";
+    },
+
+    getRoutePairs : function() {
+
+        var self = this;
+        self.pairs.reset([]);
+
+        this.each(function(e,i){
+
+            var from = undefined;
+            // skip the from of the first entry
+            if (i > 0) {
+                from = self.at(i-1);
+            }
+
+            // all others are "the one before me to me"
+            var to = e;
+            self.pairs.add(new TriangleRoutePart({from : from, to: to}));
+        });
+
+        this.totals.set({
+            distance : undefined,
+            toll : undefined  ,
+            size: this.size(),
+            duration: undefined
+        });
+
+        this.server.getRouteDetails(self.pairs, this.routeArrived);
+
+        return self.pairs;
+    },
+
+    routeArrived : function(route) {
+
+        var self = this;
+
+        this.totals.set({
+            distance : Helper.formatKM(route.data.totalDistance),
+            toll : Helper.formatKM(route.data.totalTollDistance)  ,
+            duration : Helper.formatDurationInDetail(route.data.totalDuration),
+            size: this.size()
+        });
+
+        var parts = route.data.parts;
+
+        this.pairs.each(  function(pair,index) {
+
+            if (index > 0) {
+                var part = parts[index-1];
+                var distance = Helper.formatKM(part.data.distance);
+                var toll = Helper.formatKM(part.data.tollDistance);
+                var duration  = Helper.formatDurationInDetail(part.data.duration);
+
+
+                pair.set({distance: distance, toll: toll, duration: duration});
+            }
+        });
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/models/TriangleRoutePart.js b/src/main/webapp/client/js/routing/models/TriangleRoutePart.js
new file mode 100644
index 00000000..0c215ecd
--- /dev/null
+++ b/src/main/webapp/client/js/routing/models/TriangleRoutePart.js
@@ -0,0 +1,7 @@
+var TriangleRoutePart = Backbone.Model.extend({
+
+});
+
+var TriangleRoutePartList =   Backbone.Collection.extend({
+
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/Address.html b/src/main/webapp/client/js/routing/templates/Address.html
new file mode 100644
index 00000000..2c149cb0
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/Address.html
@@ -0,0 +1,8 @@
+{{#if selected}}
+<td class="selectAddressRow item-select" title="Click to unselect">
+<strong><span class="address"></span></strong>
+</td>
+{{else}}
+<td class="selectAddressRow notselected item-select address"  title="Click to select">
+</td>
+{{/if}}
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/AddressCategoryView.html b/src/main/webapp/client/js/routing/templates/AddressCategoryView.html
new file mode 100644
index 00000000..b954ebf1
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/AddressCategoryView.html
@@ -0,0 +1,3 @@
+<div class="row-float geocoding-results">
+    <div class="accordion" id="addressCategoryAccordion"></div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/AddressList.html b/src/main/webapp/client/js/routing/templates/AddressList.html
new file mode 100644
index 00000000..c815a82e
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/AddressList.html
@@ -0,0 +1,45 @@
+<div class="accordion-group">
+    <div class="accordion-heading">
+
+        {{#if moreThanOne}}
+            <a class="collapsable-indicator clickable accordion-heading-open" href="#collapse{{cid}}" 
+               data-toggle="collapse" title="Expand for {{more}} suburbs"></a>
+        {{else}}
+            <a class="collapsable-indicator notclickable" href="#"
+               onclick="return false;"></a>
+        {{/if}}
+
+        <div class="content-title accordion-content-title content-title-grey selectParentAddress">
+            <h4 style="font-weight: normal;">
+                {{parentAddress.address.postcode}} 
+                {{parentAddress.displayName}} 
+                {{#if moreThanOne}} 
+                    <strong>
+                        [click for {{more}} suburbs]
+                    </strong> 
+                {{/if}}
+            </h4>
+        </div>
+
+    </div>
+
+    {{#if isExpanded}}
+    <div id="collapse{{cid}}" class="row-fluid accordion-body collapse in collapsableindicator">
+        {{else}}
+        <div id="collapse{{cid}}" class="row-fluid accordion-body collapse collapsableindicator">
+            {{/if}}
+            <div class="accordion-inner">
+
+                <table class="table iris-table">
+                    <tbody class="address_table">
+                    </tbody>
+                </table>
+
+            </div>
+            {{#if isExpanded}}
+        </div>
+        {{else}}
+    </div>
+    {{/if}}
+
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/DetailedAddress.html b/src/main/webapp/client/js/routing/templates/DetailedAddress.html
new file mode 100644
index 00000000..8416dc3d
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/DetailedAddress.html
@@ -0,0 +1,7 @@
+<span title="{{displayName}}">{{niceName}}</span>
+
+{{#if hasDetails}}
+<span class="info" title="Address: Details" data-content="{{details}}">
+        <i class="icon-info-sign"></i>
+    </span>
+{{/if}}
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/GeoCodeRequest.html b/src/main/webapp/client/js/routing/templates/GeoCodeRequest.html
new file mode 100644
index 00000000..80f6c7c5
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/GeoCodeRequest.html
@@ -0,0 +1,25 @@
+<div class="content-title">
+    <h2>Destination</h2>
+</div>
+
+<div class="content">
+    <form class="form-horizontal" style="padding-top: 0;">
+
+        <p class="gap">Please provide as much information as possible on the destination. Fields can be left blank.</p>
+
+        <div>
+
+            <input id="street" type="text" class="input-medium street" placeholder="Street & House number"
+                   title="Street & House number" value="{{street}}"/>
+            <input id="postCode" type="text" class="input-small postalcode" placeholder="Postal code"
+                   title="Postal code" value="{{postalcode}}"/>
+            <input id="city" type="text" class="input-small-medium city" placeholder="City" title="City"
+                   value="{{city}}"/>
+            <!-- country container is filled by GeoCodeRequestView -->
+            <span class="country-container"></span>
+            <button id="submitButton" type="submit" class="search btn btn-primary">Search</button>
+            <button id="resetButton" type="reset" class="reset btn">Reset</button>
+
+        </div>
+    </form>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/Seaport.html b/src/main/webapp/client/js/routing/templates/Seaport.html
new file mode 100644
index 00000000..775a4ce0
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/Seaport.html
@@ -0,0 +1,7 @@
+<span class="info underlined" title="Seaport: {{name}}"
+    data-content="Name: {{name}}<br />
+    Code: {{shortName}}<br />
+    latitude: {{latitude}}<br />
+    longitude: {{longitude}}">
+    {{name}} <i class="icon-info-sign"></i>
+</span>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/Terminal.html b/src/main/webapp/client/js/routing/templates/Terminal.html
new file mode 100644
index 00000000..770b21d8
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/Terminal.html
@@ -0,0 +1,8 @@
+<span class="info underlined" title="Terminal: {{name}}"
+      data-content="Phone: {{phone}}<br />
+                    Fax: {{fax}}<br />
+                    Email: {{email}}<br />
+                    For details on extra charges see &#34;Routing&#34;, column &#34;Extra Charges&#34;. <br />
+                    ">
+    {{name}} <i class="icon-info-sign"></i>
+</span> 
diff --git a/src/main/webapp/client/js/routing/templates/TriangleDropDownWithAddButtonView.html b/src/main/webapp/client/js/routing/templates/TriangleDropDownWithAddButtonView.html
new file mode 100644
index 00000000..0bc66a09
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/TriangleDropDownWithAddButtonView.html
@@ -0,0 +1,4 @@
+<div class="dropdownwithadd">
+    <select class="autoComplete"></select>
+    <button class="btn btn-primary add">Add</button>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/TrianglePoints.html b/src/main/webapp/client/js/routing/templates/TrianglePoints.html
new file mode 100644
index 00000000..f4e8c5e1
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/TrianglePoints.html
@@ -0,0 +1,20 @@
+<div class="trianglepoints">
+    <table class="table iris-table">
+        <thead>
+            <tr>
+                <th>From</th>
+                <th>To</th>
+                <th>Distance</th>
+                <th>Toll</th>
+                <th>Time</th>
+                <th>Action</th>
+            </tr>
+        </thead>
+        <tbody class="children">
+
+        </tbody>
+        <tfoot class="totals triangleTableTotals">
+
+        </tfoot>
+    </table>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/TriangleRoutePart.html b/src/main/webapp/client/js/routing/templates/TriangleRoutePart.html
new file mode 100644
index 00000000..24c755b1
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/TriangleRoutePart.html
@@ -0,0 +1,13 @@
+<td class="from">
+</td>
+<td class="to">
+
+</td>
+<td style="text-align: right;">{{distance}}</td>
+<td style="text-align: right;">{{toll}}</td>
+<td style="text-align: right;">{{duration}}</td>
+<td>
+    <a href="" class="up"><i class="icon-arrow-up"></i></a>
+    <a href="" class="down"><i class="icon-arrow-down"></i></a>
+    <a href="" class="remove"><i class="icon-trash"></i></a>
+</td>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/TriangleRouteTotal.html b/src/main/webapp/client/js/routing/templates/TriangleRouteTotal.html
new file mode 100644
index 00000000..cf09aa87
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/TriangleRouteTotal.html
@@ -0,0 +1,9 @@
+<td><b>Totals:</b> {{size}} Stops</td>
+<td>
+</td>
+<td style="text-align: right;">{{distance}}</td>
+<td style="text-align: right;">{{toll}}</td>
+<td style="text-align: right;">{{duration}}</td>
+
+<td>Clear: <a href="" class="clear"><i class="icon-trash"></i></a>
+</td>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/templates/TriangleView.html b/src/main/webapp/client/js/routing/templates/TriangleView.html
new file mode 100644
index 00000000..cbdb0bfd
--- /dev/null
+++ b/src/main/webapp/client/js/routing/templates/TriangleView.html
@@ -0,0 +1,27 @@
+<div class="triangle row-fluid">
+    <div class="span5">
+        <div class="content-title">
+            <h2>Seaports and Terminals</h2>
+        </div>
+        <div class="content" style="min-height: 5em;">
+            <form class="form-horizontal" style="padding-top: 0px;">
+
+                <p class="gap">Select a Terminal or Seaport and add it to the Route</p>
+                <div class="terminals">
+
+                </div>
+                <div class="seaports">
+
+                </div>
+            </form>
+        </div>
+        <div class="geocoding"></div>
+    </div>
+    
+    <div class="span7">
+        <div class="content-title">
+            <h2>Multistop Routing</h2>
+        </div>
+        <div class="content points"></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/views/AddressListView.js b/src/main/webapp/client/js/routing/views/AddressListView.js
new file mode 100644
index 00000000..395bd6ca
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/AddressListView.js
@@ -0,0 +1,275 @@
+var AddressListView = Backbone.View.extend({
+
+    templateName: "AddressList",
+
+    events: {
+        "click .selectParentAddress": "selectParentAddress"
+    },
+
+    initialize: function (options) {
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+        this.template = getTemplate(this.templateName);
+
+        if (this.model === undefined) {
+            throw "model is undefined";
+        }
+
+        _.bindAll(this, "render", "addOne", "addAll", "selectParentAddress",
+            "expand");
+        this.model.get("addresses").bind("add", this.render);
+        this.model.get("addresses").bind("remove", this.render);
+        this.model.get("addresses").bind("reset", this.render);
+
+        this.render();
+    },
+
+    selectParentAddress: function () {
+        var first = this.model.get("addresses").at(0);
+
+        var newvalue = !first.get("expanded");
+        this.expand(newvalue);
+        first.set("expanded", newvalue);
+
+        return false;
+    },
+
+    render: function () {
+
+        if (this.model.get("addresses").size() === 0) {
+            this.$el.html("<strong>No results found.</strong>");
+        } else {
+
+            var model = this.model.toJSON();
+            model.size = this.model.get("addresses").size();
+            model.moreThanOne = model.size > 1;
+            model.more = model.size - 1;
+
+            model.cid = this.model.cid;
+
+            this.$el.html(this.template(model));
+
+            this.addAll();
+        }
+
+        this.collapsables();
+    },
+
+    collapsables: function () {
+
+        this.$('.collapsableindicator').on('hide', function (e) {
+
+            var $header = $(e.target).parent(".accordion-group").find(".collapsable-indicator");
+            $header.removeClass("accordion-heading-open");
+        });
+
+        this.$('.collapsableindicator').on('show', function (e) {
+            var $header = $(e.target).parent(".accordion-group").find(".collapsable-indicator");
+            $header.addClass("accordion-heading-open");
+        });
+
+    },
+
+    addOne: function (address) {
+
+        var view = new AddressView({
+            model: address
+        });
+        view.render();
+        var node = view.el;
+        this.$(".address_table").append(node);
+    },
+
+    addAll: function () {
+        this.model.get("addresses").forEach(this.addOne);
+    },
+
+    expand: function (value) {
+
+        if (value) {
+
+            $(this.$(".accordion-body")).addClass('in');
+            $(this.$(".accordion-toggle")).addClass('accordion-heading-open');
+            $(this.$(".accordion-body")).css('height', 'auto');
+        } else {
+            $(this.$(".accordion-body")).removeClass('in');
+            $(this.$(".accordion-toggle")).removeClass('accordion-heading-open');
+            $(this.$(".accordion-body")).css('height', '0px');
+        }
+    }
+
+});
+
+var AddressCategoryView = Backbone.View.extend({
+
+    templateName: "AddressCategoryView",
+
+    initialize: function (options) {
+
+        Helper.isDefined(options.searchStatus, "searchStatus");
+
+        this.searchStatus = options.searchStatus;
+
+        this.template = getTemplate(this.templateName);
+
+        _.bindAll(this, "render", "selectedChanged");
+        this.model.bind("add", this.render);
+        this.model.bind("remove", this.render);
+
+        this.model.bind("reset", this.render);
+        this.model.bind("change:selectedAddressOfAddressListList",
+            this.selectedChanged);
+
+        this.render();
+    },
+
+    render: function () {
+
+        this.$el.html("");
+
+        if (this.model.length === 0 && this.searchStatus.haveSearched()) {
+            this.$el.html("<strong>No results found.</strong>");
+        } else if (this.searchStatus.haveSearched()) {
+            // get combined address count
+            var count = this.model.reduce(function (memo, el) {
+                return memo + el.get("addresses").size();
+            }, 0);
+
+            var model = {
+                length: count
+            };
+
+            this.$el.html(this.template(model));
+
+            var addressListHasNonEmptyAddresses = false;
+
+            this.model.each(function (addressList) {
+                if(typeof addressList.get("addresses").first() !== "undefined") {
+                    addressListHasNonEmptyAddresses = true;
+                }
+            });
+            var expand = (this.model.size() === 1);
+            var self = this;
+            this.model.each(function (addressList) {
+                if(!(typeof addressList.get("addresses").first() === "undefined" && addressListHasNonEmptyAddresses)) {
+                    var view = new AddressListView({
+                        model: addressList
+                    });
+
+                    if (expand) {
+                        view.expand(true);
+                    }
+
+                    self.$("#addressCategoryAccordion").append(view.el);
+                }
+            });           
+        }
+    },
+
+    selectedChanged: function (address) {
+
+        var oneElement = (this.model.size() === 1);
+
+        this.model.each(function (addressList) {
+
+            var expand = false;
+
+            addressList.get("addresses").each(function (addr) {
+                if (addr === address) {
+                    expand = true;
+                }
+            });
+
+            if (expand || oneElement) {
+                this.$("#collapse" + addressList.cid).addClass('in');
+                this.$("#collapse" + addressList.cid).addClass('accordion-heading-open');
+                this.$("#collapse" + addressList.cid).css('height', 'auto');
+            } else {
+                this.$("#collapse" + addressList.cid).removeClass('in');
+                this.$("#collapse" + addressList.cid).removeClass('accordion-heading-open');
+                this.$("#collapse" + addressList.cid).css('height', '0px');
+            }
+        });
+    }
+});
+
+var DetailledAddressView = Backbone.View.extend({
+
+    templateName: "DetailedAddress",
+
+    initialize: function (options) {
+        _.bindAll(this, "render");
+
+        this.template = getTemplate(this.templateName);
+
+        this.model.bind("change", this.render);
+
+        this.render();
+    },
+
+    render: function () {
+
+        var model = this.model.toJSON();
+
+        var details = "";
+        if (model.address) {
+            _.each(model.address, function (e, f) {
+                details = details + "<strong>" + f + ":</strong> " + e + "<br />";
+            });
+        }
+
+        details = details + "<strong>latitude:</strong> " + model.latitude + "<br />";
+        details = details + "<strong>longitude:</strong> " + model.longitude + "<br />";
+
+        model.hasDetails = (details.length > 0);
+        model.details = details;
+
+        this.$el.html(this.template(model));
+
+        this.$(".info").popover();
+
+        Helper.setPopoverOnClickCloseEvent(this);
+    }
+});
+
+var AddressView = Backbone.View.extend({
+
+    tagName: "tr",
+    className: "address",
+    templateName: "Address",
+
+    initialize: function (options) {
+        _.bindAll(this, "render", "selectAddress");
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(this.model, "model");
+
+        this.template = getTemplate(this.templateName);
+
+        this.model.bind("change", this.render);
+
+        this.showdetails = true;
+    },
+
+    events: {
+        "click .selectAddressRow": "selectAddress"
+    },
+
+    render: function () {
+
+        var model = this.model.toJSON();
+        this.$el.html(this.template(model));
+
+        if (this.showdetails) {
+            this.addressView = new DetailledAddressView({
+                el: this.$(".address"),
+                model: this.model
+            });
+        }
+    },
+
+    selectAddress: function () {
+        this.model.set("selected", !this.model.get("selected"));
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/views/BootstrapDropDownView.js b/src/main/webapp/client/js/routing/views/BootstrapDropDownView.js
new file mode 100644
index 00000000..5dcd5230
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/BootstrapDropDownView.js
@@ -0,0 +1,85 @@
+var BootstrapDropDownView = Backbone.View.extend({
+
+    initialize: function (options) {
+
+        _.bindAll(this, "render", "addOne", "selectedchanged");
+
+        this.model.bind("add", this.render);
+        this.model.bind("remove", this.render);
+        this.model.bind("reset", this.render);
+        this.model.bind("change", this.render);
+
+        this.outputField = this.getOutputField(options.outputField);
+
+        // the element with defaultValue = true has to be set as selected if there is nothing selected
+        if (this.model.getSelected() === undefined) {
+            this.model.setDefaultToSelected();
+        }
+
+        this.render();
+    },
+
+    events: {
+        "click .selectLink": "selectedchanged"
+    },
+
+    getOutputField: function (outputField) {
+        if (outputField !== undefined && outputField !== null) {
+           return outputField;
+        } else {
+            return "name";
+        }
+    },
+
+    render: function () {
+
+        if (this.model.getSelected() === undefined) {
+            this.model.setDefaultToSelected();
+        }
+
+        var model = this.model.toJSON();
+        this.$el.html("<div class='btn-group'><ul class='dropdown-menu'></ul></div>");
+        this.addAll();
+
+    },
+
+    addOne: function (model) {
+
+        if (model.get("invisible")) {
+            return;
+        }
+
+        if (model === this.model.getSelected()) {
+            var element = $("<a class='btn dropdown-toggle' data-toggle='dropdown'></a>").attr("id", model.cid).html(model.get(this.outputField) + "&nbsp;<span class='caret'></span>");
+            this.$("div.btn-group").append(element);
+        }
+
+        var option = $("<a class='selectLink'></a>").attr("id", model.cid).html(model.get(this.outputField));
+        var listElement = $("<li></li>").html(option);
+        this.$("ul.dropdown-menu").append(listElement);
+    },
+
+    addAll: function () {
+        this.model.forEach(this.addOne);
+    },
+
+    selectedchanged: function (element) {
+
+        var cid = element.target.id;
+        var selectedElement = this.model.get(cid);
+        var dropdownToggle;
+
+        this.$("a.dropdown-toggle").remove();
+        if(this.title !== undefined && this.title !== null){
+            dropdownToggle = $("<a class='btn dropdown-toggle' data-toggle='dropdown'></a>").html(this.title + "&nbsp;<span class='caret'></span>");
+        } else {
+            dropdownToggle = $("<a class='btn dropdown-toggle' data-toggle='dropdown'></a>").attr("id", cid).html(selectedElement.get(this.outputField) + "&nbsp;<span class='caret'></span>");
+        }
+        this.$("div.btn-group").append(dropdownToggle);
+
+        this.changeSelectStrategy(selectedElement);
+    },
+    changeSelectStrategy: function(selectedElement){
+        selectedElement.set('selected', true);
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/views/GeoCodeRequestView.js b/src/main/webapp/client/js/routing/views/GeoCodeRequestView.js
new file mode 100644
index 00000000..23754d9d
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/GeoCodeRequestView.js
@@ -0,0 +1,88 @@
+var GeoCodeRequestView = Backbone.View.extend({
+
+    templateName: "GeoCodeRequest",
+
+    initialize: function (options) {
+
+        Helper.isDefined(options.searchStatus, "searchStatus");
+        this.searchStatus = options.searchStatus;
+
+        this.template = getTemplate(this.templateName);
+
+        _.bindAll(this, "render", "search", "reset", "resetForm");
+
+        this.model.bind("change", this.render);
+        this.render();
+    },
+
+    events: {
+        "click button.search": "search",
+        "click button.reset": "reset",
+        "change select.suburbSearch": "render"
+
+    },
+
+    render: function () {
+        var model = this.getModel();
+        this.$el.html(this.template(model));
+
+        this.countryView = new BootstrapDropDownView({
+            el: this.$(".country-container"),
+            model: this.model.get("countries")
+        });
+
+        this.$(".info").popover();
+    },
+
+    search: function () {
+
+        this.model.set(this.getModel());
+
+        return false;
+    },
+
+    reset: function () {
+
+        this.model.trigger("reset");
+
+        this.resetForm();
+
+        return false;
+
+    },
+
+    resetForm: function () {
+
+        $(":input").each(function (index, element) {
+            var placeholder = $(this).attr('placeholder');
+            if (element.type === "text") {
+                if (!Modernizr.input.placeholder && (placeholder !== "" && placeholder !== undefined)) {
+                    $(element).val(placeholder);
+                } else {
+                    $(element).val("");
+                }
+            }
+        });
+    },
+
+    getModel: function () {
+        var model = this.model;
+
+        return {
+            street: this.extract(".street"),
+            city: this.extract(".city"),
+            postalcode: this.extract(".postalcode"),
+            country: model.get("countries").getSelected().get("value")
+        };
+    },
+
+    extract: function (selector) {
+        var val = this.$(selector).val();
+        var placeholder = this.$(selector).attr("placeholder");
+        if (val !== placeholder) {
+            return val;
+        } else {
+            return "";
+        }
+    }
+});
\ No newline at end of file
diff --git a/src/main/webapp/client/js/routing/views/GeoCodingView.js b/src/main/webapp/client/js/routing/views/GeoCodingView.js
new file mode 100644
index 00000000..31ea2f6f
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/GeoCodingView.js
@@ -0,0 +1,56 @@
+var GeoCodingView = Backbone.View.extend({
+
+    tagName: "div",
+    className: "span8",
+
+    initialize: function (options) {
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+
+        this.searchStatus = options.model.get('searchStatus');
+
+        _.bindAll(this, "render", "handleSearchChanged");
+
+        this.model.bind("change:searching", this.handleSearchChanged);
+
+        this.render();
+    },
+
+    render: function () {
+
+        this.requestNode = $("<div class='geocoderequest'></div>");
+        this.listNode = $("<div class='addresslist'></div>");
+        this.infoNode = $("<div class='searching'>Searching...</div>");
+
+        this.geocodingrequestview = new GeoCodeRequestView({
+            el: this.requestNode,
+            model: this.model.getRequest(),
+            searchStatus: this.searchStatus
+        });
+
+        this.addresslist = new AddressCategoryView({
+            el: this.listNode,
+            model: this.model.getResults(),
+            searchStatus: this.searchStatus
+        });
+
+        this.$el.empty();
+        this.$el.append(this.requestNode);
+        this.$el.append(this.infoNode);
+        this.$el.append(this.listNode);
+
+        this.handleSearchChanged();
+    },
+
+    handleSearchChanged: function () {
+
+        if (this.model.get("searching")) {
+            this.infoNode.show();
+            this.listNode.hide();
+        } else {
+            this.listNode.show();
+            this.infoNode.hide();
+        }
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/SeaportView.js b/src/main/webapp/client/js/routing/views/SeaportView.js
new file mode 100644
index 00000000..89bbdd9e
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/SeaportView.js
@@ -0,0 +1,25 @@
+
+var SeaportView = Backbone.View.extend({
+    tagName: "span",
+
+    templateName : "Seaport",
+
+    initialize : function(options) {
+        _.bindAll(this, "render");
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(this.model, "model");
+
+        this.template = getTemplate(this.templateName);
+
+        this.render();
+    },
+
+    render: function() {
+
+        var model = this.model.toJSON();
+        this.$el.html(this.template(model));
+
+        this.$(".info").popover();
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/TerminalView.js b/src/main/webapp/client/js/routing/views/TerminalView.js
new file mode 100644
index 00000000..f5f748da
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TerminalView.js
@@ -0,0 +1,26 @@
+
+var TerminalView = Backbone.View.extend({
+    tagName: "span",
+
+    templateName : "Terminal",
+
+
+    initialize : function(options) {
+        _.bindAll(this, "render");
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(this.model, "model");
+
+        this.template = getTemplate(this.templateName);
+
+        this.render();
+    },
+
+    render: function() {
+
+        var model = this.model.toJSON();
+        this.$el.html(this.template(model));
+
+        this.$(".info").popover();
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/TriangleDropDownWithAddButtonView.js b/src/main/webapp/client/js/routing/views/TriangleDropDownWithAddButtonView.js
new file mode 100644
index 00000000..66b1e18f
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TriangleDropDownWithAddButtonView.js
@@ -0,0 +1,101 @@
+var TriangleDropDownWithAddButtonView = Backbone.View.extend({
+    templateName : "TriangleDropDownWithAddButtonView",
+    events : {
+        "click .add" : "addclicked"
+    },
+    initialize : function(options) {
+        _.bindAll(this, "render", "saveselected", "addclicked" );
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(this.model, "model");
+
+        this.template = getTemplate(this.templateName);
+
+        this.model.bind("selectedchanged", this.saveselected);
+
+        this.render();
+    },
+
+    render : function() {
+
+        var model = {};
+        this.$el.html(this.template(model));
+
+        var node = this.$(".autoComplete");
+        var dropdown = new TriangularTrafficDropDownView({el: node, model: this.model});
+    },
+
+    saveselected : function(e) {
+        this.current = e;
+    },
+    addclicked : function() {
+        if (this.current) {
+            this.model.trigger("selectedadded", this.current);
+        }
+        return false;
+    }
+});
+
+
+var TriangularTrafficDropDownView = Backbone.View.extend({
+
+    initialize : function(options) {
+
+        _.bindAll(this, "render", "addOne", "selectedchanged");
+        this.model.bind("add", this.render);
+        this.model.bind("remove", this.render);
+        this.model.bind("reset", this.render);
+        this.model.bind("change", this.render);
+
+        var elementToSelect;
+        if (options !== undefined && options.selectedText !== undefined) {
+            this.model.each(function (element) {
+                if (element.get("name") === options.selectedText) {
+                    elementToSelect = element;
+
+                }
+            });
+        }
+
+        if (this.model.size() > 0) {
+            elementToSelect = this.model.first();
+            elementToSelect.set("defaultValue", true);
+
+            this.model.trigger("selectedchanged", elementToSelect);
+        }
+
+        this.render();
+    },
+    render: function() {
+        this.$el.empty();
+        var model = this.model.toJSON();
+        this.addAll();
+        this.$el.select2({ width: 'resolve'});
+        var that = this;
+        this.$el.on('change', function(e){
+            that.selectedchanged(e);
+        });
+
+    },
+    addOne: function(model) {
+        if(model.get("invisible")){
+            return;
+        }
+        var option = $("<option/>").html(model.get("name"));
+        if(model.get("defaultValue")){
+            option.attr("selected", "selected");
+        }
+        this.$el.append(option);
+
+    },
+    addAll : function() {
+        this.model.forEach(this.addOne);
+    },
+    selectedchanged : function(element) {
+        var elementName = element.val;
+        var selectedElement = this.model.getByName(elementName);
+        this.model.trigger("selectedchanged", selectedElement);
+    }
+});
+
+
diff --git a/src/main/webapp/client/js/routing/views/TrianglePointsView.js b/src/main/webapp/client/js/routing/views/TrianglePointsView.js
new file mode 100644
index 00000000..fb86ed6f
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TrianglePointsView.js
@@ -0,0 +1,62 @@
+var TrianglePointsView = Backbone.View.extend({
+
+    templateName : "TrianglePoints",
+    events : {
+        "click .clear" : "clear"
+    },
+
+
+
+    initialize : function(options) {
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+
+        if (options.childView) {
+            this.childView = options.childView;
+        } else {
+            this.childView = TriangleRoutePartView;
+        }
+        this.template = getTemplate(this.templateName);
+
+        if (this.model === undefined) {
+            throw "model is undefined";
+        }
+
+        _.bindAll(this, "render", "renderRoutingPoint", "clear", "renderTotals");
+        this.model.bind("add", this.render);
+        this.model.bind("remove", this.render);
+        this.model.bind("reset", this.render);
+
+        this.model.totals.on("change", this.renderTotals);
+        this.render();
+    },
+
+    renderTotals: function() {
+
+        var childView = new TriangleRouteTotalView({model : this.model.totals});
+        this.$(".totals").empty();
+        this.$(".totals").append(childView.$el);
+    },
+
+    render: function() {
+        this.$el.html(this.template({}));
+
+        var points = this.model.getRoutePairs();
+
+        if (points.size() > 0) {
+            points.each(this.renderRoutingPoint);
+        }
+        this.renderTotals();
+    },
+
+    renderRoutingPoint : function(child) {
+        var childView = new this.childView({model : child});
+        this.$(".children").append(childView.$el);
+    },
+
+    clear : function() {
+        this.model.reset([]);
+        return false;
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/TriangleRoutePartView.js b/src/main/webapp/client/js/routing/views/TriangleRoutePartView.js
new file mode 100644
index 00000000..1af5e8e9
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TriangleRoutePartView.js
@@ -0,0 +1,51 @@
+var TriangleRoutePartView = Backbone.View.extend({
+
+    templateName : "TriangleRoutePart",
+    tagName: "tr",
+    events : {
+        "click .up" : "moveup",
+        "click .down" : "movedown",
+        "click .remove" : "remove"
+    },
+
+    initialize : function(options) {
+
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+
+        this.template = getTemplate(this.templateName);
+
+        if (this.model === undefined) {
+            throw "model is undefined";
+        }
+
+        _.bindAll(this, "render", "moveup", "movedown", "remove");
+        this.model.bind("change", this.render);
+
+        this.render();
+
+    },
+
+
+    render: function() {
+
+        var model = this.model.toJSON();
+        this.$el.html(this.template(model));
+
+        var from = Helper.renderCorrectGeolocationView(this.model.get("from"), this.$(".from"));
+        var to = Helper.renderCorrectGeolocationView(this.model.get("to"),this.$(".to"));
+
+    },
+    remove : function() {
+        this.model.destroy();
+        return false;
+    },
+    moveup : function() {
+        this.model.trigger("up", this.model);
+        return false;
+    },
+    movedown : function() {
+        this.model.trigger("down", this.model);
+        return false;
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/TriangleRouteTotalView.js b/src/main/webapp/client/js/routing/views/TriangleRouteTotalView.js
new file mode 100644
index 00000000..6cc5eb50
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TriangleRouteTotalView.js
@@ -0,0 +1,25 @@
+var TriangleRouteTotalView = Backbone.View.extend({
+
+    templateName : "TriangleRouteTotal",
+    tagName: "tr",
+
+    initialize : function(options) {
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+
+        this.template = getTemplate(this.templateName);
+
+        if (this.model === undefined) {
+            throw "model is undefined";
+        }
+
+        _.bindAll(this, "render");
+        this.model.bind("change", this.render);
+        this.render();
+    },
+
+    render: function() {
+        var model = this.model.toJSON();
+        this.$el.html(this.template(model));
+    }
+});
diff --git a/src/main/webapp/client/js/routing/views/TriangleView.js b/src/main/webapp/client/js/routing/views/TriangleView.js
new file mode 100644
index 00000000..9ce3848e
--- /dev/null
+++ b/src/main/webapp/client/js/routing/views/TriangleView.js
@@ -0,0 +1,47 @@
+var TriangleView = Backbone.View.extend({
+
+    templateName: "TriangleView",
+    searchStatus: new SearchStatus(),
+
+    initialize: function (options) {
+        Helper.isDefined(options, "options");
+        Helper.isDefined(options.model, "options.model");
+        this.template = getTemplate(this.templateName);
+
+        if (this.model === undefined) {
+            throw "model is undefined";
+        }
+        _.bindAll(this, "render");
+
+        this.render();
+    },
+
+    render: function () {
+        var model = {};
+        this.$el.html(this.template(model));
+
+        this.trianglePointsView = new TrianglePointsView({
+            el: this.$(".points"),
+            model: this.model.get("points")
+        });
+
+        var geocodingModel = this.model.get('geocoding');
+        geocodingModel.set('searchStatus',this.searchStatus);
+
+        this.geocodingrequestview = new GeoCodingView({
+            el: this.$(".geocoding"),
+            model: geocodingModel
+        });
+
+        this.terminalsView = new TriangleDropDownWithAddButtonView({
+            el: this.$(".terminals"),
+            model: this.model.get("terminals")
+        });
+
+        this.seaportsView = new TriangleDropDownWithAddButtonView({
+            el: this.$(".seaports"),
+            model: this.model.get("seaports")
+        });
+    }
+
+});
diff --git a/src/main/webapp/decorators/minimal-template.jsp b/src/main/webapp/decorators/minimal-template.jsp
new file mode 100644
index 00000000..48d87ccb
--- /dev/null
+++ b/src/main/webapp/decorators/minimal-template.jsp
@@ -0,0 +1,50 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+    <title>
+        <decorator:title default="IRIS"/>
+    </title>
+
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <!-- Le styles -->
+    <link href="<c:url value="/client/css/bootstrap.min.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/css/custom.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/css/bootstrap-notify.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/js/lib/select2.css" />" rel="stylesheet"/>
+
+    <script src="<c:url value="/client/js/lib/jquery-1.10.2.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/jquery-migrate-1.2.1.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/bootstrap.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/bootstrap-notify.js" />"></script>
+    <script src="<c:url value="/client/js/lib/select2.js" />"></script>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <decorator:head/>
+
+</head>
+<body>
+<div class="container-fluid">
+    <div class="row-fluid" style="text-align: center; margin-top: 10px; margin-bottom: 10px;">
+        <img src="<c:url value="/template/style/pictures/logo/start.png" />" alt="logo"/>
+    </div>
+</div>
+
+<!-- CONTENT -->
+<decorator:body/>
+
+</body>
+</html>
diff --git a/src/main/webapp/decorators/template.jsp b/src/main/webapp/decorators/template.jsp
new file mode 100644
index 00000000..1ae91d10
--- /dev/null
+++ b/src/main/webapp/decorators/template.jsp
@@ -0,0 +1,162 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<%@ page session="false" %>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+
+    <title>
+        <decorator:title default="IRIS"/>
+    </title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <!-- Le styles -->
+    <link href="<c:url value="/client/css/bootstrap.min.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/css/custom.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/css/bootstrap-notify.css"/>" rel="stylesheet">
+    <link href="<c:url value="/client/js/lib/select2.css" />" rel="stylesheet"/>
+
+    <script src="<c:url value="/client/js/lib/jquery-1.10.2.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/jquery-migrate-1.2.1.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/bootstrap.min.js" />"></script>
+    <script src="<c:url value="/client/js/lib/bootstrap-notify.js" />"></script>
+    <script src="<c:url value="/client/js/lib/select2.js" />"></script>
+
+    <decorator:head/>
+</head>
+<body>
+
+<div class="header">
+    <div class="row-fluid">
+        <div class="container-fluid">
+            <ul class="nav nav-pills iris-nav-links">
+                <li>
+                    <a id="nav-index" href="<c:url value="/web/"/>"> <spring:message code="page.navbar.index"/></a>
+                </li>
+                <sec:authorize access="isAuthenticated()">
+                    <li>
+                        <a id="nav-trianglerouting" href="<c:url value="/web/triangle/"/>"><spring:message
+                                code="page.navbar.trianglerouting"/></a>
+                    </li>
+                    <li class="dropdown">
+                        <a id="nav-management" data-toggle="dropdown" class="dropdown-toggle" href="#">
+                            Management <b class="caret"></b>
+                        </a>
+
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a id="nav-terminal-management" href="<c:url value="/web/terminals/"/>"><spring:message
+                                        code="page.navbar.terminalmanagement"/></a>
+                            </li>
+                            <li>
+                                <a id="nav-seaport-management" href="<c:url value="/web/seaports/"/>"><spring:message
+                                        code="page.navbar.seaportmanagement"/></a>
+                            </li>
+                            <li>
+                                <a id="nav-connection-management"
+                                   href="<c:url value="/web/connections/"/>"><spring:message
+                                        code="page.navbar.connectionmanagement"/></a>
+                            </li>
+                            <li>
+                                <a id="nav-staticaddress-management"
+                                   href="<c:url value="/web/staticaddresses/"/>"><spring:message
+                                        code="page.navbar.staticaddresses"/></a>
+                            </li>
+                        </ul>
+                    </li>
+
+                    <ul class="nav pull-right">
+                        <li>
+                            <a id="logged-in-text" style="color: black;">Logged in as <sec:authentication
+                                    property="principal.username"/></a>
+                        </li>
+                        <li>
+                            <a id="logoutlink" href="<c:url value="/web/logout"/>">Logout</a>
+                        </li>
+                    </ul>
+                </sec:authorize>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <div class="header-title pull-right">
+            <span class="header-title-first-letters">IRI</span><span class="header-title-last-letters">S</span>
+        </div>
+        <div class="header-line"></div>
+        <div class="header-page-title pull-left">
+            <div class="row-fluid">
+                <c:choose>
+                    <c:when test="${requestScope['page.title']}">
+                        <spring:message var="title" code="${requestScope['page.title']}"/>
+                    </c:when>
+                    <c:otherwise>
+                        <c:set var="title" value="IRIS"/>
+                    </c:otherwise>
+                </c:choose>
+                <h2 id="page-title">
+                    <decorator:title default="IRIS"/>
+                </h2>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="container-fluid">
+    <div class="row-fluid">
+        <c:if test="${message != null}">
+            <div id="page-message" class="row-fluid message message-${fn:toLowerCase(message.type)} message-width">
+                <spring:message code="${message.message}"/>
+            </div>
+        </c:if>
+    </div>
+</div>
+
+<!-- CONTENT -->
+<decorator:body/>
+
+<!-- FOOTER -->
+<footer class="footer">
+    <div class="footer-border"></div>
+    <p class="pull-left">
+        <spring:message code="page.toTopScrollerToolTip" var="toTopScrollerToolTip"/>
+        <a class="to-top-scroller" href="" title="${toTopScrollerToolTip}"></a>
+    </p>
+</footer>
+
+<script type="text/javascript">
+    var helplinkanchor = "top";
+
+    function helpPopup(url, title) {
+
+        var complete = url + helplinkanchor;
+        var win = window.open(complete, title, "width=800,height=600,top=50,resizable=yes,scrollbars=yes");
+        win.focus();
+        return false;
+    }
+
+    function adjustHelpLink(anchor) {
+        helplinkanchor = anchor;
+    }
+
+    $(function () {
+        $("a.toTopScroller").click(function (event) {
+            event.preventDefault();
+            window.scrollTo(0, 0);
+        });
+
+    })
+</script>
+</body>
+</html>
diff --git a/src/main/webapp/images/back.png b/src/main/webapp/images/back.png
new file mode 100644
index 00000000..9e0b491e
Binary files /dev/null and b/src/main/webapp/images/back.png differ
diff --git a/src/main/webapp/images/down_black.png b/src/main/webapp/images/down_black.png
new file mode 100644
index 00000000..697a4593
Binary files /dev/null and b/src/main/webapp/images/down_black.png differ
diff --git a/src/main/webapp/images/top-scroller.png b/src/main/webapp/images/top-scroller.png
new file mode 100644
index 00000000..bea09852
Binary files /dev/null and b/src/main/webapp/images/top-scroller.png differ
diff --git a/src/main/webapp/images/up_black.png b/src/main/webapp/images/up_black.png
new file mode 100644
index 00000000..5c859344
Binary files /dev/null and b/src/main/webapp/images/up_black.png differ
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
new file mode 100644
index 00000000..60331345
--- /dev/null
+++ b/src/main/webapp/index.jsp
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<% response.sendRedirect("web"); %>
\ No newline at end of file
diff --git a/src/test/java/net/contargo/iris/BoundingBoxUnitTest.java b/src/test/java/net/contargo/iris/BoundingBoxUnitTest.java
new file mode 100644
index 00000000..212298cd
--- /dev/null
+++ b/src/test/java/net/contargo/iris/BoundingBoxUnitTest.java
@@ -0,0 +1,63 @@
+package net.contargo.iris;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class BoundingBoxUnitTest {
+
+    public static final BigDecimal EXPECTED_LATITUDE_LOWER_LEFT = new BigDecimal(
+            "179.910067980566537926279124803841114044189453125");
+    public static final BigDecimal EXPECTED_LONGITUDE_LOWER_LEFT = new BigDecimal(
+            "6.91006798056656634798855520784854888916015625");
+    public static final BigDecimal EXPECTED_LATITUDE_UPPER_RIGHT = new BigDecimal(
+            "0.08993201943346866567008390802584472112357616424560546875");
+    public static final BigDecimal EXPECTED_LONGITUDE_UPPER_RIGHT = new BigDecimal(
+            "7.08993201943349049543030560016632080078125");
+    public static final BigDecimal ORIGIN_LATITUDE = BigDecimal.ZERO;
+    public static final BigDecimal ORIGIN_LONGITUDE = new BigDecimal("7.0");
+    private static final BigDecimal MAX_LATITUDE = new BigDecimal("90");
+    private static final BigDecimal MAX_LONGITUDE = new BigDecimal("90");
+    private static final BigDecimal MIN_LONGITUDE = BigDecimal.ZERO;
+    private static final BigDecimal MIN_LATIITUDE = new BigDecimal("180");
+    private static final double RADIUS = 10.0;
+    private static final double RADIUS_TOO_HIGH = 1000000.0;
+
+    @Test
+    public void createBoundingBox() {
+
+        GeoLocation location = new GeoLocation(ORIGIN_LATITUDE, ORIGIN_LONGITUDE);
+
+        BoundingBox sut = new BoundingBox(location, RADIUS);
+
+        GeoLocation expectedLowerLeft = new GeoLocation(EXPECTED_LATITUDE_LOWER_LEFT, EXPECTED_LONGITUDE_LOWER_LEFT);
+        GeoLocation expectedUpperRight = new GeoLocation(EXPECTED_LATITUDE_UPPER_RIGHT, EXPECTED_LONGITUDE_UPPER_RIGHT);
+
+        assertThat(sut.getLowerLeft(), is(expectedLowerLeft));
+        assertThat(sut.getUpperRight(), is(expectedUpperRight));
+    }
+
+
+    @Test
+    public void createBoundingBoxLatitudeTooHigh() {
+
+        GeoLocation location = new GeoLocation(new BigDecimal("90.0"), ORIGIN_LONGITUDE);
+
+        BoundingBox sut = new BoundingBox(location, RADIUS_TOO_HIGH);
+
+        GeoLocation expectedLowerLeft = new GeoLocation(MAX_LATITUDE, MAX_LONGITUDE);
+        GeoLocation expectedUpperRight = new GeoLocation(MIN_LATIITUDE, MIN_LONGITUDE);
+
+        assertThat(sut.getLowerLeft(), is(expectedLowerLeft));
+        assertThat(sut.getUpperRight(), is(expectedUpperRight));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/MessageUnitTest.java b/src/test/java/net/contargo/iris/MessageUnitTest.java
new file mode 100644
index 00000000..859cb0d4
--- /dev/null
+++ b/src/test/java/net/contargo/iris/MessageUnitTest.java
@@ -0,0 +1,51 @@
+package net.contargo.iris;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class MessageUnitTest {
+
+    private static final String MESSAGE = "message";
+
+    @Test
+    public void createSuccessMessage() {
+
+        Message success = Message.success(MESSAGE);
+        assertThat(success.getMessage(), is(MESSAGE));
+        assertThat(success.getType(), is(Message.MessageType.SUCCESS));
+    }
+
+
+    @Test
+    public void createErrorMessage() {
+
+        Message error = Message.error(MESSAGE);
+        assertThat(error.getMessage(), is(MESSAGE));
+        assertThat(error.getType(), is(Message.MessageType.ERROR));
+    }
+
+
+    @Test
+    public void createWarningMessage() {
+
+        Message warning = Message.warning(MESSAGE);
+        assertThat(warning.getMessage(), is(MESSAGE));
+        assertThat(warning.getType(), is(Message.MessageType.WARNING));
+    }
+
+
+    @Test
+    public void toStringTest() {
+
+        String message = Message.success(MESSAGE).toString();
+        assertThat(message, endsWith("[type=SUCCESS,message=message]"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/Movement.java b/src/test/java/net/contargo/iris/Movement.java
new file mode 100644
index 00000000..37bf34f4
--- /dev/null
+++ b/src/test/java/net/contargo/iris/Movement.java
@@ -0,0 +1,53 @@
+package net.contargo.iris;
+
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteBuilder;
+import net.contargo.iris.route.RouteType;
+
+
+/**
+ * Helper class for {@link net.contargo.iris.Movement}s in unit tests.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class Movement {
+
+    private GeoLocation loc;
+    private RouteType type;
+    private ContainerType c;
+
+    Movement(GeoLocation loc, RouteType type, ContainerType c) {
+
+        this.loc = loc;
+        this.type = type;
+        this.c = c;
+    }
+
+    public static Movement to(GeoLocation loc, RouteType type) {
+
+        return new Movement(loc, type, null);
+    }
+
+
+    public static Movement to(GeoLocation loc, RouteType type, ContainerType c) {
+
+        return new Movement(loc, type, c);
+    }
+
+
+    public static Route move(GeoLocation start, ContainerType containerType, Movement... movements) {
+
+        RouteBuilder b = new RouteBuilder(start, containerType, null);
+
+        for (Movement m : movements) {
+            if (m.c != null) {
+                b.changeContainerType(m.c);
+            }
+
+            b.goTo(m.loc, m.type);
+        }
+
+        return b.getRoute();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/AddressUnitTest.java b/src/test/java/net/contargo/iris/address/AddressUnitTest.java
new file mode 100644
index 00000000..ab73708b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/AddressUnitTest.java
@@ -0,0 +1,144 @@
+package net.contargo.iris.address;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class AddressUnitTest {
+
+    Map<String, String> addressDetailsMap;
+
+    @Before
+    public void before() {
+
+        addressDetailsMap = new HashMap<>();
+        addressDetailsMap.put("postcode", "1234567");
+        addressDetailsMap.put("boundary", "boundary");
+        addressDetailsMap.put("suburb", "Hagsfeld");
+        addressDetailsMap.put("city", "Karlsruhe");
+    }
+
+
+    @Test
+    public void getNiceName() {
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+
+        assertThat(sut.getNiceName(), is("1234567 Karlsruhe (Hagsfeld)"));
+    }
+
+
+    @Test
+    public void getNiceNameWithEmptySuburb() {
+
+        addressDetailsMap.put("suburb", "");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+
+        assertThat(sut.getNiceName(), is("1234567 Karlsruhe"));
+    }
+
+
+    @Test
+    public void getNiceNameWithNullSuburb() {
+
+        addressDetailsMap.put("suburb", null);
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+
+        assertThat(sut.getNiceName(), is("1234567 Karlsruhe"));
+    }
+
+
+    @Test
+    public void getNiceNameWithNoSuburb() {
+
+        addressDetailsMap.remove("suburb");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+
+        assertThat(sut.getNiceName(), is("1234567 Karlsruhe"));
+    }
+
+
+    @Test
+    public void getNiceNameWithNullPostCode() {
+
+        addressDetailsMap.put("postcode", null);
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+
+        assertThat(sut.getNiceName(), is("boundary Karlsruhe (Hagsfeld)"));
+    }
+
+
+    @Test
+    public void getNiceNameWithNoCity() {
+
+        addressDetailsMap.remove("city");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+        sut.setShortName("Short Name");
+
+        assertThat(sut.getNiceName(), is("Short Name"));
+    }
+
+
+    @Test
+    public void testGetNiceNameWithNoBoundary() {
+
+        addressDetailsMap.remove("boundary");
+        addressDetailsMap.remove("postcode");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+        sut.setShortName("Short Name");
+
+        assertThat(sut.getNiceName(), is("Short Name"));
+    }
+
+
+    @Test
+    public void testGetNiceNameWithNoShortName() {
+
+        addressDetailsMap.remove("boundary");
+        addressDetailsMap.remove("postcode");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+        sut.setDisplayName("Display Name");
+
+        assertThat(sut.getNiceName(), is("Display Name"));
+    }
+
+
+    @Test
+    public void testGetNiceNameWithEmptyShortName() {
+
+        addressDetailsMap.remove("boundary");
+        addressDetailsMap.remove("postcode");
+
+        Address sut = new Address();
+        sut.setAddress(addressDetailsMap);
+        sut.setDisplayName("Display Name");
+        sut.setShortName("");
+
+        assertThat(sut.getNiceName(), is("Display Name"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/api/AddressApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/address/api/AddressApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..9583762f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/api/AddressApiControllerMvcUnitTest.java
@@ -0,0 +1,164 @@
+package net.contargo.iris.address.api;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.AddressDtoService;
+import net.contargo.iris.address.dto.AddressListDto;
+import net.contargo.iris.address.nominatim.service.AddressDetailKey;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * MVC Unit test of {@link AddressApiController}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class AddressApiControllerMvcUnitTest {
+
+    static final int OSM_ID = 12;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+    @Autowired
+    private AddressDtoService addressDtoServiceMock;
+
+    @Before
+    public void setUp() throws Exception {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+
+        Address address = new Address();
+        address.setDisplayName("76137 Karlsruhe");
+        address.setLatitude(BigDecimal.ONE);
+        address.setLongitude(BigDecimal.ONE);
+
+        AddressDto addressDto = new AddressDto(address);
+        when(addressDtoServiceMock.getAddressByOsmId(AddressApiControllerMvcUnitTest.OSM_ID)).thenReturn(addressDto);
+        when(addressDtoServiceMock.wrapInListOfAddressLists(any(AddressDto.class))).thenReturn(Arrays.asList(
+                new AddressListDto("Result", Arrays.asList(addressDto))));
+        when(addressDtoServiceMock.getAddressForGeoLocation(new GeoLocation(BigDecimal.ONE, BigDecimal.ONE)))
+            .thenReturn(addressDto);
+
+        Map<String, String> addressDetails = new HashMap<>();
+        addressDetails.put(AddressDetailKey.CITY.getKey(), "Karlsruhe");
+        addressDetails.put(AddressDetailKey.NAME.getKey(), "zkm");
+        when(addressDtoServiceMock.getAddressesByDetails(addressDetails)).thenReturn(Arrays.asList(
+                new AddressListDto("name1", Arrays.asList(addressDto))));
+        when(addressDtoServiceMock.getAddressesByDetailsPlain(addressDetails)).thenReturn(Arrays.asList(addressDto));
+        when(addressDtoServiceMock.getAddressesWherePlaceIsIn(1L)).thenReturn(Arrays.asList(addressDto));
+    }
+
+
+    @Test
+    public void testAddressByOsmId() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/osmaddresses/" + OSM_ID).accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.addresses[0].addresses[0].displayName",
+                    is("76137 Karlsruhe"))));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.links", empty())));
+    }
+
+
+    @Test
+    public void testAddressByGeolocation() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get(
+                    "/reversegeocode/" + BigDecimal.ONE + ":" + BigDecimal.ONE + "/").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+        resultActions.andExpect((jsonPath("$.reverseGeocodeResponse.address.displayName", is("76137 Karlsruhe"))));
+        resultActions.andExpect((jsonPath("$.reverseGeocodeResponse.links", hasSize(1))));
+        resultActions.andExpect((jsonPath("$.reverseGeocodeResponse.links[0].rel", is("self"))));
+        resultActions.andExpect((jsonPath("$.reverseGeocodeResponse.links[0].href",
+                    is("http://localhost/reversegeocode/1:1/"))));
+    }
+
+
+    @Test
+    public void testAddressByAddressDetails() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/geocodes/?city=Karlsruhe&name=zkm").accept(
+                    APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.addresses[0].addresses[0].displayName",
+                    is("76137 Karlsruhe"))));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.links", hasSize(1))));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.links[0].rel", is("self"))));
+        resultActions.andExpect((jsonPath("$.geoCodeResponse.links[0].href",
+                    is("http://localhost/geocodes?city=Karlsruhe&name=zkm"))));
+    }
+
+
+    @Test
+    public void testAddressByAddressDetailsPlain() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/simplegeocodes/?city=Karlsruhe&name=zkm").accept(
+                    APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+        resultActions.andExpect((jsonPath("$.simpleGeoCodeResponse.addresses[0].displayName", is("76137 Karlsruhe"))));
+        resultActions.andExpect((jsonPath("$.simpleGeoCodeResponse.links", hasSize(1))));
+        resultActions.andExpect((jsonPath("$.simpleGeoCodeResponse.links[0].rel", is("self"))));
+        resultActions.andExpect((jsonPath("$.simpleGeoCodeResponse.links[0].href",
+                    is("http://localhost/simplegeocodes?city=Karlsruhe&name=zkm"))));
+    }
+
+
+    @Test
+    public void testAddressByPlaceId() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/places/1/addresses").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk()).andExpect(content().contentType("application/json")).andExpect(
+            (jsonPath("$.addresses[0].displayName", is("76137 Karlsruhe"))));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/dto/AddressDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/address/dto/AddressDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..7e6e5f03
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/dto/AddressDtoServiceImplUnitTest.java
@@ -0,0 +1,163 @@
+package net.contargo.iris.address.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.nominatim.service.AddressService;
+import net.contargo.iris.address.service.AddressServiceWrapper;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * Unit test of {@link AddressDtoServiceImpl}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class AddressDtoServiceImplUnitTest {
+
+    private static final int OSM_ID = 1;
+    private static final GeoLocation GEOLOCATION = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+    private static final Long PLACE_ID = 1L;
+    private final AddressService addressServiceMock = mock(AddressService.class);
+    private final AddressServiceWrapper addressServiceWrapperMock = mock(AddressServiceWrapper.class);
+    private final AddressDtoServiceImpl sut = new AddressDtoServiceImpl(addressServiceMock, addressServiceWrapperMock);
+    Address address = new Address(BigDecimal.ONE, BigDecimal.ONE);
+    private Map<String, String> addressDetails;
+
+    @Before
+    public void setUp() throws Exception {
+
+        addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), "city");
+        addressDetails.put(STREET.getKey(), "street");
+        addressDetails.put(POSTAL_CODE.getKey(), "postalcode");
+        addressDetails.put(NAME.getKey(), "name");
+        addressDetails.put(COUNTRY.getKey(), "country");
+    }
+
+
+    @Test
+    public void testGetAddressByOsmId() {
+
+        when(addressServiceMock.getAddressByOsmId(OSM_ID)).thenReturn(address);
+
+        AddressDto expectedAddress = new AddressDto(address);
+        AddressDto actualAddress = sut.getAddressByOsmId(OSM_ID);
+        assertReflectionEquals(actualAddress, expectedAddress);
+    }
+
+
+    @Test
+    public void testGetAddressByOsmIdNull() {
+
+        AddressDto actualAddress = sut.getAddressByOsmId(OSM_ID);
+        assertThat(actualAddress, nullValue());
+    }
+
+
+    @Test
+    public void testWrapInListOfAddressLists() {
+
+        Address address = new Address("Karlsruhe");
+        AddressDto addressDto = new AddressDto(address);
+        List<AddressListDto> actualListOfLists = sut.wrapInListOfAddressLists(addressDto);
+        assertThat(actualListOfLists.get(0).getAddresses().get(0), is(addressDto));
+    }
+
+
+    @Test
+    public void testReverseLookupAddress() {
+
+        when(addressServiceWrapperMock.getAddressForGeoLocation(GEOLOCATION)).thenReturn(address);
+
+        AddressDto expectedAddress = new AddressDto(address);
+        AddressDto actualAddress = sut.getAddressForGeoLocation(GEOLOCATION);
+        assertReflectionEquals(actualAddress, expectedAddress);
+    }
+
+
+    @Test
+    public void testReverseLookupAddressNull() {
+
+        AddressDto actualAddress = sut.getAddressForGeoLocation(GEOLOCATION);
+        assertThat(actualAddress, nullValue());
+    }
+
+
+    @Test
+    public void testGetAddressesByDetails() {
+
+        Address secondAddress = new Address(BigDecimal.TEN, BigDecimal.TEN);
+        List<AddressList> addressListList = Arrays.asList(new AddressList("name1", Arrays.asList(address)),
+                new AddressList("name2", Arrays.asList(secondAddress)));
+        when(addressServiceWrapperMock.getAddressesByDetails(addressDetails)).thenReturn(addressListList);
+
+        List<AddressListDto> expectedAddressListDtoList = Arrays.asList(new AddressListDto("name1",
+                    Arrays.asList(new AddressDto(address))),
+                new AddressListDto("name2", Arrays.asList(new AddressDto(secondAddress))));
+
+        List<AddressListDto> actualAddressListDtoList = sut.getAddressesByDetails(addressDetails);
+        assertThat(actualAddressListDtoList.size(), is(expectedAddressListDtoList.size()));
+        assertReflectionEquals(actualAddressListDtoList.get(0).getParentAddress(),
+            expectedAddressListDtoList.get(0).getParentAddress());
+        assertReflectionEquals(actualAddressListDtoList.get(0).getAddresses(),
+            expectedAddressListDtoList.get(0).getAddresses());
+        assertReflectionEquals(actualAddressListDtoList.get(1).getParentAddress(),
+            expectedAddressListDtoList.get(1).getParentAddress());
+        assertReflectionEquals(actualAddressListDtoList.get(1).getAddresses(),
+            expectedAddressListDtoList.get(1).getAddresses());
+    }
+
+
+    @Test
+    public void testGetAddressesByDetailsPlain() {
+
+        Address secondAddress = new Address(BigDecimal.TEN, BigDecimal.TEN);
+        List<AddressList> addressListList = Arrays.asList(new AddressList("name1", Arrays.asList(address)),
+                new AddressList("name2", Arrays.asList(secondAddress)));
+        when(addressServiceWrapperMock.getAddressesByDetails(addressDetails)).thenReturn(addressListList);
+
+        List<AddressDto> expectedAddressDtoList = Arrays.asList(new AddressDto(address), new AddressDto(secondAddress));
+
+        List<AddressDto> actualAddressDtoList = sut.getAddressesByDetailsPlain(addressDetails);
+        assertReflectionEquals(actualAddressDtoList, expectedAddressDtoList);
+    }
+
+
+    @Test
+    public void testGetAddressesWherePlaceIsIn() {
+
+        Address secondAddress = new Address(BigDecimal.TEN, BigDecimal.TEN);
+        when(addressServiceMock.getAdressesWherePlaceIsIn(PLACE_ID)).thenReturn(Arrays.asList(address, secondAddress));
+
+        List<AddressDto> expectedAddressList = Arrays.asList(new AddressDto(address), new AddressDto(secondAddress));
+
+        List<AddressDto> actualAddressList = sut.getAddressesWherePlaceIsIn(PLACE_ID);
+        assertReflectionEquals(actualAddressList, expectedAddressList);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/AddressServiceHelperUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/AddressServiceHelperUnitTest.java
new file mode 100644
index 00000000..b936109f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/AddressServiceHelperUnitTest.java
@@ -0,0 +1,57 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.address.Address;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasItem;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test of {@link AddressServiceHelper}.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class AddressServiceHelperUnitTest {
+
+    @Test
+    public void mergeSearchResultsWithoutDuplications() {
+
+        Address address1 = new Address();
+        address1.setLatitude(BigDecimal.ZERO);
+        address1.setLongitude(BigDecimal.ZERO);
+
+        Address address2 = new Address();
+        address2.setLatitude(BigDecimal.ONE);
+        address2.setLongitude(BigDecimal.ONE);
+
+        Address address3 = new Address(); // equals address1
+        address3.setLatitude(BigDecimal.ZERO);
+        address3.setLongitude(BigDecimal.ZERO);
+
+        Address address4 = new Address(); // equals address2
+        address4.setLatitude(BigDecimal.ONE);
+        address4.setLongitude(BigDecimal.ONE);
+
+        AddressServiceHelper sut = new AddressServiceHelper();
+
+        List<Address> mergeResult = sut.mergeSearchResultsWithoutDuplications(asList(address1, address2),
+                asList(address3, address4));
+
+        assertThat(mergeResult, hasItem(address2));
+        assertThat(mergeResult, hasItem(address1));
+
+        mergeResult = sut.mergeSearchResultsWithoutDuplications(asList(address3, address4), asList(address1, address2));
+        assertThat(mergeResult, hasItem(address2));
+        assertThat(mergeResult, hasItem(address1));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/AddressSorterUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/AddressSorterUnitTest.java
new file mode 100644
index 00000000..39c5b4a6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/AddressSorterUnitTest.java
@@ -0,0 +1,55 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.gis.service.GisService;
+import net.contargo.iris.gis.service.GisServiceImpl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class AddressSorterUnitTest {
+
+    private GisService gisServiceMock;
+
+    private AddressSorter sut;
+
+    @Before
+    public void setUp() {
+
+        gisServiceMock = mock(GisServiceImpl.class);
+        sut = new AddressSorter(gisServiceMock);
+    }
+
+
+    @Test
+    public void testCompare() {
+
+        Address addressFar = new Address();
+        addressFar.setLatitude(BigDecimal.TEN);
+        addressFar.setLongitude(BigDecimal.TEN);
+
+        Address addressNear = new Address();
+        addressNear.setLatitude(BigDecimal.ONE);
+        addressNear.setLongitude(BigDecimal.ONE);
+
+        when(gisServiceMock.calcAirLineDistInMeters(addressFar, GisService.CENTER_OF_THE_EUROPEAN_UNION)).thenReturn(
+            BigDecimal.TEN);
+        when(gisServiceMock.calcAirLineDistInMeters(addressNear, GisService.CENTER_OF_THE_EUROPEAN_UNION)).thenReturn(
+            BigDecimal.ONE);
+
+        assertThat(sut.compare(addressFar, addressNear), is(1));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/AddressValidatorUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/AddressValidatorUnitTest.java
new file mode 100644
index 00000000..6e136452
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/AddressValidatorUnitTest.java
@@ -0,0 +1,48 @@
+package net.contargo.iris.address.nominatim.service;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de *
+ */
+public class AddressValidatorUnitTest {
+
+    private static final String VALID_STREET = "validStreet";
+    private static final String VALID_STREET_NULL = null;
+    private static final String INVALID_STREET_TOO_SHORT = "a";
+    private static final String RESULT_WHEN_INVALID = "";
+    private AddressValidator sut;
+
+    @Before
+    public void setUp() {
+
+        sut = new AddressValidator();
+    }
+
+
+    @Test
+    public void testValidateStreetSuccessNormal() {
+
+        assertThat(sut.validateStreet(VALID_STREET), is(VALID_STREET));
+    }
+
+
+    @Test
+    public void testValidateStreetSuccessStreetNull() {
+
+        assertThat(sut.validateStreet(VALID_STREET_NULL), is(VALID_STREET_NULL));
+    }
+
+
+    @Test
+    public void testValidateStreetFailTooShort() {
+
+        assertThat(sut.validateStreet(INVALID_STREET_TOO_SHORT), is(RESULT_WHEN_INVALID));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceIntegrationTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceIntegrationTest.java
new file mode 100644
index 00000000..c0d338b4
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceIntegrationTest.java
@@ -0,0 +1,77 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.address.Address;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+
+
+/**
+ * Test for Geo-coding (resolving addresses to geo coordinates) with {@link NominatimAddressService} using
+ * http://nominatim.openstreetmap.org.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+public class NominatimAddressServiceIntegrationTest {
+
+    @Autowired
+    private AddressService addressService;
+
+    @Test
+    public void resolve() {
+
+        Map<String, String> addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), "city");
+        addressDetails.put(STREET.getKey(), "street");
+        addressDetails.put(POSTAL_CODE.getKey(), "postalcode");
+        addressDetails.put(NAME.getKey(), "name");
+        addressDetails.put(COUNTRY.getKey(), "country");
+
+        List<Address> addresses = addressService.getAddressesByDetails(addressDetails);
+
+        // assert that there is a result
+        assertFalse(addresses.isEmpty());
+        assertThat(addresses.size(), is(greaterThanOrEqualTo(1)));
+    }
+
+
+    @Test
+    public void resolveByName() {
+
+        Map<String, String> addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), "city");
+        addressDetails.put(NAME.getKey(), "name");
+
+        List<Address> addresses = addressService.getAddressesByDetails(addressDetails);
+
+        // assert that there is a result
+        assertFalse(addresses.isEmpty());
+        assertThat(addresses.size(), greaterThanOrEqualTo(1));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceUnitTest.java
new file mode 100644
index 00000000..88ac29bf
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimAddressServiceUnitTest.java
@@ -0,0 +1,276 @@
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.util.HttpUtilException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyListOf;
+import static org.mockito.Matchers.anyString;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link NominatimAddressService}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class NominatimAddressServiceUnitTest {
+
+    private static final int OSM_ID = 77;
+    private static final String DUMMY_URL = "dummyUrl";
+    private static final long OSM_PLACE_ID = 99L;
+
+    private static final String urlNormal = "street, postalCode, city, country";
+
+    private static final String urlByName = "null, postalCode, city, country, name";
+    private static final String urlByStreet = "street, postalCode, city, country, null";
+
+    private NominatimAddressService sut;
+
+    @Mock
+    private NominatimUrlBuilder nominatimUrlBuilderMock;
+    @Mock
+    private NominatimJsonResponseParser nominatimResponderMock;
+    @Mock
+    private AddressSorter addressSorterMock;
+    @Mock
+    private AddressValidator addressValidatorMock;
+    @Mock
+    private AddressServiceHelper addressHelperMock;
+
+    private Map<String, String> addressDetails;
+    private Address a1;
+    private Address a2;
+    private Address a3;
+    private Address a4;
+
+    @Before
+    public void setup() {
+
+        sut = new NominatimAddressService(nominatimUrlBuilderMock, nominatimResponderMock, addressSorterMock,
+                addressHelperMock, addressValidatorMock);
+
+        a1 = new Address();
+        a1.setOsmId(1L);
+
+        a2 = new Address();
+        a2.setOsmId(2L);
+
+        a3 = new Address();
+        a3.setOsmId(3L);
+
+        a4 = new Address();
+        a4.setOsmId(4L);
+
+        // the simple case
+        when(nominatimResponderMock.getAddressesForUrl(urlNormal)).thenReturn(asList(a1, a2, a3, a4));
+
+        // the complex case: searching by name
+        when(nominatimResponderMock.getAddressesForUrl(urlByName)).thenReturn(asList(a3, a4));
+        when(nominatimResponderMock.getAddressesForUrl(urlByStreet)).thenReturn(asList(a1, a3));
+
+        when(addressSorterMock.compare(any(Address.class), any(Address.class))).thenReturn(1);
+        when(addressValidatorMock.validateStreet(anyString())).then(returnsFirstArg());
+        when(addressHelperMock.mergeSearchResultsWithoutDuplications(anyListOf(Address.class),
+                anyListOf(Address.class))).then(returnsFirstArg());
+
+        addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), "city");
+        addressDetails.put(STREET.getKey(), "street");
+        addressDetails.put(POSTAL_CODE.getKey(), "postalcode");
+        addressDetails.put(NAME.getKey(), "name");
+        addressDetails.put(COUNTRY.getKey(), "country");
+    }
+
+
+    @Test
+    public void testResolveSimpleCaseNameIsNull() {
+
+        when(nominatimUrlBuilderMock.buildUrl("karlstrasse 68", "76137", "karlsruhe", "de", null)).thenReturn(
+            urlNormal);
+
+        List<Address> addresses = sut.resolveWithNominatim("karlstrasse 68", "76137", "karlsruhe", "de", null);
+
+        assertThat(addresses, hasSize(4));
+        assertThat(addresses, hasItems(a1, a2, a3, a4));
+    }
+
+
+    @Test
+    public void testResolveSimpleCaseStreetIsNull() {
+
+        when(nominatimUrlBuilderMock.buildUrl(null, "76137", "karlsruhe", "de", "synyx")).thenReturn(urlNormal);
+
+        List<Address> addresses = sut.resolveWithNominatim(null, "76137", "karlsruhe", "de", "synyx");
+
+        assertThat(addresses, hasSize(4));
+        assertThat(addresses, hasItems(a1, a2, a3, a4));
+    }
+
+
+    @Test
+    public void testResolveComplexCase() {
+
+        when(nominatimUrlBuilderMock.buildUrl("karlstrasse 68", "76137", "karlsruhe", "de", null)).thenReturn(
+            urlByStreet);
+        when(nominatimUrlBuilderMock.buildUrl(null, "76137", "karlsruhe", "de", "synyx")).thenReturn(urlByName);
+
+        List<Address> addresses = sut.resolveWithNominatim("karlstrasse 68", "76137", "karlsruhe", "de", "synyx");
+
+        // Show that there is no duplication: Address a3 is only one time in List
+        assertThat(addresses, hasSize(2));
+        assertThat(addresses, hasItems(a3, a4));
+    }
+
+
+    @Test
+    public void reverseLookupAddress() {
+
+        BigDecimal lat = new BigDecimal(48.07506);
+        BigDecimal lon = new BigDecimal(8.6362987);
+        GeoLocation geoLocation = new GeoLocation(lat, lon);
+
+        Address address = new Address(lat, lon);
+
+        when(nominatimUrlBuilderMock.buildUrl(geoLocation)).thenReturn("url");
+        when(nominatimResponderMock.getAddressForUrl("url")).thenReturn(address);
+
+        Address result = sut.getAddressByGeolocation(geoLocation);
+
+        assertThat(result.getLatitude(), closeTo(lat, new BigDecimal("0.001")));
+        assertThat(result.getLongitude(), closeTo(lon, new BigDecimal("0.001")));
+
+        verify(nominatimUrlBuilderMock).buildUrl(geoLocation);
+        verify(nominatimResponderMock).getAddressForUrl("url");
+    }
+
+
+    @Test
+    public void testGetAddressByOsmId() {
+
+        Address expectedAddress = new Address();
+        expectedAddress.setDisplayName("Alleinstellungsmerkmal für die expectedAddress");
+
+        when(nominatimUrlBuilderMock.buildOsmUrl(OSM_ID)).thenReturn(DUMMY_URL);
+        when(nominatimResponderMock.getAddressesForUrlForOsmId(DUMMY_URL)).thenReturn(asList(expectedAddress));
+
+        Address actualAddress = sut.getAddressByOsmId(OSM_ID);
+
+        assertThat(actualAddress, is(expectedAddress));
+    }
+
+
+    @Test
+    public void testGetAdressesWherePlaceIsIn() {
+
+        Address expectedAddress1 = new Address();
+        expectedAddress1.setDisplayName("Alleinstellungsmerkmal für die expectedAddress1");
+
+        Address expectedAddress2 = new Address();
+        expectedAddress2.setDisplayName("Alleinstellungsmerkmal für die expectedAddress2");
+
+        List<Address> expectedAddresses = asList(expectedAddress1, expectedAddress2);
+
+        when(nominatimUrlBuilderMock.buildSuburbUrl(OSM_PLACE_ID, SuburbType.ADDRESSES.getType())).thenReturn(
+            DUMMY_URL);
+        when(nominatimResponderMock.getAddressesForUrl(DUMMY_URL)).thenReturn(asList(expectedAddress1,
+                expectedAddress2));
+
+        List<Address> actualAddresses = sut.getAdressesWherePlaceIsIn(OSM_PLACE_ID);
+        assertThat(actualAddresses, is(expectedAddresses));
+    }
+
+
+    @Test
+    public void testResolveWithFallbacks() {
+
+        Address expectedAddress1 = new Address();
+        expectedAddress1.setDisplayName("Alleinstellungsmerkmal für die expectedAddress1");
+
+        Address expectedAddress2 = new Address();
+        expectedAddress2.setDisplayName("Alleinstellungsmerkmal für die expectedAddress2");
+
+        when(nominatimUrlBuilderMock.buildSuburbUrl(OSM_PLACE_ID, SuburbType.ADDRESSES.getType())).thenReturn(
+            DUMMY_URL);
+        when(nominatimResponderMock.getAddressesForUrl(anyString())).thenReturn(asList(expectedAddress1,
+                expectedAddress2));
+
+        List<Address> actualList = sut.getAddressesByDetails(addressDetails);
+        assertThat(actualList, contains(expectedAddress1, expectedAddress2));
+    }
+
+
+    @Test
+    public void testResolveWithFallbacksNoAddressesFound() {
+
+        Address expectedAddress1 = new Address();
+        expectedAddress1.setDisplayName("Alleinstellungsmerkmal für die expectedAddress1");
+
+        Address expectedAddress2 = new Address();
+        expectedAddress2.setDisplayName("Alleinstellungsmerkmal für die expectedAddress2");
+
+        when(nominatimUrlBuilderMock.buildSuburbUrl(OSM_PLACE_ID, SuburbType.ADDRESSES.getType())).thenReturn(
+            DUMMY_URL);
+        when(nominatimResponderMock.getAddressesForUrl(anyString())).thenReturn(Collections.<Address>emptyList());
+
+        List<Address> actualList = sut.getAddressesByDetails(addressDetails);
+        assertThat(actualList, empty());
+    }
+
+
+    @Test(expected = AddressResolutionException.class)
+    public void getAddressByGeolocationIllegalArgument() {
+
+        when(nominatimUrlBuilderMock.buildUrl(a1)).thenThrow(new IllegalArgumentException());
+        sut.getAddressByGeolocation(a1);
+    }
+
+
+    @Test(expected = AddressResolutionException.class)
+    public void getAddressByGeolocationHttpUtilError() {
+
+        when(nominatimUrlBuilderMock.buildUrl(a1)).thenReturn("foo");
+        when(nominatimResponderMock.getAddressForUrl("foo")).thenThrow(new HttpUtilException("", new Throwable()));
+        sut.getAddressByGeolocation(a1);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParserUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParserUnitTest.java
new file mode 100644
index 00000000..57cf9a4d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimJsonResponseParserUnitTest.java
@@ -0,0 +1,162 @@
+package net.contargo.iris.address.nominatim.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.util.HttpUtil;
+import net.contargo.iris.util.InputStreamUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Matchers.anyString;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link NominatimJsonResponseParser} using constant file with address entries in Json format.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class NominatimJsonResponseParserUnitTest {
+
+    private static final String FILE = "nominatim/json_sample.json";
+    private static final String FILE_SINGLE_RESULT = "nominatim/json_sample_single_result.json";
+    private static final int DELTA = 1;
+    private static final String REQUEST =
+        "http://maps.contargo.net/nominatim/reverse/?format=json&lat=48.0750600000&lon=8.6362987000";
+    private static final String ADDRESS =
+        "Fotostudio Becker, 68, Karlstrasse, Suedweststadt, Karlsruhe, Regierungsbezirk Karlsruhe, Baden-Wuerttemberg, 76137, Federal Republic of Germany (land mass)";
+    private static final String ADDRESS_EBERHARDSTR =
+        "Eberhardstraße, Schura, Trossingen, Landkreis Tuttlingen, Regierungsbezirk Freiburg, Baden-Württemberg, 78647, Germany";
+
+    private NominatimJsonResponseParser sut;
+
+    @Mock
+    private HttpUtil httpUtilMock;
+
+    private InputStream in;
+
+    @Before
+    public void setup() {
+
+        in = InputStreamUtil.getFileInputStream(FILE);
+
+        sut = new NominatimJsonResponseParser(httpUtilMock, new ObjectMapper());
+    }
+
+
+    @After
+    public void tearDown() throws IOException {
+
+        in.close();
+    }
+
+
+    @Test
+    public void getAddressesForUrl() throws IOException {
+
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(InputStreamUtil.convertInputStreamToString(in));
+
+        List<Address> addresses = sut.getAddressesForUrl("foo");
+        assertThat(addresses.size(), is(5));
+
+        Address address = addresses.get(0);
+        assertThat(address.getDisplayName(), is(ADDRESS));
+        assertThat(address.getOsmId(), is(90085697L));
+        assertThat(address.getLatitude().doubleValue(), closeTo(49.002095196515d, DELTA));
+        assertThat(address.getLongitude().doubleValue(), closeTo(8.39391718305592d, DELTA));
+    }
+
+
+    @Test
+    public void getAddressesForUrlForOsmId() throws IOException {
+
+        in = InputStreamUtil.getFileInputStream(FILE_SINGLE_RESULT);
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(InputStreamUtil.convertInputStreamToString(in));
+
+        List<Address> addresses = sut.getAddressesForUrlForOsmId("foo");
+        assertThat(addresses.size(), is(1));
+
+        Address address = addresses.get(0);
+        assertThat(address.getDisplayName(), is(ADDRESS));
+        assertThat(address.getOsmId(), is(90085697L));
+        assertThat(address.getLatitude().doubleValue(), closeTo(49.002095196515d, DELTA));
+        assertThat(address.getLongitude().doubleValue(), closeTo(8.39391718305592d, DELTA));
+    }
+
+
+    @Test
+    public void noResponse() {
+
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(null);
+
+        List<Address> addresses = sut.getAddressesForUrl("foo");
+        assertThat(addresses, nullValue());
+    }
+
+
+    @Test
+    public void getCountryCode() throws IOException {
+
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(InputStreamUtil.convertInputStreamToString(in));
+
+        Address address = sut.getAddressesForUrl("foo").get(0);
+        assertThat(address.getCountryCode(), is("de"));
+    }
+
+
+    @Test
+    public void getAddressForUrl() {
+
+        when(httpUtilMock.getResponseContent(REQUEST)).thenReturn(getResponse());
+
+        String displayName = sut.getAddressForUrl(REQUEST).getDisplayName();
+        assertThat(displayName, is(ADDRESS_EBERHARDSTR));
+    }
+
+
+    @Test
+    public void getAddressForUrlRequestNull() {
+
+        when(httpUtilMock.getResponseContent(REQUEST)).thenReturn(getResponse());
+
+        Address address = sut.getAddressForUrl(null);
+        assertThat(address, nullValue());
+    }
+
+
+    private String getResponse() {
+
+        return "{" + "\"place_id\":\"36907539\"," + "\"licence\":\"Data \\u00a9 OpenStreetMap contributors"
+            + ", ODbL 1.0. http:\\/\\/www.openstreetmap.org\\/copyright\"," + "\"osm_type\":\"way\","
+            + "\"osm_id\":\"23515787\"," + "\"lat\":\"48.0743824\"," + "\"lon\":\"8.6358638\","
+            + "\"display_name\":\"Eberhardstra\\u00dfe, Schura, Trossingen, Landkreis Tuttlingen"
+            + ", Regierungsbezirk Freiburg, Baden-W\\u00fcrttemberg, 78647, Germany\"," + "\"address\":{"
+            + "\"road\":\"Eberhardstra\\u00dfe\"," + "\"suburb\":\"Schura\"," + "\"city\":\"Trossingen\","
+            + "\"county\":\"Landkreis Tuttlingen\"," + "\"state_district\":\"Regierungsbezirk Freiburg\","
+            + "\"state\":\"Baden-W\\u00fcrttemberg\"," + "\"postcode\":\"78647\"," + "\"country\":\"Germany\","
+            + "\"country_code\":\"de\"" + "}}";
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilderUnitTest.java b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilderUnitTest.java
new file mode 100644
index 00000000..20e7278c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/nominatim/service/NominatimUrlBuilderUnitTest.java
@@ -0,0 +1,225 @@
+
+package net.contargo.iris.address.nominatim.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.countries.service.CountryService;
+
+import org.hamcrest.MatcherAssert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.anyOf;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.startsWith;
+
+import static org.junit.Assert.assertThat;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link NominatimUrlBuilder}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class NominatimUrlBuilderUnitTest {
+
+    private static final int OSM_ID = 77;
+    private static final int PLACE_ID = 42;
+
+    private NominatimUrlBuilder sut;
+
+    @Mock
+    private CountryService countryServiceMock;
+
+    @Before
+    public void setup() {
+
+        String baseUrl = "http://maps.contargo.net/nominatim/";
+        String language = "de";
+
+        Map<String, String> countryMap = new HashMap<>();
+        countryMap.put("Netherlands", "NL");
+        countryMap.put("Germany", "DE");
+
+        when(countryServiceMock.getCountries()).thenReturn(countryMap);
+
+        sut = new NominatimUrlBuilder(baseUrl, language, countryServiceMock);
+    }
+
+
+    @Test
+    public void testConstructorAndBuildUrl() {
+
+        String url = sut.buildUrl("karlstrasse 68", "76137", "karlsruhe", "de", null);
+
+        assertThat(url, startsWith("http://maps.contargo.net/nominatim/search.php?"));
+        assertThat(url, containsString("accept-language=de"));
+        assertThat(url, containsString("format=json"));
+
+        // URL encoding results in: whitespaces are replaced by plus and commas by %2C
+        assertThat(url, containsString("karlstrasse+68%2C76137+karlsruhe"));
+        assertThat(url, containsString("countrycodes=de"));
+    }
+
+
+    @Test
+    public void testBuildUrlWithNoCountryGiven() {
+
+        String url = sut.buildUrl(null, null, "karlsruhe", null, null);
+
+        assertThat(url, startsWith("http://maps.contargo.net/nominatim/search.php?"));
+        assertThat(url, containsString("accept-language=de"));
+        assertThat(url, containsString("format=json"));
+        assertThat(url, containsString("karlsruhe"));
+
+        assertThat(url, anyOf(containsString("countrycodes=DE%2CNL"), containsString("countrycodes=NL%2CDE")));
+    }
+
+
+    @Test
+    public void testConstructorAndBuildUrlWithSpecialPhrases() {
+
+        String url = sut.buildSpecialPhrasesUrl("karlsruhe", "suburb");
+
+        assertThat(url, startsWith("http://maps.contargo.net/nominatim/search.php?"));
+        assertThat(url, containsString("accept-language=de"));
+        assertThat(url, containsString("format=json"));
+        assertThat(url, containsString("q=suburb+karlsruhe"));
+        assertThat(url, containsString("addressdetails=1"));
+        assertThat(url, containsString("limit=100"));
+    }
+
+
+    @Test
+    public void testBuildQuery() {
+
+        // URL encoding results in: whitespaces are replaced by plus and commas by %2C
+
+        String query = sut.buildQuery("karlstrasse 68", "76137", "karlsruhe", null);
+        assertThat(query, containsString("karlstrasse+68%2C76137+karlsruhe"));
+
+        query = sut.buildQuery("karlstrasse 68", "76137", "karlsruhe", null);
+        assertThat(query, containsString("karlstrasse+68%2C76137+karlsruhe"));
+
+        query = sut.buildQuery("", "", "karlsruhe", null);
+        assertThat(query, containsString("karlsruhe"));
+
+        query = sut.buildQuery(null, "76137", "karlsruhe", "Fotostudio Becker");
+        assertThat(query, containsString("76137+karlsruhe+Fotostudio+Becker"));
+    }
+
+
+    @Test
+    public void testBuildSpecialPhraseQuery() {
+
+        String query = sut.buildSpecialPhraseQuery("karlsruhe", "suburb");
+        assertThat(query, containsString("suburb+karlsruhe"));
+    }
+
+
+    @Test
+    public void testAppendStringWithSeparatorIfHasText() {
+
+        StringBuilder builder = new StringBuilder();
+        sut.appendStringWithSeparatorIfHasText(builder, null, " ");
+        assertThat(builder.toString(), isEmptyString());
+
+        builder = new StringBuilder();
+        sut.appendStringWithSeparatorIfHasText(builder, "", " ");
+        assertThat(builder.toString(), isEmptyString());
+
+        builder = new StringBuilder();
+        sut.appendStringWithSeparatorIfHasText(builder, " ", ",");
+        assertThat(builder.toString(), isEmptyString());
+
+        builder = new StringBuilder();
+        sut.appendStringWithSeparatorIfHasText(builder, "Hello World", ",");
+        assertThat(builder.toString(), containsString("Hello World,"));
+    }
+
+
+    @Test
+    public void testBuildSuburbUrlForTypeSuburb() {
+
+        String url = sut.buildSuburbUrl(PLACE_ID, SuburbType.SUBURB.getType());
+        assertThat(url,
+            containsString(
+                "http://maps.contargo.net/nominatim/suburb.php?place_id=42&format=json&addressdetails=1&suburb_type="
+                    .concat(SuburbType.SUBURB.getType())));
+    }
+
+
+    @Test
+    public void testBuildSuburbUrlForTypeAdministrative() {
+
+        String url = sut.buildSuburbUrl(PLACE_ID, SuburbType.ADMINISTRATIVE.getType());
+        assertThat(url,
+            containsString(
+                "http://maps.contargo.net/nominatim/suburb.php?place_id=42&format=json&addressdetails=1&suburb_type="
+                    .concat(SuburbType.ADMINISTRATIVE.getType())));
+    }
+
+
+    @Test
+    public void testBuildSuburbUrlForTypeVillage() {
+
+        String url = sut.buildSuburbUrl(PLACE_ID, SuburbType.VILLAGE.getType());
+        assertThat(url,
+            containsString(
+                "http://maps.contargo.net/nominatim/suburb.php?place_id=42&format=json&addressdetails=1&suburb_type="));
+    }
+
+
+    @Test
+    public void testBuildOsmUrl() {
+
+        String url = sut.buildOsmUrl(OSM_ID);
+        assertThat(url,
+            containsString("http://maps.contargo.net/nominatim/reverse?osm_id=" + OSM_ID
+                + "&osm_type=W&format=json"));
+    }
+
+
+    @Test
+    public void buildUrl() {
+
+        GeoLocation geoLocation = new GeoLocation(new BigDecimal(48.07506), new BigDecimal(8.6362987));
+        MatcherAssert.assertThat(sut.buildUrl(geoLocation),
+            is("http://maps.contargo.net/nominatim/reverse/?format=json&lat=48.0750600000&lon=8.6362987000"));
+    }
+
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildUrlWithoutLatitude() {
+
+        GeoLocation locationWithoutLatitude = new GeoLocation();
+        locationWithoutLatitude.setLongitude(BigDecimal.ONE);
+        sut.buildUrl(locationWithoutLatitude);
+    }
+
+
+    @Test(expected = IllegalArgumentException.class)
+    public void buildUrlWithoutLongitude() {
+
+        GeoLocation locationWithoutLongitude = new GeoLocation();
+        locationWithoutLongitude.setLatitude(BigDecimal.ONE);
+        sut.buildUrl(locationWithoutLongitude);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/service/AddressCacheUnitTest.java b/src/test/java/net/contargo/iris/address/service/AddressCacheUnitTest.java
new file mode 100644
index 00000000..e7e3ac4b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/service/AddressCacheUnitTest.java
@@ -0,0 +1,82 @@
+package net.contargo.iris.address.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.cache.concurrent.ConcurrentMapCache;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+
+/**
+ * Unit test for {@link AddressCache}.
+ *
+ * @author  Vincent Potucek - potucek@synyx.de
+ * @author  Tobias Schenider - schneider@synyx.de
+ */
+public class AddressCacheUnitTest {
+
+    public static final BigDecimal DURLACH_LATITUDE = new BigDecimal(48.9970339131);
+    public static final BigDecimal DURLACH_LONGITUDE = new BigDecimal(8.4693895567);
+    public static final String CACHE_NAME = "cacheName";
+
+    private AddressCache sut;
+
+    private Address expectedAddress;
+    private GeoLocation geoLocation;
+
+    @Before
+    public void setUp() throws Exception {
+
+        expectedAddress = new Address();
+        expectedAddress.setLatitude(DURLACH_LATITUDE);
+        expectedAddress.setLongitude(DURLACH_LONGITUDE);
+
+        geoLocation = new GeoLocation(DURLACH_LATITUDE, DURLACH_LONGITUDE);
+
+        sut = new AddressCache(new ConcurrentMapCache(CACHE_NAME));
+    }
+
+
+    @Test
+    public void testCache() {
+
+        List<Address> addresses = new ArrayList<>();
+        addresses.add(expectedAddress);
+
+        List<AddressList> arrayList = new ArrayList<>();
+        arrayList.add(new AddressList(CACHE_NAME, addresses));
+
+        sut.cache(arrayList);
+
+        Address actualAddress = sut.getForLocation(geoLocation);
+
+        assertThat(expectedAddress, is(actualAddress));
+    }
+
+
+    @Test
+    public void testCacheIsNull() {
+
+        List<AddressList> arrayList = new ArrayList<>();
+        arrayList.add(new AddressList(CACHE_NAME, new ArrayList<Address>()));
+
+        sut.cache(arrayList);
+
+        Address actualAddress = sut.getForLocation(geoLocation);
+
+        assertThat(actualAddress, is(nullValue()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperCachingUnitTest.java b/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperCachingUnitTest.java
new file mode 100644
index 00000000..ec14e216
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperCachingUnitTest.java
@@ -0,0 +1,143 @@
+package net.contargo.iris.address.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.nominatim.service.AddressService;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+import net.contargo.iris.normalizer.NormalizerService;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.mockito.Mockito;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Tests Caching-Aspects of AddressServiceWrapper.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ */
+public class AddressServiceWrapperCachingUnitTest {
+
+    public static final String CITY_NAME = "bar";
+    public static final String CITY_NAME_NORMALIZED = "BAR";
+
+    // mocked
+    private AddressService addressService;
+
+    private StaticAddressService staticAddressServiceMock;
+
+    // object to test
+    private AddressServiceWrapper addressServiceWrapper;
+    private AddressCache addressCache;
+
+    @Before
+    public void setup() {
+
+        addressService = Mockito.mock(AddressService.class);
+        staticAddressServiceMock = Mockito.mock(StaticAddressService.class);
+        addressCache = Mockito.mock(AddressCache.class);
+
+        NormalizerService normalizerServiceMock = mock(NormalizerService.class);
+        when(normalizerServiceMock.normalize(CITY_NAME)).thenReturn(CITY_NAME_NORMALIZED);
+
+        addressServiceWrapper = new AddressServiceWrapper(addressService, staticAddressServiceMock, addressCache,
+                normalizerServiceMock);
+    }
+
+
+    @Test
+    public void cachesOnRetrieve() {
+
+        Address a = new Address();
+        a.setLatitude(new BigDecimal(49.01542167885));
+        a.setLongitude(new BigDecimal(8.425742155221));
+
+        Map<String, String> addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), CITY_NAME);
+        addressDetails.put(COUNTRY.getKey(), "Deutschland");
+        addressDetails.put(STREET.getKey(), "foo");
+        addressDetails.put(POSTAL_CODE.getKey(), "42");
+        addressDetails.put(NAME.getKey(), "bla");
+
+        List<Address> addresses = Arrays.asList(a);
+        Mockito.when(addressService.getAddressesByDetails(addressDetails)).thenReturn(addresses);
+
+        List<AddressList> expectedList = new ArrayList<>();
+        AddressList expectedAddressList = new AddressList(a, addresses);
+        expectedList.add(null);
+        expectedList.add(expectedAddressList);
+
+        addressServiceWrapper.getAddressesByDetails(addressDetails);
+
+        Mockito.verify(addressCache).cache(expectedList);
+    }
+
+
+    @Test
+    public void testCaching() {
+
+        Address a = new Address();
+        a.setOsmId(123L);
+        a.setLatitude(new BigDecimal(49.01542167885));
+        a.setLongitude(new BigDecimal(8.425742155221));
+
+        GeoLocation loc = new GeoLocation(a.getLatitude(), a.getLongitude());
+        Mockito.when(addressCache.getForLocation(loc)).thenReturn(a);
+
+        Map<String, String> addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), CITY_NAME);
+        addressDetails.put(COUNTRY.getKey(), "Deutschland");
+        addressDetails.put(STREET.getKey(), "foo");
+        addressDetails.put(POSTAL_CODE.getKey(), "42");
+        addressDetails.put(NAME.getKey(), "bla");
+        addressServiceWrapper.getAddressesByDetails(addressDetails);
+
+        Address b = addressServiceWrapper.getAddressForGeoLocation(loc);
+
+        Assert.assertEquals(a, b);
+    }
+
+
+    @Test
+    public void testAlsoChecksStaticAddressesBeforeCache() {
+
+        Address a = new Address();
+        a.setOsmId(123L);
+        a.setLatitude(new BigDecimal(49.01542167885));
+        a.setLongitude(new BigDecimal(8.425742155221));
+
+        StaticAddress sa = Mockito.mock(StaticAddress.class);
+
+        Mockito.when(sa.toAddress()).thenReturn(a);
+
+        GeoLocation loc = new GeoLocation(a.getLatitude(), a.getLongitude());
+
+        Mockito.when(addressCache.getForLocation(loc)).thenReturn(null);
+        Mockito.when(staticAddressServiceMock.getForLocation(loc)).thenReturn(sa);
+
+        Address b = addressServiceWrapper.getAddressForGeoLocation(loc);
+
+        Assert.assertEquals(a, b);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperUnitTest.java b/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperUnitTest.java
new file mode 100644
index 00000000..9d223eec
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/service/AddressServiceWrapperUnitTest.java
@@ -0,0 +1,382 @@
+package net.contargo.iris.address.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.nominatim.service.AddressService;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+import net.contargo.iris.normalizer.NormalizerService;
+
+import org.hamcrest.Matchers;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.CITY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.COUNTRY;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.NAME;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.POSTAL_CODE;
+import static net.contargo.iris.address.nominatim.service.AddressDetailKey.STREET;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.address.service.AddressServiceWrapper}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class AddressServiceWrapperUnitTest {
+
+    private static final double LATITUDE = 11.0;
+    private static final double LONGITUDE = 12.0;
+    public static final String CITYNAME_NEUSTADT = "Neustadt";
+    public static final String CITYNAME_NEUSTADT_NORMALIZED = "NEUSTADT";
+    public static final String CITYNAME_KARLSRUHE = "Karlsruhe";
+    public static final String CITYNAME_KARLSRUHE_NORMALIZED = "KARLSRUHE";
+    public static final String CITYNAME_NOT_NORMALIZED_AT_ALL = "%4/()&32";
+    public static final String STREETNAME_KARLSTRASSE = "Karlstrasse";
+    public static final String POSTAL_CODE_76133 = "76133";
+    public static final String POSTAL_CODE_76137 = "76137";
+    private AddressServiceWrapper addressServiceWrapper;
+    @Mock
+    private AddressService addressServiceMock;
+    @Mock
+    private StaticAddressService staticAddressServiceMock;
+    @Mock
+    private AddressCache cache;
+    @Mock
+    private NormalizerService normalizerServiceMock;
+    private Map<String, String> addressDetails;
+
+    @Before
+    public void setUp() {
+
+        addressDetails = new HashMap<>();
+        addressDetails.put(CITY.getKey(), "city");
+        addressDetails.put(COUNTRY.getKey(), "country");
+        addressDetails.put(STREET.getKey(), "street");
+        addressDetails.put(POSTAL_CODE.getKey(), "postalCode");
+        addressDetails.put(NAME.getKey(), "name");
+
+        when(normalizerServiceMock.normalize(CITYNAME_KARLSRUHE)).thenReturn(CITYNAME_KARLSRUHE_NORMALIZED);
+
+        addressServiceWrapper = new AddressServiceWrapper(addressServiceMock, staticAddressServiceMock, cache,
+                normalizerServiceMock);
+    }
+
+
+    /**
+     * Test of getAddressesByDetailsWithFallbacks method, of class AddressServiceWrapper.
+     */
+    @Test
+    public void testResolveReturnsStaticAddressesAsFirstElement() {
+
+        AddressList value = Mockito.mock(AddressList.class);
+        Mockito.when(staticAddressServiceMock.findAddresses(addressDetails.get(POSTAL_CODE.getKey()),
+                CITYNAME_KARLSRUHE_NORMALIZED, addressDetails.get(COUNTRY.getKey()))).thenReturn(value);
+
+        addressDetails.put(CITY.getKey(), CITYNAME_KARLSRUHE);
+
+        List<AddressList> result = addressServiceWrapper.getAddressesByDetails(addressDetails);
+
+        Mockito.verify(staticAddressServiceMock).findAddresses(addressDetails.get(POSTAL_CODE.getKey()),
+            CITYNAME_KARLSRUHE_NORMALIZED, addressDetails.get(COUNTRY.getKey()));
+
+        Assert.assertEquals(result.get(0), value);
+    }
+
+
+    @Test
+    public void testGetAddressForGeoLocationAddressReturnedByAddressService() {
+
+        GeoLocation loc = new GeoLocation();
+        loc.setLatitude(BigDecimal.valueOf(LATITUDE));
+        loc.setLongitude(BigDecimal.valueOf(LONGITUDE));
+
+        Mockito.when(addressServiceMock.getAddressByGeolocation(Mockito.any(GeoLocation.class))).thenReturn(
+            new Address());
+        Mockito.when(staticAddressServiceMock.getForLocation(Mockito.any(GeoLocation.class))).thenReturn(null);
+        Mockito.when(cache.getForLocation(loc)).thenReturn(null);
+
+        Address expectedAddress = new Address();
+        expectedAddress.setLongitude(loc.getLongitude());
+        expectedAddress.setLatitude(loc.getLatitude());
+
+        Assert.assertEquals(expectedAddress, addressServiceWrapper.getAddressForGeoLocation(loc));
+    }
+
+
+    /**
+     * Test of getAddressesByDetailsWithFallbacks method, of class AddressServiceWrapper.
+     */
+    @Test
+    public void resolvesAddressAndThenSuburbsWithStreet() {
+
+        Address a = new Address();
+        a.setOsmId(23L);
+
+        Mockito.when(addressServiceMock.getAddressesByDetails(addressDetails)).thenReturn(Arrays.asList(a));
+
+        Address suburb = new Address();
+        suburb.setDisplayName("suburb of address");
+        suburb.setOsmId(42L);
+
+        List<AddressList> result = addressServiceWrapper.getAddressesByDetails(addressDetails);
+
+        Assert.assertThat(result.size(), Matchers.equalTo(2));
+        Assert.assertThat(result.get(1).getAddresses().size(), Matchers.equalTo(1)); // only address
+        Assert.assertThat(result.get(1).getAddresses().get(0), Matchers.equalTo(a));
+
+        Mockito.verify(cache).cache(result);
+    }
+
+
+    @Test
+    public void testSuburbSearchWithStreet() {
+
+        Address neustadtHessen = new Address();
+        neustadtHessen.setPlaceId(23L);
+        neustadtHessen.setOsmId(23L);
+        neustadtHessen.setDisplayName(
+            "Neustadt, Marburg-Biedenkopf, Regierungsbezirk Gießen, Hessen, 35279, Deutschland, Europa");
+        neustadtHessen.setShortName(CITYNAME_NEUSTADT);
+
+        Address neustadtSachsen = new Address();
+        neustadtSachsen.setPlaceId(42L);
+        neustadtSachsen.setOsmId(42L);
+        neustadtSachsen.setDisplayName("Neustadt, Dresden, Sachsen, Deutschland");
+        neustadtSachsen.setShortName(CITYNAME_NEUSTADT);
+
+        Map<String, String> detailsNeustadt = new HashMap<>();
+        detailsNeustadt.put(CITY.getKey(), CITYNAME_NEUSTADT);
+        detailsNeustadt.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        detailsNeustadt.put(POSTAL_CODE.getKey(), null);
+        detailsNeustadt.put(COUNTRY.getKey(), "DE");
+        detailsNeustadt.put(NAME.getKey(), null);
+
+        Mockito.when(addressServiceMock.getAddressesByDetails(detailsNeustadt)).thenReturn(Arrays.asList(neustadtHessen,
+                neustadtSachsen));
+        when(normalizerServiceMock.normalize(CITYNAME_NEUSTADT)).thenReturn(CITYNAME_NEUSTADT_NORMALIZED);
+
+        List<AddressList> addresses = addressServiceWrapper.getAddressesByDetails(detailsNeustadt);
+
+        Assert.assertEquals(3, addresses.size());
+        Assert.assertThat(addresses.get(1).getParentAddress(), Matchers.equalTo(neustadtHessen));
+        Assert.assertThat(addresses.get(2).getParentAddress(), Matchers.equalTo(neustadtSachsen));
+    }
+
+
+    @Test
+    public void getAddressForGeoLocation() {
+
+        Address address = new Address();
+        GeoLocation geoLocation = new GeoLocation(new BigDecimal(48.07506), new BigDecimal(8.6362987));
+        when(cache.getForLocation(geoLocation)).thenReturn(address);
+
+        assertThat(addressServiceWrapper.getAddressForGeoLocation(geoLocation), is(address));
+        verifyZeroInteractions(addressServiceMock);
+    }
+
+
+    @Test
+    public void getAddressForGeoLocationCacheMiss() {
+
+        GeoLocation geoLocation = new GeoLocation(new BigDecimal(48.07506), new BigDecimal(8.6362987));
+        when(cache.getForLocation(geoLocation)).thenReturn(null); // cache miss
+
+        addressServiceWrapper.getAddressForGeoLocation(geoLocation);
+        verify(addressServiceMock).getAddressByGeolocation(geoLocation);
+    }
+
+
+    @Test
+    public void testDoesNotExecuteStaticAddressSearchIfOnlyStreetIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), null);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verifyZeroInteractions(staticAddressServiceMock);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchIfPostalcodeIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), null);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76133);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(POSTAL_CODE_76133, null, null);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchIfStreetAndPostalcodeIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76133);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(POSTAL_CODE_76133, null, null);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchIfCityIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), CITYNAME_KARLSRUHE);
+        details.put(STREET.getKey(), null);
+        details.put(POSTAL_CODE.getKey(), null);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(null, CITYNAME_KARLSRUHE_NORMALIZED, null);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchIfStreetAndCityIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), CITYNAME_KARLSRUHE);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), null);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(null, CITYNAME_KARLSRUHE_NORMALIZED, null);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchIfPostalcodeAndCityIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), CITYNAME_KARLSRUHE);
+        details.put(STREET.getKey(), null);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76133);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(POSTAL_CODE_76133, CITYNAME_KARLSRUHE_NORMALIZED, null);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchAndNominatimSearchIfStreetAndPostalcodeIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76137);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(POSTAL_CODE_76137, null, null);
+
+        verify(addressServiceMock).getAddressesByDetails(details);
+    }
+
+
+    @Test
+    public void testDoesExecuteStaticAddressSearchAndNominatimSearchIfStreetAndPostalcodeAndCityIsGiven() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), CITYNAME_KARLSRUHE);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76137);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+
+        verify(staticAddressServiceMock).findAddresses(POSTAL_CODE_76137, CITYNAME_KARLSRUHE_NORMALIZED, null);
+        verify(addressServiceMock).getAddressesByDetails(details);
+    }
+
+
+    @Test
+    public void testDoesNotExecuteStaticAddressSearchIfCityGetsNormalizedToNull() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), CITYNAME_NOT_NORMALIZED_AT_ALL);
+        details.put(STREET.getKey(), STREETNAME_KARLSTRASSE);
+        details.put(POSTAL_CODE.getKey(), null);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        when(normalizerServiceMock.normalize(CITYNAME_NOT_NORMALIZED_AT_ALL)).thenReturn("");
+        addressServiceWrapper.getAddressesByDetails(details);
+        verifyZeroInteractions(staticAddressServiceMock);
+    }
+
+
+    @Test
+    public void testDoesNotExecuteStaticAddressSearchIfStreetIsNull() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), null);
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76137);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+        verifyZeroInteractions(addressServiceMock);
+    }
+
+
+    @Test
+    public void testDoesNotExecuteStaticAddressSearchIfStreetIsEmpty() {
+
+        Map<String, String> details = new HashMap<>();
+        details.put(CITY.getKey(), null);
+        details.put(STREET.getKey(), "");
+        details.put(POSTAL_CODE.getKey(), POSTAL_CODE_76137);
+        details.put(COUNTRY.getKey(), null);
+        details.put(NAME.getKey(), null);
+        addressServiceWrapper.getAddressesByDetails(details);
+        verifyZeroInteractions(addressServiceMock);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/StaticAddressUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/StaticAddressUnitTest.java
new file mode 100644
index 00000000..7bcb60e4
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/StaticAddressUnitTest.java
@@ -0,0 +1,241 @@
+package net.contargo.iris.address.staticsearch;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.junit.Assert.assertThat;
+
+
+/**
+ * Unit test for {@link StaticAddress}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class StaticAddressUnitTest {
+
+    StaticAddress sut;
+
+    @Before
+    public void setUp() {
+
+        sut = new StaticAddress();
+    }
+
+
+    @Test
+    public void generateHashKey() {
+
+        sut.setUniqueId(new BigInteger("1301000000000001"));
+        assertThat(sut.getHashKey(), is("D3YTD"));
+
+        sut.setUniqueId(new BigInteger("1300000000100011"));
+        assertThat(sut.getHashKey(), is("CJMWB"));
+
+        sut.setUniqueId(new BigInteger("0001000000000001"));
+        assertThat(sut.getHashKey(), is("0MH35"));
+    }
+
+
+    @Test
+    public void generateHashKeyCheckDuplicates() {
+
+        // tests every single incremented uniqueId for duplication.
+        // shows when the first duplication appears.
+        // use this test to try out the hashkey algorithm and possible outcomes.
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setUniqueId(new BigInteger("1301000000000001"));
+
+        boolean duplicateFound = false;
+        Set<String> hashKeys = new HashSet<>();
+        String currentHashKey;
+
+        while (!duplicateFound) {
+            staticAddress.setUniqueId(staticAddress.getUniqueId().add(BigInteger.ONE));
+            currentHashKey = staticAddress.getHashKey();
+
+            if (hashKeys.contains(currentHashKey)) {
+                duplicateFound = true;
+            }
+
+            // commented because of performance issues. uncomment to get clearer output.
+//            System.out.println(staticAddress.getUniqueId() + ": " + currentHashKey);
+            hashKeys.add(currentHashKey);
+        }
+
+        System.out.println("Fail at " + staticAddress.getUniqueId());
+
+        // With the current implementation the first duplication should appear with this number.
+        assertThat(staticAddress.getUniqueId(), is(new BigInteger("1301000001048578")));
+    }
+
+
+    @Test
+    public void generateHashKeyWithNullUniqueId() {
+
+        assertThat(sut.getHashKey(), is(""));
+    }
+
+
+    @Test
+    public void generateHashKeyWithTooShortUniqueId() {
+
+        sut.setUniqueId(BigInteger.ONE);
+        assertThat(sut.getHashKey(), is("00001"));
+    }
+
+
+    @Test
+    public void areAddressParametersDifferent() {
+
+        sut.setSuburb("suburb");
+        sut.setCity("city");
+        sut.setPostalcode("12345");
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setSuburb("suburb");
+        staticAddress.setCity("city");
+        staticAddress.setPostalcode("12345");
+
+        boolean areDifferent = sut.areAddressParametersDifferent(staticAddress);
+        assertThat(areDifferent, is(false));
+    }
+
+
+    @Test
+    public void addressParameterSuburbDifferent() {
+
+        sut.setSuburb("suburb");
+        sut.setCity("city");
+        sut.setPostalcode("12345");
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setSuburb("newsuburb");
+        staticAddress.setCity("city");
+        staticAddress.setPostalcode("12345");
+
+        boolean areDifferent = sut.areAddressParametersDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+
+
+    @Test
+    public void addressParameterCityDifferent() {
+
+        sut.setSuburb("suburb");
+        sut.setCity("city");
+        sut.setPostalcode("12345");
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setSuburb("suburb");
+        staticAddress.setCity("newcity");
+        staticAddress.setPostalcode("12345");
+
+        boolean areDifferent = sut.areAddressParametersDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+
+
+    @Test
+    public void addressParameterPostalcodeDifferent() {
+
+        sut.setSuburb("suburb");
+        sut.setCity("city");
+        sut.setPostalcode("12345");
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setSuburb("suburb");
+        staticAddress.setCity("city");
+        staticAddress.setPostalcode("67890");
+
+        boolean areDifferent = sut.areAddressParametersDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+
+
+    @Test
+    public void latitudeAndLongitudeEquals() {
+
+        BigDecimal latitude = new BigDecimal("34.12345");
+        BigDecimal longitude = new BigDecimal("55.98765");
+
+        sut.setLatitude(latitude);
+        sut.setLongitude(longitude);
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setLatitude(latitude);
+        staticAddress.setLongitude(longitude);
+
+        boolean areDifferent = sut.areLatitudeAndLongitudeDifferent(staticAddress);
+        assertThat(areDifferent, is(false));
+    }
+
+
+    @Test
+    public void latitudeDifferent() {
+
+        BigDecimal latitude = new BigDecimal("34.12345");
+        BigDecimal longitude = new BigDecimal("55.98765");
+
+        sut.setLatitude(latitude);
+        sut.setLongitude(longitude);
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(longitude);
+
+        boolean areDifferent = sut.areLatitudeAndLongitudeDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+
+
+    @Test
+    public void longitudeDifferent() {
+
+        BigDecimal latitude = new BigDecimal("34.12345");
+        BigDecimal longitude = new BigDecimal("55.98765");
+
+        sut.setLatitude(latitude);
+        sut.setLongitude(longitude);
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setLatitude(latitude);
+        staticAddress.setLongitude(BigDecimal.TEN);
+
+        boolean areDifferent = sut.areLatitudeAndLongitudeDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+
+
+    @Test
+    public void latitudeAndLongitudeDifferent() {
+
+        BigDecimal latitude = new BigDecimal("34.12345");
+        BigDecimal longitude = new BigDecimal("55.98765");
+
+        sut.setLatitude(latitude);
+        sut.setLongitude(longitude);
+
+        StaticAddress staticAddress = new StaticAddress();
+
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.TEN);
+
+        boolean areDifferent = sut.areLatitudeAndLongitudeDifferent(staticAddress);
+        assertThat(areDifferent, is(true));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..9f326ee8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/api/StaticAddressApiControllerMvcUnitTest.java
@@ -0,0 +1,151 @@
+package net.contargo.iris.address.staticsearch.api;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.staticsearch.dto.StaticAddressDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class StaticAddressApiControllerMvcUnitTest {
+
+    private static final String CITY = "Karlsruhe";
+    private static final String POSTALCODE = "76131";
+    private static final String COUNTRY = "DE";
+    private static final String SUBURB = "Neureuth";
+
+    @Autowired
+    StaticAddressDtoService staticAddressDtoServiceMock;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+    @Before
+    public void before() {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+    }
+
+
+    @Test
+    public void getAll() throws Exception {
+
+        Map<String, String> addressMap = new HashMap<>();
+        addressMap.put("city", CITY);
+        addressMap.put("country_code", COUNTRY);
+        addressMap.put("postcode", POSTALCODE);
+        addressMap.put("suburb", SUBURB);
+
+        Address address = new Address();
+        address.setLatitude(BigDecimal.ONE);
+        address.setLongitude(BigDecimal.ONE);
+        address.setAddress(addressMap);
+
+        AddressDto dto = new AddressDto(address);
+
+        when(staticAddressDtoServiceMock.getAll()).thenReturn(Arrays.asList(dto));
+
+        ResultActions resultActions = mockMvc.perform(get("/staticaddresses").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk()).andExpect(content().contentType("application/json"));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].address.city", is(CITY))));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].address.postcode",
+                    is(POSTALCODE))));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].address.country_code",
+                    is(COUNTRY))));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].address.suburb", is(SUBURB))));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].latitude", is(1.0))));
+        resultActions.andExpect((jsonPath("$.staticAddressesResponse.addressDtoList[0].longitude", is(1.0))));
+    }
+
+
+    @Test
+    public void getByPostalCodeAndCityAndCountry() throws Exception {
+
+        Map<String, String> addressMap = new HashMap<>();
+        addressMap.put("city", CITY);
+        addressMap.put("country_code", COUNTRY);
+        addressMap.put("postcode", POSTALCODE);
+        addressMap.put("suburb", null);
+
+        Address address = new Address();
+        address.setLatitude(BigDecimal.ONE);
+        address.setLongitude(BigDecimal.ONE);
+        address.setAddress(addressMap);
+
+        AddressDto dto = new AddressDto(address);
+
+        when(staticAddressDtoServiceMock.getAddressesByDetails("76131", "Karlsruhe", "DE")).thenReturn(asList(dto));
+
+        ResultActions resultActions = mockMvc.perform(get(
+                    "/staticaddresses?postalCode=76131&country=DE&city=Karlsruhe").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8"));
+        resultActions.andExpect((jsonPath("$.[0].address.country_code", is(COUNTRY))));
+        resultActions.andExpect((jsonPath("$.[0].address.city", is(CITY))));
+        resultActions.andExpect((jsonPath("$.[0].address.postcode", is(POSTALCODE))));
+    }
+
+
+    @Test
+    public void staticAddressesByBoundingBox() throws Exception {
+
+        when(staticAddressDtoServiceMock.getStaticAddressByBoundingBox(any(GeoLocation.class), eq(20d))).thenReturn(
+            asList(BigInteger.ONE, BigInteger.TEN));
+
+        ResultActions resultActions = mockMvc.perform(get("/staticaddresses").param("lat", "10").param("lon", "1")
+                .param("distance", "20").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8"));
+        resultActions.andExpect((jsonPath("$.uids", hasSize(2))));
+        resultActions.andExpect((jsonPath("$.uids[0]", is(1))));
+        resultActions.andExpect((jsonPath("$.uids[1]", is(10))));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..8e199aed
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/dto/StaticAddressDtoServiceImplUnitTest.java
@@ -0,0 +1,129 @@
+package net.contargo.iris.address.staticsearch.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.AddressListDto;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for the {@link net.contargo.iris.address.staticsearch.dto.StaticAddressDtoServiceImpl}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class StaticAddressDtoServiceImplUnitTest {
+
+    private static final String CITY = "city";
+    private static final String POSTALCODE = "postalcode";
+    private static final String COUNTRY = "country";
+
+    @Mock
+    private StaticAddressService staticAddressServiceMock;
+    private StaticAddressDtoServiceImpl sut;
+    private StaticAddress staticAddress;
+    private StaticAddress staticAddress2;
+    private Address address;
+
+    @Before
+    public void setUp() throws Exception {
+
+        sut = new StaticAddressDtoServiceImpl(staticAddressServiceMock);
+        staticAddress = new StaticAddress();
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+        staticAddress.setCity(CITY);
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCountry(COUNTRY);
+        staticAddress.setUniqueId(BigInteger.TEN);
+        staticAddress2 = new StaticAddress();
+        staticAddress2.setUniqueId(BigInteger.ONE);
+        address = new Address();
+        address.setLatitude(staticAddress.getLatitude());
+        address.setLongitude(staticAddress.getLongitude());
+    }
+
+
+    @Test
+    public void testGetAddressesByDetails() {
+
+        when(staticAddressServiceMock.getAddressesByDetails(POSTALCODE, CITY, COUNTRY)).thenReturn(asList(
+                staticAddress));
+
+        List<AddressDto> actualList = sut.getAddressesByDetails(POSTALCODE, CITY, COUNTRY);
+
+        assertThat(actualList.size(), is(1));
+        assertThat(actualList.get(0).getAddress().get("city"), is(CITY));
+        assertThat(actualList.get(0).getAddress().get("postcode"), is(POSTALCODE));
+        assertThat(actualList.get(0).getCountryCode(), is(COUNTRY));
+    }
+
+
+    @Test
+    public void getAll() {
+
+        when(staticAddressServiceMock.getAll()).thenReturn(asList(staticAddress));
+
+        List<AddressDto> actualList = sut.getAll();
+
+        assertThat(actualList.size(), is(1));
+        assertThat(actualList.get(0).getAddress().get("city"), is(CITY));
+        assertThat(actualList.get(0).getAddress().get("postcode"), is(POSTALCODE));
+        assertThat(actualList.get(0).getCountryCode(), is(COUNTRY));
+    }
+
+
+    @Test
+    public void testGetStaticAddressByGeolocation() {
+
+        GeoLocation location = new GeoLocation(BigDecimal.ONE, BigDecimal.TEN);
+
+        when(staticAddressServiceMock.getAddressListListForGeolocation(location)).thenReturn(asList(
+                new AddressList("name1", asList(address))));
+
+        List<AddressListDto> expected = asList(new AddressListDto("name1", asList(new AddressDto(address))));
+        assertReflectionEquals(sut.getStaticAddressByGeolocation(location), expected);
+    }
+
+
+    @Test
+    public void getStaticAddressByBoundingBox() {
+
+        when(staticAddressServiceMock.getAddressesInBoundingBox(address, 20d)).thenReturn(asList(staticAddress,
+                staticAddress2));
+
+        List<BigInteger> uids = sut.getStaticAddressByBoundingBox(address, 20d);
+
+        assertThat(uids, contains(BigInteger.TEN, BigInteger.ONE));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressRepositoryIntegrationTest.java
new file mode 100644
index 00000000..73508bd3
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressRepositoryIntegrationTest.java
@@ -0,0 +1,516 @@
+package net.contargo.iris.address.staticsearch.service;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.reflect.Field;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.emptyCollectionOf;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * Test for {@link StaticAddressRepository}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:application-context.xml" })
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class StaticAddressRepositoryIntegrationTest {
+
+    private static final String COUNTRY_DE = "DE";
+    private static final String CITY_ENTENHAUSEN = "Entenhausen";
+    private static final String POSTALCODE_12345 = "12345";
+    private static final String SUBURB_INNENSTADT = "Innenstadt";
+    private static final String SUBURB_DAXLANDEN = "Daxlanden";
+    private static final String KARLSRUHE = "Karlsruhe";
+    private static final String MANNHEIM = "Mannheim";
+    private static final String POSTAL_CODE = "76137";
+    private static final BigInteger UNIQUE_ID_ONE = new BigInteger("1301000000000001");
+    private static final BigInteger UNIQUE_ID_TWO = new BigInteger("1301000000000002");
+    private static final BigInteger UNIQUE_ID_THREE = new BigInteger("1301000000000003");
+    private static final BigInteger UNIQUE_ID_FOUR = new BigInteger("1301000000000004");
+    private static final BigInteger UNIQUE_ID_FIVE = new BigInteger("1301000000000005");
+    private static final BigInteger UNIQUE_ID_TEN = new BigInteger("1301000000000010");
+
+    @Autowired
+    private StaticAddressRepository sut;
+
+    @PersistenceContext
+    EntityManager em;
+
+    @Before
+    public void setUp() {
+
+        em.createQuery("DELETE FROM StaticAddress s").executeUpdate();
+    }
+
+
+    @Test
+    public void findByPostalCodeAndCityWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+        em.flush();
+
+        List<StaticAddress> staticAddresses = sut.findByPostalCodeAndCity(POSTAL_CODE, KARLSRUHE);
+
+        assertThat(staticAddresses, hasSize(2));
+        assertThat(staticAddresses.get(0).getSuburb(), is(SUBURB_DAXLANDEN));
+        assertThat(staticAddresses.get(1).getSuburb(), is(SUBURB_INNENSTADT));
+    }
+
+
+    @Test
+    public void findByPostalCodeOrCityWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTALCODE_12345);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(MANNHEIM);
+        staticAddress2.setCityNormalized(MANNHEIM.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+        em.flush();
+
+        List<StaticAddress> staticAddresses = sut.findByPostalCodeOrCity(POSTAL_CODE, KARLSRUHE);
+
+        assertThat(staticAddresses, hasSize(2));
+        assertThat(staticAddresses.get(0).getSuburb(), is(SUBURB_INNENSTADT));
+        assertThat(staticAddresses.get(1).getSuburb(), is(SUBURB_DAXLANDEN));
+    }
+
+
+    @Test
+    public void findByCountryAndPostalCodeAndCityWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+
+        List<StaticAddress> staticAddresses = sut.findByCountryAndPostalCodeAndCity(POSTAL_CODE, KARLSRUHE, COUNTRY_DE);
+
+        assertThat(staticAddresses, hasSize(1));
+        assertThat(staticAddresses.get(0).getSuburb(), is(SUBURB_INNENSTADT));
+    }
+
+
+    @Test
+    public void findByCountryAndPostalCodeAndCityWithEmptyCityWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+
+        List<StaticAddress> staticAddresses = sut.findByCountryAndPostalCodeAndCity(POSTAL_CODE, "", COUNTRY_DE);
+
+        assertThat(staticAddresses, hasSize(1));
+        assertThat(staticAddresses.get(0).getSuburb(), is(SUBURB_INNENSTADT));
+    }
+
+
+    @Test
+    public void findByCountryAndPostalCodeOrCityWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        StaticAddress staticAddress3 = new StaticAddress();
+        staticAddress3.setCity(MANNHEIM);
+        staticAddress3.setCityNormalized(MANNHEIM.toUpperCase());
+        staticAddress3.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress3.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress3.setPostalcode(POSTALCODE_12345);
+        staticAddress3.setLatitude(BigDecimal.TEN);
+        staticAddress3.setLongitude(BigDecimal.ONE);
+        staticAddress3.setUniqueId(UNIQUE_ID_THREE);
+        staticAddress3.setCountry(COUNTRY_DE);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+        em.persist(staticAddress3);
+
+        List<StaticAddress> staticAddresses = sut.findByCountryAndPostalCodeOrCity(POSTALCODE_12345, KARLSRUHE,
+                COUNTRY_DE);
+        assertThat(staticAddresses, hasSize(2));
+        assertThat(staticAddresses.get(0).getCity(), is(KARLSRUHE));
+        assertThat(staticAddresses.get(1).getCity(), is(MANNHEIM));
+    }
+
+
+    @Test
+    public void findByCountryAndPostalCodeOrCityWithoutSuburbWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb("");
+        staticAddress1.setSuburbNormalized("");
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb("");
+        staticAddress2.setSuburbNormalized("");
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.TEN);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        StaticAddress staticAddress3 = new StaticAddress();
+        staticAddress3.setCity(MANNHEIM);
+        staticAddress3.setCityNormalized(MANNHEIM.toUpperCase());
+        staticAddress3.setSuburb("");
+        staticAddress3.setSuburbNormalized("");
+        staticAddress3.setPostalcode(POSTALCODE_12345);
+        staticAddress3.setLatitude(BigDecimal.TEN);
+        staticAddress3.setLongitude(BigDecimal.ONE);
+        staticAddress3.setUniqueId(UNIQUE_ID_THREE);
+        staticAddress3.setCountry(COUNTRY_DE);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+        em.persist(staticAddress3);
+
+        List<StaticAddress> staticAddresses = sut.findByCountryAndPostalCodeOrCity(POSTALCODE_12345, KARLSRUHE,
+                COUNTRY_DE);
+        assertThat(staticAddresses, hasSize(2));
+        assertThat(staticAddresses.get(0).getCity(), is(KARLSRUHE));
+        assertThat(staticAddresses.get(1).getCity(), is(MANNHEIM));
+    }
+
+
+    @Test
+    public void findbyLatLonWorks() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.ONE);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+
+        StaticAddress staticAddress = sut.findByLatitudeAndLongitude(BigDecimal.ONE, BigDecimal.ONE);
+        assertThat(staticAddress, notNullValue());
+        assertReflectionEquals(staticAddress1, staticAddress);
+    }
+
+
+    @Test
+    public void findByCityAndSuburbAndPostalcode() {
+
+        String city = "City";
+        String suburb = "suburb";
+        String postalcode = "76131";
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setCity(city);
+        staticAddress.setCityNormalized(city.toUpperCase());
+        staticAddress.setSuburb(suburb);
+        staticAddress.setSuburbNormalized(suburb.toUpperCase());
+        staticAddress.setPostalcode(postalcode);
+        staticAddress.setLongitude(new BigDecimal("2"));
+        staticAddress.setLatitude(new BigDecimal("2"));
+        staticAddress.setUniqueId(UNIQUE_ID_THREE);
+
+        em.persist(staticAddress);
+
+        List<StaticAddress> staticAddressList = sut.findByCityNormalizedAndSuburbNormalizedAndPostalcode(city, suburb,
+                postalcode);
+
+        assertThat(staticAddressList.get(0), is(staticAddress));
+        assertThat(staticAddressList, hasSize(1));
+    }
+
+
+    @Test
+    public void findByPostalcode() {
+
+        createTestData();
+
+        List<StaticAddress> staticAddressList = sut.findByPostalcode(POSTALCODE_12345);
+
+        assertThat(staticAddressList, hasSize(1));
+        assertThat(staticAddressList.get(0).getPostalcode(), is(POSTALCODE_12345));
+    }
+
+
+    @Test
+    public void findNoAddressByPostalcode() {
+
+        createTestData();
+
+        List<StaticAddress> staticAddressList = sut.findByPostalcode("55443");
+
+        assertThat(staticAddressList, emptyCollectionOf(StaticAddress.class));
+    }
+
+
+    @Test
+    public void findNoAddressByPostalcodeAndCountry() {
+
+        createTestData();
+
+        List<StaticAddress> staticAddressList = sut.findByCountryAndPostalCodeOrCity("37678", "", "DE");
+        assertThat(staticAddressList, emptyCollectionOf(StaticAddress.class));
+    }
+
+
+    private void createTestData() {
+
+        StaticAddress withoutSuburb = new StaticAddress();
+        withoutSuburb.setCountry(COUNTRY_DE);
+        withoutSuburb.setCity(CITY_ENTENHAUSEN);
+        withoutSuburb.setCityNormalized(CITY_ENTENHAUSEN);
+        withoutSuburb.setSuburb("");
+        withoutSuburb.setSuburbNormalized("");
+        withoutSuburb.setPostalcode(POSTALCODE_12345);
+        withoutSuburb.setLatitude(BigDecimal.ONE);
+        withoutSuburb.setLongitude(BigDecimal.ONE);
+        withoutSuburb.setUniqueId(UNIQUE_ID_TEN);
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setCity(KARLSRUHE);
+        staticAddress.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress.setPostalcode(POSTAL_CODE);
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.TEN);
+        staticAddress.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(withoutSuburb);
+        em.persist(staticAddress);
+    }
+
+
+    @Test
+    public void findMissingHashKeys() throws NoSuchFieldException, IllegalAccessException {
+
+        String city = "City";
+        String suburb = "suburb";
+        String postalcode = "76131";
+
+        StaticAddress staticAddressWithoutHashkey = new StaticAddress();
+        staticAddressWithoutHashkey.setCity(city);
+        staticAddressWithoutHashkey.setCityNormalized(city.toUpperCase());
+        staticAddressWithoutHashkey.setSuburb(suburb);
+        staticAddressWithoutHashkey.setSuburbNormalized(suburb.toUpperCase());
+        staticAddressWithoutHashkey.setPostalcode(postalcode);
+        staticAddressWithoutHashkey.setLongitude(BigDecimal.ONE);
+        staticAddressWithoutHashkey.setLatitude(BigDecimal.ONE);
+        staticAddressWithoutHashkey.setUniqueId(UNIQUE_ID_FOUR);
+
+        // using reflection to set hashkey to null
+        Class<?> c = staticAddressWithoutHashkey.getClass();
+
+        Field hashKeyField = c.getDeclaredField("hashKey");
+        hashKeyField.setAccessible(true);
+        hashKeyField.set(staticAddressWithoutHashkey, null);
+
+        StaticAddress staticAddressWithHashKey = new StaticAddress();
+        staticAddressWithHashKey.setCity(city);
+        staticAddressWithHashKey.setCityNormalized(city.toUpperCase());
+        staticAddressWithHashKey.setSuburb(suburb);
+        staticAddressWithHashKey.setSuburbNormalized(suburb.toUpperCase());
+        staticAddressWithHashKey.setPostalcode(postalcode);
+        staticAddressWithHashKey.setLongitude(BigDecimal.TEN);
+        staticAddressWithHashKey.setLatitude(BigDecimal.TEN);
+        staticAddressWithHashKey.setUniqueId(UNIQUE_ID_FIVE);
+
+        em.persist(staticAddressWithoutHashkey);
+        em.persist(staticAddressWithHashKey);
+
+        Pageable pageable = new PageRequest(0, 50);
+
+        Page<StaticAddress> actualResult = sut.findMissingHashKeys(pageable);
+
+        assertThat(actualResult.getContent(), contains(staticAddressWithoutHashkey));
+        assertThat(actualResult.getContent(), not(contains(staticAddressWithHashKey)));
+    }
+
+
+    @Test
+    public void findByBoundingBox() {
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity(KARLSRUHE);
+        staticAddress1.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress1.setSuburb(SUBURB_INNENSTADT);
+        staticAddress1.setSuburbNormalized(SUBURB_INNENSTADT.toUpperCase());
+        staticAddress1.setPostalcode(POSTAL_CODE);
+        staticAddress1.setLatitude(BigDecimal.ONE);
+        staticAddress1.setLongitude(BigDecimal.ONE);
+        staticAddress1.setUniqueId(UNIQUE_ID_ONE);
+        staticAddress1.setCountry(COUNTRY_DE);
+
+        StaticAddress staticAddress2 = new StaticAddress();
+        staticAddress2.setCity(KARLSRUHE);
+        staticAddress2.setCityNormalized(KARLSRUHE.toUpperCase());
+        staticAddress2.setSuburb(SUBURB_DAXLANDEN);
+        staticAddress2.setSuburbNormalized(SUBURB_DAXLANDEN.toUpperCase());
+        staticAddress2.setPostalcode(POSTAL_CODE);
+        staticAddress2.setLatitude(BigDecimal.ONE);
+        staticAddress2.setLongitude(BigDecimal.TEN);
+        staticAddress2.setUniqueId(UNIQUE_ID_TWO);
+
+        em.persist(staticAddress1);
+        em.persist(staticAddress2);
+
+        List<StaticAddress> staticAddresses = sut.findByBoundingBox(BigDecimal.ZERO, BigDecimal.TEN, BigDecimal.ZERO,
+                BigDecimal.ONE);
+
+        assertThat(staticAddresses, hasSize(1));
+        assertThat(staticAddresses.get(0).getSuburb(), is(SUBURB_INNENSTADT));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplIntegrationTest.java b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplIntegrationTest.java
new file mode 100644
index 00000000..6ebdf755
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplIntegrationTest.java
@@ -0,0 +1,90 @@
+package net.contargo.iris.address.staticsearch.service;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+import net.contargo.iris.normalizer.NormalizerServiceImpl;
+import net.contargo.iris.sequence.UniqueIdSequence;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class StaticAddressServiceImplIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private StaticAddressRepository staticAddressRepository;
+    @Autowired
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceService;
+    @Autowired
+    private NormalizerServiceImpl normalizerService;
+
+    private StaticAddressServiceImpl sut;
+
+    private StaticAddress staticAddress;
+
+    @Before
+    public void setUp() {
+
+        sut = new StaticAddressServiceImpl(staticAddressRepository, uniqueIdSequenceService, normalizerService);
+        staticAddress = new StaticAddress();
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+        staticAddress.setCity("City");
+        staticAddress.setCityNormalized("CITY");
+        staticAddress.setPostalcode("12345");
+        staticAddress.setCountry("DE");
+
+        em.createQuery("DELETE FROM StaticAddress s").executeUpdate();
+    }
+
+
+    @Test
+    public void testSaveWithoutUniqueId() {
+
+        UniqueIdSequence nextSequenceObject = getNextSequenceObjectFromDb();
+
+        BigInteger nextSequence = nextSequenceObject.getNextId();
+        StaticAddress savedStaticAddress = sut.saveStaticAddress(staticAddress);
+        assertThat(savedStaticAddress.getUniqueId(), is(nextSequence));
+
+        assertThat(getNextSequenceObjectFromDb().getNextId(), is(nextSequence.add(BigInteger.ONE)));
+    }
+
+
+    private UniqueIdSequence getNextSequenceObjectFromDb() {
+
+        String queryString = "SELECT o FROM UniqueIdSequence o WHERE o.entityName = 'StaticAddress'";
+
+        return em.createQuery(queryString, UniqueIdSequence.class).getSingleResult();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplUnitTest.java
new file mode 100644
index 00000000..5ae527ef
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/service/StaticAddressServiceImplUnitTest.java
@@ -0,0 +1,774 @@
+package net.contargo.iris.address.staticsearch.service;
+
+import net.contargo.iris.BoundingBox;
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.AddressList;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+import net.contargo.iris.normalizer.NormalizerServiceImpl;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+
+import org.hamcrest.CoreMatchers;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.junit.Assert.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+
+
+/**
+ * Unit test for {@link StaticAddressServiceImpl}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class StaticAddressServiceImplUnitTest {
+
+    public static final long STATIC_ADDRESS_ID = 66L;
+
+    public static final String POSTAL_CODE_76137 = "76137";
+    public static final String POSTALCODE_76189 = "76189";
+
+    public static final String COUNTRY_DE = "DE";
+
+    public static final String CITY_KARLSRUHE = "Karlsruhe";
+    public static final String CITY_BERLIN = "Berlin";
+    public static final String CITY_OBERREUT = "Oberreut";
+    public static final String CITY_SCHOENEFELD = "Schoenefeld";
+    public static final String CITY_NEUSTADT_AN_DER_WEINSTRASSE = "Neustadt an der Weinstrasse";
+
+    public static final String CITY_KARLSRUHE_NORMALIZED = "KARLSRUHE";
+    public static final String CITY_BERLIN_NORMALIZED = "BERLIN";
+    public static final String CITY_SCHOENEFELD_NORMALIZED = "SCHOENEFELD";
+    public static final String CITY_OBERREUT_NORMALIZED = "CITY_OBERREUT";
+    public static final String CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED = "NEUSTADTANDERWEINSTRASSE";
+    public static final BigInteger UNIQUE_ID = new BigInteger("130100000000008");
+
+    @Mock
+    private StaticAddressRepository staticAddressRepositoryMock;
+    @Mock
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceServiceMock;
+
+    private StaticAddressServiceImpl sut;
+
+    private StaticAddress kaSuedstadt;
+    private StaticAddress kaWeststadt;
+    private StaticAddress kaNordstadt;
+    private StaticAddress berlinSchoenefeld;
+    private StaticAddress berlinSchoenefeldWithoutPostalcode;
+
+    private NormalizerServiceImpl normalizerService;
+
+    @Before
+    public void setup() {
+
+        staticAddressRepositoryMock = mock(StaticAddressRepository.class);
+        normalizerService = mock(NormalizerServiceImpl.class);
+        sut = new StaticAddressServiceImpl(staticAddressRepositoryMock, uniqueIdSequenceServiceMock, normalizerService);
+
+        when(normalizerService.normalize(CITY_KARLSRUHE)).thenReturn(CITY_KARLSRUHE_NORMALIZED);
+        when(normalizerService.normalize(CITY_BERLIN)).thenReturn(CITY_BERLIN_NORMALIZED);
+        when(normalizerService.normalize(CITY_OBERREUT)).thenReturn(CITY_OBERREUT_NORMALIZED);
+        when(normalizerService.normalize(CITY_SCHOENEFELD)).thenReturn(CITY_SCHOENEFELD_NORMALIZED);
+        when(normalizerService.normalize(CITY_NEUSTADT_AN_DER_WEINSTRASSE)).thenReturn(
+            CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED);
+
+        initTestAddresses();
+    }
+
+
+    @Test
+    public void testFindByPostalCodeAndCity() {
+
+        String postalCode = "78137";
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+
+        when(staticAddressRepositoryMock.findByPostalCodeAndCity(postalCode, normalizedCity + "%")).thenReturn(asList(
+                kaSuedstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, "");
+
+        assertThat(result.getAddresses().size(), is(1));
+
+        verify(staticAddressRepositoryMock).findByPostalCodeAndCity(postalCode, normalizedCity + "%");
+    }
+
+
+    @Test
+    public void testFindByPostalcodeOnly() {
+
+        String postalCode = "78137";
+
+        when(staticAddressRepositoryMock.findByPostalcode(postalCode)).thenReturn(asList(kaSuedstadt));
+
+        AddressList result = sut.findAddresses(postalCode, "", "");
+
+        assertThat(result.getAddresses().size(), is(1));
+
+        verify(staticAddressRepositoryMock, times(2)).findByPostalcode(postalCode);
+    }
+
+
+    @Test
+    public void testFindByPostalcodeOnlyWithNullValues() {
+
+        String postalCode = "12345";
+
+        when(staticAddressRepositoryMock.findByPostalcode(postalCode)).thenReturn(asList(kaSuedstadt));
+
+        AddressList result = sut.findAddresses(postalCode, null, null);
+
+        assertThat(result.getAddresses().size(), is(1));
+
+        verify(staticAddressRepositoryMock, times(2)).findByPostalcode(postalCode);
+    }
+
+
+    @Test
+    public void testPostalCodeOrCountry() {
+
+        String postalCode = "78137";
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = COUNTRY_DE;
+
+        when(staticAddressRepositoryMock.findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%", country))
+            .thenReturn(new ArrayList<>());
+
+        when(staticAddressRepositoryMock.findByCountryAndPostalCodeOrCity(postalCode, normalizedCity + "%", country))
+            .thenReturn(asList(kaSuedstadt, kaWeststadt, kaNordstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, country);
+
+        assertThat(result.getAddresses().size(), is(3));
+        verify(staticAddressRepositoryMock).findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%",
+            country);
+        verify(staticAddressRepositoryMock).findByCountryAndPostalCodeOrCity(postalCode, normalizedCity + "%", country);
+    }
+
+
+    @Test
+    public void testFindByCity() {
+
+        String postalCode = "";
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = "";
+
+        when(staticAddressRepositoryMock.findByPostalCodeAndCity(postalCode, normalizedCity + "%")).thenReturn(
+            new ArrayList<>());
+        when(staticAddressRepositoryMock.findByPostalCodeOrCity(postalCode, normalizedCity + "%")).thenReturn(asList(
+                kaSuedstadt, kaWeststadt, kaNordstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, country);
+
+        assertThat(result.getAddresses().size(), is(3));
+        verify(staticAddressRepositoryMock).findByPostalCodeAndCity(postalCode, normalizedCity + "%");
+        verify(staticAddressRepositoryMock).findByPostalCodeOrCity(postalCode, normalizedCity + "%");
+    }
+
+
+    @Test
+    public void testFindById() {
+
+        StaticAddress expectedAddress = new StaticAddress();
+        expectedAddress.setCountry("Unique Attribute for distinction");
+        when(staticAddressRepositoryMock.findOne(STATIC_ADDRESS_ID)).thenReturn(expectedAddress);
+
+        Assert.assertEquals(expectedAddress, sut.findbyId(STATIC_ADDRESS_ID));
+        verify(staticAddressRepositoryMock).findOne(STATIC_ADDRESS_ID);
+    }
+
+
+    @Test
+    public void testFindByPostalCodeAndCityAndCountry() {
+
+        String postalCode = POSTAL_CODE_76137;
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = COUNTRY_DE;
+
+        when(staticAddressRepositoryMock.findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%", country))
+            .thenReturn(asList(kaSuedstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, country);
+
+        assertThat(result.getAddresses().size(), is(1));
+        verify(staticAddressRepositoryMock).findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%",
+            country);
+    }
+
+
+    @Test
+    public void getAddressesByDetails() {
+
+        String postalCode = POSTAL_CODE_76137;
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = COUNTRY_DE;
+
+        when(staticAddressRepositoryMock.findByCountryAndPostalCodeAndCity(postalCode, normalizedCity, country))
+            .thenReturn(asList(kaSuedstadt));
+
+        List<StaticAddress> result = sut.getAddressesByDetails(postalCode, city, country);
+
+        assertThat(result.size(), is(1));
+    }
+
+
+    @Test
+    public void testFindLatLong() {
+
+        BigDecimal lat = new BigDecimal("49.123");
+        BigDecimal lon = new BigDecimal("8.123");
+        GeoLocation loc = new GeoLocation(lat, lon);
+
+        when(staticAddressRepositoryMock.findByLatitudeAndLongitude(loc.getLatitude(), loc.getLongitude())).thenReturn(
+            kaSuedstadt);
+
+        StaticAddress result = sut.getForLocation(loc);
+
+        assertThat(result, CoreMatchers.notNullValue());
+
+        assertThat(result.toAddress().getDisplayName(), CoreMatchers.equalTo(kaSuedstadt.toAddress().getDisplayName()));
+        verify(staticAddressRepositoryMock).findByLatitudeAndLongitude(loc.getLatitude(), loc.getLongitude());
+    }
+
+
+    @Test
+    public void testFallbackFindByPostalCodeAndCity() {
+
+        String postalCode = "76131";
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = "";
+
+        when(staticAddressRepositoryMock.findByPostalCodeAndCity(postalCode, normalizedCity + "%")).thenReturn(
+            new ArrayList<>());
+        when(staticAddressRepositoryMock.findByPostalCodeOrCity(postalCode, normalizedCity + "%")).thenReturn(asList(
+                kaSuedstadt, kaWeststadt, kaNordstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, country);
+
+        assertThat(result.getAddresses().size(), is(3));
+
+        verify(staticAddressRepositoryMock).findByPostalCodeAndCity(postalCode, normalizedCity + "%");
+        verify(staticAddressRepositoryMock).findByPostalCodeOrCity(postalCode, normalizedCity + "%");
+    }
+
+
+    @Test
+    public void testFallbackSplittingSearchParameter() {
+
+        String postalCode = "";
+        String country = "";
+
+        when(staticAddressRepositoryMock.findByPostalCodeAndCity(postalCode,
+                CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED + "%")).thenReturn(new ArrayList<>());
+        when(staticAddressRepositoryMock.findByPostalCodeOrCity(postalCode,
+                CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED + "%")).thenReturn(new ArrayList<>());
+
+        sut.findAddresses(postalCode, CITY_NEUSTADT_AN_DER_WEINSTRASSE, country);
+
+        verify(staticAddressRepositoryMock).findByPostalCodeAndCity("",
+            CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED + "%");
+        verify(staticAddressRepositoryMock).findByPostalCodeOrCity("",
+            CITY_NEUSTADT_AN_DER_WEINSTRASSE_NORMALIZED + "%");
+    }
+
+
+    /**
+     * Check transformation of {@link StaticAddress} to {@link Address}.
+     */
+    @Test
+    public void testAddressTransformation() {
+
+        String postalCode = POSTAL_CODE_76137;
+        String city = CITY_KARLSRUHE;
+        String normalizedCity = CITY_KARLSRUHE_NORMALIZED;
+        String country = COUNTRY_DE;
+
+        when(staticAddressRepositoryMock.findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%", country))
+            .thenReturn(asList(kaSuedstadt));
+
+        AddressList result = sut.findAddresses(postalCode, city, country);
+
+        assertThat(result.getAddresses().size(), is(1));
+
+        Address address = result.getAddresses().get(0);
+
+        Assert.assertEquals("76137 Karlsruhe (Suedstadt)", address.getDisplayName());
+        Assert.assertEquals(COUNTRY_DE, address.getAddress().get(Address.COUNTRY_CODE));
+        Assert.assertNotNull(address.getLatitude());
+        Assert.assertNotNull(address.getLongitude());
+
+        verify(staticAddressRepositoryMock).findByCountryAndPostalCodeAndCity(postalCode, normalizedCity + "%",
+            country);
+    }
+
+
+    @Test
+    public void saveStaticAddressWithValidAddress() {
+
+        berlinSchoenefeld.setUniqueId(UNIQUE_ID);
+        when(staticAddressRepositoryMock.save(berlinSchoenefeld)).thenReturn(berlinSchoenefeld);
+
+        StaticAddress staticAddress = this.sut.saveStaticAddress(berlinSchoenefeld);
+
+        assertThat(staticAddress, is(berlinSchoenefeld));
+        verify(staticAddressRepositoryMock).save(berlinSchoenefeld);
+    }
+
+
+    @Test
+    public void saveNewStaticAddressWithoutUniqueId() {
+
+        berlinSchoenefeld.setId(null);
+        berlinSchoenefeld.setUniqueId(null);
+
+        BigInteger id = new BigInteger("1301000000000005");
+
+        when(staticAddressRepositoryMock.save(berlinSchoenefeld)).thenReturn(berlinSchoenefeld);
+        when(uniqueIdSequenceServiceMock.getNextId("StaticAddress")).thenReturn(id);
+        when(staticAddressRepositoryMock.findByUniqueId(id)).thenReturn(null);
+
+        ArgumentCaptor<StaticAddress> captor = ArgumentCaptor.forClass(StaticAddress.class);
+
+        StaticAddress savedBerlinSchoenefeld = sut.saveStaticAddress(berlinSchoenefeld);
+        assertThat(savedBerlinSchoenefeld.getUniqueId(), notNullValue());
+
+        verify(staticAddressRepositoryMock).save(captor.capture());
+        assertThat(captor.getValue().getUniqueId(), is(savedBerlinSchoenefeld.getUniqueId()));
+    }
+
+
+    @Test
+    public void determineUniqueId() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("StaticAddress")).thenReturn(BigInteger.ONE);
+        when(staticAddressRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(null);
+
+        assertThat(sut.determineUniqueId(), is(BigInteger.ONE));
+
+        verify(uniqueIdSequenceServiceMock, times(1)).getNextId("StaticAddress");
+    }
+
+
+    @Test
+    public void determineUniqueIdWithSecondRetry() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("StaticAddress")).thenReturn(BigInteger.ONE);
+        when(staticAddressRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(new StaticAddress());
+
+        assertThat(sut.determineUniqueId(), is(new BigInteger("2")));
+
+        InOrder order = inOrder(uniqueIdSequenceServiceMock);
+        order.verify(uniqueIdSequenceServiceMock, times(1)).getNextId("StaticAddress");
+        order.verify(uniqueIdSequenceServiceMock, times(1)).setNextId("StaticAddress", new BigInteger("2"));
+    }
+
+
+    @Test
+    public void saveStaticAddressWithNullValues() {
+
+        StaticAddress berlinSchoenefeldWithNull = mock(StaticAddress.class);
+
+        when(berlinSchoenefeldWithNull.getId()).thenReturn(null);
+        when(berlinSchoenefeldWithNull.getCity()).thenReturn(null);
+        when(berlinSchoenefeldWithNull.getSuburb()).thenReturn(null);
+        when(berlinSchoenefeldWithNull.getPostalcode()).thenReturn(null);
+
+        when(staticAddressRepositoryMock.save(berlinSchoenefeldWithNull)).thenReturn(berlinSchoenefeld);
+
+        this.sut.saveStaticAddress(berlinSchoenefeldWithNull);
+
+        verify(berlinSchoenefeldWithNull, times(1)).setSuburb("");
+        verify(berlinSchoenefeldWithNull, times(1)).setCity("");
+        verify(berlinSchoenefeldWithNull, times(1)).setPostalcode("");
+        verify(staticAddressRepositoryMock).save(berlinSchoenefeldWithNull);
+    }
+
+
+    @Test
+    public void testNormalizingProcess() {
+
+        StaticAddress berlinSchoenefeldWithNull = mock(StaticAddress.class);
+
+        when(berlinSchoenefeldWithNull.getId()).thenReturn(null);
+        when(berlinSchoenefeldWithNull.getCity()).thenReturn(CITY_KARLSRUHE);
+        when(berlinSchoenefeldWithNull.getSuburb()).thenReturn(CITY_OBERREUT);
+        when(berlinSchoenefeldWithNull.getPostalcode()).thenReturn(POSTALCODE_76189);
+
+        when(staticAddressRepositoryMock.save(berlinSchoenefeldWithNull)).thenReturn(berlinSchoenefeld);
+
+        this.sut.saveStaticAddress(berlinSchoenefeldWithNull);
+
+        verify(berlinSchoenefeldWithNull, times(1)).setSuburbNormalized(CITY_OBERREUT_NORMALIZED);
+        verify(berlinSchoenefeldWithNull, times(1)).setCityNormalized(CITY_KARLSRUHE_NORMALIZED);
+        verify(berlinSchoenefeldWithNull, never()).setPostalcode(anyString());
+        verify(staticAddressRepositoryMock).save(berlinSchoenefeldWithNull);
+    }
+
+
+    @Test(expected = StaticAddressDuplicationException.class)
+    public void saveStaticAddressWithDuplicates() {
+
+        List<StaticAddress> staticAddresses = new ArrayList<>();
+        staticAddresses.add(berlinSchoenefeld);
+
+        berlinSchoenefeld.setCityNormalized(CITY_BERLIN_NORMALIZED);
+        berlinSchoenefeld.setSuburbNormalized(CITY_SCHOENEFELD_NORMALIZED);
+
+        when(staticAddressRepositoryMock.findByCityNormalizedAndSuburbNormalizedAndPostalcode(
+                berlinSchoenefeld.getCityNormalized(), berlinSchoenefeld.getSuburbNormalized(),
+                berlinSchoenefeld.getPostalcode())).thenReturn(staticAddresses);
+
+        sut.saveStaticAddress(berlinSchoenefeld);
+    }
+
+
+    @Test(expected = StaticAddressCoordinatesDuplicationException.class)
+    public void saveStaticAddressWithDuplicateCoordinates() {
+
+        berlinSchoenefeld.setCityNormalized(CITY_BERLIN_NORMALIZED);
+        berlinSchoenefeld.setSuburbNormalized(CITY_SCHOENEFELD_NORMALIZED);
+
+        when(staticAddressRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class)))
+            .thenReturn(new StaticAddress());
+
+        sut.saveStaticAddress(berlinSchoenefeld);
+    }
+
+
+    @Test
+    public void updateStaticAddress() {
+
+        berlinSchoenefeld.setId(1L);
+
+        when(staticAddressRepositoryMock.findOne(berlinSchoenefeld.getId())).thenReturn(berlinSchoenefeld);
+        when(staticAddressRepositoryMock.save(berlinSchoenefeld)).thenReturn(berlinSchoenefeld);
+        assertThat(sut.saveStaticAddress(berlinSchoenefeld), is(berlinSchoenefeld));
+    }
+
+
+    @Test
+    public void updateStaticAddressWithChangedGeocoordinates() {
+
+        berlinSchoenefeld.setId(1L);
+
+        StaticAddress berlinSchoenefeldParameterChanged = new StaticAddress();
+        berlinSchoenefeldParameterChanged.setId(1L);
+        berlinSchoenefeldParameterChanged.setCity(berlinSchoenefeld.getCity());
+        berlinSchoenefeldParameterChanged.setCityNormalized(berlinSchoenefeld.getCityNormalized());
+        berlinSchoenefeldParameterChanged.setSuburb(berlinSchoenefeld.getSuburb());
+        berlinSchoenefeldParameterChanged.setSuburbNormalized(berlinSchoenefeld.getSuburbNormalized());
+        berlinSchoenefeldParameterChanged.setPostalcode(berlinSchoenefeld.getPostalcode());
+        berlinSchoenefeldParameterChanged.setLatitude(BigDecimal.ONE);
+        berlinSchoenefeldParameterChanged.setLongitude(BigDecimal.TEN);
+
+        when(staticAddressRepositoryMock.findOne(berlinSchoenefeld.getId())).thenReturn(
+            berlinSchoenefeldParameterChanged);
+        when(staticAddressRepositoryMock.save(berlinSchoenefeld)).thenReturn(berlinSchoenefeld);
+        assertThat(sut.saveStaticAddress(berlinSchoenefeld), is(berlinSchoenefeld));
+        verify(staticAddressRepositoryMock, times(1)).findByLatitudeAndLongitude(any(BigDecimal.class),
+            any(BigDecimal.class));
+        verify(staticAddressRepositoryMock, never()).findByCityNormalizedAndSuburbNormalizedAndPostalcode(anyString(),
+            anyString(), anyString());
+    }
+
+
+    @Test(expected = StaticAddressCoordinatesDuplicationException.class)
+    public void updateStaticAddressWithDuplicateCoordinatesError() {
+
+        berlinSchoenefeld.setId(1L);
+
+        StaticAddress address = new StaticAddress();
+        address.setPostalcode(berlinSchoenefeld.getPostalcode());
+        address.setCity(berlinSchoenefeld.getCity());
+        address.setSuburb(berlinSchoenefeld.getSuburb());
+        address.setLongitude(BigDecimal.TEN);
+        address.setLatitude(BigDecimal.ONE);
+
+        when(staticAddressRepositoryMock.findOne(berlinSchoenefeld.getId())).thenReturn(address);
+        when(staticAddressRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class)))
+            .thenReturn(new StaticAddress());
+
+        sut.saveStaticAddress(berlinSchoenefeld);
+
+        verify(staticAddressRepositoryMock, never()).save(any(StaticAddress.class));
+
+        verify(staticAddressRepositoryMock, never()).findByCityNormalizedAndSuburbNormalizedAndPostalcode(anyString(),
+            anyString(), anyString());
+    }
+
+
+    @Test
+    public void updateStaticAddressWithKeyValueChanges() {
+
+        berlinSchoenefeld.setId(1L);
+        berlinSchoenefeld.setCityNormalized(CITY_BERLIN_NORMALIZED);
+        berlinSchoenefeld.setSuburbNormalized(CITY_SCHOENEFELD_NORMALIZED);
+
+        when(staticAddressRepositoryMock.findOne(berlinSchoenefeld.getId())).thenReturn(
+            berlinSchoenefeldWithoutPostalcode);
+        when(staticAddressRepositoryMock.findByCityNormalizedAndSuburbNormalizedAndPostalcode(
+                berlinSchoenefeld.getCityNormalized(), berlinSchoenefeld.getSuburbNormalized(),
+                berlinSchoenefeld.getPostalcode())).thenReturn(new ArrayList<>());
+        when(staticAddressRepositoryMock.save(berlinSchoenefeld)).thenReturn(berlinSchoenefeld);
+
+        sut.saveStaticAddress(berlinSchoenefeld);
+
+        assertThat(sut.saveStaticAddress(berlinSchoenefeld), is(berlinSchoenefeld));
+    }
+
+
+    @Test(expected = StaticAddressDuplicationException.class)
+    public void updateStaticAddressWithKeyValueChangesAndDuplicates() {
+
+        berlinSchoenefeld.setId(1L);
+        berlinSchoenefeld.setCityNormalized(CITY_BERLIN_NORMALIZED);
+        berlinSchoenefeld.setSuburbNormalized(CITY_SCHOENEFELD_NORMALIZED);
+
+        List<StaticAddress> staticAddresses = new ArrayList<>();
+        staticAddresses.add(berlinSchoenefeld);
+
+        when(staticAddressRepositoryMock.findOne(berlinSchoenefeld.getId())).thenReturn(
+            berlinSchoenefeldWithoutPostalcode);
+
+        when(staticAddressRepositoryMock.findByCityNormalizedAndSuburbNormalizedAndPostalcode(
+                berlinSchoenefeld.getCityNormalized(), berlinSchoenefeld.getSuburbNormalized(),
+                berlinSchoenefeld.getPostalcode())).thenReturn(staticAddresses);
+
+        sut.saveStaticAddress(berlinSchoenefeld);
+    }
+
+
+    @Test
+    public void getAll() {
+
+        List<StaticAddress> staticAddresses = new ArrayList<>();
+        staticAddresses.add(kaSuedstadt);
+        staticAddresses.add(kaWeststadt);
+
+        when(staticAddressRepositoryMock.findAll()).thenReturn(staticAddresses);
+
+        assertThat(sut.getAll(), is(staticAddresses));
+    }
+
+
+    @Test
+    public void testGetAddressListListForStaticAddressId() {
+
+        List<AddressList> expectedListOfLists = new ArrayList<>();
+        StaticAddress expectedAddress = new StaticAddress();
+        expectedAddress.setCountry("Unique Attribute for distinction");
+
+        AddressList expectedList = new AddressList("Result ", asList(expectedAddress.toAddress()));
+        expectedListOfLists.add(expectedList);
+
+        when(staticAddressRepositoryMock.findOne(STATIC_ADDRESS_ID)).thenReturn(expectedAddress);
+
+        Assert.assertEquals(expectedListOfLists, sut.getAddressListListForStaticAddressId(STATIC_ADDRESS_ID));
+    }
+
+
+    @Test
+    public void testGetAddressListListForNotExistingStaticAddressId() {
+
+        when(staticAddressRepositoryMock.findOne(STATIC_ADDRESS_ID)).thenReturn(null);
+
+        Assert.assertEquals(new ArrayList<AddressList>(), sut.getAddressListListForStaticAddressId(STATIC_ADDRESS_ID));
+    }
+
+
+    @Test
+    public void testGetAddressListListForGeolocation() {
+
+        List<AddressList> expectedListOfLists = new ArrayList<>();
+        StaticAddress expectedAddress = new StaticAddress();
+        expectedAddress.setCountry("Unique Attribute for distinction");
+
+        AddressList expectedList = new AddressList("Result ", asList(expectedAddress.toAddress()));
+        expectedListOfLists.add(expectedList);
+
+        when(staticAddressRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class)))
+            .thenReturn(expectedAddress);
+
+        Assert.assertEquals(expectedListOfLists,
+            sut.getAddressListListForGeolocation(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN)));
+    }
+
+
+    @Test
+    public void testGetAddressListListForNotExistingGeolocation() {
+
+        when(staticAddressRepositoryMock.findByLatitudeAndLongitude(BigDecimal.ONE, BigDecimal.TEN)).thenReturn(null);
+
+        Assert.assertEquals(new ArrayList<AddressList>(),
+            sut.getAddressListListForGeolocation(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN)));
+    }
+
+
+    @Test
+    public void normalizeFields() {
+
+        StaticAddress address = new StaticAddress();
+        sut.normalizeFields(address);
+
+        assertThat(address.getCityNormalized(), nullValue());
+        assertThat(address.getSuburbNormalized(), nullValue());
+    }
+
+
+    @Test
+    public void normalizeFieldsNonNull() {
+
+        StaticAddress address = new StaticAddress();
+        address.setCity("FOO");
+        address.setSuburb("BAR");
+
+        when(normalizerService.normalize("FOO")).thenReturn("foo");
+        when(normalizerService.normalize("BAR")).thenReturn("bar");
+
+        sut.normalizeFields(address);
+
+        assertThat(address.getCityNormalized(), is("foo"));
+        assertThat(address.getSuburbNormalized(), is("bar"));
+    }
+
+
+    @Test
+    public void fillMissingHashKeys() {
+
+        Pageable pageable1 = new PageRequest(0, 3);
+        Page<StaticAddress> page = new PageImpl<>(asList(kaSuedstadt, kaNordstadt, kaWeststadt), pageable1, 3);
+
+        Pageable pageable2 = new PageRequest(0, 3);
+        Page<StaticAddress> lastPage = new PageImpl<>(emptyList(), pageable2, 50);
+
+        when(staticAddressRepositoryMock.findMissingHashKeys(any(Pageable.class))).thenReturn(page, page, lastPage);
+
+        sut.fillMissingHashKeys();
+
+        verify(staticAddressRepositoryMock, times(3)).findMissingHashKeys(any(Pageable.class));
+        verify(staticAddressRepositoryMock, times(3)).save(any(StaticAddress.class));
+    }
+
+
+    @Test
+    public void getAddressesInBoundingBox() {
+
+        double distance = 20d;
+        GeoLocation corner = new GeoLocation(BigDecimal.ONE, BigDecimal.TEN);
+        GeoLocation location = mock(GeoLocation.class);
+        BoundingBox boundingBox = mock(BoundingBox.class);
+
+        when(location.getBoundingBox(distance)).thenReturn(boundingBox);
+        when(boundingBox.getLowerLeft()).thenReturn(corner);
+        when(boundingBox.getUpperRight()).thenReturn(corner);
+        when(staticAddressRepositoryMock.findByBoundingBox(argThat(closeTo(BigDecimal.ONE, BigDecimal.ZERO)),
+                argThat(closeTo(BigDecimal.ONE, BigDecimal.ZERO)), argThat(closeTo(BigDecimal.TEN, BigDecimal.ZERO)),
+                argThat(closeTo(BigDecimal.TEN, BigDecimal.ZERO)))).thenReturn(asList(berlinSchoenefeld));
+
+        List<StaticAddress> addresses = sut.getAddressesInBoundingBox(location, distance);
+
+        assertThat(addresses, hasSize(1));
+    }
+
+
+    private void initTestAddresses() {
+
+        kaSuedstadt = new StaticAddress();
+        kaSuedstadt.setId(76137L);
+        kaSuedstadt.setPostalcode(POSTAL_CODE_76137);
+        kaSuedstadt.setCity(CITY_KARLSRUHE);
+        kaSuedstadt.setSuburb("Suedstadt");
+        kaSuedstadt.setCountry(COUNTRY_DE);
+        kaSuedstadt.setLatitude(new BigDecimal(1.1));
+        kaSuedstadt.setLongitude(new BigDecimal(1.2));
+
+        kaWeststadt = new StaticAddress();
+        kaWeststadt.setId(76135L);
+        kaWeststadt.setPostalcode("76135");
+        kaWeststadt.setCity(CITY_KARLSRUHE);
+        kaWeststadt.setSuburb("Weststadt");
+        kaWeststadt.setCountry(COUNTRY_DE);
+        kaWeststadt.setLatitude(new BigDecimal(2.1));
+        kaWeststadt.setLongitude(new BigDecimal(2.2));
+
+        kaNordstadt = new StaticAddress();
+        kaNordstadt.setId(76133L);
+        kaNordstadt.setPostalcode("76133");
+        kaNordstadt.setCity(CITY_KARLSRUHE);
+        kaNordstadt.setSuburb("Nordstadt");
+        kaNordstadt.setCountry(COUNTRY_DE);
+        kaNordstadt.setLatitude(new BigDecimal(3.1));
+        kaNordstadt.setLongitude(new BigDecimal(3.2));
+
+        StaticAddress berlinSteglitz = new StaticAddress();
+        berlinSteglitz.setId(12157L);
+        berlinSteglitz.setPostalcode("12157");
+        berlinSteglitz.setCity(CITY_BERLIN);
+        berlinSteglitz.setSuburb("Steglitz");
+        berlinSteglitz.setCountry(COUNTRY_DE);
+        berlinSteglitz.setLatitude(new BigDecimal(4.1));
+        berlinSteglitz.setLongitude(new BigDecimal(4.2));
+
+        berlinSchoenefeld = new StaticAddress();
+        berlinSchoenefeld.setPostalcode("12345");
+        berlinSchoenefeld.setCity(CITY_BERLIN);
+        berlinSchoenefeld.setSuburb(CITY_SCHOENEFELD);
+        berlinSchoenefeld.setLatitude(new BigDecimal(4.1));
+        berlinSchoenefeld.setLongitude(new BigDecimal(4.2));
+
+        berlinSchoenefeldWithoutPostalcode = new StaticAddress();
+        berlinSchoenefeldWithoutPostalcode.setCity(berlinSchoenefeld.getCity());
+        berlinSchoenefeldWithoutPostalcode.setSuburb(berlinSchoenefeld.getSuburb());
+        berlinSchoenefeldWithoutPostalcode.setPostalcode("");
+        berlinSchoenefeldWithoutPostalcode.setLatitude(berlinSchoenefeld.getLatitude());
+        berlinSchoenefeldWithoutPostalcode.setLongitude(berlinSchoenefeld.getLongitude());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressControllerMvcUnitTest.java
new file mode 100644
index 00000000..3f23ac8e
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressControllerMvcUnitTest.java
@@ -0,0 +1,256 @@
+package net.contargo.iris.address.staticsearch.web;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.service.StaticAddressCoordinatesDuplicationException;
+import net.contargo.iris.address.staticsearch.service.StaticAddressDuplicationException;
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.Matchers.any;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * Unit tests for controller {@link StaticAddressController}.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:web-api-context.xml" })
+@WebAppConfiguration
+public class StaticAddressControllerMvcUnitTest {
+
+    private static final long ID = 1L;
+    private static final String CITY = "City";
+    private static final String POSTALCODE = "76137";
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Autowired
+    private StaticAddressService staticAddressServiceMock;
+
+    @Before
+    public void setUp() {
+
+        reset(staticAddressServiceMock);
+    }
+
+
+    @Test
+    public void testGetAddressesByDetails() throws Exception {
+
+        List<StaticAddress> staticAddresses = new ArrayList<>();
+        staticAddresses.add(new StaticAddress());
+
+        when(staticAddressServiceMock.getAddressesByDetailsWithFallbacks("12345", "karlsruhe", null)).thenReturn(
+            staticAddresses);
+
+        MockHttpServletRequestBuilder builder = get("/staticaddresses/?postalcode=12345&city=karlsruhe");
+
+        ResultActions resultActions = perform(builder).andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddresses", staticAddresses));
+    }
+
+
+    @Test
+    public void searchRequestEmpty() throws Exception {
+
+        MockHttpServletRequestBuilder requestBuilder = get("/staticaddresses/");
+
+        ResultActions resultActions = perform(requestBuilder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddresses", nullValue()));
+
+        verify(staticAddressServiceMock, never()).getAddressesByDetailsWithFallbacks(null, null, null);
+    }
+
+
+    @Test
+    public void getStaticAddress() throws Exception {
+
+        when(staticAddressServiceMock.findbyId(1L)).thenReturn(new StaticAddress());
+
+        MockHttpServletRequestBuilder requestBuilder = get("/staticaddresses/1");
+
+        ResultActions resultActions = perform(requestBuilder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", new StaticAddress()));
+    }
+
+
+    @Test
+    public void prepareCreateStaticAddress() throws Exception {
+
+        MockHttpServletRequestBuilder requestBuilder = get("/staticaddresses/new");
+
+        ResultActions resultActions = perform(requestBuilder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", any(StaticAddress.class)));
+    }
+
+
+    @Test
+    public void createStaticAddress() throws Exception {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCity(CITY);
+        staticAddress.setCityNormalized(CITY.toUpperCase());
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+
+        StaticAddress savedStaticAddress = new StaticAddress();
+        savedStaticAddress.setId(ID);
+
+        when(staticAddressServiceMock.saveStaticAddress(staticAddress)).thenReturn(savedStaticAddress);
+
+        MockHttpServletRequestBuilder builder = post("/staticaddresses/");
+        builder.flashAttr("staticAddress", staticAddress);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", savedStaticAddress));
+        resultActions.andExpect(model().attribute("message", hasProperty("message", is("staticaddress.save.success"))));
+
+        verify(staticAddressServiceMock).saveStaticAddress(staticAddress);
+    }
+
+
+    @Test
+    public void createStaticAddressWithDuplicate() throws Exception {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCity(CITY);
+        staticAddress.setCityNormalized(CITY.toUpperCase());
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+
+        when(staticAddressServiceMock.saveStaticAddress(staticAddress)).thenThrow(
+            new StaticAddressDuplicationException());
+
+        MockHttpServletRequestBuilder builder = post("/staticaddresses/");
+        builder.flashAttr("staticAddress", staticAddress);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", staticAddress));
+        resultActions.andExpect(model().attribute("message",
+                hasProperty("message", is("staticaddress.error.duplicate"))));
+
+        verify(staticAddressServiceMock).saveStaticAddress(staticAddress);
+    }
+
+
+    @Test
+    public void createStaticAddressWithDuplicateCoordinates() throws Exception {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCity(CITY);
+        staticAddress.setCityNormalized(CITY.toUpperCase());
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+
+        when(staticAddressServiceMock.saveStaticAddress(staticAddress)).thenThrow(
+            new StaticAddressCoordinatesDuplicationException());
+
+        MockHttpServletRequestBuilder requestBuilder = post("/staticaddresses/");
+        requestBuilder.flashAttr("staticAddress", staticAddress);
+
+        ResultActions resultActions = perform(requestBuilder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", staticAddress));
+        resultActions.andExpect(model().attribute("message",
+                hasProperty("message", is("staticaddress.error.coordinates.duplicate"))));
+
+        verify(staticAddressServiceMock).saveStaticAddress(staticAddress);
+    }
+
+
+    @Test
+    public void createStaticAddressWithErrors() throws Exception {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCity(CITY);
+        staticAddress.setCityNormalized(CITY.toUpperCase());
+
+        MockHttpServletRequestBuilder builder = post("/staticaddresses/");
+        builder.flashAttr("staticAddress", staticAddress);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", staticAddress));
+
+        verify(staticAddressServiceMock, never()).saveStaticAddress(staticAddress);
+    }
+
+
+    @Test
+    public void updateStaticAddress() throws Exception {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setPostalcode(POSTALCODE);
+        staticAddress.setCity(CITY);
+        staticAddress.setCityNormalized(CITY.toUpperCase());
+        staticAddress.setId(ID);
+        staticAddress.setLatitude(BigDecimal.ONE);
+        staticAddress.setLongitude(BigDecimal.ONE);
+
+        when(staticAddressServiceMock.saveStaticAddress(staticAddress)).thenReturn(staticAddress);
+
+        MockHttpServletRequestBuilder builder = put("/staticaddresses/1");
+        builder.flashAttr("staticAddress", staticAddress);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("staticAddress", staticAddress));
+        resultActions.andExpect(model().attribute("message",
+                hasProperty("message", is("staticaddress.update.success"))));
+
+        verify(staticAddressServiceMock).saveStaticAddress(staticAddress);
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequestUnitTest.java b/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequestUnitTest.java
new file mode 100644
index 00000000..fd390ee1
--- /dev/null
+++ b/src/test/java/net/contargo/iris/address/staticsearch/web/StaticAddressRequestUnitTest.java
@@ -0,0 +1,78 @@
+package net.contargo.iris.address.staticsearch.web;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test for {@link StaticAddressRequest}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class StaticAddressRequestUnitTest {
+
+    private StaticAddressRequest staticAddressRequest;
+
+    @Before
+    public void before() {
+
+        staticAddressRequest = new StaticAddressRequest();
+    }
+
+
+    @Test
+    public void getPostalcode() throws Exception {
+
+        staticAddressRequest.setPostalcode("");
+        assertThat(null, is(staticAddressRequest.getPostalcode()));
+
+        staticAddressRequest.setPostalcode("76137");
+        assertThat("76137", is(staticAddressRequest.getPostalcode()));
+
+        staticAddressRequest.setPostalcode(null);
+        assertThat(null, is(staticAddressRequest.getPostalcode()));
+    }
+
+
+    @Test
+    public void getCity() throws Exception {
+
+        staticAddressRequest.setCity("");
+        assertThat(null, is(staticAddressRequest.getCity()));
+
+        staticAddressRequest.setCity(null);
+        assertThat(null, is(staticAddressRequest.getCity()));
+
+        staticAddressRequest.setCity("Schonach im Schwarzwald");
+        assertThat("Schonach im Schwarzwald", is(staticAddressRequest.getCity()));
+    }
+
+
+    @Test
+    public void isEmpty() throws Exception {
+
+        staticAddressRequest.setCity("");
+        staticAddressRequest.setPostalcode("");
+        assertThat(true, is(staticAddressRequest.isEmpty()));
+
+        staticAddressRequest.setCity(null);
+        staticAddressRequest.setPostalcode(null);
+        assertThat(true, is(staticAddressRequest.isEmpty()));
+
+        staticAddressRequest.setCity("Schonach im Schwarzwald");
+        staticAddressRequest.setPostalcode("78136");
+        assertThat(false, is(staticAddressRequest.isEmpty()));
+
+        staticAddressRequest.setCity(null);
+        staticAddressRequest.setPostalcode("78136");
+        assertThat(false, is(staticAddressRequest.isEmpty()));
+
+        staticAddressRequest.setCity("Schonach im Schwarzwald");
+        staticAddressRequest.setPostalcode(null);
+        assertThat(false, is(staticAddressRequest.isEmpty()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/PublicAPIExceptionHandlerUnitTest.java b/src/test/java/net/contargo/iris/api/PublicAPIExceptionHandlerUnitTest.java
new file mode 100644
index 00000000..fb75051a
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/PublicAPIExceptionHandlerUnitTest.java
@@ -0,0 +1,119 @@
+
+package net.contargo.iris.api;
+
+import org.hamcrest.Matchers;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.springframework.http.HttpStatus;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import org.springframework.web.client.HttpClientErrorException;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * Unit test for {@link PublicAPIExceptionHandler}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public class PublicAPIExceptionHandlerUnitTest {
+
+    private final PublicAPIExceptionHandler sut;
+
+    private final HttpServletRequest request;
+    private final MockHttpServletResponse response;
+
+    public PublicAPIExceptionHandlerUnitTest() {
+
+        sut = new PublicAPIExceptionHandler();
+        request = new MockHttpServletRequest();
+        response = new MockHttpServletResponse();
+    }
+
+    @Test
+    public void testResolveIllegalArgumentException() {
+
+        String exMessage = "Invalid ID for Foo";
+
+        sut.resolveException(request, response, sut, new IllegalArgumentException(exMessage));
+
+        Assert.assertThat(response.getErrorMessage(), Matchers.containsString(exMessage));
+        Assert.assertThat(response.getStatus(), Matchers.equalTo(HttpServletResponse.SC_BAD_REQUEST));
+    }
+
+
+    @Test
+    public void testResolveIllegalStateException() {
+
+        String exMessage = "Invalid state foo";
+
+        sut.resolveException(request, response, sut, new IllegalStateException(exMessage));
+
+        Assert.assertThat(response.getErrorMessage(), Matchers.containsString(exMessage));
+        Assert.assertThat(response.getStatus(), Matchers.equalTo(HttpServletResponse.SC_BAD_REQUEST));
+    }
+
+
+    @Test
+    public void testResolveHttpClientErrorException() {
+
+        String exMessage = "Nominatim down";
+
+        sut.resolveException(request, response, sut,
+            new HttpClientErrorException(HttpStatus.SERVICE_UNAVAILABLE, exMessage));
+
+        Assert.assertThat(response.getErrorMessage(), Matchers.containsString(exMessage));
+        Assert.assertThat(response.getErrorMessage(),
+            Matchers.containsString("Service is temporary not available, please try again later"));
+        Assert.assertThat(response.getStatus(), Matchers.equalTo(HttpServletResponse.SC_SERVICE_UNAVAILABLE));
+    }
+
+
+    @Test
+    public void testResolveNullPointerException() {
+
+        String exMessage = "This should never happen";
+
+        // NullpointerException must be thrown for test purposes
+        sut.resolveException(request, response, sut, new NullPointerException(exMessage));
+
+        Assert.assertThat(response.getErrorMessage(), Matchers.containsString(exMessage));
+        Assert.assertThat(response.getStatus(), Matchers.equalTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+    }
+
+
+    @Test
+    public void testResolveRuntimeException() {
+
+        String exMessage = "This should never happen";
+
+        // Runtimeexception must be thrown for test purposes
+        sut.resolveException(request, response, sut, new RuntimeException(exMessage));
+
+        Assert.assertThat(response.getErrorMessage(), Matchers.containsString(exMessage));
+        Assert.assertThat(response.getStatus(), Matchers.equalTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+    }
+
+
+    @Test
+    public void testExceptionWhileResolvingGetsCaught() throws IOException {
+
+        String exMessage = "Invalid state foo";
+        HttpServletResponse responseMock = mock(HttpServletResponse.class);
+
+        doThrow(new IOException()).when(responseMock).sendError(HttpServletResponse.SC_BAD_REQUEST,
+            "Bad request. " + exMessage);
+        sut.resolveException(request, responseMock, sut, new IllegalStateException(exMessage));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/WebExceptionHandlerUnitTest.java b/src/test/java/net/contargo/iris/api/WebExceptionHandlerUnitTest.java
new file mode 100644
index 00000000..35b32f7f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/WebExceptionHandlerUnitTest.java
@@ -0,0 +1,124 @@
+package net.contargo.iris.api;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.hamcrest.Matchers;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import org.unitils.thirdparty.org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link WebExceptionHandler}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class WebExceptionHandlerUnitTest {
+
+    private static final String REPORT_PATH = "test-tmp";
+    private WebExceptionHandler sut;
+    private HttpServletRequest request;
+    private HttpServletResponse response;
+    private UserAuthenticationService userAuthenticationServiceMock;
+
+    @Before
+    public void setUp() {
+
+        userAuthenticationServiceMock = mock(UserAuthenticationService.class);
+        sut = new WebExceptionHandler(new File(REPORT_PATH), userAuthenticationServiceMock);
+
+        request = new MockHttpServletRequest();
+        response = new MockHttpServletResponse();
+    }
+
+
+    @After
+    public void tearDown() {
+
+        // clean up the directory and delete all the files created for this test
+
+        File dir = new File(REPORT_PATH);
+        File[] files = dir.listFiles();
+
+        for (File file : files) {
+            file.delete();
+        }
+
+        dir.delete();
+    }
+
+
+    /**
+     * Test of doResolveException method, of class WebExceptionHandler.
+     */
+    @Test
+    public void testDoResolveExceptionErrorReportContainsTheRelevantInformation() throws Exception {
+
+        sut.doResolveException(request, response, sut, new IOException("My Foo-Exception"));
+
+        File dir = new File(REPORT_PATH);
+        File[] files = dir.listFiles();
+
+        Assert.assertThat(files.length, Matchers.equalTo(1));
+
+        String content = IOUtils.toString(new FileInputStream(files[0]));
+
+        Assert.assertThat(content, Matchers.containsString("java.io.IOException: My Foo-Exception"));
+    }
+
+
+    @Test
+    public void textualRepresentationOfCurrentUser() {
+
+        UserDetails userDetails = new User("admin@synyx.de", "password", asList(new SimpleGrantedAuthority("USER")));
+        UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken =
+            new UsernamePasswordAuthenticationToken(userDetails, null);
+
+        when(userAuthenticationServiceMock.getCurrentUser()).thenReturn(usernamePasswordAuthenticationToken);
+
+        String user = sut.textualRepresentationOfCurrentUser();
+
+        assertThat(user, is("user: admin@synyx.de\n"));
+    }
+
+
+    @Test
+    public void textualRepresentationOfCurrentUserNull() {
+
+        when(userAuthenticationServiceMock.getCurrentUser()).thenReturn(null);
+
+        String user = sut.textualRepresentationOfCurrentUser();
+
+        assertThat(user, is("?"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/discover/DiscoverPublicApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/api/discover/DiscoverPublicApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..977cb99c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/discover/DiscoverPublicApiControllerMvcUnitTest.java
@@ -0,0 +1,115 @@
+package net.contargo.iris.api.discover;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_CONNECTIONS;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_COUNTRIES;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_GEOCODE;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_OSM_ADDRESSES;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_REVERSE_GEOCODE;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_ROUTE_DETAILS_EXAMPLE;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_SEAPORTS_OF_CONNECTIONS;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_SEAPORTS_OF_CONNECTIONS_FILTERED;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_SEAPORT_EXAMPLE;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_SIMPLE_GEOCODES_EXAMPLE;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_TERMINALS;
+import static net.contargo.iris.api.discover.DiscoverPublicApiController.REL_TERMINAL_EXAMPLE;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * MVC Unit test of {@link net.contargo.iris.api.discover.DiscoverPublicApiController}.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class DiscoverPublicApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Test
+    public void discover() throws Exception {
+
+        ResultActions resultActions = perform(get("/").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(jsonPath("$.response.links", hasSize(12)));
+
+        String responseContent = new ObjectMapper().readTree(resultActions.andReturn().getResponse()
+                .getContentAsString()).get("response").toString();
+
+        DiscoverResponse response =
+            new ObjectMapper().readValue(responseContent, new TypeReference<DiscoverResponse>() {
+                });
+
+        assertThat(response.getLink(REL_COUNTRIES).getHref(), is("http://localhost/countries"));
+        assertThat(response.getLink(REL_OSM_ADDRESSES).getHref(),
+            is("http://localhost/osmaddresses/134631686?_=1381911583029"));
+        assertThat(response.getLink(REL_REVERSE_GEOCODE).getHref(), is("http://localhost/reversegeocode/49.123:8.12/"));
+        assertThat(response.getLink(REL_GEOCODE).getHref(),
+            is("http://localhost/geocodes?city=Karlsruhe&postalcode=76137"));
+        assertThat(response.getLink(REL_SEAPORTS_OF_CONNECTIONS).getHref(),
+            is("http://localhost/connections/seaports?combo=ALL"));
+        assertThat(response.getLink(REL_SEAPORTS_OF_CONNECTIONS_FILTERED).getHref(),
+            is("http://localhost/connections/seaports?combo=RAILWAY"));
+        assertThat(response.getLink(REL_SEAPORT_EXAMPLE).getHref(), is("http://localhost/seaports/1301000000000001"));
+        assertThat(response.getLink(REL_TERMINALS).getHref(), is("http://localhost/terminals"));
+        assertThat(response.getLink(REL_TERMINAL_EXAMPLE).getHref(), is("http://localhost/terminals/1301000000000001"));
+        assertThat(response.getLink(REL_CONNECTIONS).getHref(),
+            is("http://localhost/connections/1301000000000001/49.0:8.41/true?containerType=TWENTY_LIGHT&isImport=false&combo=WATERWAY"));
+        assertThat(response.getLink(REL_SIMPLE_GEOCODES_EXAMPLE).getHref(),
+            is("http://localhost/simplegeocodes?city=Karlsruhe&postalcode=76137"));
+        assertThat(response.getLink(REL_ROUTE_DETAILS_EXAMPLE).getHref(),
+            is("http://localhost/routedetails?data.parts%5B0%5D.origin.longitude=4.3"
+                + "&data.parts%5B0%5D.origin.latitude=51.36833"
+                + "&data.parts%5B0%5D.destination.longitude=8.2852700000"
+                + "&data.parts%5B0%5D.destination.latitude=49.0690300000"
+                + "&data.parts%5B0%5D.routeType=BARGE&data.parts%5B0%5D.containerType=TWENTY_LIGHT"
+                + "&data.parts%5B0%5D.containerState=FULL&data.parts%5B1%5D.origin.longitude=8.2852700000"
+                + "&data.parts%5B1%5D.origin.latitude=49.0690300000&data.parts%5B1%5D.destination.longitude=8.41"
+                + "&data.parts%5B1%5D.destination.latitude=49.0&data.parts%5B1%5D.routeType=TRUCK"
+                + "&data.parts%5B1%5D.containerType=TWENTY_LIGHT&data.parts%5B1%5D.containerState=FULL"
+                + "&data.parts%5B2%5D.origin.longitude=8.41&data.parts%5B2%5D.origin.latitude=49.0"
+                + "&data.parts%5B2%5D.destination.longitude=8.2852700000"
+                + "&data.parts%5B2%5D.destination.latitude=49.0690300000&data.parts%5B2%5D.routeType=TRUCK"
+                + "&data.parts%5B2%5D.containerType=TWENTY_LIGHT&data.parts%5B2%5D.containerState=EMPTY"
+                + "&data.parts%5B3%5D.origin.longitude=8.2852700000"
+                + "&data.parts%5B3%5D.origin.latitude=49.0690300000&data.parts%5B3%5D.destination.longitude=4.3"
+                + "&data.parts%5B3%5D.destination.latitude=51.36833&data.parts%5B3%5D.routeType=BARGE"
+                + "&data.parts%5B3%5D.containerType=TWENTY_LIGHT&data.parts%5B3%5D.containerState=EMPTY"));
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/discover/TestExplainViewUnitTest.java b/src/test/java/net/contargo/iris/api/discover/TestExplainViewUnitTest.java
new file mode 100644
index 00000000..66bbd4ba
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/discover/TestExplainViewUnitTest.java
@@ -0,0 +1,172 @@
+package net.contargo.iris.api.discover;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.ResourceSupport;
+
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.io.IOException;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.api.discover.TestExplainView}.
+ *
+ * @author  David Schilling - schilling@synyx.de
+ */
+public class TestExplainViewUnitTest {
+
+    public static final int WANTED_NUMBER_OF_INVOCATIONS = 4;
+    private final HttpServletResponse responseMock = mock(HttpServletResponse.class);
+    private final HttpServletRequest requestMock = mock(HttpServletRequest.class);
+    private final ObjectMapper objectMapper = new ObjectMapper();
+    private final ObjectWriter objectWriter = objectMapper.writerWithDefaultPrettyPrinter();
+    private final ServletOutputStream outputStreamMock = mock(ServletOutputStream.class);
+    private final ResourceSupport countriesResponse = new ResourceSupport();
+    private final UserAuthenticationService userAuthenticationService = mock(UserAuthenticationService.class);
+
+    private final TestExplainView sut = new TestExplainView(userAuthenticationService, new ObjectMapper());
+    private final Map<String, Object> model = new HashMap<>();
+
+    @Before
+    public void setUp() throws IOException {
+
+        when(responseMock.getOutputStream()).thenReturn(outputStreamMock);
+
+        model.put("aaa", 2.0);
+        model.put("response", countriesResponse);
+
+        when(requestMock.getHeader("Accept")).thenReturn("acceptHeader");
+        when(requestMock.getRequestURL()).thenReturn(new StringBuffer("http://requestURL.de"));
+        when(requestMock.getQueryString()).thenReturn("queryString");
+        when(requestMock.getRemoteHost()).thenReturn("127.0.0.1");
+
+        UserDetails userDetails = new User("admin@synyx.de", "password", asList(new SimpleGrantedAuthority("USER")));
+        UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken =
+            new UsernamePasswordAuthenticationToken(userDetails, null);
+
+        when(userAuthenticationService.getCurrentUser()).thenReturn(usernamePasswordAuthenticationToken);
+    }
+
+
+    @Test
+    public void testRenderMergedOutputModel() throws IOException {
+
+        sut.renderMergedOutputModel(model, requestMock, responseMock);
+
+        verify(outputStreamMock, times(WANTED_NUMBER_OF_INVOCATIONS)).write(any(byte[].class));
+    }
+
+
+    @Test
+    public void addGreetingSection() {
+
+        StringBuilder builder = new StringBuilder();
+        sut.addGreetingSection(builder, requestMock);
+
+        assertThat(builder.toString(),
+            is("<h1>Hello admin@synyx.de from 127.0.0.1</h1>"
+                + "This is a <i>RESTful</i> webservice. <br/>"));
+    }
+
+
+    @Test
+    public void testAddJSONPrettyPrintSection() throws IOException {
+
+        StringBuilder builder = new StringBuilder();
+
+        sut.addJSONPrettyPrintSection(responseMock, model, builder);
+        assertThat(builder.toString(), is("<h2>JSON</h2><pre>"));
+        verify(outputStreamMock).write(objectWriter.writeValueAsBytes(model));
+        verify(outputStreamMock).write("</pre>".getBytes("UTF-8"));
+    }
+
+
+    @Test
+    public void testAddFormatSection() {
+
+        StringBuilder builder = new StringBuilder();
+        sut.addFormatsSection(requestMock, builder);
+        assertThat(builder.toString(),
+            is("<h2>Request and Formats</h2>You requested this page using url "
+                + "<b>http://requestURL.de?queryString</b> and Accept-Header "
+                + "<b>acceptHeader</b>  <br/><br/>You requested this page as HTML "
+                + "(Probably because your client has text/html prior to application/json or application/xml "
+                + "in the Accept-Header.If you are intersted in another format please adjust your Accept-Header "
+                + "or append .json or .xml at the url:<ul><li>"
+                + "<a href='http://requestURL.de?queryString.json?queryString'>Show as json</a>  "
+                + "(http://requestURL.de?queryString.json?queryString)</li></ul>"));
+    }
+
+
+    @Test
+    public void testAddFormatSectionWithQueryStringNull() {
+
+        when(requestMock.getQueryString()).thenReturn(null);
+
+        StringBuilder builder = new StringBuilder();
+        sut.addFormatsSection(requestMock, builder);
+        assertThat(builder.toString(),
+            is("<h2>Request and Formats</h2>You requested this page using url "
+                + "<b>http://requestURL.de</b> and Accept-Header <b>acceptHeader</b>  "
+                + "<br/><br/>You requested this page as HTML (Probably because your client has text/html "
+                + "prior to application/json or application/xml in the Accept-Header.If you are intersted "
+                + "in another format please adjust your Accept-Header or append .json or .xml at the url:"
+                + "<ul><li><a href='http://requestURL.de.json'>Show as json</a>  "
+                + "(http://requestURL.de.json)</li></ul>"));
+    }
+
+
+    @Test
+    public void testAddLinkSection() {
+
+        StringBuilder builder = new StringBuilder();
+        countriesResponse.add(new Link("http://textvomlink.de"));
+        sut.addLinkSection(builder, model);
+        assertThat(builder.toString(),
+            is("<h2>Links</h2>You can navigate to the following other resources "
+                + "from here:<ul><li><a href='http://textvomlink.de'>self</a> (http://textvomlink.de)</li></ul>"));
+    }
+
+
+    @Test
+    public void testAddLinkSectionWithPlaceholder() {
+
+        StringBuilder builder = new StringBuilder();
+        countriesResponse.add(new Link("http://textvomlink.de/{placeholder}"));
+        sut.addLinkSection(builder, model);
+        assertThat(builder.toString(),
+            is("<h2>Links</h2>You can navigate to the following other resources from here:"
+                + "<ul><li>self: http://textvomlink.de/{placeholder} (url contains placeholders)</li></ul>"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/AddressDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/AddressDtoServiceConfig.java
new file mode 100644
index 00000000..a90a2889
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/AddressDtoServiceConfig.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.address.dto.AddressDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+@Configuration
+public class AddressDtoServiceConfig {
+
+    @Bean
+    public AddressDtoService addressDtoService() {
+
+        return mock(AddressDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/AirlineDistanceDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/AirlineDistanceDtoServiceConfig.java
new file mode 100644
index 00000000..517c184c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/AirlineDistanceDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.gis.dto.AirlineDistanceDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+class AirlineDistanceDtoServiceConfig {
+
+    @Bean
+    AirlineDistanceDtoService gisDtoService() {
+
+        return mock(AirlineDistanceDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/ControllerLinkBuilderFactoryConfig.java b/src/test/java/net/contargo/iris/api/mock/ControllerLinkBuilderFactoryConfig.java
new file mode 100644
index 00000000..9c122452
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/ControllerLinkBuilderFactoryConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import org.springframework.hateoas.mvc.ControllerLinkBuilderFactory;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class ControllerLinkBuilderFactoryConfig {
+
+    @Bean
+    public ControllerLinkBuilderFactory controllerLinkBuilderFactory() {
+
+        return mock(ControllerLinkBuilderFactory.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/CountryDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/CountryDtoServiceConfig.java
new file mode 100644
index 00000000..68af3ff5
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/CountryDtoServiceConfig.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.countries.dto.CountryDto;
+import net.contargo.iris.countries.dto.CountryDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ *
+ *          <p>Created: Date: 8/27/13 Time: 9:28 AM</p>
+ */
+
+@Configuration
+public class CountryDtoServiceConfig {
+
+    private static final CountryDto GERMANY = new CountryDto("Germany", "DE");
+    private static final CountryDto BELGIUM = new CountryDto("Belgium", "BE");
+
+    @Bean
+    public CountryDtoService countryDtoService() {
+
+        return mock(CountryDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/DistanceCloudAddressDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/DistanceCloudAddressDtoServiceConfig.java
new file mode 100644
index 00000000..68855304
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/DistanceCloudAddressDtoServiceConfig.java
@@ -0,0 +1,24 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDtoService;
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDtoServiceImpl;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class DistanceCloudAddressDtoServiceConfig {
+
+    @Bean
+    public DistanceCloudAddressDtoService distanceCloudAddressDtoService() {
+
+        return mock(DistanceCloudAddressDtoServiceImpl.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/EnricherServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/EnricherServiceConfig.java
new file mode 100644
index 00000000..49d1040a
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/EnricherServiceConfig.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.enricher.dto.EnricherDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+@Configuration
+public class EnricherServiceConfig {
+
+    @Bean
+    public EnricherDtoService EnricherDtoService() {
+
+        return mock(EnricherDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/MainRunConnectionDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/MainRunConnectionDtoServiceConfig.java
new file mode 100644
index 00000000..cf2d6554
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/MainRunConnectionDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.connection.dto.MainRunConnectionDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class MainRunConnectionDtoServiceConfig {
+
+    @Bean
+    public MainRunConnectionDtoService connectionDtoService() {
+
+        return mock(MainRunConnectionDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/RouteUrlSerializationServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/RouteUrlSerializationServiceConfig.java
new file mode 100644
index 00000000..0ccd080a
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/RouteUrlSerializationServiceConfig.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.connection.api.RouteUrlSerializationService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+@Configuration
+public class RouteUrlSerializationServiceConfig {
+
+    @Bean
+    public RouteUrlSerializationService routeUrlSerializationService() {
+
+        return mock(RouteUrlSerializationService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/SeaportDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/SeaportDtoServiceConfig.java
new file mode 100644
index 00000000..14b5a092
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/SeaportDtoServiceConfig.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+@Configuration
+public class SeaportDtoServiceConfig {
+
+    @Bean
+    public SeaportDtoService seaportDtoService() {
+
+        return mock(SeaportDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionDtoServiceConfig.java
new file mode 100644
index 00000000..f909654b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Configuration
+public class SeaportTerminalConnectionDtoServiceConfig {
+
+    @Bean
+    public SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService() {
+
+        return mock(SeaportTerminalConnectionDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionRoutesDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionRoutesDtoServiceConfig.java
new file mode 100644
index 00000000..d187f446
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/SeaportTerminalConnectionRoutesDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.connection.dto.SeaportConnectionRoutesDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Configuration
+public class SeaportTerminalConnectionRoutesDtoServiceConfig {
+
+    @Bean
+    public SeaportConnectionRoutesDtoService seaportConnectionRoutesDtoService() {
+
+        return mock(SeaportConnectionRoutesDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/StaticAddressDtoServiceApiConfig.java b/src/test/java/net/contargo/iris/api/mock/StaticAddressDtoServiceApiConfig.java
new file mode 100644
index 00000000..4e4f032d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/StaticAddressDtoServiceApiConfig.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.address.staticsearch.dto.StaticAddressDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Configuration
+public class StaticAddressDtoServiceApiConfig {
+
+    @Bean
+    public StaticAddressDtoService staticAddressDtoService() {
+
+        return mock(StaticAddressDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/TerminalDtoServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/TerminalDtoServiceConfig.java
new file mode 100644
index 00000000..0a4eecd8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/TerminalDtoServiceConfig.java
@@ -0,0 +1,19 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.terminal.dto.TerminalDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+@Configuration
+public class TerminalDtoServiceConfig {
+
+    @Bean
+    public TerminalDtoService terminalDtoService() {
+
+        return mock(TerminalDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/api/mock/UserAuthenticationServiceConfig.java b/src/test/java/net/contargo/iris/api/mock/UserAuthenticationServiceConfig.java
new file mode 100644
index 00000000..ebce71b8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/api/mock/UserAuthenticationServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.api.mock;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Configuration
+public class UserAuthenticationServiceConfig {
+
+    @Bean
+    public UserAuthenticationService userAuthenticationService() {
+
+        return mock(UserAuthenticationService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/advice/Co2BargeRegionMapUnitTest.java b/src/test/java/net/contargo/iris/co2/advice/Co2BargeRegionMapUnitTest.java
new file mode 100644
index 00000000..cc17ade8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/advice/Co2BargeRegionMapUnitTest.java
@@ -0,0 +1,191 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.terminal.Region;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.container.ContainerState.EMPTY;
+import static net.contargo.iris.container.ContainerState.FULL;
+import static net.contargo.iris.route.RoutePart.*;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class Co2BargeRegionMapUnitTest {
+
+    private Co2BargeRegionMap sut = new Co2BargeRegionMap();
+
+    @Test
+    public void getCo2FactorsKeyFullDownStream() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("FullDownstream"));
+    }
+
+
+    @Test
+    public void getCo2FactorsKeyFullUpStream() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("FullUpstream"));
+    }
+
+
+    @Test
+    public void getCo2FactorsKeyFullNotSet() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.NOT_SET);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("FullUpstream"));
+    }
+
+
+    @Test
+    public void getCo2FactorsKeyEmptyDownStream() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("EmptyDownstream"));
+    }
+
+
+    @Test
+    public void getCo2FactorsKeyEmptyUpStream() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("EmptyUpstream"));
+    }
+
+
+    @Test
+    public void getCo2FactorsKeyEmptyNotSet() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.NOT_SET);
+
+        assertThat(sut.getCo2FactorsKey(routePartMock), is("EmptyUpstream"));
+    }
+
+
+    @Test
+    public void co2FactorsForRegionNiederrhein() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.NIEDERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.27")));
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.NIEDERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.14")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.NIEDERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.31")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.NIEDERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.17")));
+    }
+
+
+    @Test
+    public void co2FactorsForRegionOberrhein() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.OBERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.4")));
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.OBERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.21")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.OBERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.43")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.OBERRHEIN, routePartMock), comparesEqualTo(new BigDecimal("0.23")));
+    }
+
+
+    @Test
+    public void co2FactorsForRegionSchelde() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.SCHELDE, routePartMock), comparesEqualTo(new BigDecimal("0.375")));
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.SCHELDE, routePartMock), comparesEqualTo(new BigDecimal("0.375")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.SCHELDE, routePartMock), comparesEqualTo(new BigDecimal("0.427")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.SCHELDE, routePartMock), comparesEqualTo(new BigDecimal("0.427")));
+    }
+
+
+    @Test
+    public void co2FactorsForRegionNotSet() {
+
+        RoutePart routePartMock = mock(RoutePart.class);
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.NOT_SET, routePartMock), comparesEqualTo(new BigDecimal("0.27")));
+
+        when(routePartMock.getContainerState()).thenReturn(EMPTY);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.NOT_SET, routePartMock), comparesEqualTo(new BigDecimal("0.14")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.UPSTREAM);
+        assertThat(sut.getCo2Factor(Region.NOT_SET, routePartMock), comparesEqualTo(new BigDecimal("0.31")));
+
+        when(routePartMock.getContainerState()).thenReturn(FULL);
+        when(routePartMock.getDirection()).thenReturn(Direction.DOWNSTREAM);
+        assertThat(sut.getCo2Factor(Region.NOT_SET, routePartMock), comparesEqualTo(new BigDecimal("0.17")));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/advice/Co2PartBargeStrategyUnitTest.java b/src/test/java/net/contargo/iris/co2/advice/Co2PartBargeStrategyUnitTest.java
new file mode 100644
index 00000000..a602b778
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/advice/Co2PartBargeStrategyUnitTest.java
@@ -0,0 +1,71 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.container.ContainerState.EMPTY;
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.terminal.Region.OBERRHEIN;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.co2.advice.Co2PartBargeStrategy}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class Co2PartBargeStrategyUnitTest {
+
+    @Mock
+    private Terminal terminalMock;
+    @Mock
+    private Co2BargeRegionMap co2BargeRegionMapMock;
+
+    private Co2PartBargeStrategy sut;
+
+    @Before
+    public void before() {
+
+        sut = new Co2PartBargeStrategy(co2BargeRegionMapMock);
+    }
+
+
+    @Test
+    public void getEmission() {
+
+        RoutePart routePart = new RoutePart();
+        routePart.setRouteType(BARGE);
+        routePart.setContainerState(EMPTY);
+
+        // seaport -> terminal (so direction is upstream)
+        routePart.setOrigin(new Seaport());
+        routePart.setDestination(terminalMock);
+
+        routePart.getData().setDieselDistance(new BigDecimal("2"));
+
+        when(terminalMock.getRegion()).thenReturn(OBERRHEIN);
+        when(co2BargeRegionMapMock.getCo2Factor(OBERRHEIN, routePart)).thenReturn(new BigDecimal("0.4"));
+
+        BigDecimal expected = BigDecimal.valueOf(2 * 0.4);
+        assertThat(sut.getEmissionForRoutePart(routePart), comparesEqualTo(expected));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/advice/Co2PartRailStrategyUnitTest.java b/src/test/java/net/contargo/iris/co2/advice/Co2PartRailStrategyUnitTest.java
new file mode 100644
index 00000000..1388a122
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/advice/Co2PartRailStrategyUnitTest.java
@@ -0,0 +1,75 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.route.RoutePart;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.container.ContainerState.FULL;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.equalTo;
+
+
+/**
+ * Unit test of {@link Co2PartRailStrategy}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class Co2PartRailStrategyUnitTest {
+
+    private Co2PartRailStrategy sut;
+
+    private RoutePart routePart;
+    private BigDecimal dieselDistance;
+    private BigDecimal electricDistance;
+
+    @Before
+    public void before() {
+
+        dieselDistance = new BigDecimal(2);
+        electricDistance = new BigDecimal(3);
+
+        routePart = new RoutePart();
+
+        sut = new Co2PartRailStrategy();
+    }
+
+
+    @Test
+    public void getEmissionForRoutePartFull() {
+
+        routePart.setContainerState(FULL);
+        routePart.getData().setDieselDistance(dieselDistance);
+        routePart.getData().setElectricDistance(electricDistance);
+
+        BigDecimal diesel = BigDecimal.valueOf(dieselDistance.doubleValue() * 0.5);
+        BigDecimal electronic = BigDecimal.valueOf(electricDistance.doubleValue() * 0.34);
+        BigDecimal expectedEmission = diesel.add(electronic);
+
+        BigDecimal co2 = sut.getEmissionForRoutePart(routePart);
+        assertThat(co2, equalTo(expectedEmission));
+    }
+
+
+    @Test
+    public void getEmissionForRoutePartEmpty() {
+
+        routePart.setContainerState(ContainerState.EMPTY);
+        routePart.getData().setDieselDistance(dieselDistance);
+        routePart.getData().setElectricDistance(electricDistance);
+
+        BigDecimal diesel = BigDecimal.valueOf(dieselDistance.doubleValue() * 0.4);
+        BigDecimal electronic = BigDecimal.valueOf(electricDistance.doubleValue() * 0.27);
+        BigDecimal expectedEmission = diesel.add(electronic);
+
+        BigDecimal co2 = sut.getEmissionForRoutePart(routePart);
+        assertThat(co2, comparesEqualTo(expectedEmission));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisorUnitTest.java b/src/test/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisorUnitTest.java
new file mode 100644
index 00000000..c2b42ab6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/advice/Co2PartStrategyAdvisorUnitTest.java
@@ -0,0 +1,70 @@
+package net.contargo.iris.co2.advice;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.RAIL;
+import static net.contargo.iris.route.RouteType.TRUCK;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test of {@link Co2PartStrategyAdvisor}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class Co2PartStrategyAdvisorUnitTest {
+
+    private Co2PartStrategyAdvisor sut;
+
+    @Mock
+    private Co2PartStrategy expectedStrategyMock;
+
+    @Before
+    public void before() {
+
+        sut = new Co2PartStrategyAdvisor();
+    }
+
+
+    @Test
+    public void adviceForRouteTypeBarge() {
+
+        sut.setBargeStrategy(expectedStrategyMock);
+
+        Co2PartStrategy strategy = sut.advice(BARGE);
+        assertThat(strategy, is(expectedStrategyMock));
+    }
+
+
+    @Test
+    public void adviceForRouteTypeRail() {
+
+        sut.setRailStrategy(expectedStrategyMock);
+
+        Co2PartStrategy strategy = sut.advice(RAIL);
+        assertThat(strategy, is(expectedStrategyMock));
+    }
+
+
+    @Test
+    public void adviceForRouteTypeTruck() {
+
+        sut.setTruckStrategy(expectedStrategyMock);
+
+        Co2PartStrategy strategy = sut.advice(TRUCK);
+        assertThat(strategy, is(expectedStrategyMock));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/advice/Co2PartTruckStrategyUnitTest.java b/src/test/java/net/contargo/iris/co2/advice/Co2PartTruckStrategyUnitTest.java
new file mode 100644
index 00000000..6882b346
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/advice/Co2PartTruckStrategyUnitTest.java
@@ -0,0 +1,61 @@
+package net.contargo.iris.co2.advice;
+
+import net.contargo.iris.route.RoutePart;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.container.ContainerState.EMPTY;
+import static net.contargo.iris.container.ContainerState.FULL;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+
+
+/**
+ * Unit test of {@link Co2PartTruckStrategy}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class Co2PartTruckStrategyUnitTest {
+
+    private Co2PartTruckStrategy sut;
+
+    private BigDecimal distance;
+    private RoutePart routePart;
+
+    @Before
+    public void before() {
+
+        routePart = new RoutePart();
+        distance = new BigDecimal("42");
+
+        sut = new Co2PartTruckStrategy();
+    }
+
+
+    @Test
+    public void getEmissionForRoutePartFull() {
+
+        routePart.setContainerState(FULL);
+        routePart.getData().setDistance(distance);
+
+        BigDecimal co2 = sut.getEmissionForRoutePart(routePart);
+        assertThat(co2, comparesEqualTo(BigDecimal.valueOf(distance.doubleValue() * 0.88)));
+    }
+
+
+    @Test
+    public void getEmissionForRoutePartEmpty() {
+
+        routePart.setContainerState(EMPTY);
+        routePart.getData().setDistance(distance);
+
+        BigDecimal co2 = sut.getEmissionForRoutePart(routePart);
+        assertThat(co2, comparesEqualTo(BigDecimal.valueOf(distance.doubleValue() * 0.73)));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/co2/service/Co2ServiceImplUnitTest.java b/src/test/java/net/contargo/iris/co2/service/Co2ServiceImplUnitTest.java
new file mode 100644
index 00000000..9e3b942c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/co2/service/Co2ServiceImplUnitTest.java
@@ -0,0 +1,299 @@
+package net.contargo.iris.co2.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.co2.advice.Co2PartStrategy;
+import net.contargo.iris.co2.advice.Co2PartStrategyAdvisor;
+import net.contargo.iris.route.DirectTruckRouteBuilder;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RoutePart;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.TRUCK;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.co2.service.Co2ServiceImpl}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class Co2ServiceImplUnitTest {
+
+    private static final GeoLocation GEO_TERMINAL = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+    private static final GeoLocation GEO_ADDRESS = new GeoLocation(BigDecimal.ONE, BigDecimal.TEN);
+    private static final GeoLocation GEO_SEAPORT = new GeoLocation(BigDecimal.TEN, BigDecimal.TEN);
+
+    private Co2ServiceImpl sut;
+
+    @Mock
+    private DirectTruckRouteBuilder builderMock;
+    @Mock
+    private Co2PartStrategyAdvisor co2PartStrategyAdvisorMock;
+
+    @Before
+    public void setup() {
+
+        sut = new Co2ServiceImpl(builderMock, co2PartStrategyAdvisorMock);
+    }
+
+
+    @Test
+    public void getEmissionExportOneWay() {
+
+        Co2PartStrategy co2PartBargeStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(BARGE)).thenReturn(co2PartBargeStrategyMock);
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_TERMINAL);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_TERMINAL);
+
+        RoutePart bargePart = new RoutePart();
+        bargePart.setRouteType(BARGE);
+        bargePart.setOrigin(GEO_TERMINAL);
+        bargePart.setDestination(GEO_SEAPORT);
+
+        Route route = new Route();
+        route.getData().setParts(asList(truckPart1, truckPart2, bargePart));
+
+        when(co2PartBargeStrategyMock.getEmissionForRoutePart(bargePart)).thenReturn(new BigDecimal("10"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // + 8 (co2 handling)
+        // +10 (barge part)
+        // + 4 (Umschlag "Direkttruck Oneway")
+        // = 27
+
+        BigDecimal co2 = sut.getEmission(route);
+        assertThat(co2, comparesEqualTo(new BigDecimal("27")));
+    }
+
+
+    @Test
+    public void getEmissionImportOneWay() {
+
+        Co2PartStrategy co2PartBargeStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(BARGE)).thenReturn(co2PartBargeStrategyMock);
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart bargePart = new RoutePart();
+        bargePart.setRouteType(BARGE);
+        bargePart.setOrigin(GEO_SEAPORT);
+        bargePart.setDestination(GEO_TERMINAL);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_TERMINAL);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_TERMINAL);
+
+        Route route = new Route();
+        route.getData().setParts(asList(bargePart, truckPart1, truckPart2));
+
+        when(co2PartBargeStrategyMock.getEmissionForRoutePart(bargePart)).thenReturn(new BigDecimal("10"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // + 8 (co2 handling)
+        // +10 (barge part)
+        // + 4 (Umschlag "Direkttruck Oneway")
+        // = 27
+
+        BigDecimal co2 = sut.getEmission(route);
+        assertThat(co2, comparesEqualTo(new BigDecimal("27")));
+    }
+
+
+    @Test
+    public void getEmissionRoundTrip() {
+
+        Co2PartStrategy co2PartBargeStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(BARGE)).thenReturn(co2PartBargeStrategyMock);
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart bargePart1 = new RoutePart();
+        bargePart1.setRouteType(BARGE);
+        bargePart1.setOrigin(GEO_SEAPORT);
+        bargePart1.setDestination(GEO_TERMINAL);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_TERMINAL);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_TERMINAL);
+
+        RoutePart bargePart2 = new RoutePart();
+        bargePart2.setRouteType(BARGE);
+        bargePart2.setOrigin(GEO_TERMINAL);
+        bargePart2.setDestination(GEO_SEAPORT);
+
+        Route route = new Route();
+        route.getData().setParts(asList(bargePart1, truckPart1, truckPart2, bargePart2));
+
+        when(co2PartBargeStrategyMock.getEmissionForRoutePart(bargePart1)).thenReturn(new BigDecimal("10"));
+        when(co2PartBargeStrategyMock.getEmissionForRoutePart(bargePart2)).thenReturn(new BigDecimal("15"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // +10 (barge part 1)
+        // + 8 (co2 handling)
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // + 8 (co2 handling)
+        // +15 (barge part 2)
+        // = 46
+
+        BigDecimal co2 = sut.getEmission(route);
+        assertThat(co2, comparesEqualTo(new BigDecimal("46")));
+    }
+
+
+    @Test
+    public void getEmissionDirectTruckExportOneWay() {
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_TERMINAL);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_SEAPORT);
+
+        Route route = new Route();
+        route.getData().setParts(asList(truckPart1, truckPart2));
+
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // + 4 (Umschlag "Direkttruck Oneway")
+        // = 9
+
+        Route routeDummy = new Route();
+        when(builderMock.getCorrespondingDirectTruckRoute(routeDummy)).thenReturn(route);
+
+        BigDecimal co2 = sut.getEmissionDirectTruck(routeDummy);
+        assertThat(co2, comparesEqualTo(new BigDecimal("9")));
+    }
+
+
+    @Test
+    public void getEmissionDirectTruckImportOneWay() {
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_SEAPORT);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_TERMINAL);
+
+        Route route = new Route();
+        route.getData().setParts(asList(truckPart1, truckPart2));
+
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // + 4 (Umschlag "Direkttruck Oneway")
+        // = 9
+
+        Route routeDummy = new Route();
+        when(builderMock.getCorrespondingDirectTruckRoute(routeDummy)).thenReturn(route);
+
+        BigDecimal co2 = sut.getEmissionDirectTruck(routeDummy);
+        assertThat(co2, comparesEqualTo(new BigDecimal("9")));
+    }
+
+
+    @Test
+    public void getEmissionDirectTruckRoundTrip() {
+
+        Co2PartStrategy co2PartTruckStrategyMock = mock(Co2PartStrategy.class);
+        when(co2PartStrategyAdvisorMock.advice(TRUCK)).thenReturn(co2PartTruckStrategyMock);
+
+        RoutePart truckPart1 = new RoutePart();
+        truckPart1.setRouteType(TRUCK);
+        truckPart1.setOrigin(GEO_SEAPORT);
+        truckPart1.setDestination(GEO_ADDRESS);
+
+        RoutePart truckPart2 = new RoutePart();
+        truckPart2.setRouteType(TRUCK);
+        truckPart2.setOrigin(GEO_ADDRESS);
+        truckPart2.setDestination(GEO_SEAPORT);
+
+        Route route = new Route();
+        route.getData().setParts(asList(truckPart1, truckPart2));
+
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart1)).thenReturn(new BigDecimal("2"));
+        when(co2PartTruckStrategyMock.getEmissionForRoutePart(truckPart2)).thenReturn(new BigDecimal("3"));
+
+        // + 2 (truck part 1)
+        // + 3 (truck part 2)
+        // = 13
+
+        Route routeDummy = new Route();
+        when(builderMock.getCorrespondingDirectTruckRoute(routeDummy)).thenReturn(route);
+
+        BigDecimal co2 = sut.getEmissionDirectTruck(routeDummy);
+        assertThat(co2, comparesEqualTo(new BigDecimal("5")));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/MainRunConnectionUnitTest.java b/src/test/java/net/contargo/iris/connection/MainRunConnectionUnitTest.java
new file mode 100644
index 00000000..76ebfd31
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/MainRunConnectionUnitTest.java
@@ -0,0 +1,119 @@
+package net.contargo.iris.connection;
+
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test for {@link MainRunConnection}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class MainRunConnectionUnitTest {
+
+    private MainRunConnection sut;
+    private Seaport seaport;
+    private Terminal terminal;
+
+    @Before
+    public void setUp() {
+
+        sut = new MainRunConnection();
+
+        seaport = new Seaport();
+        terminal = new Terminal();
+    }
+
+
+    @Test
+    public void getTotalDistance() {
+
+        sut.setDieselDistance(BigDecimal.TEN);
+        sut.setElectricDistance(BigDecimal.TEN);
+
+        BigDecimal totalDistance = sut.getTotalDistance();
+
+        assertThat(totalDistance, is(new BigDecimal(20)));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledFalse() {
+
+        sut.setEnabled(false);
+
+        assertThat(sut.getEverythingEnabled(), is(false));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledNullSeaport() {
+
+        sut.setEnabled(true);
+
+        assertThat(sut.getEverythingEnabled(), is(false));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledDisabledSeaport() {
+
+        sut.setEnabled(true);
+
+        seaport.setEnabled(false);
+        sut.setSeaport(seaport);
+
+        assertThat(sut.getEverythingEnabled(), is(false));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledNullTerminal() {
+
+        sut.setEnabled(true);
+
+        seaport.setEnabled(true);
+        sut.setSeaport(seaport);
+
+        assertThat(sut.getEverythingEnabled(), is(false));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledDisabledTerminal() {
+
+        sut.setEnabled(true);
+
+        seaport.setEnabled(true);
+        sut.setSeaport(seaport);
+
+        terminal.setEnabled(false);
+        sut.setTerminal(terminal);
+
+        assertThat(sut.getEverythingEnabled(), is(false));
+    }
+
+
+    @Test
+    public void getEveryThingEnabledTrue() {
+
+        sut.setEnabled(true);
+
+        seaport.setEnabled(true);
+        sut.setSeaport(seaport);
+
+        terminal.setEnabled(true);
+        sut.setTerminal(terminal);
+
+        assertThat(sut.getEverythingEnabled(), is(true));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/advice/MainRunAdvisorUnitTest.java b/src/test/java/net/contargo/iris/connection/advice/MainRunAdvisorUnitTest.java
new file mode 100644
index 00000000..1c94d33c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/advice/MainRunAdvisorUnitTest.java
@@ -0,0 +1,73 @@
+package net.contargo.iris.connection.advice;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static net.contargo.iris.route.RouteDirection.EXPORT;
+import static net.contargo.iris.route.RouteDirection.IMPORT;
+import static net.contargo.iris.route.RouteProduct.ONEWAY;
+import static net.contargo.iris.route.RouteProduct.ROUNDTRIP;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MainRunAdvisorUnitTest {
+
+    private MainRunAdvisor sut;
+
+    @Mock
+    private MainRunStrategy mainRunRoundTripImportAdviceMock;
+    @Mock
+    private MainRunStrategy mainRunRoundTripExportAdviceMock;
+    @Mock
+    private MainRunStrategy mainRunOneWayImportAdviceMock;
+    @Mock
+    private MainRunStrategy mainRunOneWayExportAdviceMock;
+
+    @Before
+    public void before() {
+
+        sut = new MainRunAdvisor(mainRunRoundTripImportAdviceMock, mainRunRoundTripExportAdviceMock,
+                mainRunOneWayImportAdviceMock, mainRunOneWayExportAdviceMock);
+    }
+
+
+    @Test
+    public void testMainRunAdviceWithRoundTripImport() {
+
+        assertThat(sut.advice(ROUNDTRIP, IMPORT), is(mainRunRoundTripImportAdviceMock));
+    }
+
+
+    @Test
+    public void testMainRunAdviceWithRoundTripExport() {
+
+        assertThat(sut.advice(ROUNDTRIP, EXPORT), is(mainRunRoundTripExportAdviceMock));
+    }
+
+
+    @Test
+    public void testMainRunAdviceWithOneWayImport() {
+
+        assertThat(sut.advice(ONEWAY, IMPORT), is(mainRunOneWayImportAdviceMock));
+    }
+
+
+    @Test
+    public void testMainRunAdviceWithOneWayExport() {
+
+        assertThat(sut.advice(ONEWAY, EXPORT), is(mainRunOneWayExportAdviceMock));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategyUnitTest.java b/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategyUnitTest.java
new file mode 100644
index 00000000..2083bfd6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayExportStrategyUnitTest.java
@@ -0,0 +1,50 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Locale;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+public class MainRunOneWayExportStrategyUnitTest {
+
+    @Before
+    public void before() {
+
+        Locale.setDefault(Locale.GERMANY);
+    }
+
+
+    @Test
+    public void testGetRoute() {
+
+        Seaport seaPort = new Seaport();
+        seaPort.setName("seaPort");
+
+        GeoLocation destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+        Terminal terminal = new Terminal();
+        terminal.setName("term");
+
+        MainRunOneWayExportStrategy sut = new MainRunOneWayExportStrategy();
+        Route route = sut.getRoute(seaPort, destination, terminal, ContainerType.TWENTY_LIGHT, RouteType.BARGE);
+
+        assertThat(route.getName(), is("term -> 1,0:1,0 -> term -> seaPort"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategyUnitTest.java b/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategyUnitTest.java
new file mode 100644
index 00000000..1bc5935d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/advice/MainRunOneWayImportStrategyUnitTest.java
@@ -0,0 +1,50 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Locale;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+public class MainRunOneWayImportStrategyUnitTest {
+
+    @Before
+    public void before() {
+
+        Locale.setDefault(Locale.GERMANY);
+    }
+
+
+    @Test
+    public void testGetRoute() {
+
+        Seaport seaPort = new Seaport();
+        seaPort.setName("seaPort");
+
+        GeoLocation destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+        Terminal terminal = new Terminal();
+        terminal.setName("term");
+
+        MainRunOneWayImportStrategy sut = new MainRunOneWayImportStrategy();
+        Route route = sut.getRoute(seaPort, destination, terminal, ContainerType.TWENTY_LIGHT, RouteType.BARGE);
+
+        assertThat(route.getName(), is("seaPort -> term -> 1,0:1,0 -> term"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategyUnitTest.java b/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategyUnitTest.java
new file mode 100644
index 00000000..ead03590
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripExportStrategyUnitTest.java
@@ -0,0 +1,50 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Locale;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+public class MainRunRoundTripExportStrategyUnitTest {
+
+    @Before
+    public void before() {
+
+        Locale.setDefault(Locale.GERMANY);
+    }
+
+
+    @Test
+    public void testGetRoute() {
+
+        Seaport seaPort = new Seaport();
+        seaPort.setName("seaPort");
+
+        GeoLocation destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+        Terminal terminal = new Terminal();
+        terminal.setName("term");
+
+        MainRunRoundTripExportStrategy sut = new MainRunRoundTripExportStrategy();
+        Route route = sut.getRoute(seaPort, destination, terminal, ContainerType.TWENTY_LIGHT, RouteType.RAIL);
+
+        assertThat(route.getName(), is("seaPort -> term -> 1,0:1,0 -> term -> seaPort"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategyUnitTest.java b/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategyUnitTest.java
new file mode 100644
index 00000000..a12b524b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/advice/MainRunRoundTripImportStrategyUnitTest.java
@@ -0,0 +1,50 @@
+package net.contargo.iris.connection.advice;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Locale;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Jörg Alberto Hoffmann - hoffmann@synyx.de
+ */
+public class MainRunRoundTripImportStrategyUnitTest {
+
+    @Before
+    public void before() {
+
+        Locale.setDefault(Locale.GERMANY);
+    }
+
+
+    @Test
+    public void testGetRoute() {
+
+        Seaport seaPort = new Seaport();
+        seaPort.setName("seaPort");
+
+        GeoLocation destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+        Terminal terminal = new Terminal();
+        terminal.setName("term");
+
+        MainRunRoundTripImportStrategy sut = new MainRunRoundTripImportStrategy();
+        Route route = sut.getRoute(seaPort, destination, terminal, ContainerType.TWENTY_LIGHT, RouteType.RAIL);
+
+        assertThat(route.getName(), is("seaPort -> term -> 1,0:1,0 -> term -> seaPort"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/api/MainRunConnectionApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/connection/api/MainRunConnectionApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..c63d279d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/api/MainRunConnectionApiControllerMvcUnitTest.java
@@ -0,0 +1,240 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.connection.dto.MainRunConnectionDto;
+import net.contargo.iris.connection.dto.MainRunConnectionDtoService;
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.connection.dto.SeaportConnectionRoutesDtoService;
+import net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Mvc unit test for {@link MainRunConnectionApiController}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class MainRunConnectionApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    @Autowired
+    private SeaportDtoService seaportDtoServiceMock;
+    @Autowired
+    private SeaportConnectionRoutesDtoService seaportConnectionRoutesDtoServiceMock;
+    @Autowired
+    private RouteUrlSerializationService routeUrlSerializationServiceMock;
+    @Autowired
+    private MainRunConnectionDtoService connectionApiDtoService;
+    @Autowired
+    private SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService;
+
+    private SeaportDto seaportDto1;
+    private SeaportDto seaportDto2;
+
+    @Before
+    public void setUp() {
+
+        reset(connectionApiDtoService);
+        reset(seaportDtoServiceMock);
+        reset(seaportConnectionRoutesDtoServiceMock);
+        reset(routeUrlSerializationServiceMock);
+        reset(seaportTerminalConnectionDtoService);
+
+        createSeaportDtos();
+    }
+
+
+    @Test
+    public void getSeaportRoutes() throws Exception {
+
+        BigInteger seaportUid = new BigInteger("42");
+        BigDecimal lat = BigDecimal.TEN;
+        BigDecimal lon = BigDecimal.ONE;
+        boolean isRoundTrip = true;
+
+        Seaport port = new Seaport();
+        port.setUniqueId(seaportUid);
+
+        SeaportDto seaportDto = new SeaportDto(port);
+
+        Route route = new Route();
+        RouteDto routeDto = new RouteDto(route);
+
+        String urlTemplate = "/connections/%s/%s:%s/%s";
+        String url = String.format(urlTemplate, seaportUid, lat, lon, isRoundTrip);
+
+        when(seaportDtoServiceMock.getByUid(seaportUid)).thenReturn(seaportDto);
+        when(seaportConnectionRoutesDtoServiceMock.getAvailableSeaportConnectionRoutes(eq(seaportDto),
+                any(RouteInformation.class))).thenReturn(asList(routeDto));
+
+        MockHttpServletRequestBuilder builder = get(url);
+        builder.param("containerType", ContainerType.TWENTY_LIGHT.toString());
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType(APPLICATION_JSON));
+        resultActions.andExpect(jsonPath("$.response.routes", hasSize(1)));
+        resultActions.andExpect(jsonPath("$response.routes[0].roundTrip", is(false)));
+
+        verify(routeUrlSerializationServiceMock).serializeUrl(routeDto, "/routedetails", "/routepartdetails");
+    }
+
+
+    @Test
+    public void getConnectionsForTerminal() throws Exception {
+
+        String terminalUid = "5";
+        String seaportUid = "23";
+
+        MainRunConnectionDto dto = new MainRunConnectionDto(seaportUid, terminalUid, BARGE);
+        when(connectionApiDtoService.getConnectionsForTerminal(new BigInteger(terminalUid))).thenReturn(asList(dto));
+
+        MockHttpServletRequestBuilder builder = get("/connections");
+        builder.accept(APPLICATION_JSON);
+        builder.param("terminalUid", terminalUid);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType(APPLICATION_JSON));
+
+        resultActions.andExpect(jsonPath("$.[0].terminalUid", is(terminalUid)));
+        resultActions.andExpect(jsonPath("$.[0].seaportUid", is(seaportUid)));
+        resultActions.andExpect(jsonPath("$.[0].routeType", is("BARGE")));
+    }
+
+
+    @Test
+    public void getSeaportsOfConnections() throws Exception {
+
+        when(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(RouteType.BARGE)).thenReturn(asList(
+                seaportDto1));
+        when(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(RouteType.RAIL)).thenReturn(asList(
+                seaportDto1, seaportDto2));
+
+        MockHttpServletRequestBuilder builder = get("/connections/seaports");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json;charset=UTF-8"));
+        resultActions.andExpect(jsonPath("$.seaports", hasSize(2)));
+        resultActions.andExpect(jsonPath("$.seaports[*].latitude",
+                containsInAnyOrder(seaportDto1.getLatitude().intValue(), seaportDto2.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[*].longitude",
+                containsInAnyOrder(seaportDto1.getLongitude().intValue(), seaportDto2.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[*].name",
+                containsInAnyOrder(seaportDto1.getName(), seaportDto2.getName())));
+        resultActions.andExpect(jsonPath("$.seaports[*].enabled",
+                containsInAnyOrder(seaportDto1.isEnabled(), seaportDto2.isEnabled())));
+        resultActions.andExpect(jsonPath("$.links", hasSize(1)));
+        resultActions.andExpect(jsonPath("$.links[0].rel", is("self")));
+    }
+
+
+    @Test
+    public void getSeaportsOfConnectionsForCombo() throws Exception {
+
+        when(seaportTerminalConnectionDtoService.findSeaportsConnectedByRouteType(RouteType.RAIL)).thenReturn(asList(
+                seaportDto1));
+
+        MockHttpServletRequestBuilder builder = get("/connections/seaports?combo=RAILWAY");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json;charset=UTF-8"));
+        resultActions.andExpect(jsonPath("$.seaports", hasSize(1)));
+        resultActions.andExpect(jsonPath("$.seaports[0].latitude", is(seaportDto1.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[0].longitude", is(seaportDto1.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[0].name", is(seaportDto1.getName())));
+        resultActions.andExpect(jsonPath("$.seaports[0].enabled", is(seaportDto1.isEnabled())));
+        resultActions.andExpect(jsonPath("$.links", hasSize(1)));
+        resultActions.andExpect(jsonPath("$.links[0].rel", is("self")));
+    }
+
+
+    @Test
+    public void getSeaportsOfConnectionsForBadRequest() throws Exception {
+
+        MockHttpServletRequestBuilder builder = get("/connections/seaports?combo=FOO");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isBadRequest());
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+
+
+    private void createSeaportDtos() {
+
+        seaportDto1 = new SeaportDto();
+        seaportDto1.setEnabled(true);
+        seaportDto1.setName("terminalDto1");
+        seaportDto1.setLatitude(BigDecimal.ONE);
+        seaportDto1.setLongitude(BigDecimal.TEN);
+
+        seaportDto2 = new SeaportDto();
+        seaportDto2.setEnabled(true);
+        seaportDto2.setName("terminalDto2");
+        seaportDto2.setLatitude(BigDecimal.ONE);
+        seaportDto2.setLongitude(BigDecimal.ZERO);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImplUnitTest.java
new file mode 100644
index 00000000..ec47027e
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/api/RouteUrlSerializationServiceImplUnitTest.java
@@ -0,0 +1,88 @@
+package net.contargo.iris.connection.api;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test for {@link RouteUrlSerializationServiceImpl}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RouteUrlSerializationServiceImplUnitTest {
+
+    private RouteUrlSerializationServiceImpl sut;
+
+    @Before
+    public void setup() {
+
+        sut = new RouteUrlSerializationServiceImpl();
+    }
+
+
+    @Test
+    public void testSerializeRouteUrl() {
+
+        // set up route object to "serialize"
+
+        Route route = new Route();
+
+        RoutePart truckRoutePart = new RoutePart();
+        truckRoutePart.setRouteType(RouteType.TRUCK);
+        truckRoutePart.setOrigin(new GeoLocation(new BigDecimal(8.42), new BigDecimal(49.015)));
+        truckRoutePart.setDestination(new GeoLocation(new BigDecimal(9.42), new BigDecimal(59.015)));
+        truckRoutePart.setContainerType(ContainerType.TWENTY_LIGHT);
+        truckRoutePart.setContainerState(ContainerState.FULL);
+
+        route.getData().getParts().add(truckRoutePart);
+
+        RoutePart bargeRoutePart = new RoutePart();
+        bargeRoutePart.setRouteType(RouteType.BARGE);
+        bargeRoutePart.setOrigin(new GeoLocation(new BigDecimal(9.42), new BigDecimal(59.015)));
+        bargeRoutePart.setDestination(new GeoLocation(new BigDecimal(8.42), new BigDecimal(49.015)));
+        bargeRoutePart.setContainerType(ContainerType.TWENTY_LIGHT);
+        bargeRoutePart.setContainerState(ContainerState.EMPTY);
+
+        Terminal terminal = new Terminal();
+        terminal.setUniqueId(BigInteger.ONE);
+        route.setResponsibleTerminal(terminal);
+
+        route.getData().getParts().add(bargeRoutePart);
+
+        // run test
+        RouteDto routeDto = new RouteDto(route);
+        sut.serializeUrl(routeDto, "/routedetails", "/routepartdetails");
+
+        // assert that results are correct
+        assertThat("/routedetails?terminal=1&data.parts[0].origin.longitude=49.015"
+            + "&data.parts[0].origin.latitude=8.42"
+            + "&data.parts[0].destination.longitude=59.015"
+            + "&data.parts[0].destination.latitude=9.42"
+            + "&data.parts[0].routeType=TRUCK"
+            + "&data.parts[0].containerType=TWENTY_LIGHT"
+            + "&data.parts[0].containerState=FULL"
+            + "&data.parts[1].origin.longitude=59.015"
+            + "&data.parts[1].origin.latitude=9.42"
+            + "&data.parts[1].destination.longitude=49.015"
+            + "&data.parts[1].destination.latitude=8.42"
+            + "&data.parts[1].routeType=BARGE"
+            + "&data.parts[1].containerType=TWENTY_LIGHT"
+            + "&data.parts[1].containerState=EMPTY", is(routeDto.getUrl()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/dto/GeolocationDtoFactoryUnitTest.java b/src/test/java/net/contargo/iris/connection/dto/GeolocationDtoFactoryUnitTest.java
new file mode 100644
index 00000000..859f9af7
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/dto/GeolocationDtoFactoryUnitTest.java
@@ -0,0 +1,88 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.dto.AddressDto;
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.connection.dto.GeolocationDtoFactory}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class GeolocationDtoFactoryUnitTest {
+
+    private GeoLocation geoLocation;
+    private Seaport seaport;
+    private Terminal terminal;
+    private Address address;
+
+    @Before
+    public void setup() {
+
+        geoLocation = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        terminal = new Terminal();
+        seaport = new Seaport();
+        address = new Address();
+    }
+
+
+    @Test
+    public void constructWithGeolocation() {
+
+        GeoLocationDto dto = GeolocationDtoFactory.createGeolocationDto(geoLocation);
+
+        assertThat(dto, is(instanceOf(GeoLocationDto.class)));
+        assertThat(dto, not(instanceOf(TerminalDto.class)));
+        assertThat(dto, not(instanceOf(SeaportDto.class)));
+    }
+
+
+    @Test
+    public void constructWithTerminal() {
+
+        GeoLocationDto dto = GeolocationDtoFactory.createGeolocationDto(terminal);
+
+        assertThat(dto, is(instanceOf(TerminalDto.class)));
+        assertThat(dto, is(instanceOf(GeoLocationDto.class)));
+        assertThat(dto, not(instanceOf(SeaportDto.class)));
+    }
+
+
+    @Test
+    public void constructWithSeaport() {
+
+        GeoLocationDto dto = GeolocationDtoFactory.createGeolocationDto(seaport);
+
+        assertThat(dto, is(instanceOf(SeaportDto.class)));
+        assertThat(dto, is(instanceOf(GeoLocationDto.class)));
+        assertThat(dto, not(instanceOf(TerminalDto.class)));
+    }
+
+
+    @Test
+    public void constructWithAddress() {
+
+        GeoLocationDto dto = GeolocationDtoFactory.createGeolocationDto(address);
+
+        assertThat(dto, is(instanceOf(AddressDto.class)));
+        assertThat(dto, is(instanceOf(GeoLocationDto.class)));
+        assertThat(dto, not(instanceOf(TerminalDto.class)));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..a57bf253
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/dto/MainRunConnectionDtoServiceImplUnitTest.java
@@ -0,0 +1,101 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MainRunConnectionDtoServiceImplUnitTest {
+
+    @Mock
+    private MainRunConnectionService mainRunConnectionServiceMock;
+    private MainRunConnectionDtoServiceImpl sut;
+
+    @Before
+    public void before() {
+
+        sut = new MainRunConnectionDtoServiceImpl(mainRunConnectionServiceMock);
+    }
+
+
+    @Test
+    public void getConnectionsForTerminal() {
+
+        BigInteger terminalUID = new BigInteger("2");
+        Terminal terminal = new Terminal();
+        terminal.setUniqueId(terminalUID);
+
+        BigInteger seaportOneUID = new BigInteger("3");
+        Seaport seaportOne = new Seaport();
+        seaportOne.setUniqueId(seaportOneUID);
+
+        BigInteger seaportTwoUID = new BigInteger("4");
+        Seaport seaportTwo = new Seaport();
+        seaportTwo.setUniqueId(seaportTwoUID);
+
+        MainRunConnection c1 = newConnection(seaportOne, terminal, BARGE);
+        MainRunConnection c2 = newConnection(seaportTwo, terminal, BARGE);
+
+        when(mainRunConnectionServiceMock.getConnectionsForTerminal(terminalUID)).thenReturn(asList(c1, c2));
+
+        MainRunConnectionDto dto1 = new MainRunConnectionDto(seaportOneUID.toString(), terminalUID.toString(), BARGE);
+        MainRunConnectionDto dto2 = new MainRunConnectionDto(seaportTwoUID.toString(), terminalUID.toString(), BARGE);
+
+        List<MainRunConnectionDto> expectedConnections = asList(dto1, dto2);
+
+        assertConnections(sut.getConnectionsForTerminal(terminalUID), expectedConnections);
+    }
+
+
+    private MainRunConnection newConnection(Seaport seaport, Terminal terminal, RouteType type) {
+
+        MainRunConnection connection = new MainRunConnection();
+        connection.setSeaport(seaport);
+        connection.setTerminal(terminal);
+        connection.setRouteType(type);
+
+        return connection;
+    }
+
+
+    private void assertConnections(List<MainRunConnectionDto> actual, List<MainRunConnectionDto> expected) {
+
+        assertThat(actual, hasSize(expected.size()));
+
+        for (int i = 0; i < actual.size(); i++) {
+            assertThat(actual.get(i).getTerminalUid(), is(expected.get(i).getTerminalUid()));
+            assertThat(actual.get(i).getSeaportUid(), is(expected.get(i).getSeaportUid()));
+            assertThat(actual.get(i).getRouteType(), is(expected.get(i).getRouteType()));
+        }
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/dto/RoutePartDtoUnitTest.java b/src/test/java/net/contargo/iris/connection/dto/RoutePartDtoUnitTest.java
new file mode 100644
index 00000000..b26b7e95
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/dto/RoutePartDtoUnitTest.java
@@ -0,0 +1,98 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.dto.GeoLocationDto;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.connection.dto.RoutePartDto}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RoutePartDtoUnitTest {
+
+    private GeoLocation geoLocation;
+    private Seaport seaport;
+    private Terminal terminal;
+
+    @Before
+    public void setup() {
+
+        geoLocation = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        terminal = new Terminal();
+        seaport = new Seaport();
+    }
+
+
+    @Test
+    public void constructWithGeolocation() {
+
+        RoutePart part = new RoutePart();
+        part.setOrigin(geoLocation);
+        part.setDestination(geoLocation);
+
+        RoutePartDto routePartDto = new RoutePartDto(part);
+
+        assertThat(routePartDto.getOrigin(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getOrigin(), not(instanceOf(TerminalDto.class)));
+        assertThat(routePartDto.getOrigin(), not(instanceOf(SeaportDto.class)));
+
+        assertThat(routePartDto.getDestination(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getDestination(), not(instanceOf(TerminalDto.class)));
+        assertThat(routePartDto.getDestination(), not(instanceOf(SeaportDto.class)));
+    }
+
+
+    @Test
+    public void constructWithTerminal() {
+
+        RoutePart part = new RoutePart();
+        part.setOrigin(terminal);
+        part.setDestination(terminal);
+
+        RoutePartDto routePartDto = new RoutePartDto(part);
+
+        assertThat(routePartDto.getOrigin(), is(instanceOf(TerminalDto.class)));
+        assertThat(routePartDto.getOrigin(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getOrigin(), not(instanceOf(SeaportDto.class)));
+
+        assertThat(routePartDto.getDestination(), is(instanceOf(TerminalDto.class)));
+        assertThat(routePartDto.getDestination(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getDestination(), not(instanceOf(SeaportDto.class)));
+    }
+
+
+    @Test
+    public void constructWithSeaport() {
+
+        RoutePart part = new RoutePart();
+        part.setOrigin(seaport);
+        part.setDestination(seaport);
+
+        RoutePartDto routePartDto = new RoutePartDto(part);
+
+        assertThat(routePartDto.getOrigin(), is(instanceOf(SeaportDto.class)));
+        assertThat(routePartDto.getOrigin(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getOrigin(), not(instanceOf(TerminalDto.class)));
+
+        assertThat(routePartDto.getDestination(), is(instanceOf(SeaportDto.class)));
+        assertThat(routePartDto.getDestination(), is(instanceOf(GeoLocationDto.class)));
+        assertThat(routePartDto.getDestination(), not(instanceOf(TerminalDto.class)));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..c06f2c9e
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/dto/SeaportConnectionRoutesDtoServiceImplUnitTest.java
@@ -0,0 +1,89 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.connection.service.SeaportConnectionRoutesService;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteCombo;
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.route.RouteProduct;
+import net.contargo.iris.seaport.dto.SeaportDto;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.connection.dto.SeaportConnectionRoutesDtoServiceImpl}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportConnectionRoutesDtoServiceImplUnitTest {
+
+    private SeaportConnectionRoutesDtoServiceImpl sut;
+
+    @Mock
+    private SeaportConnectionRoutesService seaportConnectionRoutesServiceMock;
+
+    @Before
+    public void setUp() {
+
+        sut = new SeaportConnectionRoutesDtoServiceImpl(seaportConnectionRoutesServiceMock);
+    }
+
+
+    @Test
+    public void getAvailableSeaportConnectionRoutes() {
+
+        SeaportDto port = new SeaportDto();
+        GeoLocation location = new GeoLocation();
+
+        Route route1 = new Route();
+        Route route2 = new Route();
+
+        RouteInformation information = new RouteInformation(location, RouteProduct.ONEWAY, ContainerType.FORTY,
+                RouteDirection.EXPORT, RouteCombo.ALL);
+
+        when(seaportConnectionRoutesServiceMock.getAvailableSeaportConnectionRoutes(port.toEntity(), information))
+            .thenReturn(asList(route1, route2));
+
+        List<RouteDto> routes = sut.getAvailableSeaportConnectionRoutes(port, information);
+
+        assertThat(routes, hasSize(2));
+        assertReflectionEquals(new RouteDto(route1), routes.get(0));
+        assertReflectionEquals(new RouteDto(route2), routes.get(1));
+    }
+
+
+    @Test
+    public void getAvailableSeaportConnectionRoutesForNullSeaport() {
+
+        RouteInformation information = new RouteInformation(new GeoLocation(), RouteProduct.ONEWAY, ContainerType.FORTY,
+                RouteDirection.EXPORT, RouteCombo.ALL);
+
+        List<RouteDto> routes = sut.getAvailableSeaportConnectionRoutes(null, information);
+
+        assertThat(routes, empty());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..a758fc77
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/dto/SeaportTerminalConnectionDtoServiceImplUnitTest.java
@@ -0,0 +1,130 @@
+package net.contargo.iris.connection.dto;
+
+import net.contargo.iris.connection.service.SeaportTerminalConnectionService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.dto.TerminalDto;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasSize;
+
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportTerminalConnectionDtoServiceImplUnitTest {
+
+    private SeaportTerminalConnectionDtoService sut;
+
+    @Mock
+    private SeaportTerminalConnectionService seaportTerminalConnectionServiceMock;
+
+    private Seaport port1;
+    private Seaport port2;
+    private SeaportDto port2Dto;
+    private Terminal terminal1;
+    private TerminalDto terminal1Dto;
+    private Terminal terminal2;
+    private TerminalDto terminal2Dto;
+
+    @Before
+    public void setup() {
+
+        sut = new SeaportTerminalConnectionDtoServiceImpl(seaportTerminalConnectionServiceMock);
+
+        createSeaports();
+        createTerminals();
+    }
+
+
+    private void createSeaports() {
+
+        port1 = new Seaport();
+        port1.setEnabled(true);
+        port1.setId(42L);
+        port1.setName("Seaport 1");
+        port1.setLatitude(BigDecimal.ONE);
+        port1.setLongitude(BigDecimal.ONE);
+
+        port2 = new Seaport();
+        port2.setEnabled(true);
+        port2.setId(23L);
+        port2.setName("Seaport 2");
+        port2.setLatitude(BigDecimal.TEN);
+        port2.setLongitude(BigDecimal.TEN);
+        port2Dto = new SeaportDto(port2);
+    }
+
+
+    private void createTerminals() {
+
+        terminal1 = new Terminal();
+        terminal1.setEnabled(true);
+        terminal1.setId(42L);
+        terminal1.setName("Terminal 1");
+        terminal1.setLatitude(BigDecimal.ONE);
+        terminal1.setLongitude(BigDecimal.ONE);
+        terminal1Dto = new TerminalDto(terminal1);
+
+        terminal2 = new Terminal();
+        terminal2.setEnabled(true);
+        terminal2.setId(23L);
+        terminal2.setName("Terminal 2");
+        terminal2.setLatitude(BigDecimal.TEN);
+        terminal2.setLongitude(BigDecimal.TEN);
+        terminal2Dto = new TerminalDto(terminal2);
+    }
+
+
+    @Test
+    public void findSeaPortsConnectedByRouteType() {
+
+        when(seaportTerminalConnectionServiceMock.findSeaPortsConnectedByRouteType(RouteType.BARGE)).thenReturn(asList(
+                port1, port2));
+
+        List<SeaportDto> seaportDtos = sut.findSeaportsConnectedByRouteType(RouteType.BARGE);
+
+        assertThat(seaportDtos, hasSize(2));
+        assertReflectionEquals(seaportDtos.get(0), new SeaportDto(port1));
+        assertReflectionEquals(seaportDtos.get(1), new SeaportDto(port2));
+    }
+
+
+    @Test
+    public void getTerminalsConnectedToSeaPortByRouteType() {
+
+        when(seaportTerminalConnectionServiceMock.getTerminalsConnectedToSeaPortByRouteType(port2Dto.toEntity(),
+                RouteType.RAIL)).thenReturn(asList(terminal1, terminal2));
+
+        List<TerminalDto> terminalDtos = sut.findTerminalsConnectedToSeaPortByRouteType(port2Dto, RouteType.RAIL);
+
+        assertThat(terminalDtos, hasSize(2));
+        assertReflectionEquals(terminalDtos.get(0), terminal1Dto);
+        assertReflectionEquals(terminalDtos.get(1), terminal2Dto);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/persistence/MainRunConnectionRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/connection/persistence/MainRunConnectionRepositoryIntegrationTest.java
new file mode 100644
index 00000000..b8269796
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/persistence/MainRunConnectionRepositoryIntegrationTest.java
@@ -0,0 +1,102 @@
+package net.contargo.iris.connection.persistence;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class MainRunConnectionRepositoryIntegrationTest {
+
+    private static final GeoLocation GEO_TERMINAL_1 = new GeoLocation(new BigDecimal("49.2"), new BigDecimal("8.6"));
+    private static final GeoLocation GEO_TERMINAL_2 = new GeoLocation(new BigDecimal("50.2"), new BigDecimal("9.6"));
+    private static final GeoLocation GEO_SEAPORT = new GeoLocation(new BigDecimal("48.23"), new BigDecimal("11.75"));
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Autowired
+    private MainRunConnectionRepository sut;
+
+    @Test
+    public void findConnectionsByTerminalUniqueId() {
+
+        BigInteger unconnectedTerminalUID = new BigInteger("2");
+        Terminal unconnectedTerminal = new Terminal(GEO_TERMINAL_1);
+        unconnectedTerminal.setName("unconnected terminal");
+        unconnectedTerminal.setUniqueId(unconnectedTerminalUID);
+
+        BigInteger connectedTerminalUID = new BigInteger("3");
+        Terminal connectedTerminal = new Terminal(GEO_TERMINAL_2);
+        connectedTerminal.setName("connected terminal");
+        connectedTerminal.setUniqueId(connectedTerminalUID);
+
+        BigInteger connectedSeaportUID = new BigInteger("4");
+        Seaport connectedSeaport = new Seaport(GEO_SEAPORT);
+        connectedSeaport.setName("connected seaport");
+        connectedSeaport.setUniqueId(connectedSeaportUID);
+
+        MainRunConnection connection = newConnection(connectedSeaport, connectedTerminal);
+
+        // transition to managed state
+        em.persist(unconnectedTerminal);
+        em.persist(connectedTerminal);
+        em.persist(connectedSeaport);
+        em.persist(connection);
+
+        em.flush(); // syncs in-memory model with database
+
+        List<MainRunConnection> connections = sut.findConnectionsByTerminalUniqueId(connectedTerminalUID);
+        List<MainRunConnection> expectedConnections = em.createQuery(
+                "SELECT c FROM MainRunConnection c WHERE c.terminal.uniqueId = " + connectedTerminalUID,
+                MainRunConnection.class).getResultList();
+
+        assertThat(connections, is(expectedConnections));
+    }
+
+
+    private MainRunConnection newConnection(Seaport seaport, Terminal terminal) {
+
+        MainRunConnection connection = new MainRunConnection();
+        connection.setSeaport(seaport);
+        connection.setTerminal(terminal);
+        connection.setRouteType(BARGE);
+        connection.setElectricDistance(new BigDecimal("300"));
+        connection.setDieselDistance(new BigDecimal("200"));
+
+        return connection;
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/service/MainRunConnectionServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/service/MainRunConnectionServiceImplUnitTest.java
new file mode 100644
index 00000000..a3b22e39
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/service/MainRunConnectionServiceImplUnitTest.java
@@ -0,0 +1,140 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.persistence.MainRunConnectionRepository;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link MainRunConnectionServiceImpl}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MainRunConnectionServiceImplUnitTest {
+
+    private static final Long CONNECTION_ID = 42L;
+
+    private MainRunConnectionServiceImpl sut;
+
+    @Mock
+    private MainRunConnectionRepository mainRunConnectionRepositoryMock;
+
+    private MainRunConnection con1;
+    private MainRunConnection con2;
+    private Terminal terminal;
+    private Seaport seaport;
+
+    @Before
+    public void setUp() {
+
+        sut = new MainRunConnectionServiceImpl(mainRunConnectionRepositoryMock);
+
+        con1 = new MainRunConnection();
+        con2 = new MainRunConnection();
+        terminal = new Terminal();
+        seaport = new Seaport();
+    }
+
+
+    @Test
+    public void getAll() {
+
+        when(mainRunConnectionRepositoryMock.findAll()).thenReturn(asList(con1, con2));
+
+        List<MainRunConnection> allMainrunConnections = sut.getAll();
+
+        assertThat(allMainrunConnections, hasSize(2));
+        assertThat(allMainrunConnections, contains(con1, con2));
+    }
+
+
+    @Test
+    public void getAllActive() {
+
+        when(mainRunConnectionRepositoryMock.findByEnabled(true)).thenReturn(asList(con1, con2));
+
+        List<MainRunConnection> activeMainrunConnections = sut.getAllActive();
+
+        assertThat(activeMainrunConnections, hasSize(2));
+        assertThat(activeMainrunConnections, contains(con1, con2));
+    }
+
+
+    @Test
+    public void getById() {
+
+        when(mainRunConnectionRepositoryMock.findOne(CONNECTION_ID)).thenReturn(con1);
+
+        MainRunConnection mainrunConnection = sut.getById(CONNECTION_ID);
+        assertThat(mainrunConnection, is(con1));
+    }
+
+
+    @Test
+    public void save() {
+
+        MainRunConnection con = new MainRunConnection();
+        con.setId(CONNECTION_ID);
+
+        when(mainRunConnectionRepositoryMock.save(con1)).thenReturn(con);
+
+        MainRunConnection savedMainrunConnection = sut.save(con1);
+
+        assertThat(savedMainrunConnection, is(con));
+        assertThat(savedMainrunConnection.getId(), is(CONNECTION_ID));
+    }
+
+
+    @Test
+    public void findRoutingConnectionBetweenTerminalAndSeaportByType() {
+
+        when(mainRunConnectionRepositoryMock.findByTerminalAndSeaportAndRouteTypeAndEnabled(terminal, seaport,
+                RouteType.BARGE, true)).thenReturn(con1);
+
+        MainRunConnection mainrunConnection = sut.findRoutingConnectionBetweenTerminalAndSeaportByType(terminal,
+                seaport, RouteType.BARGE);
+
+        assertThat(mainrunConnection, is(con1));
+    }
+
+
+    @Test
+    public void getConnectionsForTerminal() {
+
+        BigInteger terminalUID = new BigInteger("200");
+
+        MainRunConnection c1 = new MainRunConnection();
+        MainRunConnection c2 = new MainRunConnection();
+
+        when(mainRunConnectionRepositoryMock.findConnectionsByTerminalUniqueId(terminalUID)).thenReturn(asList(c1, c2));
+
+        assertThat(sut.getConnectionsForTerminal(terminalUID), contains(c1, c2));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImplUnitTest.java
new file mode 100644
index 00000000..d8c1fc24
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/service/SeaportConnectionRoutesServiceImplUnitTest.java
@@ -0,0 +1,273 @@
+package net.contargo.iris.connection.service;
+
+import com.vividsolutions.jts.util.Assert;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.connection.advice.MainRunAdvisor;
+import net.contargo.iris.connection.advice.MainRunStrategy;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteCombo;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RouteInformation;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static net.contargo.iris.container.ContainerType.TWENTY_LIGHT;
+import static net.contargo.iris.route.RouteDirection.EXPORT;
+import static net.contargo.iris.route.RouteDirection.IMPORT;
+import static net.contargo.iris.route.RouteProduct.ONEWAY;
+import static net.contargo.iris.route.RouteProduct.ROUNDTRIP;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportConnectionRoutesServiceImplUnitTest {
+
+    private SeaportConnectionRoutesServiceImpl sut;
+
+    @Mock
+    private SeaportTerminalConnectionService seaportTerminalConnectionService;
+    @Mock
+    private MainRunAdvisor mainRunAdvisorMock;
+
+    private Seaport seaPort;
+    private GeoLocation destination;
+    private ContainerType containerType;
+    private Terminal terminal;
+
+    @Before
+    public void setup() throws Exception {
+
+        List<Terminal> terminals = Collections.singletonList(new Terminal());
+
+        when(seaportTerminalConnectionService.getTerminalsConnectedToSeaPortByRouteType(any(Seaport.class),
+                any(RouteType.class))).thenReturn(terminals);
+
+        RoutePart bargeRoute = new RoutePart();
+        bargeRoute.setRouteType(RouteType.BARGE);
+
+        RoutePart railRoute = new RoutePart();
+        railRoute.setRouteType(RouteType.RAIL);
+
+        RoutePart truckRoute = new RoutePart();
+        truckRoute.setRouteType(RouteType.TRUCK);
+
+        seaPort = new Seaport();
+        destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        containerType = TWENTY_LIGHT;
+        terminal = new Terminal();
+
+        sut = new SeaportConnectionRoutesServiceImpl(seaportTerminalConnectionService, mainRunAdvisorMock);
+    }
+
+
+    private Route getExpectedRoute(List<RouteType> expectedRouteTypes) {
+
+        Route expectedRoute = new Route();
+        RouteData expectedRouteData = new RouteData();
+
+        List<RoutePart> expectedRouteParts = new ArrayList<>();
+
+        for (int i = 0; i < expectedRouteTypes.size(); i++) {
+            RoutePart routePart = new RoutePart();
+            routePart.setRouteType(expectedRouteTypes.get(i));
+            expectedRouteParts.add(i, routePart);
+        }
+
+        expectedRouteData.setParts(expectedRouteParts);
+        expectedRoute.setData(expectedRouteData);
+
+        return expectedRoute;
+    }
+
+
+    @Test
+    public void testGetPossibleConnectionsOneWayImport() {
+
+        List<RouteType> expectedRouteTypes = new ArrayList<>();
+        expectedRouteTypes.add(RouteType.BARGE);
+        expectedRouteTypes.add(RouteType.TRUCK);
+        expectedRouteTypes.add(RouteType.TRUCK);
+
+        Route expectedRoute = getExpectedRoute(expectedRouteTypes);
+
+        MainRunStrategy mainRunStrategy = mock(MainRunStrategy.class);
+        when(mainRunAdvisorMock.advice(ONEWAY, IMPORT)).thenReturn(mainRunStrategy);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.BARGE)).thenReturn(
+            expectedRoute);
+
+        RouteInformation information = new RouteInformation(destination, ONEWAY, containerType, IMPORT,
+                RouteCombo.WATERWAY);
+
+        // run test
+        List<Route> routes = sut.getAvailableSeaportConnectionRoutes(seaPort, information);
+
+        Assert.equals(1, routes.size());
+        Assert.equals(3, routes.get(0).getData().getParts().size());
+        Assert.equals(RouteType.BARGE, routes.get(0).getData().getParts().get(0).getRouteType());
+        Assert.equals(RouteType.TRUCK, routes.get(0).getData().getParts().get(1).getRouteType());
+        Assert.equals(RouteType.TRUCK, routes.get(0).getData().getParts().get(2).getRouteType());
+    }
+
+
+    @Test
+    public void testGetPossibleConnectionsOneWayExport() {
+
+        List<RouteType> expectedRouteTypes = new ArrayList<>();
+        expectedRouteTypes.add(RouteType.TRUCK);
+        expectedRouteTypes.add(RouteType.TRUCK);
+        expectedRouteTypes.add(RouteType.RAIL);
+
+        Route expectedRoute = getExpectedRoute(expectedRouteTypes);
+
+        MainRunStrategy mainRunStrategy = mock(MainRunStrategy.class);
+        when(mainRunAdvisorMock.advice(ONEWAY, EXPORT)).thenReturn(mainRunStrategy);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.RAIL)).thenReturn(
+            expectedRoute);
+
+        RouteInformation information = new RouteInformation(destination, ONEWAY, containerType, EXPORT,
+                RouteCombo.RAILWAY);
+
+        // run test
+        List<Route> routes = sut.getAvailableSeaportConnectionRoutes(seaPort, information);
+
+        // assert stuff
+        assertThat(routes.size(), is(1));
+        assertThat(routes.get(0).getData().getParts().size(), is(3));
+        assertThat(routes.get(0).getData().getParts().get(0).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(0).getData().getParts().get(1).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(0).getData().getParts().get(2).getRouteType(), is(RouteType.RAIL));
+    }
+
+
+    @Test
+    public void testGetPossibleConnectionsRoundTrip() {
+
+        List<RouteType> expectedRouteTypes = new ArrayList<>();
+        expectedRouteTypes.add(RouteType.BARGE);
+        expectedRouteTypes.add(RouteType.TRUCK);
+        expectedRouteTypes.add(RouteType.TRUCK);
+        expectedRouteTypes.add(RouteType.BARGE);
+
+        Route expectedRoute = getExpectedRoute(expectedRouteTypes);
+
+        MainRunStrategy mainRunStrategy = mock(MainRunStrategy.class);
+        when(mainRunAdvisorMock.advice(ROUNDTRIP, IMPORT)).thenReturn(mainRunStrategy);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.BARGE)).thenReturn(
+            expectedRoute);
+
+        RouteInformation information = new RouteInformation(destination, ROUNDTRIP, containerType, IMPORT,
+                RouteCombo.WATERWAY);
+
+        // run test
+        List<Route> routes = sut.getAvailableSeaportConnectionRoutes(seaPort, information);
+
+        // assert stuff
+        assertThat(routes.size(), is(1));
+        assertThat(routes.get(0).getData().getParts().size(), is(4));
+        assertThat(routes.get(0).getData().getParts().get(0).getRouteType(), is(RouteType.BARGE));
+        assertThat(routes.get(0).getData().getParts().get(1).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(0).getData().getParts().get(2).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(0).getData().getParts().get(3).getRouteType(), is(RouteType.BARGE));
+    }
+
+
+    @Test
+    public void testComboAll() {
+
+        List<RouteType> expectedFirstRouteTypes = new ArrayList<>();
+        expectedFirstRouteTypes.add(RouteType.BARGE);
+        expectedFirstRouteTypes.add(RouteType.TRUCK);
+        expectedFirstRouteTypes.add(RouteType.TRUCK);
+
+        Route expectedFirstRoute = getExpectedRoute(expectedFirstRouteTypes);
+
+        List<RouteType> expectedSecondRouteTypes = new ArrayList<>();
+        expectedSecondRouteTypes.add(RouteType.RAIL);
+        expectedSecondRouteTypes.add(RouteType.TRUCK);
+        expectedSecondRouteTypes.add(RouteType.TRUCK);
+
+        Route expectedSecondRoute = getExpectedRoute(expectedSecondRouteTypes);
+
+        MainRunStrategy mainRunStrategy = mock(MainRunStrategy.class);
+        when(mainRunAdvisorMock.advice(ONEWAY, IMPORT)).thenReturn(mainRunStrategy);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.BARGE)).thenReturn(
+            expectedFirstRoute);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.RAIL)).thenReturn(
+            expectedSecondRoute);
+
+        RouteInformation information = new RouteInformation(destination, ONEWAY, containerType, IMPORT, RouteCombo.ALL);
+
+        // run test
+        List<Route> routes = sut.getAvailableSeaportConnectionRoutes(seaPort, information);
+
+        // assert stuff
+        assertThat(routes.size(), is(2));
+
+        assertThat(routes.get(0).getData().getParts().size(), is(3));
+        assertThat(routes.get(0).getData().getParts().get(0).getRouteType(), is(RouteType.BARGE));
+        assertThat(routes.get(0).getData().getParts().get(1).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(0).getData().getParts().get(2).getRouteType(), is(RouteType.TRUCK));
+
+        assertThat(routes.get(1).getData().getParts().size(), is(3));
+        assertThat(routes.get(1).getData().getParts().get(0).getRouteType(), is(RouteType.RAIL));
+        assertThat(routes.get(1).getData().getParts().get(1).getRouteType(), is(RouteType.TRUCK));
+        assertThat(routes.get(1).getData().getParts().get(2).getRouteType(), is(RouteType.TRUCK));
+    }
+
+
+    @Test
+    public void testDirectTruck() {
+
+        GeoLocation destination = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        Terminal terminal = new Terminal();
+
+        Route expectedRoute = mock(Route.class);
+        MainRunStrategy mainRunStrategy = mock(MainRunStrategy.class);
+        when(mainRunAdvisorMock.advice(ONEWAY, IMPORT)).thenReturn(mainRunStrategy);
+        when(mainRunStrategy.getRoute(seaPort, destination, terminal, TWENTY_LIGHT, RouteType.BARGE)).thenReturn(
+            expectedRoute);
+
+        RouteInformation information = new RouteInformation(destination, ONEWAY, TWENTY_LIGHT, IMPORT, null);
+        Route route = sut.getMainRunRoute(seaPort, terminal, information, RouteType.BARGE);
+
+        assertThat(route, is(expectedRoute));
+    }
+
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetMainRunConnectionWithException() {
+
+        RouteInformation information = new RouteInformation(destination, ONEWAY, TWENTY_LIGHT, IMPORT, null);
+        sut.getMainRunRoute(seaPort, terminal, information, RouteType.TRUCK);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImplUnitTest.java b/src/test/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImplUnitTest.java
new file mode 100644
index 00000000..96940937
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/service/SeaportTerminalConnectionServiceImplUnitTest.java
@@ -0,0 +1,121 @@
+package net.contargo.iris.connection.service;
+
+import net.contargo.iris.connection.persistence.MainRunConnectionRepository;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasSize;
+
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportTerminalConnectionServiceImplUnitTest {
+
+    private SeaportTerminalConnectionServiceImpl sut;
+
+    @Mock
+    private MainRunConnectionRepository mainRunConnectionRepositoryMock;
+    @Mock
+    private SeaportService seaportServiceMock;
+    @Mock
+    private TerminalService terminalServiceMock;
+
+    private Terminal terminal;
+    private Seaport seaport;
+
+    @Before
+    public void setUp() {
+
+        sut = new SeaportTerminalConnectionServiceImpl(mainRunConnectionRepositoryMock, seaportServiceMock,
+                terminalServiceMock);
+
+        terminal = new Terminal();
+        seaport = new Seaport();
+        seaport.setUniqueId(BigInteger.ONE);
+    }
+
+
+    @Test
+    public void findSeaPortsConnectedByTruckRouteType() {
+
+        when(seaportServiceMock.getAllActive()).thenReturn(asList(seaport));
+
+        List<Seaport> seaports = sut.findSeaPortsConnectedByRouteType(RouteType.TRUCK);
+
+        assertThat(seaports, hasSize(1));
+        assertThat(seaports, contains(seaport));
+
+        verifyZeroInteractions(mainRunConnectionRepositoryMock);
+    }
+
+
+    @Test
+    public void findSeaPortsConnectedByRailRouteType() {
+
+        when(mainRunConnectionRepositoryMock.findSeaportsConnectedByRouteType(RouteType.RAIL)).thenReturn(asList(
+                seaport));
+
+        List<Seaport> seaports = sut.findSeaPortsConnectedByRouteType(RouteType.RAIL);
+
+        assertThat(seaports, hasSize(1));
+        assertThat(seaports, contains(seaport));
+
+        verifyZeroInteractions(seaportServiceMock);
+    }
+
+
+    @Test
+    public void getTerminalsConnectedToSeaPortByTruckRouteType() {
+
+        when(terminalServiceMock.getAllActive()).thenReturn(asList(terminal));
+
+        List<Terminal> terminals = sut.getTerminalsConnectedToSeaPortByRouteType(seaport, RouteType.TRUCK);
+
+        assertThat(terminals, hasSize(1));
+        assertThat(terminals, contains(terminal));
+
+        verifyZeroInteractions(mainRunConnectionRepositoryMock);
+    }
+
+
+    @Test
+    public void getTerminalsConnectedToSeaPortByRailRouteType() {
+
+        when(mainRunConnectionRepositoryMock.getTerminalsConnectedToSeaPortByRouteType(seaport.getUniqueId(),
+                RouteType.RAIL)).thenReturn(asList(terminal));
+
+        List<Terminal> terminals = sut.getTerminalsConnectedToSeaPortByRouteType(seaport, RouteType.RAIL);
+
+        assertThat(terminals, hasSize(1));
+        assertThat(terminals, contains(terminal));
+
+        verifyZeroInteractions(terminalServiceMock);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/connection/web/MainRunConnectionControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/connection/web/MainRunConnectionControllerMvcUnitTest.java
new file mode 100644
index 00000000..f2adcd34
--- /dev/null
+++ b/src/test/java/net/contargo/iris/connection/web/MainRunConnectionControllerMvcUnitTest.java
@@ -0,0 +1,223 @@
+package net.contargo.iris.connection.web;
+
+import net.contargo.iris.Message;
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import static net.contargo.iris.Message.MessageType.SUCCESS;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * MVC Unit test of {@link MainRunConnectionController}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(locations = { "classpath:web-api-context.xml" })
+public class MainRunConnectionControllerMvcUnitTest {
+
+    @Autowired
+    private MainRunConnectionService mainRunConnectionServiceMock;
+    @Autowired
+    private TerminalService terminalServiceMock;
+    @Autowired
+    private SeaportService seaportServiceMock;
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+    @Before
+    public void setUp() {
+
+        reset(mainRunConnectionServiceMock);
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+    }
+
+
+    @Test
+    public void getAllConnections() throws Exception {
+
+        MainRunConnection mainRunConnection = new MainRunConnection();
+        when(mainRunConnectionServiceMock.getAll()).thenReturn(asList(mainRunConnection));
+
+        ResultActions resultActions = mockMvc.perform(get("/connections"));
+        resultActions.andExpect(model().attribute("mainRunConnections", contains(mainRunConnection)));
+        resultActions.andExpect(view().name("connectionManagement/mainrunconnections"));
+        resultActions.andExpect(status().isOk());
+    }
+
+
+    @Test
+    public void prepareForCreate() throws Exception {
+
+        Terminal terminal = new Terminal();
+        Seaport seaport = new Seaport();
+
+        when(terminalServiceMock.getAll()).thenReturn(asList(terminal));
+        when(seaportServiceMock.getAll()).thenReturn(asList(seaport));
+
+        ResultActions resultActions = mockMvc.perform(get("/connections/new"));
+        resultActions.andExpect(model().attribute("mainRunConnection", instanceOf(MainRunConnection.class)));
+        resultActions.andExpect(model().attribute("routetypes", contains(RouteType.BARGE, RouteType.RAIL)));
+        resultActions.andExpect(model().attribute("terminals", contains(terminal)));
+        resultActions.andExpect(model().attribute("seaports", contains(seaport)));
+        resultActions.andExpect(view().name("connectionManagement/mainrunconnection"));
+        resultActions.andExpect(status().isOk());
+    }
+
+
+    @Test
+    public void prepareForUpdate() throws Exception {
+
+        MainRunConnection mainRunConnection = new MainRunConnection();
+        mainRunConnection.setId(2L);
+
+        Terminal terminal = new Terminal();
+        Seaport seaport = new Seaport();
+
+        when(mainRunConnectionServiceMock.getById(2L)).thenReturn(mainRunConnection);
+        when(terminalServiceMock.getAll()).thenReturn(asList(terminal));
+        when(seaportServiceMock.getAll()).thenReturn(asList(seaport));
+
+        ResultActions resultActions = mockMvc.perform(get("/connections/2"));
+        resultActions.andExpect(model().attribute("mainRunConnection", is(mainRunConnection)));
+        resultActions.andExpect(model().attribute("routetypes", contains(RouteType.BARGE, RouteType.RAIL)));
+        resultActions.andExpect(model().attribute("terminals", contains(terminal)));
+        resultActions.andExpect(model().attribute("seaports", contains(seaport)));
+        resultActions.andExpect(view().name("connectionManagement/mainrunconnection"));
+        resultActions.andExpect(status().isOk());
+    }
+
+
+    @Test
+    public void createConnection() throws Exception {
+
+        MainRunConnection mainRunConnectionMock = mock(MainRunConnection.class);
+        when(mainRunConnectionMock.getId()).thenReturn(2L);
+
+        when(mainRunConnectionServiceMock.save(any(MainRunConnection.class))).thenReturn(mainRunConnectionMock);
+        when(mainRunConnectionServiceMock.isAlreadyApplied(mainRunConnectionMock)).thenReturn(false);
+
+        MockHttpServletRequestBuilder builder = post("/connections/");
+        builder.param("electricDistance", "2.78");
+        builder.param("dieselDistance", "3.14");
+        builder.param("seaport.id", "1");
+        builder.param("terminal.id", "1");
+        builder.param("routeType", "BARGE");
+
+        ResultActions resultActions = mockMvc.perform(builder);
+        resultActions.andExpect(flash().attribute("message", instanceOf(Message.class)));
+        resultActions.andExpect(redirectedUrl("/web/connections/2"));
+        resultActions.andExpect(status().isFound());
+
+        Message msg = (Message) resultActions.andReturn().getFlashMap().get("message");
+        assertThat(msg.getMessage(), is("mainrunconnection.success.save.message"));
+        assertThat(msg.getType(), is(SUCCESS));
+
+        ArgumentCaptor<MainRunConnection> captor = ArgumentCaptor.forClass(MainRunConnection.class);
+        verify(mainRunConnectionServiceMock).save(captor.capture());
+        assertThat(captor.getValue().getId(), nullValue());
+    }
+
+
+    @Test
+    public void createConnectionHasErrors() throws Exception {
+
+        MainRunConnection mainRunConnectionMock = mock(MainRunConnection.class);
+        when(mainRunConnectionMock.getId()).thenReturn(2L);
+
+        when(mainRunConnectionServiceMock.isAlreadyApplied(mainRunConnectionMock)).thenReturn(false);
+
+        MockHttpServletRequestBuilder builder = post("/connections/");
+        builder.param("electricDistance", "2.78");
+        builder.param("dieselDistance", "");
+
+        ResultActions resultActions = mockMvc.perform(builder);
+        resultActions.andExpect(view().name("connectionManagement/mainrunconnection"));
+        resultActions.andExpect(status().isOk());
+    }
+
+
+    @Test
+    public void updateConnection() throws Exception {
+
+        MainRunConnection mainRunConnectionMock = mock(MainRunConnection.class);
+        when(mainRunConnectionMock.getId()).thenReturn(2L);
+
+        when(mainRunConnectionServiceMock.getById(2L)).thenReturn(mainRunConnectionMock);
+        when(mainRunConnectionServiceMock.save(any(MainRunConnection.class))).thenReturn(mainRunConnectionMock);
+
+        MockHttpServletRequestBuilder builder = put("/connections/2");
+        builder.param("electricDistance", "2.78");
+        builder.param("dieselDistance", "3.14");
+        builder.param("seaport.id", "1");
+        builder.param("terminal.id", "1");
+        builder.param("routeType", "BARGE");
+
+        ResultActions resultActions = mockMvc.perform(builder);
+        resultActions.andExpect(flash().attribute("message", instanceOf(Message.class)));
+        resultActions.andExpect(redirectedUrl("/web/connections/2"));
+        resultActions.andExpect(status().isFound());
+
+        Message msg = (Message) resultActions.andReturn().getFlashMap().get("message");
+        assertThat(msg.getMessage(), is("mainrunconnection.success.edit.message"));
+        assertThat(msg.getType(), is(SUCCESS));
+
+        ArgumentCaptor<MainRunConnection> captor = ArgumentCaptor.forClass(MainRunConnection.class);
+        verify(mainRunConnectionServiceMock).save(captor.capture());
+        assertThat(captor.getValue().getId(), is(2L));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/container/ContainerTypeUnitTest.java b/src/test/java/net/contargo/iris/container/ContainerTypeUnitTest.java
new file mode 100644
index 00000000..fbb38c5c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/container/ContainerTypeUnitTest.java
@@ -0,0 +1,28 @@
+package net.contargo.iris.container;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class ContainerTypeUnitTest {
+
+    @Test
+    public void isUnknown() {
+
+        assertThat(ContainerType.FORTY.isUnknown(), is(false));
+        assertThat(ContainerType.NOT_SET.isUnknown(), is(true));
+    }
+
+
+    @Test
+    public void getCsvString() {
+
+        assertThat(ContainerType.FORTY.getCsvString(), is("forty"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/countries/api/CountriesApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/countries/api/CountriesApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..824f22a2
--- /dev/null
+++ b/src/test/java/net/contargo/iris/countries/api/CountriesApiControllerMvcUnitTest.java
@@ -0,0 +1,85 @@
+package net.contargo.iris.countries.api;
+
+import net.contargo.iris.countries.dto.CountryDto;
+import net.contargo.iris.countries.dto.CountryDtoService;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * MVC Unit test of {@link CountriesApiController}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  David Schilling - schilling@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+
+@WebAppConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+public class CountriesApiControllerMvcUnitTest {
+
+    private static final String GERMANY = "Germany";
+    private static final String GER = "GER";
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Autowired
+    private CountryDtoService countryDtoServiceMock;
+
+    @Test
+    public void geoCodeByOsmId() throws Exception {
+
+        when(countryDtoServiceMock.getCountries()).thenReturn(asList(new CountryDto(GERMANY, GER)));
+
+        MockHttpServletRequestBuilder builder = get("/countries");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(view().name("countries"));
+        resultActions.andExpect(content().contentType(APPLICATION_JSON));
+        resultActions.andExpect(jsonPath("$.countriesResponse.countries", hasSize(1)));
+        resultActions.andExpect(jsonPath("$.countriesResponse.countries[0].name", is(GERMANY)));
+        resultActions.andExpect(jsonPath("$.countriesResponse.countries[0].value", is(GER)));
+        resultActions.andExpect(jsonPath("$.countriesResponse.links[0].href", endsWith("/countries")));
+
+        verify(countryDtoServiceMock).getCountries();
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryDtoServiceUnitTest.java b/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryDtoServiceUnitTest.java
new file mode 100644
index 00000000..2c7330d2
--- /dev/null
+++ b/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryDtoServiceUnitTest.java
@@ -0,0 +1,58 @@
+package net.contargo.iris.countries.service;
+
+import net.contargo.iris.countries.dto.CountryCodeCountryDtoService;
+import net.contargo.iris.countries.dto.CountryDto;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class CountryCodeCountryDtoServiceUnitTest {
+
+    private final CountryService countryServiceMock = mock(CountryCodeCountryService.class);
+    private final CountryCodeCountryDtoService sut = new CountryCodeCountryDtoService(countryServiceMock);
+
+    @Before
+    public void setUp() {
+
+        Map<String, String> countryMap = new HashMap<>();
+        countryMap.put("Tatooine", "TA");
+        countryMap.put("Coruscant", "CO");
+        when(countryServiceMock.getCountries()).thenReturn(countryMap);
+    }
+
+
+    @Test
+    public void testGetCountriesSize() {
+
+        List<CountryDto> countryDtoList = sut.getCountries();
+        assertThat(countryDtoList.size(), is(2));
+    }
+
+
+    @Test
+    public void testGetCountriesElements() {
+
+        List<CountryDto> actualList = sut.getCountries();
+        List<CountryDto> expectedList = Arrays.asList(new CountryDto("Tatooine", "TA"),
+                new CountryDto("Coruscant", "CO"));
+        Assert.assertTrue(actualList.containsAll(expectedList));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryServiceUnitTest.java b/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryServiceUnitTest.java
new file mode 100644
index 00000000..7d03c001
--- /dev/null
+++ b/src/test/java/net/contargo/iris/countries/service/CountryCodeCountryServiceUnitTest.java
@@ -0,0 +1,31 @@
+package net.contargo.iris.countries.service;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class CountryCodeCountryServiceUnitTest {
+
+    public static final int NUMBER_OF_COUNTRIES = 12;
+    private final CountryService sut = new CountryCodeCountryService();
+
+    @Test
+    public void testGetCountries() {
+
+        assertThat(sut.getCountries().size(), is(NUMBER_OF_COUNTRIES));
+    }
+
+
+    @Test
+    public void testGetSpecificCountry() {
+
+        assertThat(sut.getCountries().get("Austria"), is("AT"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImplUnitTest.java b/src/test/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImplUnitTest.java
new file mode 100644
index 00000000..e5263451
--- /dev/null
+++ b/src/test/java/net/contargo/iris/distance/service/ConnectionDistanceServiceImplUnitTest.java
@@ -0,0 +1,73 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.rounding.RoundingService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static java.math.BigDecimal.ONE;
+import static java.math.BigDecimal.TEN;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class ConnectionDistanceServiceImplUnitTest {
+
+    @Mock
+    private MainRunConnection mainrunConnectionMock;
+    @Mock
+    private RoundingService roundingServiceMock;
+
+    private ConnectionDistanceServiceImpl sut;
+
+    @Before
+    public void setUp() {
+
+        sut = new ConnectionDistanceServiceImpl(roundingServiceMock);
+    }
+
+
+    @Test
+    public void getDistance() {
+
+        when(mainrunConnectionMock.getTotalDistance()).thenReturn(TEN);
+        when(roundingServiceMock.roundDistance(TEN)).thenReturn(ONE);
+
+        assertThat(sut.getDistance(mainrunConnectionMock), is(ONE));
+    }
+
+
+    @Test
+    public void getDieselDistance() {
+
+        when(mainrunConnectionMock.getDieselDistance()).thenReturn(TEN);
+        when(roundingServiceMock.roundDistance(TEN)).thenReturn(ONE);
+
+        assertThat(sut.getDieselDistance(mainrunConnectionMock), is(ONE));
+    }
+
+
+    @Test
+    public void getElectricDistance() {
+
+        when(mainrunConnectionMock.getElectricDistance()).thenReturn(TEN);
+        when(roundingServiceMock.roundDistance(TEN)).thenReturn(ONE);
+
+        assertThat(sut.getElectricDistance(mainrunConnectionMock), is(ONE));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/distance/service/DistanceServiceImplUnitTest.java b/src/test/java/net/contargo/iris/distance/service/DistanceServiceImplUnitTest.java
new file mode 100644
index 00000000..22947f21
--- /dev/null
+++ b/src/test/java/net/contargo/iris/distance/service/DistanceServiceImplUnitTest.java
@@ -0,0 +1,74 @@
+package net.contargo.iris.distance.service;
+
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.truck.TruckRoute;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link DistanceServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DistanceServiceImplUnitTest {
+
+    private DistanceService sut;
+
+    @Mock
+    private RoundingService roundingServiceMock;
+
+    private BigDecimal value, valueRounded;
+
+    @Before
+    public void setUp() {
+
+        value = new BigDecimal(42.2);
+        valueRounded = new BigDecimal(43);
+
+        when(roundingServiceMock.roundDistance(value)).thenReturn(valueRounded);
+
+        sut = new DistanceServiceImpl(roundingServiceMock);
+    }
+
+
+    @Test
+    public void getDistanceFromTruckRoute() {
+
+        TruckRoute truckRoute = new TruckRoute(value, new BigDecimal(1.11), null);
+
+        BigDecimal distance = sut.getDistance(truckRoute);
+
+        assertThat(valueRounded, is(distance));
+        verify(roundingServiceMock).roundDistance(value);
+    }
+
+
+    @Test
+    public void getTollDistanceFromTruckRoute() {
+
+        TruckRoute truckRoute = new TruckRoute(new BigDecimal(1.11), value, null);
+
+        BigDecimal tollDistance = sut.getTollDistance(truckRoute);
+
+        assertThat(valueRounded, is(tollDistance));
+        verify(roundingServiceMock).roundDistance(value);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/distancecloud/api/DistanceCloudApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/distancecloud/api/DistanceCloudApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..f455e577
--- /dev/null
+++ b/src/test/java/net/contargo/iris/distancecloud/api/DistanceCloudApiControllerMvcUnitTest.java
@@ -0,0 +1,94 @@
+package net.contargo.iris.distancecloud.api;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDto;
+import net.contargo.iris.distancecloud.dto.DistanceCloudAddressDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * MVC Unit test of {@link net.contargo.iris.distancecloud.api.DistanceCloudApiController}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class DistanceCloudApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private DistanceCloudAddressDto distanceCloudAddressDto1;
+    private MockMvc mockMvc;
+
+    @Autowired
+    DistanceCloudAddressDtoService distanceCloudAddressDtoServiceMock;
+
+    @Before
+    public void setUp() throws Exception {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+
+        StaticAddress staticAddress1 = new StaticAddress();
+        staticAddress1.setCity("city1");
+
+        DistanceCloudAddress distanceCloudAddress1 = new DistanceCloudAddress(staticAddress1);
+        distanceCloudAddress1.setDistance(new BigDecimal("24"));
+
+        distanceCloudAddressDto1 = new DistanceCloudAddressDto(distanceCloudAddress1);
+    }
+
+
+    @Test
+    public void distanceCloudAddress() throws Exception {
+
+        when(distanceCloudAddressDtoServiceMock.getAddressInCloud(BigInteger.ONE, BigInteger.TEN)).thenReturn(
+            distanceCloudAddressDto1);
+
+        MockHttpServletRequestBuilder builder = get("/distancecloudaddress");
+        builder.param("terminal", BigInteger.ONE.toString());
+        builder.param("address", BigInteger.TEN.toString());
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = mockMvc.perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json;charset=UTF-8"));
+
+        // some random sampling
+        resultActions.andExpect((jsonPath("$.address.city", is(distanceCloudAddressDto1.getCity()))));
+        resultActions.andExpect((jsonPath("$.address.distance", is(24))));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..a7e2a931
--- /dev/null
+++ b/src/test/java/net/contargo/iris/distancecloud/dto/DistanceCloudAddressDtoServiceImplUnitTest.java
@@ -0,0 +1,86 @@
+package net.contargo.iris.distancecloud.dto;
+
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+import net.contargo.iris.distancecloud.service.DistanceCloudAddressService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DistanceCloudAddressDtoServiceImplUnitTest {
+
+    private DistanceCloudAddressDtoServiceImpl sut;
+
+    @Mock
+    private DistanceCloudAddressService distanceCloudAddressServiceMock;
+
+    private DistanceCloudAddress address1;
+
+    @Before
+    public void setUp() {
+
+        sut = new DistanceCloudAddressDtoServiceImpl(distanceCloudAddressServiceMock);
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setCity("city");
+        staticAddress.setCountry("country");
+        staticAddress.setPostalcode("postalCode");
+        staticAddress.setSuburb("suburb");
+        staticAddress.setUniqueId(new BigInteger("1301000000000001"));
+
+        address1 = new DistanceCloudAddress(staticAddress);
+        address1.setDistance(BigDecimal.ONE);
+        address1.setTollDistance(BigDecimal.ONE);
+        address1.setErrorMessage("errorMessage");
+        address1.setHashKey("hashKey");
+        address1.setAirLineDistanceMeter(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void getAddressInCloud() {
+
+        when(distanceCloudAddressServiceMock.getAddressInCloud(BigInteger.ONE, BigInteger.TEN)).thenReturn(address1);
+
+        DistanceCloudAddressDto address = sut.getAddressInCloud(BigInteger.ONE, BigInteger.TEN);
+
+        assertCloudAddress(address);
+    }
+
+
+    private void assertCloudAddress(DistanceCloudAddressDto address) {
+
+        assertThat(address.getCity(), is(address1.getCity()));
+        assertThat(address.getDistance(), is(address1.getDistance()));
+        assertThat(address.getTollDistance(), is(address1.getTollDistance()));
+        assertThat(address.getCountry(), is(address1.getCountry()));
+        assertThat(address.getErrorMessage(), is(address1.getErrorMessage()));
+        assertThat(address.getHashKey(), is(address1.getHashKey()));
+        assertThat(address.getPostalcode(), is(address1.getPostalcode()));
+        assertThat(address.getSuburb(), is(address1.getSuburb()));
+        assertThat(address.getUniqueId(), is(String.valueOf(address1.getUniqueId())));
+        assertThat(address.getAirLineDistanceMeter(), is(address1.getAirLineDistanceMeter()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImplUnitTest.java b/src/test/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImplUnitTest.java
new file mode 100644
index 00000000..5c9d3c5e
--- /dev/null
+++ b/src/test/java/net/contargo/iris/distancecloud/service/DistanceCloudAddressServiceImplUnitTest.java
@@ -0,0 +1,141 @@
+package net.contargo.iris.distancecloud.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.staticsearch.StaticAddress;
+import net.contargo.iris.address.staticsearch.persistence.StaticAddressRepository;
+import net.contargo.iris.distancecloud.DistanceCloudAddress;
+import net.contargo.iris.gis.service.GisService;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.OSRMNonRoutableRouteException;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.isEmptyString;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit tests for {@link DistanceCloudAddressServiceImpl}.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DistanceCloudAddressServiceImplUnitTest {
+
+    private DistanceCloudAddressServiceImpl sut;
+
+    @Mock
+    private StaticAddressRepository repositoryMock;
+    @Mock
+    private TruckRouteService truckRouteServiceMock;
+    @Mock
+    private GisService gisServiceMock;
+    @Mock
+    private RoundingService roundingServiceMock;
+    @Mock
+    private TerminalService terminalServiceMock;
+
+    private BigDecimal distance = BigDecimal.ONE;
+    private BigDecimal tollDistance = BigDecimal.ONE;
+    private BigDecimal airLineDistance = BigDecimal.ONE;
+    private StaticAddress staticAddress;
+    private BigInteger uniqueId = new BigInteger("1301000000000001");
+
+    @Before
+    public void setup() {
+
+        staticAddress = createAddressForCloudTest(BigDecimal.ONE, BigDecimal.ONE);
+
+        sut = new DistanceCloudAddressServiceImpl(truckRouteServiceMock, repositoryMock, roundingServiceMock,
+                gisServiceMock, terminalServiceMock);
+    }
+
+
+    private StaticAddress createAddressForCloudTest(BigDecimal lat, BigDecimal lon) {
+
+        StaticAddress staticAddress = new StaticAddress();
+        staticAddress.setId(42L);
+        staticAddress.setLatitude(lat);
+        staticAddress.setLongitude(lon);
+        staticAddress.setCity("Karlsruhe");
+        staticAddress.setSuburb("Weststadt");
+        staticAddress.setPostalcode("76137");
+        staticAddress.setCountry("DE");
+        staticAddress.setUniqueId(uniqueId);
+
+        return staticAddress;
+    }
+
+
+    @Test
+    public void getAddressInCloud() {
+
+        Terminal terminalMock = mock(Terminal.class);
+
+        when(terminalServiceMock.getByUniqueId(BigInteger.ONE)).thenReturn(terminalMock);
+        when(repositoryMock.findByUniqueId(uniqueId)).thenReturn(staticAddress);
+        when(truckRouteServiceMock.route(any(GeoLocation.class), any(GeoLocation.class))).thenReturn(new TruckRoute(
+                distance, tollDistance, null));
+        when(gisServiceMock.calcAirLineDistInMeters(any(GeoLocation.class), any(GeoLocation.class))).thenReturn(
+            airLineDistance);
+        when(roundingServiceMock.roundDistance(distance)).thenReturn(BigDecimal.TEN);
+        when(roundingServiceMock.roundDistance(tollDistance)).thenReturn(BigDecimal.TEN);
+        when(roundingServiceMock.roundDistance(airLineDistance)).thenReturn(BigDecimal.TEN);
+
+        DistanceCloudAddress cloudAddress = sut.getAddressInCloud(BigInteger.ONE, uniqueId);
+
+        assertThat(cloudAddress.getDistance(), comparesEqualTo(BigDecimal.TEN));
+        assertThat(cloudAddress.getTollDistance(), comparesEqualTo(new BigDecimal("20")));
+        assertThat(cloudAddress.getAirLineDistanceMeter(), comparesEqualTo(BigDecimal.TEN));
+        assertThat(cloudAddress.getCity(), is("Karlsruhe"));
+        assertThat(cloudAddress.getSuburb(), is("Weststadt"));
+        assertThat(cloudAddress.getPostalcode(), is("76137"));
+        assertThat(cloudAddress.getErrorMessage(), isEmptyString());
+        assertThat(cloudAddress.getUniqueId(), is(uniqueId));
+    }
+
+
+    @Test
+    public void getAddressInCloudWithError() {
+
+        Terminal terminalMock = mock(Terminal.class);
+
+        when(terminalServiceMock.getByUniqueId(BigInteger.ONE)).thenReturn(terminalMock);
+        when(repositoryMock.findByUniqueId(uniqueId)).thenReturn(staticAddress);
+
+        doThrow(OSRMNonRoutableRouteException.class).when(truckRouteServiceMock).route(any(GeoLocation.class),
+            any(GeoLocation.class));
+
+        DistanceCloudAddress cloudAddress = sut.getAddressInCloud(BigInteger.ONE, uniqueId);
+
+        assertThat(cloudAddress.getErrorMessage(), is("Routing not possible"));
+
+        verifyZeroInteractions(roundingServiceMock);
+        verifyZeroInteractions(gisServiceMock);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/duration/service/DurationServiceImplUnitTest.java b/src/test/java/net/contargo/iris/duration/service/DurationServiceImplUnitTest.java
new file mode 100644
index 00000000..ae6ddb64
--- /dev/null
+++ b/src/test/java/net/contargo/iris/duration/service/DurationServiceImplUnitTest.java
@@ -0,0 +1,62 @@
+package net.contargo.iris.duration.service;
+
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.truck.TruckRoute;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link DurationServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DurationServiceImplUnitTest {
+
+    private DurationService sut;
+
+    @Mock
+    private RoundingService roundingServiceMock;
+
+    private BigDecimal value, valueRounded;
+
+    @Before
+    public void setUp() {
+
+        value = new BigDecimal(42.2);
+        valueRounded = new BigDecimal(43);
+
+        when(roundingServiceMock.roundDuration(value)).thenReturn(valueRounded);
+
+        sut = new DurationServiceImpl(roundingServiceMock);
+    }
+
+
+    @Test
+    public void getDurationFromTruckRoute() {
+
+        TruckRoute truckRoute = new TruckRoute(BigDecimal.ONE, BigDecimal.TEN, value);
+
+        BigDecimal duration = sut.getDuration(truckRoute);
+
+        assertThat(valueRounded, is(duration));
+        verify(roundingServiceMock).roundDuration(value);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/api/RouteEnricherApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/enricher/api/RouteEnricherApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..772d67fb
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/api/RouteEnricherApiControllerMvcUnitTest.java
@@ -0,0 +1,85 @@
+package net.contargo.iris.enricher.api;
+
+import net.contargo.iris.api.AbstractController;
+import net.contargo.iris.connection.dto.RouteDataDto;
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.connection.dto.RoutePartDto;
+import net.contargo.iris.enricher.dto.EnricherDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class RouteEnricherApiControllerMvcUnitTest {
+
+    @Autowired
+    private EnricherDtoService enricherDtoServiceMock;
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+    @Before
+    public void setUp() {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+    }
+
+
+    @Test
+    public void testGetEnrichedRoute() throws Exception {
+
+        RouteDto routeDto = new RouteDto();
+        routeDto.setName("RuthResponse");
+
+        RouteDataDto routeData = new RouteDataDto();
+        List<RoutePartDto> routePartList = Arrays.asList(new RoutePartDto());
+        routeData.setParts(routePartList);
+        routeDto.setData(routeData);
+
+        when(enricherDtoServiceMock.enrich(any(RouteDto.class))).thenReturn(routeDto);
+
+        ResultActions resultActions = mockMvc.perform(get("/" + AbstractController.ROUTE_DETAILS).param("name",
+                    "Ruth").accept(APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType(APPLICATION_JSON_VALUE));
+        resultActions.andExpect((jsonPath("$.response.route.name", is("RuthResponse"))));
+        resultActions.andExpect(model().attributeDoesNotExist("routeDto"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..1252e9f1
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/dto/EnricherDtoServiceImplUnitTest.java
@@ -0,0 +1,78 @@
+package net.contargo.iris.enricher.dto;
+
+import net.contargo.iris.connection.dto.RouteDto;
+import net.contargo.iris.enricher.service.EnricherService;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteProduct;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class EnricherDtoServiceImplUnitTest {
+
+    public static final String ROOT_NAME = "Ruth";
+    public static final String ROUTE_SHORTNAME = "kurzRuth";
+    private EnricherDtoServiceImpl sut;
+    @Mock
+    private EnricherService enricherServiceMock;
+    @Mock
+    private Route routeMock;
+    @Mock
+    private RouteData routeDataMock;
+
+    // This isn't a mock because it is final
+    private RouteDto routeDto;
+
+    @Before
+    public void setUp() {
+
+        sut = new EnricherDtoServiceImpl(enricherServiceMock);
+
+        when(routeMock.getData()).thenReturn(routeDataMock);
+        when(routeMock.getDirection()).thenReturn(RouteDirection.EXPORT);
+        when(routeMock.getName()).thenReturn(ROOT_NAME);
+        when(routeMock.getProduct()).thenReturn(RouteProduct.ONEWAY);
+        when(routeMock.getShortName()).thenReturn(ROUTE_SHORTNAME);
+        when(routeMock.isRoundTrip()).thenReturn(true);
+
+        when(routeDataMock.getCo2()).thenReturn(BigDecimal.TEN);
+        when(routeDataMock.getCo2DirectTruck()).thenReturn(BigDecimal.ZERO);
+
+        routeDto = new RouteDto(routeMock);
+
+        when(enricherServiceMock.enrich(any(Route.class))).thenReturn(routeMock);
+    }
+
+
+    @Test
+    public void testEnrich() {
+
+        RouteDto returnedRouteDto = sut.enrich(routeDto);
+
+        verify(enricherServiceMock).enrich(any(Route.class));
+
+        assertReflectionEquals(routeDto, returnedRouteDto);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricherUnitTest.java
new file mode 100644
index 00000000..f1bd29f6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/AirLineDistancePartEnricherUnitTest.java
@@ -0,0 +1,95 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.gis.service.GisService;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+
+import static org.junit.Assert.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.AirLineDistancePartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+
+@RunWith(MockitoJUnitRunner.class)
+public class AirLineDistancePartEnricherUnitTest {
+
+    private static final BigDecimal METERS_IN_A_KILOMETER = new BigDecimal(1000);
+
+    private AirLineDistancePartEnricher sut;
+
+    @Mock
+    private GisService gisServiceMock;
+    @Mock
+    private RoundingService roundingServiceMock;
+    @Mock
+    private RoutePart routePartMock;
+
+    // This is no mock because it is final
+    private EnricherContext enricherContext;
+
+    private BigDecimal airDis1, airDis2, airDis3;
+    private GeoLocation geoLocation;
+    private RoutePartData routePartData;
+
+    @Before
+    public void setup() {
+
+        geoLocation = new GeoLocation();
+        routePartData = new RoutePartData();
+
+        airDis1 = new BigDecimal(42000.0001);
+        airDis2 = new BigDecimal(42000.1);
+        airDis3 = new BigDecimal(42001.00);
+
+        when(roundingServiceMock.roundDistance(airDis1.divide(METERS_IN_A_KILOMETER))).thenReturn(new BigDecimal(42));
+        when(roundingServiceMock.roundDistance(airDis2.divide(METERS_IN_A_KILOMETER))).thenReturn(new BigDecimal(42));
+        when(roundingServiceMock.roundDistance(airDis3.divide(METERS_IN_A_KILOMETER))).thenReturn(new BigDecimal(43));
+        when(gisServiceMock.calcAirLineDistInMeters(geoLocation, geoLocation)).thenReturn(airDis1, airDis2, airDis3);
+
+        enricherContext = new EnricherContext.Builder().build();
+
+        sut = new AirLineDistancePartEnricher(gisServiceMock, roundingServiceMock);
+    }
+
+
+    @Test
+    public void testDelegation() {
+
+        when(routePartMock.getOrigin()).thenReturn(geoLocation);
+        when(routePartMock.getDestination()).thenReturn(geoLocation);
+        when(routePartMock.getData()).thenReturn(routePartData);
+
+        sut.enrich(routePartMock, enricherContext);
+        assertThat(routePartData.getAirLineDistance(), equalTo(new BigDecimal(42)));
+        verify(roundingServiceMock).roundDistance(airDis1.divide(METERS_IN_A_KILOMETER));
+
+        sut.enrich(routePartMock, enricherContext);
+        assertThat(routePartData.getAirLineDistance(), equalTo(new BigDecimal(42)));
+        verify(roundingServiceMock).roundDistance(airDis2.divide(METERS_IN_A_KILOMETER));
+
+        sut.enrich(routePartMock, enricherContext);
+        assertThat(routePartData.getAirLineDistance(), equalTo(new BigDecimal(43)));
+        verify(roundingServiceMock).roundDistance(airDis3.divide(METERS_IN_A_KILOMETER));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/Co2PartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/Co2PartEnricherUnitTest.java
new file mode 100644
index 00000000..b8e70257
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/Co2PartEnricherUnitTest.java
@@ -0,0 +1,72 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.co2.advice.Co2PartStrategy;
+import net.contargo.iris.co2.advice.Co2PartStrategyAdvisor;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.Co2PartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class Co2PartEnricherUnitTest {
+
+    private Co2PartEnricher sut;
+
+    @Mock
+    private Co2PartStrategyAdvisor co2PartStrategyAdvisorMock;
+    @Mock
+    private Co2PartStrategy strategyMock;
+
+    private RoutePart routePart;
+
+    @Before
+    public void setup() {
+
+        routePart = new RoutePart();
+        routePart.setRouteType(RouteType.RAIL);
+
+        sut = new Co2PartEnricher(co2PartStrategyAdvisorMock);
+    }
+
+
+    @Test
+    public void enrich() throws CriticalEnricherException {
+
+        when(co2PartStrategyAdvisorMock.advice(RouteType.RAIL)).thenReturn(strategyMock);
+        when(strategyMock.getEmissionForRoutePart(routePart)).thenReturn(BigDecimal.TEN);
+
+        sut.enrich(routePart, null);
+        assertThat(routePart.getData().getCo2(), is(BigDecimal.TEN));
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichWithCriticalError() throws CriticalEnricherException {
+
+        when(co2PartStrategyAdvisorMock.advice(RouteType.RAIL)).thenThrow(new IllegalStateException());
+
+        sut.enrich(routePart, null);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/Co2TotalEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/Co2TotalEnricherUnitTest.java
new file mode 100644
index 00000000..d4f94453
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/Co2TotalEnricherUnitTest.java
@@ -0,0 +1,96 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.co2.service.Co2Service;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test of {@link Co2TotalEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class Co2TotalEnricherUnitTest {
+
+    private Co2TotalEnricher sut;
+
+    @Mock
+    private Co2Service co2ServiceMock;
+
+    private Route route;
+    private BigDecimal co2Emission, co2EmissionDirectTruck;
+
+    @Before
+    public void setup() {
+
+        co2Emission = BigDecimal.TEN;
+        co2EmissionDirectTruck = BigDecimal.ONE;
+
+        route = new Route();
+
+        sut = new Co2TotalEnricher(co2ServiceMock);
+
+        RoutePart routePart = new RoutePart();
+        routePart.setRouteType(RouteType.RAIL);
+        routePart.getData().setCo2(BigDecimal.TEN);
+        route.getData().setParts(asList(routePart));
+
+        when(co2ServiceMock.getEmissionDirectTruck(route)).thenReturn(co2EmissionDirectTruck);
+        when(co2ServiceMock.getEmission(route)).thenReturn(co2Emission);
+    }
+
+
+    @Test
+    public void enrich() throws CriticalEnricherException {
+
+        sut.enrich(route, null);
+
+        assertThat(route.getData().getCo2(), is(co2Emission));
+        assertThat(route.getData().getCo2DirectTruck(), is(co2EmissionDirectTruck));
+
+        verify(co2ServiceMock).getEmission(route);
+        verify(co2ServiceMock).getEmissionDirectTruck(route);
+        verifyNoMoreInteractions(co2ServiceMock);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichDirectTruckWithCriticalException() throws CriticalEnricherException {
+
+        when(co2ServiceMock.getEmissionDirectTruck(route)).thenThrow(new IllegalStateException());
+
+        sut.enrich(route, null);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichRouteWithCriticalException() throws CriticalEnricherException {
+
+        when(co2ServiceMock.getEmission(route)).thenThrow(new IllegalStateException());
+
+        sut.enrich(route, null);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/EnricherContextUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/EnricherContextUnitTest.java
new file mode 100644
index 00000000..562b4a54
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/EnricherContextUnitTest.java
@@ -0,0 +1,53 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.RouteDirection;
+import net.contargo.iris.route.RouteType;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.enricher.service.EnricherContext}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class EnricherContextUnitTest {
+
+    private EnricherContext sut;
+
+    @Test
+    public void buildPlain() {
+
+        sut = new EnricherContext.Builder().build();
+        assertThat(sut.getRouteDirection(), nullValue());
+        assertThat(sut.getRouteTypes(), nullValue());
+        assertThat(sut.getErrors().size(), is(0));
+    }
+
+
+    @Test
+    public void buildWithRouteDirection() {
+
+        sut = new EnricherContext.Builder().routeDirection(RouteDirection.EXPORT).build();
+        assertThat(sut.getRouteDirection(), is(RouteDirection.EXPORT));
+    }
+
+
+    @Test
+    public void buildWithRouteTypes() {
+
+        sut = new EnricherContext.Builder().routeTypes(asList(RouteType.BARGE, RouteType.RAIL)).build();
+        assertThat(sut.getRouteTypes(), hasItem(RouteType.BARGE));
+        assertThat(sut.getRouteTypes(), hasItem(RouteType.RAIL));
+        assertThat(sut.getRouteTypes(), hasSize(2));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/EnricherServiceImplUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/EnricherServiceImplUnitTest.java
new file mode 100644
index 00000000..62d73d4e
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/EnricherServiceImplUnitTest.java
@@ -0,0 +1,112 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.truck.service.OSRMNonRoutableRouteException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.EnricherServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class EnricherServiceImplUnitTest {
+
+    private EnricherServiceImpl sut;
+
+    @Mock
+    private RouteTotalEnricher routeTotalEnricherMock;
+    @Mock
+    private RoutePartEnricher routePartEnricherMock;
+    @Mock
+    private Route routeMock;
+    @Mock
+    private RouteData routeDataMock;
+
+    @Captor
+    private ArgumentCaptor<Map<String, String>> mapCaptor;
+
+    private RoutePart routePart;
+
+    @Before
+    public void setUp() throws Exception {
+
+        routePart = new RoutePart(new GeoLocation(BigDecimal.TEN, BigDecimal.TEN),
+                new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO), RouteType.RAIL);
+
+        when(routeDataMock.getParts()).thenReturn(asList(routePart));
+        when(routeMock.getData()).thenReturn(routeDataMock);
+
+        sut = new EnricherServiceImpl(asList(routePartEnricherMock), asList(routeTotalEnricherMock));
+    }
+
+
+    @Test
+    public void enrich() throws CriticalEnricherException {
+
+        sut.enrich(routeMock);
+
+        verify(routeTotalEnricherMock).enrich(any(Route.class), any(EnricherContext.class));
+        verify(routePartEnricherMock).enrich(any(RoutePart.class), any(EnricherContext.class));
+    }
+
+
+    @Test(expected = OSRMNonRoutableRouteException.class)
+    public void enrichOSRMFailure() throws CriticalEnricherException {
+
+        doThrow(OSRMNonRoutableRouteException.class).when(routePartEnricherMock).enrich(any(RoutePart.class),
+            any(EnricherContext.class));
+
+        sut.enrich(routeMock);
+
+        verify(routeTotalEnricherMock).enrich(any(Route.class), any(EnricherContext.class));
+        verify(routePartEnricherMock).enrich(any(RoutePart.class), any(EnricherContext.class));
+    }
+
+
+    @Test
+    public void enrichCriticalEnricherException() throws CriticalEnricherException {
+
+        doThrow(CriticalEnricherException.class).when(routePartEnricherMock).enrich(any(RoutePart.class),
+            any(EnricherContext.class));
+
+        sut.enrich(routeMock);
+
+        verify(routeMock).setData(Matchers.argThat(
+                org.hamcrest.Matchers.<RouteData>hasProperty("parts", is(asList(routePart)))));
+        verify(routeMock).setErrors(mapCaptor.capture());
+        assertThat(mapCaptor.getValue().get("route"), is("Routing failed"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/GeoLocationPartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/GeoLocationPartEnricherUnitTest.java
new file mode 100644
index 00000000..21c517bf
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/GeoLocationPartEnricherUnitTest.java
@@ -0,0 +1,81 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.nominatim.service.AddressResolutionException;
+import net.contargo.iris.location.GeoLocationService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.GeoLocationPartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class GeoLocationPartEnricherUnitTest {
+
+    private GeoLocationPartEnricher sut;
+
+    @Mock
+    private GeoLocationService geoLocationServiceMock;
+    @Mock
+    private RoutePart routePartMock;
+
+    // This is no mock because it is final
+    private EnricherContext enricherContext;
+    private GeoLocation x;
+    private GeoLocation y;
+
+    @Before
+    public void setup() {
+
+        x = new GeoLocation();
+        y = new GeoLocation();
+
+        when(routePartMock.getOrigin()).thenReturn(x);
+        when(routePartMock.getDestination()).thenReturn(y);
+
+        sut = new GeoLocationPartEnricher(geoLocationServiceMock);
+
+        enricherContext = new EnricherContext.Builder().build();
+    }
+
+
+    @Test
+    public void testDelegation() throws CriticalEnricherException {
+
+        Terminal t = new Terminal();
+        Terminal t2 = new Terminal();
+
+        when(geoLocationServiceMock.getDetailedGeoLocation(x)).thenReturn(t);
+        when(geoLocationServiceMock.getDetailedGeoLocation(y)).thenReturn(t2);
+
+        sut.enrich(routePartMock, enricherContext);
+
+        verify(routePartMock).setOrigin(t);
+        verify(routePartMock).setDestination(t2);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichWithCriticalException() throws CriticalEnricherException {
+
+        when(geoLocationServiceMock.getDetailedGeoLocation(x)).thenThrow(new AddressResolutionException("",
+                new Throwable()));
+
+        sut.enrich(routePartMock, enricherContext);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/MainRunPartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/MainRunPartEnricherUnitTest.java
new file mode 100644
index 00000000..83203401
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/MainRunPartEnricherUnitTest.java
@@ -0,0 +1,153 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.connection.service.MainRunConnectionService;
+import net.contargo.iris.distance.service.ConnectionDistanceService;
+import net.contargo.iris.mainrun.service.MainRunDurationService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for implementation of MainRunPartEnricher: {@link net.contargo.iris.enricher.service.MainRunPartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MainRunPartEnricherUnitTest {
+
+    private static final BigDecimal ELECTRICAL_DISTANCE = BigDecimal.ONE;
+    private static final BigDecimal DIESEL_DISTANCE = BigDecimal.TEN;
+    private static final BigDecimal DISTANCE = BigDecimal.ZERO;
+    private static final BigDecimal DURATION = BigDecimal.TEN;
+
+    private MainRunPartEnricher sut;
+
+    @Mock
+    private MainRunConnectionService mainRunConnectionServiceMock;
+    @Mock
+    private MainRunDurationService mainRunDurationServiceMock;
+    @Mock
+    private ConnectionDistanceService connectionDistanceServiceMock;
+
+    // This is no mock because it is final
+    private EnricherContext enricherContext;
+    private MainRunConnection mainrunConnection;
+    private RoutePart routePart;
+
+    @Before
+    public void setup() {
+
+        mainrunConnection = new MainRunConnection();
+
+        Terminal terminal = new Terminal();
+        Seaport seaport = new Seaport();
+        RouteType routeType = RouteType.BARGE;
+
+        routePart = new RoutePart();
+        routePart.setOrigin(seaport);
+        routePart.setDestination(terminal);
+        routePart.setRouteType(routeType);
+
+        when(mainRunConnectionServiceMock.findRoutingConnectionBetweenTerminalAndSeaportByType(terminal, seaport,
+                routeType)).thenReturn(mainrunConnection);
+        when(connectionDistanceServiceMock.getElectricDistance(mainrunConnection)).thenReturn(ELECTRICAL_DISTANCE);
+        when(connectionDistanceServiceMock.getDistance(mainrunConnection)).thenReturn(DISTANCE);
+        when(connectionDistanceServiceMock.getDieselDistance(mainrunConnection)).thenReturn(DIESEL_DISTANCE);
+        when(mainRunDurationServiceMock.getMainRunRoutePartDuration(mainrunConnection, routePart)).thenReturn(DURATION);
+
+        enricherContext = new EnricherContext.Builder().build();
+
+        sut = new MainRunPartEnricher(mainRunConnectionServiceMock, mainRunDurationServiceMock,
+                connectionDistanceServiceMock);
+    }
+
+
+    @Test
+    public void enrich() throws CriticalEnricherException {
+
+        sut.enrich(routePart, enricherContext);
+
+        assertThat(routePart.getData().getElectricDistance(), is(ELECTRICAL_DISTANCE));
+        assertThat(routePart.getData().getDieselDistance(), is(DIESEL_DISTANCE));
+        assertThat(routePart.getData().getDistance(), is(DISTANCE));
+        assertThat(routePart.getData().getDuration(), is(DURATION));
+
+        verify(connectionDistanceServiceMock).getElectricDistance(mainrunConnection);
+        verify(connectionDistanceServiceMock).getDieselDistance(mainrunConnection);
+        verify(connectionDistanceServiceMock).getDistance(mainrunConnection);
+    }
+
+
+    @Test
+    public void enrichRouteTypeIsWrong() throws CriticalEnricherException {
+
+        // wrong RouteType => all attributes has to be BigDecimal(0)
+        routePart.setRouteType(RouteType.TRUCK);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertThat(routePart.getData().getDistance(), nullValue());
+        assertThat(routePart.getData().getDieselDistance(), nullValue());
+        assertThat(routePart.getData().getElectricDistance(), nullValue());
+        assertThat(routePart.getData().getDuration(), nullValue());
+
+        verify(connectionDistanceServiceMock, never()).getDistance(mainrunConnection);
+        verify(connectionDistanceServiceMock, never()).getDieselDistance(mainrunConnection);
+        verify(connectionDistanceServiceMock, never()).getElectricDistance(mainrunConnection);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichWithoutMainRunConnection() throws CriticalEnricherException {
+
+        when(mainRunConnectionServiceMock.findRoutingConnectionBetweenTerminalAndSeaportByType(any(Terminal.class),
+                any(Seaport.class), any(RouteType.class))).thenReturn(null);
+
+        sut.enrich(routePart, enricherContext);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichOriginIsNull() throws CriticalEnricherException {
+
+        routePart.setOrigin(null);
+        routePart.setRouteType(RouteType.RAIL);
+
+        sut.enrich(routePart, enricherContext);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichDestinationIsNull() throws CriticalEnricherException {
+
+        routePart.setDestination(null);
+        routePart.setRouteType(RouteType.RAIL);
+
+        sut.enrich(routePart, enricherContext);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricherUnitTest.java
new file mode 100644
index 00000000..a1ce20a6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/RouteDataRevisionPartEnricherUnitTest.java
@@ -0,0 +1,141 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.routedatarevision.service.RouteDataRevisionService;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.TRUCK;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.RouteDataRevisionPartEnricher RouteDataRevisionPartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RouteDataRevisionPartEnricherUnitTest {
+
+    protected static final BigDecimal AIRLINE_DISTANCE = BigDecimal.ZERO;
+    protected static final BigDecimal TOLL_DISTANCE_ONE_WAY = BigDecimal.ONE;
+    protected static final BigDecimal TRUCK_DISTANCE_ONE_WAY = BigDecimal.TEN;
+
+    private RoutePartEnricher sut;
+
+    @Mock
+    private RouteDataRevisionService routeDataRevisionServiceMock;
+
+    private EnricherContext enricherContext;
+    private Terminal terminal;
+    private Address address;
+
+    @Before
+    public void before() {
+
+        terminal = new Terminal();
+        address = new Address();
+
+        RouteDataRevision routeDataRevision = new RouteDataRevision();
+        routeDataRevision.setAirlineDistance(AIRLINE_DISTANCE);
+        routeDataRevision.setTollDistanceOneWay(TOLL_DISTANCE_ONE_WAY);
+        routeDataRevision.setTruckDistanceOneWay(TRUCK_DISTANCE_ONE_WAY);
+
+        when(routeDataRevisionServiceMock.getRouteDataRevision(terminal, address)).thenReturn(routeDataRevision);
+
+        enricherContext = new EnricherContext.Builder().build();
+
+        sut = new RouteDataRevisionPartEnricher(routeDataRevisionServiceMock);
+    }
+
+
+    @Test
+    public void enrichTerminal2Address() throws CriticalEnricherException {
+
+        RoutePart routePart = new RoutePart(terminal, address, TRUCK);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertRoutePartEnriched(routePart);
+    }
+
+
+    @Test
+    public void enrichAddress2Terminal() throws CriticalEnricherException {
+
+        RoutePart routePart = new RoutePart(address, terminal, TRUCK);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertRoutePartEnriched(routePart);
+    }
+
+
+    @Test
+    public void wrongRouteType() throws CriticalEnricherException {
+
+        RoutePart routePart = new RoutePart(terminal, address, BARGE);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertRoutePartNotEnriched(routePart);
+    }
+
+
+    @Test
+    public void throwInternExceptionWrongOriginType() throws CriticalEnricherException {
+
+        RoutePart routePart = new RoutePart(new Seaport(), address, TRUCK);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertRoutePartNotEnriched(routePart);
+    }
+
+
+    @Test
+    public void throwInternExceptionWrongDestinationType() throws CriticalEnricherException {
+
+        RoutePart routePart = new RoutePart(terminal, new Seaport(), TRUCK);
+
+        sut.enrich(routePart, enricherContext);
+
+        assertRoutePartNotEnriched(routePart);
+    }
+
+
+    private void assertRoutePartEnriched(RoutePart routePart) {
+
+        assertThat(routePart.getData().getAirLineDistance(), is(AIRLINE_DISTANCE));
+        assertThat(routePart.getData().getTollDistance(), is(TOLL_DISTANCE_ONE_WAY));
+        assertThat(routePart.getData().getDistance(), is(TRUCK_DISTANCE_ONE_WAY));
+    }
+
+
+    private void assertRoutePartNotEnriched(RoutePart routePart) {
+
+        assertThat(routePart.getData().getAirLineDistance(), is(nullValue()));
+        assertThat(routePart.getData().getTollDistance(), is(nullValue()));
+        assertThat(routePart.getData().getDistance(), is(nullValue()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/TotalEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/TotalEnricherUnitTest.java
new file mode 100644
index 00000000..7eb69551
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/TotalEnricherUnitTest.java
@@ -0,0 +1,91 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * Unit test for implementation of TotalEnricher: {@link TotalEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class TotalEnricherUnitTest {
+
+    private TotalEnricher sut;
+
+    private EnricherContext enricherContext;
+    private Route route;
+    private RouteData routeData;
+    private RoutePart routePart;
+    private RoutePartData routePartData;
+    private BigDecimal distance, tollDistance, duration;
+
+    @Before
+    public void setup() {
+
+        distance = new BigDecimal(1);
+        tollDistance = new BigDecimal(2);
+        duration = new BigDecimal(3);
+
+        route = new Route();
+        routeData = new RouteData();
+        routePart = new RoutePart();
+        routePartData = new RoutePartData();
+
+        enricherContext = new EnricherContext.Builder().build();
+
+        sut = new TotalEnricher();
+    }
+
+
+    @Test
+    public void testEnricher() {
+
+        routePartData.setDistance(distance);
+        routePartData.setTollDistance(tollDistance);
+        routePartData.setDuration(duration);
+        routePart.setData(routePartData);
+        routeData.setParts(Arrays.asList(routePart, routePart, routePart, routePart));
+
+        route.setData(routeData);
+
+        BigDecimal multi = new BigDecimal(routeData.getParts().size());
+
+        sut.enrich(route, enricherContext);
+
+        assertThat(route.getData().getTotalDistance(), is(distance.multiply(multi)));
+        assertThat(route.getData().getTotalRealTollDistance(), is(tollDistance.multiply(multi)));
+        assertThat(route.getData().getTotalDuration(), is(duration.multiply(multi)));
+    }
+
+
+    @Test
+    public void testEnricherNoData() {
+
+        routePart.setData(routePartData);
+        routeData.setParts(Arrays.asList(routePart, routePart, routePart, routePart));
+
+        route.setData(routeData);
+
+        sut.enrich(route, enricherContext);
+
+        assertThat(route.getData().getTotalDistance(), nullValue());
+        assertThat(route.getData().getTotalRealTollDistance(), nullValue());
+        assertThat(route.getData().getTotalDuration(), nullValue());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricherUnitTest.java
new file mode 100644
index 00000000..e3a0cf3f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/TruckRoutingPartEnricherUnitTest.java
@@ -0,0 +1,131 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.distance.service.DistanceService;
+import net.contargo.iris.duration.service.DurationService;
+import net.contargo.iris.osrm.service.RoutingException;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.enricher.service.TruckRoutingPartEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TruckRoutingPartEnricherUnitTest {
+
+    private TruckRoutingPartEnricher sut;
+
+    @Mock
+    private TruckRouteService truckRouteServiceMock;
+    @Mock
+    private DistanceService distanceServiceMock;
+    @Mock
+    private DurationService durationServiceMock;
+
+    private RoutePart routePart;
+    private TruckRoute truckRoute;
+    private BigDecimal distance, toll, duration;
+
+    @Before
+    public void setup() {
+
+        distance = BigDecimal.TEN;
+        toll = BigDecimal.ONE;
+        duration = BigDecimal.TEN;
+
+        Terminal destinationTerminal = new Terminal();
+        Terminal originTerminal = new Terminal();
+
+        truckRoute = new TruckRoute(BigDecimal.ONE, BigDecimal.TEN, null);
+
+        routePart = new RoutePart();
+        routePart.setOrigin(originTerminal);
+        routePart.setDestination(destinationTerminal);
+        routePart.setRouteType(RouteType.TRUCK);
+
+        when(distanceServiceMock.getDistance(truckRoute)).thenReturn(distance);
+        when(distanceServiceMock.getTollDistance(truckRoute)).thenReturn(toll);
+        when(durationServiceMock.getDuration(truckRoute)).thenReturn(duration);
+        when(truckRouteServiceMock.route(originTerminal, destinationTerminal)).thenReturn(truckRoute);
+
+        sut = new TruckRoutingPartEnricher(truckRouteServiceMock, distanceServiceMock, durationServiceMock);
+    }
+
+
+    @Test
+    public void enrich() throws CriticalEnricherException {
+
+        sut.enrich(routePart, null);
+
+        assertThat(routePart.getData().getDistance(), is(distance));
+        verify(distanceServiceMock).getDistance(truckRoute);
+
+        assertThat(routePart.getData().getDieselDistance(), is(distance));
+        assertThat(routePart.getData().getElectricDistance(), is(BigDecimal.ZERO));
+
+        assertThat(routePart.getData().getDuration(), is(duration));
+        verify(durationServiceMock).getDuration(truckRoute);
+
+        assertThat(routePart.getData().getTollDistance(), is(toll));
+        verify(distanceServiceMock).getTollDistance(truckRoute);
+    }
+
+
+    @Test
+    public void enrichNoTruckRoute() throws CriticalEnricherException {
+
+        routePart.setRouteType(RouteType.RAIL);
+
+        sut.enrich(routePart, null);
+
+        assertThat(routePart.getData().getDistance(), nullValue());
+        verify(distanceServiceMock, never()).getDistance(truckRoute);
+
+        assertThat(routePart.getData().getDieselDistance(), nullValue());
+        assertThat(routePart.getData().getElectricDistance(), nullValue());
+
+        assertThat(routePart.getData().getDuration(), nullValue());
+        verify(durationServiceMock, never()).getDuration(truckRoute);
+
+        assertThat(routePart.getData().getTollDistance(), nullValue());
+        verify(distanceServiceMock, never()).getTollDistance(truckRoute);
+    }
+
+
+    @Test(expected = CriticalEnricherException.class)
+    public void enrichWithCriticalError() throws CriticalEnricherException {
+
+        when(truckRouteServiceMock.route(any(GeoLocation.class), any(GeoLocation.class))).thenThrow(
+            new RoutingException("", new Exception()));
+
+        sut.enrich(routePart, null);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/enricher/service/TruckingTotalEnricherUnitTest.java b/src/test/java/net/contargo/iris/enricher/service/TruckingTotalEnricherUnitTest.java
new file mode 100644
index 00000000..d3d70344
--- /dev/null
+++ b/src/test/java/net/contargo/iris/enricher/service/TruckingTotalEnricherUnitTest.java
@@ -0,0 +1,143 @@
+package net.contargo.iris.enricher.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.route.Route;
+import net.contargo.iris.route.RouteData;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RoutePartData;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+
+/**
+ * Unit test for implementation of {@link TruckingTotalEnricher}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class TruckingTotalEnricherUnitTest {
+
+    private TruckingTotalEnricher sut;
+
+    private EnricherContext enricherContext;
+    private Route route;
+    private RoutePart routePart3, routePart4;
+    private BigDecimal totalTollDistanceSeaport, totalTollDistanceTriangle, totalOnewayTruckDistanceSeaport,
+        totalOnewayTruckDistanceTriangle;
+
+    private Terminal terminal;
+    private Address address1, address2, address3;
+
+    @Before
+    public void setup() {
+
+        BigDecimal partTollDistance1 = new BigDecimal(1);
+        BigDecimal partTollDistance2 = new BigDecimal(5);
+        totalTollDistanceSeaport = new BigDecimal(4);
+        totalTollDistanceTriangle = new BigDecimal(12);
+
+        BigDecimal partDistance1 = new BigDecimal(4);
+        BigDecimal partDistance2 = new BigDecimal(5);
+        totalOnewayTruckDistanceSeaport = new BigDecimal(8);
+        totalOnewayTruckDistanceTriangle = new BigDecimal(9);
+
+        sut = new TruckingTotalEnricher();
+
+        terminal = new Terminal();
+
+        address1 = new Address();
+        address1.setDisplayName("first");
+        address2 = new Address();
+        address2.setDisplayName("second");
+        address3 = new Address();
+        address3.setDisplayName("third");
+
+        route = new Route();
+
+        RouteData routeData = new RouteData();
+        RoutePart routePart1 = new RoutePart();
+        RoutePart routePart2 = new RoutePart();
+        routePart3 = new RoutePart();
+        routePart4 = new RoutePart();
+
+        RoutePartData routePartData1 = new RoutePartData();
+        routePartData1.setTollDistance(partTollDistance1);
+        routePartData1.setDistance(partDistance1);
+
+        RoutePartData routePartData2 = new RoutePartData();
+        routePartData2.setTollDistance(partTollDistance2);
+        routePartData2.setDistance(partDistance2);
+
+        routePart1.setData(routePartData1);
+        routePart1.setRouteType(RouteType.TRUCK);
+        routePart1.setOrigin(terminal);
+        routePart1.setDestination(address1);
+
+        routePart2.setData(routePartData1);
+        routePart2.setRouteType(RouteType.TRUCK);
+        routePart2.setOrigin(address1);
+        routePart2.setDestination(address2);
+
+        routePart3.setData(routePartData2);
+        routePart3.setRouteType(RouteType.TRUCK);
+        routePart3.setOrigin(address2);
+        routePart3.setDestination(address1);
+
+        routePart4.setData(routePartData2);
+        routePart4.setRouteType(RouteType.TRUCK);
+        routePart4.setOrigin(address1);
+        routePart4.setDestination(terminal);
+
+        routeData.setParts(Arrays.asList(routePart1, routePart2, routePart3, routePart4));
+
+        route.setData(routeData);
+
+        enricherContext = new EnricherContext.Builder().build();
+    }
+
+
+    @Test
+    public void testEnricherSeaport() {
+
+        sut.enrich(route, enricherContext);
+
+        assertThat(totalTollDistanceSeaport, is(route.getData().getTotalTollDistance()));
+        assertThat(totalOnewayTruckDistanceSeaport, is(route.getData().getTotalOnewayTruckDistance()));
+    }
+
+
+    @Test
+    public void testEnricherTriangle() {
+
+        // this is a triangle routing and the first and third address are not the same (gps coordinates)
+        // so this will return every part as the oneway
+
+        address1.setLatitude(BigDecimal.ONE);
+        address1.setLongitude(BigDecimal.ONE);
+
+        address3.setLatitude(BigDecimal.TEN);
+        address3.setLongitude(BigDecimal.TEN);
+
+        routePart3.setOrigin(address2);
+        routePart3.setDestination(address3);
+
+        routePart4.setOrigin(address3);
+        routePart4.setDestination(terminal);
+
+        sut.enrich(route, enricherContext);
+
+        assertThat(totalTollDistanceTriangle, is(route.getData().getTotalTollDistance()));
+        assertThat(totalOnewayTruckDistanceTriangle, is(route.getData().getTotalOnewayTruckDistance()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/gis/api/AirlineDistanceApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..82b47257
--- /dev/null
+++ b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceApiControllerMvcUnitTest.java
@@ -0,0 +1,97 @@
+package net.contargo.iris.gis.api;
+
+import net.contargo.iris.gis.dto.AirlineDistanceDto;
+import net.contargo.iris.gis.dto.AirlineDistanceDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.gis.dto.AirlineDistanceUnit.METER;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class AirlineDistanceApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+    @Autowired
+    private AirlineDistanceDtoService airlineDistanceDtoServiceMock;
+
+    @Before
+    public void before() {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+        when(airlineDistanceDtoServiceMock.calcAirLineDistInMeters("1.1", "1.2", "2.1", "2.2")).thenReturn(
+            new AirlineDistanceDto(new BigDecimal("7.89"), METER, "?alat=1.1&alon=1.2&blat=2.1&blon=2.2"));
+    }
+
+
+    @Test
+    public void airlineDistance() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/airlineDistance?alat=1.1&alon=1.2&blat=2.1&blon=2.2")
+                .accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk()).andExpect(content().contentType("application/json"));
+
+        resultActions.andExpect(jsonPath("$.airlineDistance.distance", comparesEqualTo(7.89)));
+        resultActions.andExpect(jsonPath("$.airlineDistance.unit", is("meter")));
+
+        resultActions.andExpect(jsonPath("$.airlineDistance.links[0].rel", is("self")));
+        resultActions.andExpect(jsonPath("$.airlineDistance.links[0].href",
+                is("http://localhost/airlineDistance?alat=1.1&alon=1.2&blat=2.1&blon=2.2")));
+    }
+
+
+    @Test
+    public void badRequestOnInvalidGeoCoordinates() throws Exception {
+
+        // invalid latitude
+        mockMvc.perform(get("/airlineDistance?alat=-90.5&alon=1.2&blat=2.1&blon=2.2").accept(APPLICATION_JSON))
+            .andExpect(status().isBadRequest());
+        mockMvc.perform(get("/airlineDistance?alat=1.1&alon=1.2&blat=91.5&blon=2.2").accept(APPLICATION_JSON))
+            .andExpect(status().isBadRequest());
+
+        // invalid longitudes
+        mockMvc.perform(get("/airlineDistance?alat=1.1&alon=-180.5&blat=2.1&blon=2.2").accept(APPLICATION_JSON))
+            .andExpect(status().isBadRequest());
+        mockMvc.perform(get("/airlineDistance?alat=1.1&alon=1.2&blat=2.1&blon=180.5").accept(APPLICATION_JSON))
+            .andExpect(status().isBadRequest());
+
+        // missing request parameters
+        mockMvc.perform(get("/airlineDistance?").accept(APPLICATION_JSON)).andExpect(status().isBadRequest());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssemblerConfig.java b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssemblerConfig.java
new file mode 100644
index 00000000..7013c767
--- /dev/null
+++ b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseAssemblerConfig.java
@@ -0,0 +1,18 @@
+package net.contargo.iris.gis.api;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@Configuration
+public class AirlineDistanceResponseAssemblerConfig {
+
+    @Bean
+    AirlineDistanceResponseAssembler airlineDistanceDtoAssembler() {
+
+        return new AirlineDistanceResponseAssembler();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseUnitTest.java b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseUnitTest.java
new file mode 100644
index 00000000..1cda50d7
--- /dev/null
+++ b/src/test/java/net/contargo/iris/gis/api/AirlineDistanceResponseUnitTest.java
@@ -0,0 +1,29 @@
+package net.contargo.iris.gis.api;
+
+import net.contargo.iris.gis.dto.AirlineDistanceDto;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.gis.dto.AirlineDistanceUnit.METER;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class AirlineDistanceResponseUnitTest {
+
+    @Test
+    public void create() {
+
+        AirlineDistanceDto airlineDistanceDto = new AirlineDistanceDto(BigDecimal.ONE, METER, "");
+        AirlineDistanceResponse sut = new AirlineDistanceResponse(airlineDistanceDto);
+        assertThat(sut.getDistance(), is(BigDecimal.ONE));
+        assertThat(sut.getUnit(), is("meter"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..2f47701b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/gis/dto/AirlineDistanceDtoServiceImplUnitTest.java
@@ -0,0 +1,57 @@
+package net.contargo.iris.gis.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.gis.service.GisService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.gis.dto.AirlineDistanceUnit.METER;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class AirlineDistanceDtoServiceImplUnitTest {
+
+    @Mock
+    private GisService gisService;
+    private AirlineDistanceDtoServiceImpl sut;
+
+    @Before
+    public void before() {
+
+        sut = new AirlineDistanceDtoServiceImpl(gisService);
+    }
+
+
+    @Test
+    public void calcAirLineDistInMeters() {
+
+        GeoLocation a = new GeoLocation(new BigDecimal("1.1"), new BigDecimal("1.2"));
+        GeoLocation b = new GeoLocation(new BigDecimal("2.1"), new BigDecimal("2.2"));
+
+        when(gisService.calcAirLineDistInMeters(a, b)).thenReturn(new BigDecimal("7.89"));
+
+        AirlineDistanceDto airlineDistanceDto = sut.calcAirLineDistInMeters("1.1", "1.2", "2.1", "2.2");
+
+        assertThat(airlineDistanceDto.getUnit(), is(METER));
+        assertThat(airlineDistanceDto.getDistance(), is(new BigDecimal("7.89")));
+        assertThat(airlineDistanceDto.getScope(), is("?alat=1.1&alon=1.2&blat=2.1&blon=2.2"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/gis/service/GisServiceImplUnitTest.java b/src/test/java/net/contargo/iris/gis/service/GisServiceImplUnitTest.java
new file mode 100644
index 00000000..935ef3da
--- /dev/null
+++ b/src/test/java/net/contargo/iris/gis/service/GisServiceImplUnitTest.java
@@ -0,0 +1,30 @@
+package net.contargo.iris.gis.service;
+
+import net.contargo.iris.GeoLocation;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class GisServiceImplUnitTest {
+
+    @Test
+    public void calcAirLineDistInMeters() {
+
+        GeoLocation a = new GeoLocation(new BigDecimal(49.015), new BigDecimal(8.42));
+        GeoLocation b = new GeoLocation(new BigDecimal(50.015), new BigDecimal(9.42));
+        GisService sut = new GisServiceImpl();
+
+        BigDecimal expected = new BigDecimal(132713.63654607915668748319149017333984375);
+        assertThat(sut.calcAirLineDistInMeters(a, b), is(expected));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/location/GeoLocationServiceImplUnitTest.java b/src/test/java/net/contargo/iris/location/GeoLocationServiceImplUnitTest.java
new file mode 100644
index 00000000..67b40054
--- /dev/null
+++ b/src/test/java/net/contargo/iris/location/GeoLocationServiceImplUnitTest.java
@@ -0,0 +1,110 @@
+package net.contargo.iris.location;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.address.service.AddressServiceWrapper;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link GeoLocationServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class GeoLocationServiceImplUnitTest {
+
+    private GeoLocationServiceImpl sut;
+
+    @Mock
+    private SeaportService seaportServiceMock;
+    @Mock
+    private TerminalService terminalServiceMock;
+    @Mock
+    private AddressServiceWrapper addressServiceWrapperMock;
+
+    private GeoLocation geoLocation;
+
+    @Before
+    public void setUp() {
+
+        geoLocation = new GeoLocation();
+        geoLocation.setLatitude(BigDecimal.TEN);
+        geoLocation.setLongitude(BigDecimal.TEN);
+
+        sut = new GeoLocationServiceImpl(terminalServiceMock, seaportServiceMock, addressServiceWrapperMock);
+    }
+
+
+    @Test
+    public void getDetailedGeoLocationSeaport() {
+
+        Seaport seaport = new Seaport(geoLocation);
+        when(seaportServiceMock.getByGeoLocation(geoLocation)).thenReturn(seaport);
+
+        GeoLocation detailedGeoLocation = sut.getDetailedGeoLocation(geoLocation);
+
+        assertThat(detailedGeoLocation, is((GeoLocation) seaport));
+        assertThat("Expecting Seaport instance.", detailedGeoLocation instanceof Seaport, is(true));
+    }
+
+
+    @Test
+    public void getDetailedGeoLocationTerminal() {
+
+        Terminal terminal = new Terminal(geoLocation);
+        when(terminalServiceMock.getByGeoLocation(geoLocation)).thenReturn(terminal);
+
+        GeoLocation detailedGeoLocation = sut.getDetailedGeoLocation(geoLocation);
+
+        assertThat(detailedGeoLocation, is((GeoLocation) terminal));
+        assertThat("Expecting Terminal instance.", detailedGeoLocation instanceof Terminal, is(true));
+    }
+
+
+    @Test
+    public void getDetailedGeoLocationNothingFound() {
+
+        GeoLocation detailedGeoLocation = sut.getDetailedGeoLocation(geoLocation);
+
+        assertThat(detailedGeoLocation, is(geoLocation));
+    }
+
+
+    @Test
+    public void getDetailedGeoLocationAddress() {
+
+        Address address = new Address();
+        address.setShortName("Karlsruhe");
+
+        when(addressServiceWrapperMock.getAddressForGeoLocation(geoLocation)).thenReturn(address);
+
+        GeoLocation detailedGeoLocation = sut.getDetailedGeoLocation(geoLocation);
+
+        assertThat("Expecting Address instance.", detailedGeoLocation instanceof Address, is(true));
+
+        if (detailedGeoLocation instanceof Address) {
+            assertThat("Expecting Address instance.", "Karlsruhe", is(((Address) detailedGeoLocation).getShortName()));
+        }
+    }
+}
diff --git a/src/test/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImplUnitTest.java b/src/test/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImplUnitTest.java
new file mode 100644
index 00000000..cca974ac
--- /dev/null
+++ b/src/test/java/net/contargo/iris/mainrun/service/MainRunDurationServiceImplUnitTest.java
@@ -0,0 +1,132 @@
+package net.contargo.iris.mainrun.service;
+
+import net.contargo.iris.connection.MainRunConnection;
+import net.contargo.iris.rounding.RoundingService;
+import net.contargo.iris.route.RoutePart;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.argThat;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link MainRunDurationServiceImpl}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class MainRunDurationServiceImplUnitTest {
+
+    private static final BigDecimal DIESEL_DISTANCE = BigDecimal.ONE;
+    private static final BigDecimal ELECTRICAL_DISTANCE = BigDecimal.TEN;
+
+    private MainRunDurationServiceImpl sut;
+
+    @Mock
+    private RoundingService roundingServiceMock;
+
+    private RoutePart routePart;
+    private Terminal terminal;
+    private Seaport seaport;
+    private MainRunConnection mainRunConnection;
+
+    @Before
+    public void setUp() {
+
+        sut = new MainRunDurationServiceImpl(roundingServiceMock);
+
+        routePart = new RoutePart();
+        terminal = new Terminal();
+        seaport = new Seaport();
+        mainRunConnection = new MainRunConnection();
+        mainRunConnection.setDieselDistance(DIESEL_DISTANCE);
+        mainRunConnection.setElectricDistance(ELECTRICAL_DISTANCE);
+    }
+
+
+    @Test
+    public void getMainRunRoutePartDurationBargeUpStream() {
+
+        routePart.setOrigin(seaport);
+        routePart.setDestination(terminal);
+        routePart.setRouteType(RouteType.BARGE);
+
+        when(roundingServiceMock.roundDuration(argThat(closeTo(new BigDecimal("66"), BigDecimal.ZERO)))).thenReturn(
+            new BigDecimal("66"));
+
+        BigDecimal duration = sut.getMainRunRoutePartDuration(mainRunConnection, routePart);
+
+        assertThat(duration, closeTo(new BigDecimal("66"), BigDecimal.ZERO));
+    }
+
+
+    @Test
+    public void getMainRunRoutePartDurationBargeDownStream() {
+
+        routePart.setOrigin(terminal);
+        routePart.setDestination(seaport);
+        routePart.setRouteType(RouteType.BARGE);
+        mainRunConnection.setDieselDistance(BigDecimal.ONE);
+        mainRunConnection.setElectricDistance(BigDecimal.TEN);
+
+        when(roundingServiceMock.roundDuration(argThat(closeTo(new BigDecimal("36.6666"), BigDecimal.ZERO))))
+            .thenReturn(new BigDecimal("36.67"));
+
+        BigDecimal duration = sut.getMainRunRoutePartDuration(mainRunConnection, routePart);
+
+        assertThat(duration, closeTo(new BigDecimal("36.67"), BigDecimal.ZERO));
+    }
+
+
+    @Test
+    public void getMainRunRoutePartDurationRail() {
+
+        routePart.setOrigin(terminal);
+        routePart.setDestination(seaport);
+        routePart.setRouteType(RouteType.RAIL);
+        mainRunConnection.setDieselDistance(BigDecimal.ONE);
+        mainRunConnection.setElectricDistance(BigDecimal.TEN);
+
+        when(roundingServiceMock.roundDuration(argThat(closeTo(new BigDecimal("14.6664"), BigDecimal.ZERO))))
+            .thenReturn(new BigDecimal("14.67"));
+
+        BigDecimal duration = sut.getMainRunRoutePartDuration(mainRunConnection, routePart);
+
+        assertThat(duration, closeTo(new BigDecimal("14.67"), BigDecimal.ZERO));
+    }
+
+
+    @Test
+    public void getMainRunRoutePartDurationTruck() {
+
+        routePart.setOrigin(terminal);
+        routePart.setDestination(seaport);
+        routePart.setRouteType(RouteType.TRUCK);
+
+        when(roundingServiceMock.roundDuration(argThat(closeTo(BigDecimal.ZERO, BigDecimal.ZERO)))).thenReturn(
+            BigDecimal.ZERO);
+
+        BigDecimal duration = sut.getMainRunRoutePartDuration(mainRunConnection, routePart);
+
+        assertThat(duration, is(BigDecimal.ZERO));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/normalizer/NormalizerServiceImplUnitTest.java b/src/test/java/net/contargo/iris/normalizer/NormalizerServiceImplUnitTest.java
new file mode 100644
index 00000000..385aced0
--- /dev/null
+++ b/src/test/java/net/contargo/iris/normalizer/NormalizerServiceImplUnitTest.java
@@ -0,0 +1,98 @@
+package net.contargo.iris.normalizer;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit tests for {@link NormalizerServiceImpl}.
+ *
+ * @author  Michael Herbold - herbold@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class NormalizerServiceImplUnitTest {
+
+    private NormalizerService sut;
+
+    @Before
+    public void before() {
+
+        sut = new NormalizerServiceImpl();
+    }
+
+
+    @Test
+    public void testGermanSpecialCharsReplacement() {
+
+        String text = "ö ä ü  Ö Ä Ü";
+
+        assertThat("OEAEUEOEAEUE", is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testGermanDoubleSReplacement() {
+
+        String text = "Karlstraße";
+
+        assertThat("KARLSTRASSE", is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testNumbersRemovement() {
+
+        String text = "Karlstrasse 68 76137 Karlsruhe";
+
+        assertThat("KARLSTRASSEKARLSRUHE", is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testNullText() {
+
+        String text = null;
+
+        assertThat(text, is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testEmptyText() {
+
+        String text = "";
+
+        assertThat(text, is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testPunctRemovement() {
+
+        String text = "Karlstraße.68, 76137 Karlsruhe -.,";
+
+        assertThat("KARLSTRASSEKARLSRUHE", is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testWhitespaceRemovement() {
+
+        String text = "a b c d e f g             h              i  ";
+
+        assertThat("ABCDEFGHI", is(sut.normalize(text)));
+    }
+
+
+    @Test
+    public void testToUpperCase() {
+
+        String text = "karlsruhe";
+
+        assertThat("KARLSRUHE", is(sut.normalize(text)));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/osrm/service/OSRMQueryServiceImplUnitTest.java b/src/test/java/net/contargo/iris/osrm/service/OSRMQueryServiceImplUnitTest.java
new file mode 100644
index 00000000..4f3d796d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/osrm/service/OSRMQueryServiceImplUnitTest.java
@@ -0,0 +1,124 @@
+package net.contargo.iris.osrm.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.util.HttpUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.io.IOException;
+
+import java.math.BigDecimal;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.anyString;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link OSRMQueryServiceImpl}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class OSRMQueryServiceImplUnitTest {
+
+    private static final String BASE_URL = "baseUrl";
+    private static final double TOTAL_DISTANCE = 28295.0;
+    private static final double TOTAL_TIME = 2264.0;
+    private static final String osrmResponseWithWrongParameters =
+        "{\"alternative_names\": [[\"Kriegsstraße/;primary/;no/;DE\"]]}";
+
+    private OSRMQueryService sut;
+
+    @Mock
+    private HttpUtil httpUtilMock;
+
+    @Before
+    public void setUp() throws Exception {
+
+        String osrmResponse = readFile("src/test/resources/osrmResponse.json", StandardCharsets.UTF_8);
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(osrmResponse);
+
+        OSRMJsonResponse OSRMJsonResponse = new OSRMJsonResponse();
+        OSRMJsonResponseRouteSummary summary = new OSRMJsonResponseRouteSummary();
+        summary.setTotalDistance(TOTAL_DISTANCE);
+        summary.setTotalTime(TOTAL_TIME);
+        OSRMJsonResponse.setRoute_summary(summary);
+
+        sut = new OSRMQueryServiceImpl(httpUtilMock, BASE_URL, new ObjectMapper());
+    }
+
+
+    @Test
+    public void getOSRMXmlRoute() {
+
+        GeoLocation start = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        GeoLocation destination = new GeoLocation(BigDecimal.TEN, BigDecimal.TEN);
+
+        OSRMQueryResult actualResult = sut.getOSRMXmlRoute(start, destination);
+
+        assertThat(actualResult.getStatus(), is(0));
+        assertThat(actualResult.getTotalDistance(), is(TOTAL_DISTANCE));
+        assertThat(actualResult.getTotalTime(), is(TOTAL_TIME));
+        assertThat(actualResult.getRouteInstructions().length, is(23));
+        assertThat(actualResult.getRouteInstructions()[0][1], is("Hafenstraße/;tertiary/;no/;DE"));
+        assertThat(actualResult.getRouteInstructions()[5][4], is("19"));
+    }
+
+
+    @Test
+    public void getOSRMXmlRouteNoRoute() throws IOException {
+
+        String osrmResponseNoRoute = readFile("src/test/resources/osrmResponseNoRoute.json", StandardCharsets.UTF_8);
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(osrmResponseNoRoute);
+
+        GeoLocation start = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        GeoLocation destination = new GeoLocation(BigDecimal.TEN, BigDecimal.TEN);
+
+        OSRMQueryResult actualResult = sut.getOSRMXmlRoute(start, destination);
+
+        assertThat(actualResult.getStatus(), is(207));
+        assertThat(actualResult.getTotalDistance(), is(0d));
+        assertThat(actualResult.getTotalTime(), is(0d));
+        assertThat(actualResult.getRouteInstructions().length, is(0));
+    }
+
+
+    @Test(expected = RoutingException.class)
+    public void getOSRMXmlRouteThrowsException() throws IOException {
+
+        GeoLocation start = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+        GeoLocation destination = new GeoLocation(BigDecimal.TEN, BigDecimal.TEN);
+
+        when(httpUtilMock.getResponseContent(anyString())).thenReturn(osrmResponseWithWrongParameters);
+
+        sut.getOSRMXmlRoute(start, destination);
+    }
+
+
+    private String readFile(String path, Charset encoding) throws IOException {
+
+        byte[] encoded = Files.readAllBytes(Paths.get(path));
+
+        return new String(encoded, encoding);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceIntegrationTest.java b/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceIntegrationTest.java
new file mode 100644
index 00000000..60881e8d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceIntegrationTest.java
@@ -0,0 +1,66 @@
+package net.contargo.iris.osrm.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.OSRMNonRoutableRouteException;
+import net.contargo.iris.truck.service.OSRMTruckRouteService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.closeTo;
+
+
+/**
+ * Integration test of {@link net.contargo.iris.truck.service.OSRMTruckRouteService}.
+ *
+ * @author  Sven Mueller - mueller@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+public class OSRMTruckRouteServiceIntegrationTest {
+
+    @Autowired
+    private OSRMQueryService OSRMQueryService;
+
+    private OSRMTruckRouteService OSRMTruckRouteService;
+
+    @Before
+    public void setUp() {
+
+        OSRMTruckRouteService = new OSRMTruckRouteService(OSRMQueryService);
+    }
+
+
+    @Test
+    public void testRoute() {
+
+        TruckRoute truckRoute = OSRMTruckRouteService.route(new GeoLocation(new BigDecimal(49.015),
+                    new BigDecimal(8.42)), new GeoLocation(new BigDecimal(50D), new BigDecimal(10D)));
+
+        assertThat(truckRoute.getDistance(), closeTo(new BigDecimal("234.72400"), BigDecimal.TEN));
+        assertThat(truckRoute.getDuration(), closeTo(new BigDecimal("189.30000"), BigDecimal.TEN));
+    }
+
+
+    @Test(expected = OSRMNonRoutableRouteException.class)
+    public void testNonRoutableRoute() {
+
+        GeoLocation start = new GeoLocation(new BigDecimal(51.013755), new BigDecimal(59.941406));
+        GeoLocation destination = new GeoLocation(new BigDecimal(34.813803), new BigDecimal(-34.101563));
+
+        OSRMTruckRouteService.route(start, destination);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceUnitTest.java b/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceUnitTest.java
new file mode 100644
index 00000000..c844544c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/osrm/service/OSRMTruckRouteServiceUnitTest.java
@@ -0,0 +1,152 @@
+package net.contargo.iris.osrm.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.OSRMNonRoutableRouteException;
+import net.contargo.iris.truck.service.OSRMTruckRouteService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import static org.junit.Assert.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.truck.service.OSRMTruckRouteService}.
+ *
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class OSRMTruckRouteServiceUnitTest {
+
+    public static final String GERMAN_STREET_WITH_TOLL = "strA/;anytype/;yes/;de";
+    public static final String GERMAN_STREET_WITHOUT_TOLL = "strA/;anytype/;no/;de";
+    public static final String FRENCH_STREET_WITH_TOLL = "strA/;anytype/;yes/;fr";
+    public static final String FRENCH_STREET_WITHOUT_TOLL = "strA/;anytype/;no/;fr";
+    private static final double DEFAULT_TOTAL_DISTANCE = 1.1;
+    private static final double DEFAULT_TOTAL_TIME = 2.2;
+
+    private OSRMTruckRouteService sut;
+
+    @Mock
+    private OSRMQueryService queryServiceMock;
+
+    private GeoLocation start;
+    private GeoLocation destination;
+
+    @Before
+    public void setup() {
+
+        sut = new OSRMTruckRouteService(queryServiceMock);
+
+        destination = new GeoLocation(49.1d, 8.1d);
+        start = new GeoLocation(49d, 8d);
+    }
+
+
+    @Test(expected = OSRMNonRoutableRouteException.class)
+    public void routeIsNotRoutable() {
+
+        when(queryServiceMock.getOSRMXmlRoute(start, destination)).thenReturn(new OSRMQueryResult(207, 1.1, 2.2,
+                new String[1][1]));
+
+        sut.route(start, destination);
+    }
+
+
+    @Test
+    public void delegatesCallToQueryService() {
+
+        makeMockReturn(new String[][] {}, DEFAULT_TOTAL_DISTANCE, DEFAULT_TOTAL_TIME);
+
+        TruckRoute route = sut.route(start, destination);
+        assertThat(route, notNullValue());
+        verify(queryServiceMock).getOSRMXmlRoute(start, destination);
+    }
+
+
+    @Test
+    public void parsesSectionsAndReturnsDistanceInMeters() {
+
+        OSRMJsonResponseRouteSummary summary = new OSRMJsonResponseRouteSummary();
+        summary.setTotalDistance(12000);
+        makeMockReturn(new String[][] {}, 12000, DEFAULT_TOTAL_TIME);
+
+        TruckRoute route = sut.route(start, destination);
+        assertThat(route, notNullValue());
+        assertThat(route.getDistance(), equalTo(new BigDecimal("12.00000")));
+    }
+
+
+    @Test
+    public void parsesSectionsAndReturnsTimeInMinutes() {
+
+        OSRMJsonResponseRouteSummary summary = new OSRMJsonResponseRouteSummary();
+        summary.setTotalTime(120);
+        makeMockReturn(new String[][] {}, DEFAULT_TOTAL_DISTANCE, 120);
+
+        TruckRoute route = sut.route(start, destination);
+        assertThat(route, notNullValue());
+        assertThat(route.getDuration(), equalTo(new BigDecimal("2.00000")));
+    }
+
+
+    @Test
+    public void parsesSectionsAndReturnsToll() {
+
+        String[][] instructions = {
+            { "", GERMAN_STREET_WITH_TOLL, "100", "" },
+            { "", GERMAN_STREET_WITH_TOLL, "300", "" },
+        };
+
+        makeMockReturn(instructions, DEFAULT_TOTAL_DISTANCE, DEFAULT_TOTAL_TIME);
+
+        TruckRoute route = sut.route(start, destination);
+
+        assertThat(route, notNullValue());
+        assertThat(route.getTollDistance(), equalTo(new BigDecimal("0.40000")));
+    }
+
+
+    @Test
+    public void doesNotAddNonTollPartsToToll() {
+
+        String[][] instructions = {
+            { "", GERMAN_STREET_WITHOUT_TOLL, "200", "" },
+            { "", GERMAN_STREET_WITH_TOLL, "100", "" },
+            { "", FRENCH_STREET_WITH_TOLL, "300", "" },
+            { "", FRENCH_STREET_WITHOUT_TOLL, "500", "" },
+        };
+
+        makeMockReturn(instructions, DEFAULT_TOTAL_DISTANCE, DEFAULT_TOTAL_TIME);
+
+        TruckRoute route = sut.route(start, destination);
+
+        assertThat(route, notNullValue());
+        assertThat(route.getTollDistance(), equalTo(new BigDecimal("0.10000")));
+    }
+
+
+    private void makeMockReturn(String[][] instructions, double totalDistance, double totalTime) {
+
+        OSRMQueryResult response = new OSRMQueryResult(0, totalDistance, totalTime, instructions);
+
+        when(queryServiceMock.getOSRMXmlRoute(start, destination)).thenReturn(response);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/rounding/RoundingServiceImplUnitTest.java b/src/test/java/net/contargo/iris/rounding/RoundingServiceImplUnitTest.java
new file mode 100644
index 00000000..a5b47e22
--- /dev/null
+++ b/src/test/java/net/contargo/iris/rounding/RoundingServiceImplUnitTest.java
@@ -0,0 +1,45 @@
+package net.contargo.iris.rounding;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test for implementation of RoundingServiceImpl: {@link RoundingServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class RoundingServiceImplUnitTest {
+
+    private RoundingService roundingService = null;
+
+    @Before
+    public void setup() {
+
+        roundingService = new RoundingServiceImpl();
+    }
+
+
+    @Test
+    public void testRoundingDistance() {
+
+        assertThat(new BigDecimal(3), is(roundingService.roundDistance(new BigDecimal(2.222222))));
+        assertThat(new BigDecimal(2), is(roundingService.roundDistance(new BigDecimal(2.000222))));
+        assertThat(new BigDecimal(2), is(roundingService.roundDistance(new BigDecimal(2.000))));
+    }
+
+
+    @Test
+    public void testRoundingDuration() {
+
+        assertThat(new BigDecimal(3), is(roundingService.roundDuration(new BigDecimal(2.222222))));
+        assertThat(new BigDecimal(3), is(roundingService.roundDuration(new BigDecimal(2.19))));
+        assertThat(new BigDecimal(2), is(roundingService.roundDuration(new BigDecimal(2.09))));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/DirectTruckRouteBuilderUnitTest.java b/src/test/java/net/contargo/iris/route/DirectTruckRouteBuilderUnitTest.java
new file mode 100644
index 00000000..3b6597c8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/DirectTruckRouteBuilderUnitTest.java
@@ -0,0 +1,155 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.truck.TruckRoute;
+import net.contargo.iris.truck.service.TruckRouteService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.InOrder;
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static net.contargo.iris.Movement.move;
+import static net.contargo.iris.Movement.to;
+import static net.contargo.iris.route.RouteType.BARGE;
+import static net.contargo.iris.route.RouteType.TRUCK;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test for {@link DirectTruckRouteBuilder}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class DirectTruckRouteBuilderUnitTest {
+
+    private DirectTruckRouteBuilder sut;
+
+    @Mock
+    private TruckRouteService truckRouteServiceMock;
+    @Mock
+    private TruckRoute truckRouteMock;
+
+    private Terminal terminal;
+    private Seaport seaport;
+
+    @Before
+    public void setup() {
+
+        sut = new DirectTruckRouteBuilder(truckRouteServiceMock);
+
+        terminal = new Terminal();
+        terminal.setId(1L);
+        terminal.setName("Terminal");
+
+        seaport = new Seaport();
+        seaport.setId(1L);
+        seaport.setName("Seaport");
+    }
+
+
+    @Test
+    public void testEliminateTerminalsOneWayImport() {
+
+        GeoLocation addressGeoLocation = new GeoLocation(new BigDecimal("49.0"), new BigDecimal("8.0"));
+
+        // actual route: seaport -> terminal -> address -> terminal
+        Route oneWayImport = move(seaport, ContainerType.THIRTY, to(terminal, BARGE), to(addressGeoLocation, TRUCK),
+                to(terminal, TRUCK));
+
+        // expected route: seaport -> address -> terminal
+        Route expectedRoute = move(seaport, ContainerType.THIRTY, to(addressGeoLocation, TRUCK), to(terminal, TRUCK));
+
+        when(truckRouteServiceMock.route(any(GeoLocation.class), any(GeoLocation.class))).thenReturn(truckRouteMock);
+
+        assertSameParts(sut.getCorrespondingDirectTruckRoute(oneWayImport), expectedRoute);
+
+        InOrder order = inOrder(truckRouteServiceMock);
+        order.verify(truckRouteServiceMock).route(any(GeoLocation.class), eq(addressGeoLocation));
+        order.verify(truckRouteServiceMock).route(eq(addressGeoLocation), any(GeoLocation.class));
+    }
+
+
+    @Test
+    public void testEliminateTerminalsOneWayExport() {
+
+        GeoLocation addressGeoLocation = new GeoLocation(new BigDecimal("49.0"), new BigDecimal("8.0"));
+
+        // actual route: terminal -> address -> terminal -> seaport
+        Route oneWayExport = move(terminal, ContainerType.THIRTY, to(addressGeoLocation, TRUCK), to(terminal, TRUCK),
+                to(seaport, BARGE));
+
+        // expected route: terminal -> address -> seaport
+        Route expectedRoute = move(terminal, ContainerType.THIRTY, to(addressGeoLocation, TRUCK), to(seaport, TRUCK));
+
+        TruckRoute truckRoute = mock(TruckRoute.class);
+        when(truckRouteServiceMock.route(any(GeoLocation.class), any(GeoLocation.class))).thenReturn(truckRoute);
+
+        assertSameParts(sut.getCorrespondingDirectTruckRoute(oneWayExport), expectedRoute);
+
+        InOrder order = inOrder(truckRouteServiceMock);
+        order.verify(truckRouteServiceMock).route(any(GeoLocation.class), eq(addressGeoLocation));
+        order.verify(truckRouteServiceMock).route(eq(addressGeoLocation), any(GeoLocation.class));
+    }
+
+
+    @Test
+    public void testEliminateTerminalsRoundTrip() {
+
+        GeoLocation addressGeoLocation = new GeoLocation(new BigDecimal("49.0"), new BigDecimal("8.0"));
+
+        // actual route: seaport -> terminal -> address -> terminal -> seaport
+        Route roundTrip = move(seaport, ContainerType.THIRTY, to(terminal, BARGE), to(addressGeoLocation, TRUCK),
+                to(terminal, TRUCK), to(seaport, BARGE));
+
+        // expected route: seaport -> address -> seaport
+        Route expectedRoute = move(seaport, ContainerType.THIRTY, to(addressGeoLocation, TRUCK), to(seaport, TRUCK));
+
+        TruckRoute truckRoute = mock(TruckRoute.class);
+        when(truckRouteServiceMock.route(any(GeoLocation.class), any(GeoLocation.class))).thenReturn(truckRoute);
+
+        assertSameParts(sut.getCorrespondingDirectTruckRoute(roundTrip), expectedRoute);
+
+        InOrder order = inOrder(truckRouteServiceMock);
+        order.verify(truckRouteServiceMock).route(any(GeoLocation.class), eq(addressGeoLocation));
+        order.verify(truckRouteServiceMock).route(eq(addressGeoLocation), any(GeoLocation.class));
+    }
+
+
+    private void assertSameParts(Route actual, Route expected) {
+
+        assertThat(actual, notNullValue());
+        assertThat(actual.getData().getParts().size(), is(expected.getData().getParts().size()));
+
+        for (int i = 0; i < expected.getData().getParts().size(); i++) {
+            RoutePart expectedPart = expected.getData().getParts().get(i);
+            RoutePart returnedPart = actual.getData().getParts().get(i);
+
+            assertThat(returnedPart.getOrigin(), is(expectedPart.getOrigin()));
+            assertThat(returnedPart.getDestination(), is(expectedPart.getDestination()));
+            assertThat(returnedPart.getRouteType(), is(expectedPart.getRouteType()));
+        }
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteBuilderUnitTest.java b/src/test/java/net/contargo/iris/route/RouteBuilderUnitTest.java
new file mode 100644
index 00000000..996cbd16
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteBuilderUnitTest.java
@@ -0,0 +1,87 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+
+/**
+ * Unit test for {@link net.contargo.iris.route.RouteBuilder}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public class RouteBuilderUnitTest {
+
+    private RouteBuilder routeBuilder;
+
+    @Test
+    public void testNewRoute() {
+
+        routeBuilder = new RouteBuilder(new GeoLocation(new BigDecimal(42.0), new BigDecimal(8.3)), ContainerType.FORTY,
+                ContainerState.FULL);
+
+        assertThat(routeBuilder.getRoute(), notNullValue());
+    }
+
+
+    @Test
+    public void testSettingRouteAttributes() {
+
+        GeoLocation loc = new GeoLocation(new BigDecimal(42.0), new BigDecimal(8.3));
+        GeoLocation otherLoc = new GeoLocation(new BigDecimal(42.01), new BigDecimal(8.19));
+
+        routeBuilder = new RouteBuilder(loc, ContainerType.FORTY, ContainerState.FULL);
+        routeBuilder.goTo(otherLoc, RouteType.TRUCK);
+
+        Route route = routeBuilder.getRoute();
+        assertThat(route.getData().getParts(), hasSize(1));
+
+        RoutePart part = route.getData().getParts().get(0);
+        assertThat(part.getContainerType(), is(ContainerType.FORTY));
+        assertThat(part.getContainerState(), is(ContainerState.FULL));
+        assertThat(part.getOrigin(), is(loc));
+        assertThat(part.getDestination(), is(otherLoc));
+    }
+
+
+    @Test
+    public void testUnloadContainer() {
+
+        GeoLocation one = new GeoLocation(new BigDecimal(42.0), new BigDecimal(8.3));
+        GeoLocation two = new GeoLocation(new BigDecimal(42.01), new BigDecimal(8.19));
+        GeoLocation three = new GeoLocation(new BigDecimal(40.87), new BigDecimal(7.9));
+
+        routeBuilder = new RouteBuilder(one, ContainerType.FORTY, ContainerState.FULL);
+        routeBuilder.goTo(two, RouteType.BARGE);
+        routeBuilder.unloadContainer();
+        routeBuilder.goTo(three, RouteType.TRUCK);
+
+        Route route = routeBuilder.getRoute();
+        assertThat(route.getData().getParts(), hasSize(2));
+
+        // show that route is from location one to location two and container is full
+        RoutePart part = route.getData().getParts().get(0);
+        assertThat(part.getContainerType(), is(ContainerType.FORTY));
+        assertThat(part.getContainerState(), is(ContainerState.FULL));
+
+        assertThat(part.getOrigin(), is(one));
+        assertThat(part.getDestination(), is(two));
+
+        // show that route is from location two to location three and container is empty
+        RoutePart part2 = route.getData().getParts().get(1);
+        assertThat(part2.getContainerType(), is(ContainerType.FORTY));
+        assertThat(part2.getContainerState(), is(ContainerState.EMPTY));
+        assertThat(part2.getOrigin(), is(two));
+        assertThat(part2.getDestination(), is(three));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteComboUnitTest.java b/src/test/java/net/contargo/iris/route/RouteComboUnitTest.java
new file mode 100644
index 00000000..632dd056
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteComboUnitTest.java
@@ -0,0 +1,54 @@
+package net.contargo.iris.route;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
+import static org.hamcrest.Matchers.arrayWithSize;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public class RouteComboUnitTest {
+
+    @Test
+    public void getWaterwayRouteTypes() {
+
+        RouteType[] routeTypes = RouteCombo.WATERWAY.getRouteTypes();
+
+        assertThat(routeTypes, arrayWithSize(1));
+        assertThat(routeTypes, arrayContainingInAnyOrder(RouteType.BARGE));
+    }
+
+
+    @Test
+    public void getRailwayRouteTypes() {
+
+        RouteType[] routeTypes = RouteCombo.RAILWAY.getRouteTypes();
+
+        assertThat(routeTypes, arrayWithSize(1));
+        assertThat(routeTypes, arrayContainingInAnyOrder(RouteType.RAIL));
+    }
+
+
+    @Test
+    public void getDirectTruckRouteTypes() {
+
+        RouteType[] routeTypes = RouteCombo.DIRECT_TRUCK.getRouteTypes();
+
+        assertThat(routeTypes, arrayWithSize(1));
+        assertThat(routeTypes, arrayContainingInAnyOrder(RouteType.TRUCK));
+    }
+
+
+    @Test
+    public void getAllRouteTypes() {
+
+        RouteType[] routeTypes = RouteCombo.ALL.getRouteTypes();
+
+        assertThat(routeTypes, arrayWithSize(2));
+        assertThat(routeTypes, arrayContainingInAnyOrder(RouteType.BARGE, RouteType.RAIL));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteCreationUtil.java b/src/test/java/net/contargo/iris/route/RouteCreationUtil.java
new file mode 100644
index 00000000..4c7d92c1
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteCreationUtil.java
@@ -0,0 +1,137 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+public final class RouteCreationUtil {
+
+    public static final String ANTWERP = "Antwerp";
+    public static final String BASEL = "Basel";
+
+    private RouteCreationUtil() {
+    }
+
+    public static Route createOneWayImportRoute() {
+
+        GeoLocation loc = new GeoLocation(new BigDecimal("49.0"), new BigDecimal("8.41"));
+
+        Terminal terminal = new Terminal();
+        terminal.setId(3L);
+        terminal.setLatitude(new BigDecimal(49.06846));
+        terminal.setLongitude(new BigDecimal(8.28070));
+
+        terminal.setName(BASEL);
+
+        Seaport seaPort = new Seaport();
+        seaPort.setLatitude(new BigDecimal(51.36833));
+        seaPort.setLongitude(new BigDecimal(4.3));
+        seaPort.setName(ANTWERP);
+
+        RoutePart part1 = new RoutePart();
+        part1.setContainerType(ContainerType.THIRTY);
+        part1.setContainerState(ContainerState.FULL);
+        part1.setOrigin(seaPort);
+        part1.setRouteType(RouteType.BARGE);
+        part1.setDestination(terminal);
+
+        RoutePart part2 = new RoutePart();
+        part2.setContainerType(ContainerType.THIRTY);
+        part2.setContainerState(ContainerState.FULL);
+        part2.setOrigin(terminal);
+        part2.setRouteType(RouteType.TRUCK);
+        part2.setDestination(loc);
+
+        RoutePartData routePartData = new RoutePartData();
+        routePartData.setAirLineDistance(new BigDecimal("0"));
+        part2.setData(routePartData);
+
+        RoutePart part3 = new RoutePart();
+        part3.setContainerType(ContainerType.THIRTY);
+        part3.setContainerState(ContainerState.EMPTY);
+        part3.setOrigin(loc);
+        part3.setRouteType(RouteType.TRUCK);
+        part3.setDestination(terminal);
+
+        routePartData = new RoutePartData();
+        routePartData.setAirLineDistance(new BigDecimal("50.00"));
+        part3.setData(routePartData);
+
+        Route route = new Route();
+        route.getData().setParts(Arrays.asList(part1, part2, part3));
+
+        return addDistances(route);
+    }
+
+
+    private static Route addDistances(Route route) {
+
+        int distance = 10;
+
+        for (RoutePart p : route.getData().getParts()) {
+            p.getData().setDistance(new BigDecimal(distance++));
+        }
+
+        return route;
+    }
+
+
+    public static Route createRoundTripImportRoute() {
+
+        GeoLocation loc = new GeoLocation(new BigDecimal(49.0), new BigDecimal(8.41));
+
+        Terminal terminal = new Terminal();
+        terminal.setId(3L);
+        terminal.setLatitude(new BigDecimal(49.06846));
+        terminal.setLongitude(new BigDecimal(8.28070));
+        terminal.setName(BASEL);
+
+        Seaport seaPort = new Seaport();
+        seaPort.setLatitude(new BigDecimal(51.36833));
+        seaPort.setLongitude(new BigDecimal(4.3));
+        seaPort.setName(ANTWERP);
+
+        RoutePart part1 = new RoutePart();
+        part1.setContainerType(ContainerType.FORTY);
+        part1.setContainerState(ContainerState.FULL);
+        part1.setOrigin(seaPort);
+        part1.setRouteType(RouteType.BARGE);
+        part1.setDestination(terminal);
+
+        RoutePart part2 = new RoutePart();
+        part2.setContainerType(ContainerType.FORTY);
+        part2.setContainerState(ContainerState.FULL);
+        part2.setOrigin(terminal);
+        part2.setRouteType(RouteType.TRUCK);
+        part2.setDestination(loc);
+
+        RoutePart part3 = new RoutePart();
+        part3.setContainerType(ContainerType.FORTY);
+        part3.setContainerState(ContainerState.EMPTY);
+        part3.setOrigin(loc);
+        part3.setRouteType(RouteType.TRUCK);
+        part3.setDestination(terminal);
+
+        RoutePart part4 = new RoutePart();
+        part4.setContainerType(ContainerType.FORTY);
+        part4.setContainerState(ContainerState.EMPTY);
+        part4.setOrigin(terminal);
+        part4.setRouteType(RouteType.BARGE);
+        part4.setDestination(seaPort);
+
+        Route route = new Route();
+        route.getData().setParts(Arrays.asList(part1, part2, part3, part4));
+
+        return addDistances(route);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteDataUnitTest.java b/src/test/java/net/contargo/iris/route/RouteDataUnitTest.java
new file mode 100644
index 00000000..44cf7da8
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteDataUnitTest.java
@@ -0,0 +1,50 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class RouteDataUnitTest {
+
+    private static final GeoLocation A = new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO);
+    private static final GeoLocation B = new GeoLocation(BigDecimal.ZERO, BigDecimal.ONE);
+    private static final GeoLocation C = new GeoLocation(BigDecimal.ONE, BigDecimal.ZERO);
+    private static final GeoLocation D = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+    private final RouteData sut = new RouteData();
+
+    @Test
+    public void getRoutePartsOfType() {
+
+        RoutePart ab = new RoutePart(A, B, RouteType.BARGE);
+        RoutePart bc = new RoutePart(B, C, RouteType.TRUCK);
+        RoutePart cb = new RoutePart(C, B, RouteType.TRUCK);
+
+        // A -> B | B -> C | C -> B
+        List<RoutePart> routeParts = asList(ab, bc, cb);
+
+        sut.setParts(routeParts);
+        assertThat(sut.getRoutePartsOfType(RouteType.BARGE), hasItems(ab));
+        assertThat(sut.getRoutePartsOfType(RouteType.TRUCK), hasItems(bc, cb));
+        assertThat(sut.getRoutePartsOfType(RouteType.TRUCK), not(hasItems(ab)));
+        assertThat(sut.getRoutePartsOfType(null), is(Collections.<RoutePart>emptyList()));
+        assertThat(sut.getRoutePartsOfType(RouteType.RAIL), is(Collections.<RoutePart>emptyList()));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteDirectionUnitTest.java b/src/test/java/net/contargo/iris/route/RouteDirectionUnitTest.java
new file mode 100644
index 00000000..1be9565b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteDirectionUnitTest.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.route;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ */
+public class RouteDirectionUnitTest {
+
+    @Test
+    public void createsImportFromIsImportTrue() {
+
+        assertThat(RouteDirection.fromIsImport(true), is(RouteDirection.IMPORT));
+    }
+
+
+    @Test
+    public void createsExportFromIsImportFalse() {
+
+        assertThat(RouteDirection.fromIsImport(false), is(RouteDirection.EXPORT));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RoutePartUnitTest.java b/src/test/java/net/contargo/iris/route/RoutePartUnitTest.java
new file mode 100644
index 00000000..26ea4278
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RoutePartUnitTest.java
@@ -0,0 +1,206 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.container.ContainerState;
+import net.contargo.iris.container.ContainerType;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Test;
+
+import org.mockito.Mockito;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class RoutePartUnitTest {
+
+    private RoutePart sut;
+
+    @Test
+    public void calculatesUpstream() {
+
+        sut = new RoutePart(new Seaport(), new Terminal(), RouteType.BARGE);
+        assertThat(sut.getDirection(), is(RoutePart.Direction.UPSTREAM));
+    }
+
+
+    @Test
+    public void calculatesDownstream() {
+
+        sut = new RoutePart(new Terminal(), new Seaport(), RouteType.BARGE);
+        assertThat(sut.getDirection(), is(RoutePart.Direction.DOWNSTREAM));
+    }
+
+
+    @Test
+    public void calculatesNoStream() {
+
+        sut = new RoutePart(new GeoLocation(), new Terminal(), RouteType.TRUCK);
+        assertThat(sut.getDirection(), is(RoutePart.Direction.NOT_SET));
+    }
+
+
+    @Test
+    public void returnsCorrectName() {
+
+        GeoLocation origin = Mockito.mock(GeoLocation.class);
+        GeoLocation destination = Mockito.mock(GeoLocation.class);
+        when(origin.getNiceName()).thenReturn("origin");
+        when(destination.getNiceName()).thenReturn("destination");
+
+        sut = new RoutePart();
+        sut.setOrigin(origin);
+        sut.setDestination(destination);
+        assertThat(sut.getName(), is("origin -> destination"));
+    }
+
+
+    @Test
+    public void isOfType() {
+
+        sut = new RoutePart();
+        assertThat(sut.isOfType(RouteType.BARGE), is(false));
+
+        sut.setRouteType(null); // explicitly set to null
+        assertThat(sut.isOfType(null), is(false));
+
+        sut.setRouteType(null); // explicitly set to null
+        assertThat(sut.isOfType(RouteType.BARGE), is(false));
+
+        sut.setRouteType(RouteType.BARGE);
+        assertThat(sut.isOfType(null), is(false));
+
+        sut.setRouteType(RouteType.TRUCK);
+        assertThat(sut.isOfType(RouteType.BARGE), is(false));
+
+        sut.setRouteType(RouteType.BARGE);
+        assertThat(sut.isOfType(RouteType.BARGE), is(true));
+    }
+
+
+    @Test
+    public void hasTerminal() {
+
+        sut = new RoutePart();
+
+        sut.setOrigin(new Terminal());
+        sut.setDestination(new Address());
+        assertThat(sut.hasTerminal(), is(true));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(new Terminal());
+        assertThat(sut.hasTerminal(), is(true));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(new Address());
+        assertThat(sut.hasTerminal(), is(false));
+    }
+
+
+    @Test
+    public void findTerminal() {
+
+        Terminal terminal = new Terminal();
+
+        sut = new RoutePart();
+        sut.setOrigin(terminal);
+        sut.setDestination(new Address());
+        assertThat(sut.findTerminal(), is(terminal));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(terminal);
+        assertThat(sut.findTerminal(), is(terminal));
+    }
+
+
+    @Test(expected = IllegalStateException.class)
+    public void findNoTerminal() {
+
+        sut = new RoutePart();
+        sut.setOrigin(new Address());
+        sut.setDestination(new Address());
+        sut.findTerminal();
+    }
+
+
+    @Test
+    public void hasSeaport() {
+
+        sut = new RoutePart();
+
+        sut.setOrigin(new Seaport());
+        sut.setDestination(new Address());
+        assertThat(sut.hasSeaport(), is(true));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(new Seaport());
+        assertThat(sut.hasSeaport(), is(true));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(new Address());
+        assertThat(sut.hasSeaport(), is(false));
+    }
+
+
+    @Test
+    public void findSeaport() {
+
+        Seaport seaport = new Seaport();
+
+        sut = new RoutePart();
+        sut.setOrigin(seaport);
+        sut.setDestination(new Address());
+        assertThat(sut.findSeaport(), is(seaport));
+
+        sut.setOrigin(new Address());
+        sut.setDestination(seaport);
+        assertThat(sut.findSeaport(), is(seaport));
+    }
+
+
+    @Test(expected = IllegalStateException.class)
+    public void findNoSeaport() {
+
+        sut = new RoutePart();
+        sut.setOrigin(new Address());
+        sut.setDestination(new Address());
+        sut.findSeaport();
+    }
+
+
+    @Test
+    public void copyWithoutData() {
+
+        RoutePartData routePartData = new RoutePartData();
+        routePartData.setAirLineDistance(BigDecimal.ONE);
+
+        sut = new RoutePart(new Seaport(), new Terminal(), RouteType.BARGE);
+        sut.setContainerState(ContainerState.FULL);
+        sut.setContainerType(ContainerType.FORTY);
+        sut.setData(routePartData);
+
+        RoutePart actualRoutePart = sut.copyWithoutData();
+        assertThat(actualRoutePart.getContainerState(), is(ContainerState.FULL));
+        assertThat(actualRoutePart.getContainerType(), is(ContainerType.FORTY));
+
+        RoutePartData actualRoutePartData = actualRoutePart.getData();
+        assertThat(actualRoutePartData.getAirLineDistance(), nullValue());
+        assertThat(actualRoutePartData.getDieselDistance(), nullValue());
+        assertThat(actualRoutePartData.getElectricDistance(), nullValue());
+        assertThat(actualRoutePartData.getTollDistance(), nullValue());
+        assertThat(actualRoutePartData.getDuration(), nullValue());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteProductUnitTest.java b/src/test/java/net/contargo/iris/route/RouteProductUnitTest.java
new file mode 100644
index 00000000..ba69bc9d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteProductUnitTest.java
@@ -0,0 +1,27 @@
+package net.contargo.iris.route;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Marc Kannegiesser - kannegiesser@synyx.de
+ */
+public class RouteProductUnitTest {
+
+    @Test
+    public void createsRoundtripFromIsRoundTripTrue() {
+
+        assertThat(RouteProduct.fromIsRoundtrip(true), is(RouteProduct.ROUNDTRIP));
+    }
+
+
+    @Test
+    public void createsExportFromIsImportFalse() {
+
+        assertThat(RouteProduct.fromIsRoundtrip(false), is(RouteProduct.ONEWAY));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/RouteUnitTest.java b/src/test/java/net/contargo/iris/route/RouteUnitTest.java
new file mode 100644
index 00000000..62581533
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/RouteUnitTest.java
@@ -0,0 +1,172 @@
+package net.contargo.iris.route;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.contargo.iris.container.ContainerState.EMPTY;
+import static net.contargo.iris.container.ContainerState.FULL;
+import static net.contargo.iris.route.RouteDirection.EXPORT;
+import static net.contargo.iris.route.RouteDirection.IMPORT;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link Route}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RouteUnitTest {
+
+    @Mock
+    private List<RoutePart> routePartsMock;
+    @Mock
+    private List<RoutePart> routeParts2Mock;
+
+    @Test
+    public void testOneway() {
+
+        Route route = RouteCreationUtil.createOneWayImportRoute();
+        assertThat(route.isRoundTrip(), is(false));
+    }
+
+
+    @Test
+    public void testRoundtrip() {
+
+        Route route = RouteCreationUtil.createRoundTripImportRoute();
+        assertThat(route.isRoundTrip(), is(true));
+    }
+
+
+    @Test
+    public void getDirectionPartsEmpty() {
+
+        Route route = RouteCreationUtil.createOneWayImportRoute();
+
+        route.getData().setParts(new ArrayList<RoutePart>());
+
+        assertThat(route.getDirection(), nullValue());
+    }
+
+
+    @Test
+    public void getDirectionContainerStateNull() {
+
+        Route route = RouteCreationUtil.createOneWayImportRoute();
+
+        for (RoutePart routePart : route.getData().getParts()) {
+            routePart.setContainerState(null);
+        }
+
+        assertThat(route.getDirection(), nullValue());
+    }
+
+
+    @Test
+    public void getDirectionGivenRouteComposedOfZeroRouteParts() {
+
+        Route sut = new Route();
+        RouteData data = new RouteData();
+        data.setParts(new ArrayList<RoutePart>());
+        sut.setData(data);
+
+        // invariant preventing sut#getDirection to determine a direction
+        assertThat(sut.getDirection(), nullValue());
+    }
+
+
+    @Test
+    public void getDirectionGivenRouteComposedOfOneRouteParts() {
+
+        RoutePart routePartA = mock(RoutePart.class);
+
+        Route sut = new Route();
+        RouteData data = new RouteData();
+        data.setParts(asList(routePartA));
+        sut.setData(data);
+
+        // invariant preventing sut#getDirection to determine a direction
+        when(routePartA.getContainerState()).thenReturn(FULL);
+        assertThat(sut.getDirection(), nullValue());
+    }
+
+
+    @Test
+    public void getDirectionGivenRouteComposedOfManyRouteParts() {
+
+        RoutePart routePartA = mock(RoutePart.class);
+        RoutePart routePartB = mock(RoutePart.class);
+        RoutePart routePartC = mock(RoutePart.class);
+        RoutePart routePartD = mock(RoutePart.class);
+
+        Route sut = new Route();
+        RouteData data = new RouteData();
+        data.setParts(asList(routePartA, routePartB, routePartC, routePartD));
+        sut.setData(data);
+
+        // transition from empty to full container state
+        when(routePartA.getContainerState()).thenReturn(EMPTY);
+        when(routePartB.getContainerState()).thenReturn(EMPTY);
+        when(routePartC.getContainerState()).thenReturn(EMPTY);
+        when(routePartD.getContainerState()).thenReturn(FULL);
+
+        assertThat(sut.getDirection(), is(EXPORT));
+
+        // transition from full to empty container state
+        when(routePartA.getContainerState()).thenReturn(FULL);
+        when(routePartB.getContainerState()).thenReturn(FULL);
+        when(routePartC.getContainerState()).thenReturn(EMPTY);
+        when(routePartD.getContainerState()).thenReturn(EMPTY);
+
+        assertThat(sut.getDirection(), is(IMPORT));
+
+        // invariant preventing sut#getDirection to determine a direction
+        when(routePartA.getContainerState()).thenReturn(FULL);
+        when(routePartB.getContainerState()).thenReturn(EMPTY);
+        when(routePartC.getContainerState()).thenReturn(FULL);
+        when(routePartD.getContainerState()).thenReturn(EMPTY);
+
+        assertThat(sut.getDirection(), nullValue());
+    }
+
+
+    @Test
+    public void testIsTriangle() {
+
+        Route sut = new Route();
+        RouteData routeDataMock = mock(RouteData.class);
+        TruckRouteParts onewayTruckRoutePartsMock = mock(TruckRouteParts.class);
+        List<RoutePart> onewayTruckPartsListMock = routePartsMock;
+        List<RoutePart> truckPartsListMock = routeParts2Mock;
+        when(truckPartsListMock.size()).thenReturn(2);
+        when(onewayTruckPartsListMock.size()).thenReturn(2);
+        when(onewayTruckRoutePartsMock.getTruckRoutePartList()).thenReturn(onewayTruckPartsListMock);
+        when(routeDataMock.getOnewayTruckParts()).thenReturn(onewayTruckRoutePartsMock);
+        when(routeDataMock.getRoutePartsOfType(RouteType.TRUCK)).thenReturn(truckPartsListMock);
+        sut.setData(routeDataMock);
+
+        assertThat(sut.isTriangle(), is(true));
+
+        when(onewayTruckPartsListMock.size()).thenReturn(3);
+
+        assertThat(sut.isTriangle(), is(false));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/route/TruckRoutePartsUnitTest.java b/src/test/java/net/contargo/iris/route/TruckRoutePartsUnitTest.java
new file mode 100644
index 00000000..f1890bd3
--- /dev/null
+++ b/src/test/java/net/contargo/iris/route/TruckRoutePartsUnitTest.java
@@ -0,0 +1,159 @@
+package net.contargo.iris.route;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.address.Address;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class TruckRoutePartsUnitTest {
+
+    private static final GeoLocation A = new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO);
+    private static final GeoLocation B = new GeoLocation(BigDecimal.ZERO, BigDecimal.ONE);
+    private static final GeoLocation C = new GeoLocation(BigDecimal.ONE, BigDecimal.ZERO);
+    private static final GeoLocation D = new GeoLocation(BigDecimal.ONE, BigDecimal.ONE);
+
+    private TruckRouteParts subjectUnderTest;
+
+    @Before
+    public void setUp() {
+
+        List<RoutePart> routeParts = new ArrayList<>();
+        subjectUnderTest = new TruckRouteParts(routeParts);
+    }
+
+
+    @Test
+    public void testReduceToOneway() {
+
+        List<RoutePart> routeParts = new ArrayList<>();
+        RoutePart forth = new RoutePart(A, B, RouteType.TRUCK);
+        RoutePart back = new RoutePart(B, A, RouteType.TRUCK);
+        routeParts.add(forth);
+        routeParts.add(back);
+        subjectUnderTest.setTruckRoutePartList(routeParts);
+        subjectUnderTest.reduceToOneway();
+        assertThat(subjectUnderTest.getTruckRoutePartList().contains(forth), is(TRUE));
+        assertThat(subjectUnderTest.getTruckRoutePartList().contains(back), is(FALSE));
+    }
+
+
+    @Test
+    public void isEqualRoundTripEvaluatesToTrue() {
+
+        // A -> B | B -> A
+        List<RoutePart> routeParts = new ArrayList<>();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, A, RouteType.TRUCK));
+        subjectUnderTest.setTruckRoutePartList(routeParts);
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(TRUE));
+
+        // A -> B | B -> C | C -> B | B -> A
+        routeParts.clear();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, C, RouteType.TRUCK));
+        routeParts.add(new RoutePart(C, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, A, RouteType.TRUCK));
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(TRUE));
+    }
+
+
+    @Test
+    public void isEqualRoundTripEvaluatesToFalse() {
+
+        // A -> B
+        List<RoutePart> routeParts = new ArrayList<>();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        subjectUnderTest.setTruckRoutePartList(routeParts);
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(FALSE));
+
+        // A -> B | B -> C
+        routeParts.clear();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, C, RouteType.TRUCK));
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(FALSE));
+
+        // A -> B | B -> C | C -> A
+        routeParts.clear();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, C, RouteType.TRUCK));
+        routeParts.add(new RoutePart(C, A, RouteType.TRUCK));
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(FALSE));
+
+        // A -> B | B -> C | C -> B
+        routeParts.clear();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, C, RouteType.TRUCK));
+        routeParts.add(new RoutePart(C, B, RouteType.TRUCK));
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(FALSE));
+
+        // A -> B | B -> C | C -> D | D -> A
+        routeParts.clear();
+        routeParts.add(new RoutePart(A, B, RouteType.TRUCK));
+        routeParts.add(new RoutePart(B, C, RouteType.TRUCK));
+        routeParts.add(new RoutePart(C, D, RouteType.TRUCK));
+        routeParts.add(new RoutePart(D, A, RouteType.TRUCK));
+        assertThat(subjectUnderTest.isEqualRoundTrip(), is(FALSE));
+    }
+
+
+    @Test
+    public void extractDestinationAddressSucceeds() {
+
+        RoutePart routePartA = mock(RoutePart.class);
+        RoutePart routePartB = mock(RoutePart.class);
+        List<RoutePart> routeParts = asList(routePartA, routePartB);
+        subjectUnderTest.setTruckRoutePartList(routeParts);
+
+        Terminal terminal = mock(Terminal.class);
+        Address address = mock(Address.class);
+
+        when(routePartA.getDestination()).thenReturn(terminal);
+        when(routePartB.getDestination()).thenReturn(address); // this route parts destination is of type address
+
+        assertThat(subjectUnderTest.extractDestinationAddress(), is(address));
+    }
+
+
+    @Test
+    public void extractStaticAddressIdReturnsNullBecauseThereIsNoRoutePartHavingDestinationAddress() {
+
+        RoutePart routePartA = mock(RoutePart.class);
+        RoutePart routePartB = mock(RoutePart.class);
+        List<RoutePart> routeParts = asList(routePartA, routePartB);
+
+        subjectUnderTest.setTruckRoutePartList(routeParts);
+
+        Terminal terminal = mock(Terminal.class);
+        Seaport seaPort = mock(Seaport.class);
+
+        when(routePartA.getDestination()).thenReturn(terminal);
+        when(routePartB.getDestination()).thenReturn(seaPort); // this route parts destination is of type seaport
+
+        assertThat(subjectUnderTest.extractDestinationAddress(), nullValue());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepositoryIntegrationTest.java
new file mode 100644
index 00000000..e51ec640
--- /dev/null
+++ b/src/test/java/net/contargo/iris/routedatarevision/persistence/RouteDataRevisionRepositoryIntegrationTest.java
@@ -0,0 +1,100 @@
+package net.contargo.iris.routedatarevision.persistence;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+import static java.math.BigDecimal.ONE;
+import static java.math.BigDecimal.TEN;
+import static java.math.BigDecimal.ZERO;
+import static java.math.BigDecimal.valueOf;
+
+
+/**
+ * Integration test of {@link net.contargo.iris.routedatarevision.persistence.RouteDataRevisionRepository}.
+ *
+ * <p>findNearest(): test if the nearest {@link net.contargo.iris.routedatarevision.RouteDataRevision} to the given
+ * GeoLocation will be returned</p>
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class RouteDataRevisionRepositoryIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    @Autowired
+    private RouteDataRevisionRepository sut;
+
+    @Test
+    public void findNearest() {
+
+        Terminal terminal = createTerminal("terminal", BigInteger.ONE, TEN, TEN);
+        em.persist(terminal);
+        em.persist(createRouteDataRevision(terminal, ZERO, ZERO, ZERO, valueOf(49.1001), valueOf(8.9101), TEN));
+        em.persist(createRouteDataRevision(terminal, ONE, ONE, ONE, valueOf(49.1011), valueOf(8.9102), TEN));
+        em.persist(createRouteDataRevision(terminal, TEN, TEN, TEN, valueOf(49.1021), valueOf(8.9103), TEN));
+
+        em.flush();
+
+        RouteDataRevision routeDataRevision = sut.findNearest(terminal, valueOf(49.10), valueOf(8.91));
+
+        assertThat(routeDataRevision.getAirlineDistance(), is(ZERO));
+        assertThat(routeDataRevision.getTollDistanceOneWay(), is(ZERO));
+        assertThat(routeDataRevision.getTruckDistanceOneWay(), is(ZERO));
+        assertThat(routeDataRevision.getLatitude(), is(valueOf(49.1001)));
+        assertThat(routeDataRevision.getLongitude(), is(valueOf(8.9101)));
+    }
+
+
+    private Terminal createTerminal(String name, BigInteger id, BigDecimal latitude, BigDecimal longitude) {
+
+        Terminal terminal = new Terminal(new GeoLocation(latitude, longitude));
+        terminal.setName(name);
+        terminal.setUniqueId(id);
+
+        return terminal;
+    }
+
+
+    private RouteDataRevision createRouteDataRevision(Terminal t, BigDecimal tdow, BigDecimal truckdow, BigDecimal ad,
+        BigDecimal lat, BigDecimal lng, BigDecimal r) {
+
+        RouteDataRevision routeDataRevision = new RouteDataRevision();
+        routeDataRevision.setTollDistanceOneWay(tdow);
+        routeDataRevision.setTruckDistanceOneWay(truckdow);
+        routeDataRevision.setAirlineDistance(ad);
+        routeDataRevision.setLatitude(lat);
+        routeDataRevision.setLongitude(lng);
+        routeDataRevision.setRadius(r);
+        routeDataRevision.setTerminal(t);
+
+        return routeDataRevision;
+    }
+}
diff --git a/src/test/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImplUnitTest.java b/src/test/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImplUnitTest.java
new file mode 100644
index 00000000..26e9d191
--- /dev/null
+++ b/src/test/java/net/contargo/iris/routedatarevision/service/RouteDataRevisionServiceImplUnitTest.java
@@ -0,0 +1,60 @@
+package net.contargo.iris.routedatarevision.service;
+
+import net.contargo.iris.address.Address;
+import net.contargo.iris.routedatarevision.RouteDataRevision;
+import net.contargo.iris.routedatarevision.persistence.RouteDataRevisionRepository;
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit test of {@link RouteDataRevisionServiceImpl}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class RouteDataRevisionServiceImplUnitTest {
+
+    private RouteDataRevisionService sut;
+
+    @Mock
+    private RouteDataRevisionRepository routeDataRevisionRepositoryMock;
+
+    @Before
+    public void before() {
+
+        sut = new RouteDataRevisionServiceImpl(routeDataRevisionRepositoryMock);
+    }
+
+
+    @Test
+    public void getRouteDataRevision() {
+
+        Terminal terminal = new Terminal();
+        Address address = new Address(BigDecimal.ONE, BigDecimal.TEN);
+        RouteDataRevision routeDataRevisionDB = new RouteDataRevision();
+
+        when(routeDataRevisionRepositoryMock.findNearest(terminal, address.getLatitude(), address.getLongitude()))
+            .thenReturn(routeDataRevisionDB);
+
+        RouteDataRevision routeDataRevision = sut.getRouteDataRevision(terminal, address);
+
+        assertThat(routeDataRevision, is(routeDataRevisionDB));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/SeaportUnitTest.java b/src/test/java/net/contargo/iris/seaport/SeaportUnitTest.java
new file mode 100644
index 00000000..482c604c
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/SeaportUnitTest.java
@@ -0,0 +1,31 @@
+package net.contargo.iris.seaport;
+
+import net.contargo.iris.GeoLocation;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class SeaportUnitTest {
+
+    @Test
+    public void create() {
+
+        BigDecimal latitude = BigDecimal.ZERO;
+        BigDecimal longitude = BigDecimal.ONE;
+
+        GeoLocation geoLocation = new GeoLocation(latitude, longitude);
+        Seaport sut = new Seaport(geoLocation);
+
+        assertThat(sut.getLongitude().compareTo(longitude), is(0));
+        assertThat(sut.getLatitude().compareTo(latitude), is(0));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/api/SeaportApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/seaport/api/SeaportApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..3eb9155a
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/api/SeaportApiControllerMvcUnitTest.java
@@ -0,0 +1,189 @@
+package net.contargo.iris.seaport.api;
+
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mockito;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.argThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Mvc Unit test for {@link SeaportApiController}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class SeaportApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    @Autowired
+    private SeaportDtoService seaportDtoService;
+
+    private SeaportDto seaportDto;
+
+    @Before
+    public void setUp() {
+
+        createSeaportDto();
+    }
+
+
+    @Test
+    public void getSeaports() throws Exception {
+
+        when(seaportDtoService.getAllActive()).thenReturn(asList(seaportDto));
+
+        MockHttpServletRequestBuilder builder = get("/seaports");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json;charset=UTF-8"));
+        resultActions.andExpect(jsonPath("$.seaports[0].latitude", is(seaportDto.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[0].longitude", is(seaportDto.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$.seaports[0].name", is(seaportDto.getName())));
+        resultActions.andExpect(jsonPath("$.seaports[0].enabled", is(seaportDto.isEnabled())));
+        resultActions.andExpect(jsonPath("$.links", hasSize(1)));
+        resultActions.andExpect(jsonPath("$.links[0].rel", is("self")));
+        resultActions.andExpect(jsonPath("$.links[0].href", endsWith("/seaports")));
+    }
+
+
+    @Test
+    public void getSeaportByUid() throws Exception {
+
+        when(seaportDtoService.getByUid(new BigInteger("42"))).thenReturn(seaportDto);
+
+        MockHttpServletRequestBuilder builder = get("/seaports/42");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType(APPLICATION_JSON));
+
+        resultActions.andExpect(jsonPath("$response.seaport.latitude", is(seaportDto.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.seaport.longitude", is(seaportDto.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.seaport.name", is(seaportDto.getName())));
+        resultActions.andExpect(jsonPath("$response.seaport.enabled", is(seaportDto.isEnabled())));
+
+        resultActions.andExpect(jsonPath("$response.links", hasSize(2)));
+        resultActions.andExpect(jsonPath("$response.links[0].rel", is("self")));
+        resultActions.andExpect(jsonPath("$response.links[0].href", endsWith("/seaports/42")));
+        resultActions.andExpect(jsonPath("$response.links[1].rel", is("seaports")));
+    }
+
+
+    @Test
+    public void getSeaportWithInvalidUid() throws Exception {
+
+        MockHttpServletRequestBuilder builder = get("/seaports/314");
+        builder.accept(APPLICATION_JSON);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isNotFound());
+    }
+
+
+    @Test
+    public void syncSeaportCreate() throws Exception {
+
+        BigInteger uniqueId = new BigInteger("8491748714921");
+
+        when(seaportDtoService.existsByUniqueId(uniqueId)).thenReturn(false);
+
+        MockHttpServletRequestBuilder builder = put("/seaports/8491748714921");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content("{\"name\": \"foo\", \"enabled\": true, \"latitude\": 0, \"longitude\": 0}");
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isCreated());
+
+        verify(seaportDtoService).save(argThat(
+                org.hamcrest.Matchers.<SeaportDto>allOf(hasProperty("uniqueId", is(uniqueId.toString())),
+                    hasProperty("name", is("foo")), hasProperty("enabled", is(true)),
+                    hasProperty("latitude", is(BigDecimal.ZERO)), hasProperty("longitude", is(BigDecimal.ZERO)))));
+    }
+
+
+    @Test
+    public void syncSeaportUpdate() throws Exception {
+
+        BigInteger uniqueId = new BigInteger("8491748714921");
+
+        when(seaportDtoService.existsByUniqueId(uniqueId)).thenReturn(true);
+
+        MockHttpServletRequestBuilder builder = put("/seaports/8491748714921");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content("{\"name\": \"foo\", \"enabled\": true, \"latitude\": 0, \"longitude\": 0}");
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isNoContent());
+
+        verify(seaportDtoService).updateSeaport(Mockito.eq(uniqueId),
+            argThat(
+                org.hamcrest.Matchers.<SeaportDto>allOf(hasProperty("name", is("foo")),
+                    hasProperty("enabled", is(true)), hasProperty("latitude", is(BigDecimal.ZERO)),
+                    hasProperty("longitude", is(BigDecimal.ZERO)))));
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+
+
+    private void createSeaportDto() {
+
+        seaportDto = new SeaportDto();
+        seaportDto.setEnabled(true);
+        seaportDto.setName("terminalDto");
+        seaportDto.setLatitude(BigDecimal.ONE);
+        seaportDto.setLongitude(BigDecimal.ZERO);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..8c9ed776
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/dto/SeaportDtoServiceImplUnitTest.java
@@ -0,0 +1,191 @@
+package net.contargo.iris.seaport.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.Arrays;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportDtoServiceImplUnitTest {
+
+    private SeaportDtoServiceImpl sut;
+    @Mock
+    private SeaportService seaportServiceMock;
+    private Seaport seaport1;
+    private Seaport seaport2;
+
+    @Before
+    public void setUp() throws Exception {
+
+        sut = new SeaportDtoServiceImpl(seaportServiceMock);
+
+        seaport1 = new Seaport();
+        seaport1.setLatitude(BigDecimal.ONE);
+        seaport1.setLongitude(BigDecimal.ONE);
+        seaport1.setName("name1");
+        seaport1.setEnabled(true);
+
+        seaport2 = new Seaport();
+        seaport2.setLatitude(BigDecimal.TEN);
+        seaport2.setLongitude(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void testGetAll() {
+
+        when(seaportServiceMock.getAll()).thenReturn(Arrays.asList(seaport1, seaport2));
+
+        assertThat(sut.getAll().size(), is(2));
+        assertThat(sut.getAll().get(0).getName(), is("name1"));
+        assertThat(sut.getAll().get(0).isEnabled(), is(true));
+    }
+
+
+    @Test
+    public void testGetAllActive() {
+
+        Seaport seaport3 = new Seaport();
+        seaport3.setLatitude(BigDecimal.TEN);
+        seaport3.setLongitude(BigDecimal.TEN);
+
+        when(seaportServiceMock.getAllActive()).thenReturn(Arrays.asList(seaport1, seaport3));
+
+        assertThat(sut.getAllActive().size(), is(2));
+        assertThat(sut.getAllActive().get(0).getName(), is("name1"));
+        assertThat(sut.getAllActive().get(0).isEnabled(), is(true));
+    }
+
+
+    @Test
+    public void testSave() {
+
+        when(seaportServiceMock.save(any(Seaport.class))).thenReturn(seaport1);
+
+        SeaportDto saveSeaportDto = new SeaportDto(seaport1);
+        SeaportDto returnSeaportDto = sut.save(saveSeaportDto);
+        assertReflectionEquals(returnSeaportDto, saveSeaportDto);
+        verify(seaportServiceMock, times(1)).save(any(Seaport.class));
+    }
+
+
+    @Test
+    public void testGetById() {
+
+        when(seaportServiceMock.getById(1L)).thenReturn(seaport1);
+
+        SeaportDto returnSeaportDto = sut.getById(1L);
+
+        assertReflectionEquals(returnSeaportDto, new SeaportDto(seaport1));
+    }
+
+
+    @Test
+    public void testGetByIdNull() {
+
+        SeaportDto returnSeaportDto = sut.getById(1L);
+
+        assertThat(returnSeaportDto, nullValue());
+    }
+
+
+    @Test
+    public void existsByUniqueIdTrue() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(seaportServiceMock.existsByUniqueId(uniqueId)).thenReturn(true);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(true));
+    }
+
+
+    @Test
+    public void existsByUniqueIdFalse() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(seaportServiceMock.existsByUniqueId(uniqueId)).thenReturn(false);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(false));
+    }
+
+
+    @Test
+    public void updateSeaport() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        SeaportDto dto = new SeaportDto();
+        dto.setUniqueId(uniqueId.toString());
+        dto.setEnabled(true);
+        dto.setName("foobar");
+        dto.setLongitude(BigDecimal.ZERO);
+        dto.setLatitude(BigDecimal.ZERO);
+
+        Seaport seaport = dto.toEntity();
+
+        Seaport savedSeaport = new Seaport(new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO));
+        savedSeaport.setId(42L);
+
+        when(seaportServiceMock.updateSeaport(uniqueId, seaport)).thenReturn(savedSeaport);
+
+        SeaportDto updatedDto = sut.updateSeaport(uniqueId, dto);
+
+        assertThat(updatedDto.toEntity(), is(savedSeaport));
+    }
+
+
+    @Test
+    public void getByUid() {
+
+        when(seaportServiceMock.getByUniqueId(BigInteger.ONE)).thenReturn(seaport1);
+
+        SeaportDto returnSeaportDto = sut.getByUid(BigInteger.ONE);
+
+        assertReflectionEquals(returnSeaportDto, new SeaportDto(seaport1));
+    }
+
+
+    @Test
+    public void testGetByUidNull() {
+
+        SeaportDto returnSeaportDto = sut.getByUid(BigInteger.ONE);
+
+        assertThat(returnSeaportDto, nullValue());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/persistence/SeaportRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/seaport/persistence/SeaportRepositoryIntegrationTest.java
new file mode 100644
index 00000000..3ae8e2a2
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/persistence/SeaportRepositoryIntegrationTest.java
@@ -0,0 +1,70 @@
+package net.contargo.iris.seaport.persistence;
+
+import net.contargo.iris.seaport.Seaport;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class SeaportRepositoryIntegrationTest {
+
+    @Autowired
+    SeaportRepository sut;
+
+    @PersistenceContext
+    EntityManager em;
+
+    @Test
+    public void testFindByEnabled() throws Exception {
+
+        Seaport seaport1 = createSeaport();
+        Seaport seaport2 = createSeaport();
+        seaport1.setUniqueId(BigInteger.ONE);
+        seaport2.setUniqueId(BigInteger.TEN);
+        em.persist(seaport1);
+        em.persist(seaport2);
+        em.flush();
+
+        assertThat(sut.findByEnabled(true).contains(seaport1), is(true));
+        assertThat(sut.findByEnabled(true).contains(seaport2), is(true));
+    }
+
+
+    private Seaport createSeaport() {
+
+        Seaport seaport = new Seaport();
+        seaport.setName("Carlo Pedersoli" + Math.random());
+        seaport.setEnabled(true);
+        seaport.setLatitude(new BigDecimal(Math.random()));
+        seaport.setLongitude(new BigDecimal(Math.random()));
+        seaport.setUniqueId(BigInteger.ONE);
+
+        return seaport;
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplIntegrationTest.java b/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplIntegrationTest.java
new file mode 100644
index 00000000..6562a99f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplIntegrationTest.java
@@ -0,0 +1,82 @@
+package net.contargo.iris.seaport.service;
+
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.persistence.SeaportRepository;
+import net.contargo.iris.sequence.UniqueIdSequence;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class SeaportServiceImplIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private SeaportRepository seaportRepository;
+    @Autowired
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceService;
+
+    private SeaportServiceImpl sut;
+
+    private Seaport seaport;
+
+    @Before
+    public void setUp() {
+
+        sut = new SeaportServiceImpl(seaportRepository, uniqueIdSequenceService);
+        seaport = new Seaport();
+        seaport.setName("SeaportName");
+        seaport.setLatitude(BigDecimal.ONE);
+        seaport.setLongitude(BigDecimal.ONE);
+    }
+
+
+    @Test
+    public void testSaveWithoutUniqueId() {
+
+        UniqueIdSequence nextSequenceObject = getNextSequenceObjectFromDb();
+
+        BigInteger nextSequence = nextSequenceObject.getNextId();
+        Seaport savedSeaport = sut.save(seaport);
+        assertThat(savedSeaport.getUniqueId(), is(nextSequence));
+
+        assertThat(getNextSequenceObjectFromDb().getNextId(), is(nextSequence.add(BigInteger.ONE)));
+    }
+
+
+    private UniqueIdSequence getNextSequenceObjectFromDb() {
+
+        String queryString = "SELECT o FROM UniqueIdSequence o WHERE o.entityName = 'Seaport'";
+
+        return em.createQuery(queryString, UniqueIdSequence.class).getSingleResult();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplUnitTest.java b/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplUnitTest.java
new file mode 100644
index 00000000..f5ac1ef0
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/service/SeaportServiceImplUnitTest.java
@@ -0,0 +1,318 @@
+package net.contargo.iris.seaport.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.persistence.SeaportRepository;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.notNullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.junit.Assert.fail;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class SeaportServiceImplUnitTest {
+
+    private static final String SEAPORT_NAME = "foobar";
+
+    private SeaportServiceImpl sut;
+
+    @Mock
+    private SeaportRepository seaportRepositoryMock;
+    @Mock
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceServiceMock;
+
+    private List<Seaport> ports;
+
+    @Before
+    public void setUp() {
+
+        sut = new SeaportServiceImpl(seaportRepositoryMock, uniqueIdSequenceServiceMock);
+
+        Seaport port1 = new Seaport();
+        Seaport port2 = new Seaport();
+
+        ports = asList(port1, port2);
+
+        when(seaportRepositoryMock.findAll()).thenReturn(ports);
+        when(seaportRepositoryMock.findByEnabled(true)).thenReturn(ports);
+    }
+
+
+    @Test
+    public void getAll() {
+
+        List<Seaport> seaports = sut.getAll();
+
+        assertThat("There should be two seaports", seaports, hasSize(2));
+    }
+
+
+    @Test
+    public void getAllActive() {
+
+        List<Seaport> seaports = sut.getAllActive();
+
+        assertThat("There should be two active seaports", seaports, hasSize(2));
+    }
+
+
+    @Test
+    public void testGetById() {
+
+        Seaport seaport = new Seaport();
+
+        when(seaportRepositoryMock.findOne(seaport.getId())).thenReturn(seaport);
+
+        Seaport result = sut.getById(seaport.getId());
+
+        verify(seaportRepositoryMock).findOne(seaport.getId());
+        assertThat(seaport, is(result));
+    }
+
+
+    @Test
+    public void testSave() {
+
+        Seaport seaportToSave = new Seaport();
+        seaportToSave.setLatitude(BigDecimal.ONE);
+        seaportToSave.setLongitude(BigDecimal.ONE);
+
+        Seaport savedSeaport = new Seaport();
+        savedSeaport.setId(1L);
+        savedSeaport.setLatitude(BigDecimal.ONE);
+        savedSeaport.setLongitude(BigDecimal.ONE);
+        when(seaportRepositoryMock.save(seaportToSave)).thenReturn(savedSeaport);
+
+        assertThat(seaportToSave, is(savedSeaport));
+        assertThat(savedSeaport.getId(), is(1L));
+    }
+
+
+    @Test
+    public void testSaveWithoutUniqueId() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Seaport")).thenReturn(BigInteger.ONE);
+        when(seaportRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(null);
+
+        Seaport seaportToSave = new Seaport();
+        seaportToSave.setLatitude(BigDecimal.ONE);
+        seaportToSave.setLongitude(BigDecimal.ONE);
+
+        sut.save(seaportToSave);
+
+        ArgumentCaptor<Seaport> captor = ArgumentCaptor.forClass(Seaport.class);
+        verify(seaportRepositoryMock).save(captor.capture());
+        assertThat(captor.getValue().getUniqueId(), notNullValue());
+        assertThat(seaportToSave.getUniqueId(), is(BigInteger.ONE));
+    }
+
+
+    @Test
+    public void determineUniqueId() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Seaport")).thenReturn(BigInteger.ONE);
+        when(seaportRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(null);
+
+        sut.determineUniqueId();
+
+        verify(uniqueIdSequenceServiceMock).getNextId("Seaport");
+    }
+
+
+    @Test
+    public void determineUniqueIdWithSecondRetry() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Seaport")).thenReturn(BigInteger.ONE);
+        when(seaportRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(new Seaport());
+
+        sut.determineUniqueId();
+
+        InOrder order = inOrder(uniqueIdSequenceServiceMock);
+        order.verify(uniqueIdSequenceServiceMock).getNextId("Seaport");
+        order.verify(uniqueIdSequenceServiceMock).setNextId("Seaport", new BigInteger("2"));
+    }
+
+
+    @Test
+    public void getByUniqueId() {
+
+        BigInteger uniqueId = BigInteger.TEN;
+
+        when(seaportRepositoryMock.findByUniqueId(uniqueId)).thenReturn(ports.get(0));
+
+        Seaport seaport = sut.getByUniqueId(uniqueId);
+
+        assertThat(seaport, is(ports.get(0)));
+    }
+
+
+    @Test
+    public void existsByUniqueIdTrue() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(seaportRepositoryMock.findByUniqueId(uniqueId)).thenReturn(ports.get(0));
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(true));
+    }
+
+
+    @Test
+    public void existsByUniqueIdFalse() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(seaportRepositoryMock.findByUniqueId(uniqueId)).thenReturn(null);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(false));
+    }
+
+
+    @Test
+    public void updateSeaport() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        Seaport seaport = new Seaport();
+        seaport.setUniqueId(uniqueId);
+        seaport.setEnabled(true);
+        seaport.setName("foobar");
+        seaport.setLongitude(BigDecimal.ZERO);
+        seaport.setLatitude(BigDecimal.ZERO);
+
+        Seaport savedSeaport = new Seaport(new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO));
+        savedSeaport.setId(42L);
+
+        when(seaportRepositoryMock.findByUniqueId(uniqueId)).thenReturn(savedSeaport);
+        when(seaportRepositoryMock.save(savedSeaport)).thenReturn(savedSeaport);
+
+        Seaport updatedSeaport = sut.updateSeaport(uniqueId, seaport);
+
+        assertThat(updatedSeaport.getName(), is(seaport.getName()));
+        assertThat(updatedSeaport.getId(), is(42L));
+        assertThat(updatedSeaport.isEnabled(), is(seaport.isEnabled()));
+        assertThat(updatedSeaport.getLongitude(), comparesEqualTo(seaport.getLongitude()));
+        assertThat(updatedSeaport.getLatitude(), comparesEqualTo(seaport.getLatitude()));
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsCreateWithNonUniqueCoordinates() {
+
+        Seaport seaport = new Seaport(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        seaport.setId(null);
+        seaport.setName(SEAPORT_NAME);
+
+        when(seaportRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class))).thenReturn(
+            ports.get(0));
+        when(seaportRepositoryMock.findByName(SEAPORT_NAME)).thenReturn(null);
+
+        try {
+            sut.checkUniqueConstraints(seaport);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueSeaportException e) {
+            Assert.assertThat(e.getBadFields(), contains("latitude", "longitude"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsCreateWithNonUniqueName() {
+
+        Seaport seaport = new Seaport(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        seaport.setId(null);
+        seaport.setName(SEAPORT_NAME);
+
+        when(seaportRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class))).thenReturn(
+            null);
+        when(seaportRepositoryMock.findByName(SEAPORT_NAME)).thenReturn(ports.get(0));
+
+        try {
+            sut.checkUniqueConstraints(seaport);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueSeaportException e) {
+            Assert.assertThat(e.getBadFields(), contains("name"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsUpdateWithNonUniqueCoordinates() {
+
+        Seaport seaport = new Seaport(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        seaport.setId(42L);
+        seaport.setName(SEAPORT_NAME);
+
+        when(seaportRepositoryMock.findByLatitudeAndLongitudeAndIdNot(any(BigDecimal.class), any(BigDecimal.class),
+                anyLong())).thenReturn(ports.get(0));
+        when(seaportRepositoryMock.findByNameAndIdNot(SEAPORT_NAME, 42L)).thenReturn(null);
+
+        try {
+            sut.checkUniqueConstraints(seaport);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueSeaportException e) {
+            Assert.assertThat(e.getBadFields(), contains("latitude", "longitude"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsUpdateWithNonUniqueName() {
+
+        Seaport seaport = new Seaport(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        seaport.setId(42L);
+        seaport.setName(SEAPORT_NAME);
+
+        when(seaportRepositoryMock.findByLatitudeAndLongitudeAndIdNot(any(BigDecimal.class), any(BigDecimal.class),
+                anyLong())).thenReturn(null);
+        when(seaportRepositoryMock.findByNameAndIdNot(SEAPORT_NAME, 42L)).thenReturn(ports.get(0));
+
+        try {
+            sut.checkUniqueConstraints(seaport);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueSeaportException e) {
+            Assert.assertThat(e.getBadFields(), contains("name"));
+        }
+    }
+}
diff --git a/src/test/java/net/contargo/iris/seaport/web/SeaportControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/seaport/web/SeaportControllerMvcUnitTest.java
new file mode 100644
index 00000000..7d24683b
--- /dev/null
+++ b/src/test/java/net/contargo/iris/seaport/web/SeaportControllerMvcUnitTest.java
@@ -0,0 +1,196 @@
+package net.contargo.iris.seaport.web;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.seaport.Seaport;
+import net.contargo.iris.seaport.service.SeaportService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.ui.ModelMap;
+
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * MVC Unit test of {@link net.contargo.iris.seaport.web.SeaportController}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:web-api-context.xml" })
+@WebAppConfiguration
+public class SeaportControllerMvcUnitTest {
+
+    private static final int SEAPORT_ID = 2;
+    public static final long SEAPORT_ID_777 = 777L;
+    public static final String SEAPORT_NAME_1 = "Entenhausen";
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Autowired
+    private SeaportService seaportServiceMock;
+
+    private Seaport seaport1;
+    private Seaport seaport2;
+
+    @Before
+    public void setUp() throws Exception {
+
+        seaport1 = createSeaport();
+        seaport2 = createSeaport();
+        seaport2.setName("Gotham City");
+        seaport2.setId(3L);
+        seaport2.setLatitude(BigDecimal.TEN);
+        seaport2.setLongitude(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void testGetAllSeaports() throws Exception {
+
+        when(seaportServiceMock.getAll()).thenReturn(Arrays.asList(seaport1, seaport2));
+
+        ResultActions resultActions = perform(get("/seaports/").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("seaports", Arrays.asList(seaport1, seaport2)));
+        resultActions.andExpect(view().name("seaportManagement/seaports"));
+    }
+
+
+    @Test
+    public void testCreateSeaport() throws Exception {
+
+        ResultActions resultActions = perform(get("/seaports/new").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(view().name("seaportManagement/seaport"));
+    }
+
+
+    @Test
+    public void testSaveSeaport() throws Exception {
+
+        String requestBody = new ObjectMapper().writeValueAsString(seaport1);
+        when(seaportServiceMock.save(any(Seaport.class))).thenReturn(seaport1);
+
+        MockHttpServletRequestBuilder builder = post("/seaports/?name=Entenhausen&latitude=1&longitude=1");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content(requestBody);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isFound());
+        resultActions.andExpect(view().name("redirect:/web/seaports/" + seaport1.getId()));
+    }
+
+
+    @Test
+    public void testSaveIncompleteSeaport() throws Exception {
+
+        Seaport incompleteSeaport = new Seaport();
+        incompleteSeaport.setName(SEAPORT_NAME_1);
+        incompleteSeaport.setLatitude(BigDecimal.ONE);
+
+        String requestBody = new ObjectMapper().writeValueAsString(seaport1);
+        when(seaportServiceMock.save(seaport1)).thenReturn(seaport1);
+
+        MockHttpServletRequestBuilder builder = post("/seaports/?name=Entenhausen&latitude=1");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content(requestBody);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(view().name("seaportManagement/seaport"));
+
+        ModelAndView modelAndView = resultActions.andReturn().getModelAndView();
+        ModelMap modelMap = modelAndView.getModelMap();
+        assertReflectionEquals(modelMap.get("seaport"), incompleteSeaport);
+    }
+
+
+    @Test
+    public void testEditSeaport() throws Exception {
+
+        when(seaportServiceMock.getById(2L)).thenReturn(seaport1);
+
+        ResultActions resultActions = perform(get("/seaports/" + SEAPORT_ID).accept(APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("seaport", seaport1));
+        resultActions.andExpect(view().name("seaportManagement/seaport"));
+    }
+
+
+    @Test
+    public void testUpdateSeaport() throws Exception {
+
+        Seaport seaport777 = new Seaport();
+        seaport777.setId(SEAPORT_ID_777);
+        seaport777.setName(SEAPORT_NAME_1);
+        seaport777.setLatitude(BigDecimal.ONE);
+        seaport777.setLongitude(BigDecimal.ONE);
+        when(seaportServiceMock.getById(SEAPORT_ID_777)).thenReturn(seaport777);
+        when(seaportServiceMock.save(any(Seaport.class))).thenReturn(seaport777);
+
+        MockHttpServletRequestBuilder builder = put("/seaports/" + SEAPORT_ID_777
+                + "?name=Entenhausen&latitude=1&longitude=1");
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isFound());
+        resultActions.andExpect(view().name("redirect:/web/seaports/" + SEAPORT_ID_777));
+    }
+
+
+    private Seaport createSeaport() {
+
+        Seaport seaport = new Seaport();
+        seaport.setId(2L);
+        seaport.setLatitude(BigDecimal.ONE);
+        seaport.setLongitude(BigDecimal.ONE);
+        seaport.setName(SEAPORT_NAME_1);
+
+        return seaport;
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/security/SpringUserAuthenticationServiceTest.java b/src/test/java/net/contargo/iris/security/SpringUserAuthenticationServiceTest.java
new file mode 100644
index 00000000..c136f72d
--- /dev/null
+++ b/src/test/java/net/contargo/iris/security/SpringUserAuthenticationServiceTest.java
@@ -0,0 +1,46 @@
+package net.contargo.iris.security;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  David Schilling - schilling@synyx.de
+ */
+public class SpringUserAuthenticationServiceTest {
+
+    private SpringUserAuthenticationService sut;
+
+    @Before
+    public void setUp() {
+
+        sut = new SpringUserAuthenticationService();
+    }
+
+
+    @Test
+    public void getCurrentUser() {
+
+        UserDetails userDetails = new User("user", "password", asList(new SimpleGrantedAuthority("USER")));
+        UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken =
+            new UsernamePasswordAuthenticationToken(userDetails, null);
+        SecurityContextHolder.getContext().setAuthentication(usernamePasswordAuthenticationToken);
+
+        Authentication currentUser = sut.getCurrentUser();
+        assertThat((UserDetails) currentUser.getPrincipal(), is(userDetails));
+        assertThat(currentUser.getName(), is("user"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/sequence/UniqueIdSequenceUnitTest.java b/src/test/java/net/contargo/iris/sequence/UniqueIdSequenceUnitTest.java
new file mode 100644
index 00000000..85cec6bb
--- /dev/null
+++ b/src/test/java/net/contargo/iris/sequence/UniqueIdSequenceUnitTest.java
@@ -0,0 +1,24 @@
+package net.contargo.iris.sequence;
+
+import org.junit.Test;
+
+import java.math.BigInteger;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+public class UniqueIdSequenceUnitTest {
+
+    @Test
+    public void testIncrementNextId() {
+
+        UniqueIdSequence sut = new UniqueIdSequence("bla", new BigInteger("42"));
+        sut.incrementNextId();
+        assertThat(sut.getNextId(), is(new BigInteger("43")));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/sequence/persistence/UniqueIdUniqueIdSequenceRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/sequence/persistence/UniqueIdUniqueIdSequenceRepositoryIntegrationTest.java
new file mode 100644
index 00000000..984143fe
--- /dev/null
+++ b/src/test/java/net/contargo/iris/sequence/persistence/UniqueIdUniqueIdSequenceRepositoryIntegrationTest.java
@@ -0,0 +1,60 @@
+package net.contargo.iris.sequence.persistence;
+
+import net.contargo.iris.sequence.UniqueIdSequence;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static net.contargo.iris.sequence.UniqueIdSequence.SYSTEM_UNIQUEID_PREFIX;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.greaterThan;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class UniqueIdUniqueIdSequenceRepositoryIntegrationTest {
+
+    @PersistenceContext
+    EntityManager em;
+
+    @Autowired
+    private UniqueIdSequenceRepository sut;
+
+    UniqueIdSequence uniqueIdSequence;
+
+    @Before
+    public void setUp() {
+
+        uniqueIdSequence = new UniqueIdSequence("Terminal", BigInteger.TEN);
+    }
+
+
+    @Test
+    public void testFindByTableName() {
+
+        UniqueIdSequence result = sut.findByEntityName("Terminal");
+        assertThat(result.getNextId(), greaterThan(new BigInteger(SYSTEM_UNIQUEID_PREFIX + "000000000000")));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImplUnitTest.java b/src/test/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImplUnitTest.java
new file mode 100644
index 00000000..e11455e5
--- /dev/null
+++ b/src/test/java/net/contargo/iris/sequence/service/UniqueIdSequenceServiceImplUnitTest.java
@@ -0,0 +1,120 @@
+package net.contargo.iris.sequence.service;
+
+import net.contargo.iris.sequence.UniqueIdSequence;
+import net.contargo.iris.sequence.persistence.UniqueIdSequenceRepository;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigInteger;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class UniqueIdSequenceServiceImplUnitTest {
+
+    public static final String TERMINAL_ENTITY_NAME = "Terminal";
+    UniqueIdSequenceServiceImpl sut;
+
+    @Mock
+    private UniqueIdSequenceRepository uniqueIdSequenceRepositoryMock;
+    private BigInteger validId1;
+    private BigInteger validId2;
+
+    @Before
+    public void setUp() {
+
+        sut = new UniqueIdSequenceServiceImpl(uniqueIdSequenceRepositoryMock);
+        validId1 = new BigInteger(UniqueIdSequence.SYSTEM_UNIQUEID_PREFIX + "000000000001");
+        validId2 = new BigInteger(UniqueIdSequence.SYSTEM_UNIQUEID_PREFIX + "000000000002");
+    }
+
+
+    @Test
+    public void testGetNextId() {
+
+        UniqueIdSequence uniqueIdSequence = new UniqueIdSequence(TERMINAL_ENTITY_NAME, validId1);
+
+        when(uniqueIdSequenceRepositoryMock.findByEntityName(TERMINAL_ENTITY_NAME)).thenReturn(uniqueIdSequence);
+
+        assertThat(sut.getNextId(TERMINAL_ENTITY_NAME), is(validId1));
+
+        ArgumentCaptor<UniqueIdSequence> captor = ArgumentCaptor.forClass(UniqueIdSequence.class);
+
+        InOrder order = inOrder(uniqueIdSequenceRepositoryMock);
+        order.verify(uniqueIdSequenceRepositoryMock).findByEntityName(TERMINAL_ENTITY_NAME);
+        order.verify(uniqueIdSequenceRepositoryMock).save(captor.capture());
+
+        assertThat(captor.getValue().getNextId(), is(validId2));
+    }
+
+
+    @Test(expected = UniqueIdSequenceServiceException.class)
+    public void getNextIdForNonExistingEntity() {
+
+        when(uniqueIdSequenceRepositoryMock.findByEntityName("non-existing-entity")).thenReturn(null);
+
+        sut.getNextId(TERMINAL_ENTITY_NAME);
+
+        verify(uniqueIdSequenceRepositoryMock).findByEntityName("non-existing-entity");
+        verifyNoMoreInteractions(uniqueIdSequenceRepositoryMock);
+    }
+
+
+    @Test
+    public void setNextId() {
+
+        UniqueIdSequence sequenceFromDb = new UniqueIdSequence(TERMINAL_ENTITY_NAME, validId1);
+
+        when(uniqueIdSequenceRepositoryMock.findByEntityName(TERMINAL_ENTITY_NAME)).thenReturn(sequenceFromDb);
+
+        ArgumentCaptor<UniqueIdSequence> captor = ArgumentCaptor.forClass(UniqueIdSequence.class);
+
+        sut.setNextId(TERMINAL_ENTITY_NAME, validId2);
+
+        verify(uniqueIdSequenceRepositoryMock).save(captor.capture());
+
+        assertThat(captor.getValue().getEntityName(), is(TERMINAL_ENTITY_NAME));
+        assertThat(captor.getValue().getNextId(), is(validId2));
+    }
+
+
+    @Test
+    public void checkValidity() {
+
+        sut.checkValidity(validId1);
+    }
+
+
+    @Test(expected = UniqueIdSequenceServiceException.class)
+    public void checkValidityWithTooShortId() {
+
+        sut.checkValidity(new BigInteger("130100000000001"));
+    }
+
+
+    @Test(expected = UniqueIdSequenceServiceException.class)
+    public void checkValidityWithIdHavingWrongPrefix() {
+
+        sut.checkValidity(new BigInteger("1111000000000001"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/startup/IrisStartupWatcherUnitTest.java b/src/test/java/net/contargo/iris/startup/IrisStartupWatcherUnitTest.java
new file mode 100644
index 00000000..51f5fbd1
--- /dev/null
+++ b/src/test/java/net/contargo/iris/startup/IrisStartupWatcherUnitTest.java
@@ -0,0 +1,47 @@
+package net.contargo.iris.startup;
+
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import org.springframework.context.event.ContextRefreshedEvent;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class IrisStartupWatcherUnitTest {
+
+    private IrisStartupWatcher sut;
+    @Mock
+    private StaticAddressService staticAddressServiceMock;
+
+    @Before
+    public void setUp() {
+
+        sut = new IrisStartupWatcher(staticAddressServiceMock);
+    }
+
+
+    @Test
+    public void testOnApplicationEvent() {
+
+        ContextRefreshedEvent eventMock = mock(ContextRefreshedEvent.class);
+        sut.onApplicationEvent(eventMock);
+        verify(staticAddressServiceMock, times(1)).fillMissingHashKeys();
+        sut.onApplicationEvent(eventMock);
+        verify(staticAddressServiceMock, times(1)).fillMissingHashKeys();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/RegionUnitTest.java b/src/test/java/net/contargo/iris/terminal/RegionUnitTest.java
new file mode 100644
index 00000000..04c88da5
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/RegionUnitTest.java
@@ -0,0 +1,43 @@
+package net.contargo.iris.terminal;
+
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.core.Is.is;
+
+
+/**
+ * Unit test of {@link net.contargo.iris.terminal.Region}.
+ *
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+public class RegionUnitTest {
+
+    @Test
+    public void getMessageKeyNotSet() {
+
+        assertThat(Region.NOT_SET.getMessageKey(), is("region.no"));
+    }
+
+
+    @Test
+    public void getMessageKeyNiederrhein() {
+
+        assertThat(Region.NIEDERRHEIN.getMessageKey(), is("region.niederrhein"));
+    }
+
+
+    @Test
+    public void getMessageKeyOberrhein() {
+
+        assertThat(Region.OBERRHEIN.getMessageKey(), is("region.oberrhein"));
+    }
+
+
+    @Test
+    public void getMessageKeySchelde() {
+
+        assertThat(Region.SCHELDE.getMessageKey(), is("region.schelde"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/TerminalUnitTest.java b/src/test/java/net/contargo/iris/terminal/TerminalUnitTest.java
new file mode 100644
index 00000000..37df4883
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/TerminalUnitTest.java
@@ -0,0 +1,33 @@
+package net.contargo.iris.terminal;
+
+import net.contargo.iris.GeoLocation;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * Unit test of {@link Terminal}.
+ *
+ * @author  Oliver Messner - messner@synyx.de
+ */
+public class TerminalUnitTest {
+
+    @Test
+    public void create() {
+
+        BigDecimal latitude = BigDecimal.ZERO;
+        BigDecimal longitude = BigDecimal.ONE;
+
+        GeoLocation geoLocation = new GeoLocation(latitude, longitude);
+        Terminal sut = new Terminal(geoLocation);
+
+        assertThat(sut.getLongitude().compareTo(longitude), is(0));
+        assertThat(sut.getLatitude().compareTo(latitude), is(0));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/api/TerminalApiControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/terminal/api/TerminalApiControllerMvcUnitTest.java
new file mode 100644
index 00000000..c3c8790f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/api/TerminalApiControllerMvcUnitTest.java
@@ -0,0 +1,248 @@
+package net.contargo.iris.terminal.api;
+
+import net.contargo.iris.connection.dto.SeaportTerminalConnectionDtoService;
+import net.contargo.iris.route.RouteType;
+import net.contargo.iris.seaport.dto.SeaportDto;
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+import net.contargo.iris.terminal.dto.TerminalDto;
+import net.contargo.iris.terminal.dto.TerminalDtoService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mockito;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.http.MediaType;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+
+import static org.mockito.Matchers.argThat;
+
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * Unit test for {@link TerminalApiController}.
+ *
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:public-api-context.xml" })
+@WebAppConfiguration
+public class TerminalApiControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    @Autowired
+    private TerminalDtoService terminalDtoService;
+    @Autowired
+    private SeaportDtoService seaportDtoService;
+    @Autowired
+    private SeaportTerminalConnectionDtoService seaportTerminalConnectionDtoService;
+
+    private MockMvc mockMvc;
+    private TerminalDto terminalDto1;
+    private TerminalDto terminalDto2;
+    private SeaportDto seaportDto1;
+
+    @Before
+    public void before() {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+
+        reset(terminalDtoService);
+        reset(seaportDtoService);
+        reset(seaportTerminalConnectionDtoService);
+
+        createTerminalDtos();
+        createSeaportDtos();
+    }
+
+
+    private void createTerminalDtos() {
+
+        terminalDto1 = new TerminalDto();
+        terminalDto1.setEnabled(true);
+        terminalDto1.setName("terminalDto1");
+        terminalDto1.setLatitude(BigDecimal.ONE);
+        terminalDto1.setLongitude(BigDecimal.TEN);
+
+        terminalDto2 = new TerminalDto();
+        terminalDto2.setEnabled(true);
+        terminalDto2.setName("terminalDto2");
+        terminalDto2.setLatitude(BigDecimal.ONE);
+        terminalDto2.setLongitude(BigDecimal.ZERO);
+    }
+
+
+    private void createSeaportDtos() {
+
+        seaportDto1 = new SeaportDto();
+        seaportDto1.setEnabled(true);
+        seaportDto1.setName("terminalDto1");
+        seaportDto1.setLatitude(BigDecimal.ONE);
+        seaportDto1.setLongitude(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void getTerminals() throws Exception {
+
+        when(terminalDtoService.getAllActive()).thenReturn(asList(terminalDto1, terminalDto2));
+
+        ResultActions resultActions = mockMvc.perform(get("/terminals").accept(MediaType.APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+
+        resultActions.andExpect(jsonPath("$response.terminals[0].latitude", is(terminalDto1.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].longitude",
+                is(terminalDto1.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].name", is(terminalDto1.getName())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].enabled", is(terminalDto1.isEnabled())));
+
+        resultActions.andExpect(jsonPath("$response.terminals[1].latitude", is(terminalDto2.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[1].longitude",
+                is(terminalDto2.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[1].name", is(terminalDto2.getName())));
+        resultActions.andExpect(jsonPath("$response.terminals[1].enabled", is(terminalDto2.isEnabled())));
+
+        resultActions.andExpect(jsonPath("$response.links", hasSize(1)));
+        resultActions.andExpect(jsonPath("$response.links[0].rel", is("self")));
+    }
+
+
+    @Test
+    public void getTerminalsForSeaportAndRouteType() throws Exception {
+
+        when(seaportDtoService.getByUid(new BigInteger("42"))).thenReturn(seaportDto1);
+        when(seaportTerminalConnectionDtoService.findTerminalsConnectedToSeaPortByRouteType(seaportDto1,
+                RouteType.RAIL)).thenReturn(asList(terminalDto2));
+
+        ResultActions resultActions = mockMvc.perform(get("/terminals").param("seaportUid", "42").param("routeType",
+                    "RAIL").accept(MediaType.APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+
+        resultActions.andExpect(jsonPath("$response.terminals", hasSize(1)));
+
+        resultActions.andExpect(jsonPath("$response.terminals[0].latitude", is(terminalDto2.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].longitude",
+                is(terminalDto2.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].name", is(terminalDto2.getName())));
+        resultActions.andExpect(jsonPath("$response.terminals[0].enabled", is(terminalDto2.isEnabled())));
+
+        resultActions.andExpect(jsonPath("$response.links", hasSize(1)));
+        resultActions.andExpect(jsonPath("$response.links[0].rel", is("self")));
+    }
+
+
+    @Test
+    public void getTerminalsForInvalidSeaport() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/terminals").param("seaportId", "42").param("routeType",
+                    "RAIL").accept(MediaType.APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(jsonPath("$response.terminals", empty()));
+    }
+
+
+    @Test
+    public void getTerminalById() throws Exception {
+
+        when(terminalDtoService.getByUid(new BigInteger("42"))).thenReturn(terminalDto2);
+
+        ResultActions resultActions = mockMvc.perform(get("/terminals/42").accept(MediaType.APPLICATION_JSON));
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(content().contentType("application/json"));
+
+        resultActions.andExpect(jsonPath("$response.terminal.latitude", is(terminalDto2.getLatitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminal.longitude", is(terminalDto2.getLongitude().intValue())));
+        resultActions.andExpect(jsonPath("$response.terminal.name", is(terminalDto2.getName())));
+        resultActions.andExpect(jsonPath("$response.terminal.enabled", is(terminalDto2.isEnabled())));
+
+        resultActions.andExpect(jsonPath("$response.links", hasSize(2)));
+        resultActions.andExpect(jsonPath("$response.links[0].rel", is("self")));
+        resultActions.andExpect(jsonPath("$response.links[0].href", endsWith("/terminals/42")));
+        resultActions.andExpect(jsonPath("$response.links[1].rel", is("terminals")));
+    }
+
+
+    @Test
+    public void getTerminalWithInvalidId() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/terminals/314").accept(MediaType.APPLICATION_JSON));
+        resultActions.andExpect(status().isNotFound());
+    }
+
+
+    @Test
+    public void syncTerminalCreate() throws Exception {
+
+        BigInteger uniqueId = new BigInteger("8491748714921");
+
+        when(terminalDtoService.existsByUniqueId(uniqueId)).thenReturn(false);
+
+        ResultActions resultActions = mockMvc.perform(put("/terminals/8491748714921").contentType(
+                    MediaType.APPLICATION_JSON).content(
+                    "{\"name\": \"foo\", \"enabled\": true, \"latitude\": 0, \"longitude\": 0}"));
+
+        resultActions.andExpect(status().isCreated());
+
+        verify(terminalDtoService).save(argThat(
+                org.hamcrest.Matchers.<TerminalDto>allOf(hasProperty("uniqueId", is(uniqueId.toString())),
+                    hasProperty("name", is("foo")), hasProperty("enabled", is(true)),
+                    hasProperty("latitude", is(BigDecimal.ZERO)), hasProperty("longitude", is(BigDecimal.ZERO)))));
+    }
+
+
+    @Test
+    public void syncTerminalUpdate() throws Exception {
+
+        BigInteger uniqueId = new BigInteger("8491748714921");
+
+        when(terminalDtoService.existsByUniqueId(uniqueId)).thenReturn(true);
+
+        ResultActions resultActions = mockMvc.perform(put("/terminals/8491748714921").contentType(
+                    MediaType.APPLICATION_JSON).content(
+                    "{\"name\": \"foo\", \"enabled\": true, \"latitude\": 0, \"longitude\": 0}"));
+
+        resultActions.andExpect(status().isNoContent());
+
+        verify(terminalDtoService).updateTerminal(Mockito.eq(uniqueId),
+            argThat(
+                org.hamcrest.Matchers.<TerminalDto>allOf(hasProperty("name", is("foo")),
+                    hasProperty("enabled", is(true)), hasProperty("latitude", is(BigDecimal.ZERO)),
+                    hasProperty("longitude", is(BigDecimal.ZERO)))));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImplUnitTest.java b/src/test/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImplUnitTest.java
new file mode 100644
index 00000000..5a1b096a
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/dto/TerminalDtoServiceImplUnitTest.java
@@ -0,0 +1,173 @@
+package net.contargo.iris.terminal.dto;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.Arrays;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TerminalDtoServiceImplUnitTest {
+
+    private TerminalDtoServiceImpl sut;
+    @Mock
+    private TerminalService terminalServiceMock;
+    private Terminal terminal1;
+    private Terminal terminal2;
+
+    @Before
+    public void setUp() throws Exception {
+
+        sut = new TerminalDtoServiceImpl(terminalServiceMock);
+
+        terminal1 = new Terminal();
+        terminal1.setLatitude(BigDecimal.ONE);
+        terminal1.setLongitude(BigDecimal.ONE);
+        terminal1.setName("name1");
+        terminal1.setEnabled(true);
+
+        terminal2 = new Terminal();
+        terminal2.setLatitude(BigDecimal.TEN);
+        terminal2.setLongitude(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void testGetAll() {
+
+        when(terminalServiceMock.getAll()).thenReturn(Arrays.asList(terminal1, terminal2));
+
+        assertThat(sut.getAll().size(), is(2));
+        assertThat(sut.getAll().get(0).getName(), is("name1"));
+        assertThat(sut.getAll().get(0).isEnabled(), is(true));
+    }
+
+
+    @Test
+    public void testGetAllActive() {
+
+        Terminal terminal2 = new Terminal();
+        terminal2.setLatitude(BigDecimal.TEN);
+        terminal2.setLongitude(BigDecimal.TEN);
+
+        when(terminalServiceMock.getAllActive()).thenReturn(Arrays.asList(terminal1, terminal2));
+
+        assertThat(sut.getAllActive().size(), is(2));
+        assertThat(sut.getAllActive().get(0).getName(), is("name1"));
+        assertThat(sut.getAllActive().get(0).isEnabled(), is(true));
+    }
+
+
+    @Test
+    public void testSave() {
+
+        when(terminalServiceMock.save(any(Terminal.class))).thenReturn(terminal1);
+
+        TerminalDto saveTerminalDto = new TerminalDto(terminal1);
+        TerminalDto returnTerminalDto = sut.save(saveTerminalDto);
+        assertReflectionEquals(returnTerminalDto, saveTerminalDto);
+        verify(terminalServiceMock, times(1)).save(any(Terminal.class));
+    }
+
+
+    @Test
+    public void testGetById() {
+
+        when(terminalServiceMock.getByUniqueId(BigInteger.ONE)).thenReturn(terminal1);
+
+        TerminalDto returnTerminalDto = sut.getByUid(BigInteger.ONE);
+
+        assertReflectionEquals(returnTerminalDto, new TerminalDto(terminal1));
+    }
+
+
+    @Test
+    public void testGetByIdNull() {
+
+        TerminalDto returnTerminalDto = sut.getByUid(BigInteger.ONE);
+
+        assertThat(returnTerminalDto, nullValue());
+    }
+
+
+    @Test
+    public void existsByUniqueIdTrue() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(terminalServiceMock.existsByUniqueId(uniqueId)).thenReturn(true);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(true));
+    }
+
+
+    @Test
+    public void existsByUniqueIdFalse() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(terminalServiceMock.existsByUniqueId(uniqueId)).thenReturn(false);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(false));
+    }
+
+
+    @Test
+    public void updateTerminal() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        TerminalDto dto = new TerminalDto();
+        dto.setUniqueId(uniqueId.toString());
+        dto.setEnabled(true);
+        dto.setName("foobar");
+        dto.setLongitude(BigDecimal.ZERO);
+        dto.setLatitude(BigDecimal.ZERO);
+
+        Terminal terminal = dto.toEntity();
+
+        Terminal savedTerminal = new Terminal(new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO));
+        savedTerminal.setId(42L);
+
+        when(terminalServiceMock.updateTerminal(uniqueId, terminal)).thenReturn(savedTerminal);
+
+        TerminalDto updatedDto = sut.updateTerminal(uniqueId, dto);
+
+        assertThat(updatedDto.toEntity(), is(savedTerminal));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/persistence/TerminalRepositoryIntegrationTest.java b/src/test/java/net/contargo/iris/terminal/persistence/TerminalRepositoryIntegrationTest.java
new file mode 100644
index 00000000..298bfb94
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/persistence/TerminalRepositoryIntegrationTest.java
@@ -0,0 +1,71 @@
+package net.contargo.iris.terminal.persistence;
+
+import net.contargo.iris.terminal.Terminal;
+
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class TerminalRepositoryIntegrationTest {
+
+    @Autowired
+    TerminalRepository sut;
+
+    @PersistenceContext
+    EntityManager em;
+
+    @Test
+    public void testFindByEnabled() {
+
+        Terminal terminal1 = createTerminal();
+        terminal1.setUniqueId(BigInteger.ONE);
+
+        Terminal terminal2 = createTerminal();
+        terminal2.setUniqueId(BigInteger.TEN);
+        em.persist(terminal1);
+        em.persist(terminal2);
+        em.flush();
+
+        assertThat(sut.findByEnabled(true).contains(terminal1), is(true));
+        assertThat(sut.findByEnabled(true).contains(terminal2), is(true));
+    }
+
+
+    private Terminal createTerminal() {
+
+        Terminal terminal1 = new Terminal();
+        terminal1.setName("Carlo Pedersoli" + Math.random());
+        terminal1.setEnabled(true);
+        terminal1.setLatitude(new BigDecimal(Math.random()));
+        terminal1.setLongitude(new BigDecimal(Math.random()));
+        terminal1.setUniqueId(BigInteger.ONE);
+
+        return terminal1;
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplIntegrationTest.java b/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplIntegrationTest.java
new file mode 100644
index 00000000..69a165cc
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplIntegrationTest.java
@@ -0,0 +1,82 @@
+package net.contargo.iris.terminal.service;
+
+import net.contargo.iris.sequence.UniqueIdSequence;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.persistence.TerminalRepository;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import static org.hamcrest.CoreMatchers.is;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+
+/**
+ * @author  Arnold Franke - franke@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = "classpath*:application-context.xml")
+@TransactionConfiguration(defaultRollback = true)
+@Transactional
+public class TerminalServiceImplIntegrationTest {
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private TerminalRepository terminalRepository;
+    @Autowired
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceService;
+
+    private TerminalServiceImpl sut;
+
+    private Terminal terminal;
+
+    @Before
+    public void setUp() {
+
+        sut = new TerminalServiceImpl(terminalRepository, uniqueIdSequenceService);
+        terminal = new Terminal();
+        terminal.setName("TerminalName");
+        terminal.setLatitude(BigDecimal.ONE);
+        terminal.setLongitude(BigDecimal.ONE);
+    }
+
+
+    @Test
+    public void testSaveWithoutUniqueId() {
+
+        UniqueIdSequence nextSequenceObject = getNextSequenceObjectFromDb();
+
+        BigInteger nextSequence = nextSequenceObject.getNextId();
+        Terminal savedTerminal = sut.save(terminal);
+        assertThat(savedTerminal.getUniqueId(), is(nextSequence));
+
+        assertThat(getNextSequenceObjectFromDb().getNextId(), is(nextSequence.add(BigInteger.ONE)));
+    }
+
+
+    private UniqueIdSequence getNextSequenceObjectFromDb() {
+
+        String queryString = "SELECT o FROM UniqueIdSequence o WHERE o.entityName = 'Terminal'";
+
+        return em.createQuery(queryString, UniqueIdSequence.class).getSingleResult();
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplUnitTest.java b/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplUnitTest.java
new file mode 100644
index 00000000..27c71dc7
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/service/TerminalServiceImplUnitTest.java
@@ -0,0 +1,322 @@
+package net.contargo.iris.terminal.service;
+
+import net.contargo.iris.GeoLocation;
+import net.contargo.iris.sequence.service.UniqueIdSequenceServiceImpl;
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.persistence.TerminalRepository;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.comparesEqualTo;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import static org.junit.Assert.fail;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import static java.util.Arrays.asList;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TerminalServiceImplUnitTest {
+
+    private static final String TERMINAL_NAME = "foobar";
+
+    private TerminalServiceImpl sut;
+
+    @Mock
+    private TerminalRepository terminalRepositoryMock;
+    @Mock
+    private UniqueIdSequenceServiceImpl uniqueIdSequenceServiceMock;
+
+    private List<Terminal> terminals;
+
+    @Before
+    public void setUp() {
+
+        sut = new TerminalServiceImpl(terminalRepositoryMock, uniqueIdSequenceServiceMock);
+
+        Terminal terminal1 = new Terminal();
+        Terminal terminal2 = new Terminal();
+
+        terminals = asList(terminal1, terminal2);
+
+        when(terminalRepositoryMock.findAll()).thenReturn(terminals);
+        when(terminalRepositoryMock.findByEnabled(true)).thenReturn(terminals);
+    }
+
+
+    @Test
+    public void getAll() {
+
+        List<Terminal> terminals = sut.getAll();
+
+        assertThat("There should be two terminals", terminals, hasSize(2));
+    }
+
+
+    @Test
+    public void getAllActive() {
+
+        List<Terminal> terminals = sut.getAllActive();
+
+        assertThat("There should be two active terminals", terminals, hasSize(2));
+    }
+
+
+    @Test
+    public void testGetById() {
+
+        Terminal terminal = new Terminal();
+        terminal.setId(1L);
+
+        Mockito.when(terminalRepositoryMock.findOne(terminal.getId())).thenReturn(terminal);
+
+        Terminal result = sut.getById(terminal.getId());
+
+        verify(terminalRepositoryMock).findOne(terminal.getId());
+        assertThat(terminal, is(result));
+    }
+
+
+    @Test
+    public void testSave() {
+
+        Terminal terminalToSave = new Terminal();
+        terminalToSave.setLatitude(BigDecimal.ONE);
+        terminalToSave.setLongitude(BigDecimal.ONE);
+        terminalToSave.setUniqueId(BigInteger.ONE);
+
+        Terminal savedTerminal = new Terminal();
+        savedTerminal.setId(1L);
+        savedTerminal.setLatitude(BigDecimal.ONE);
+        savedTerminal.setLongitude(BigDecimal.ONE);
+        savedTerminal.setUniqueId(BigInteger.ONE);
+        when(terminalRepositoryMock.save(terminalToSave)).thenReturn(savedTerminal);
+
+        Terminal actualSavedTerminal = sut.save(terminalToSave);
+
+        assertThat(terminalToSave, is(actualSavedTerminal));
+        assertThat(actualSavedTerminal.getId(), is(1L));
+    }
+
+
+    @Test
+    public void testSaveWithoutUniqueId() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Terminal")).thenReturn(BigInteger.ONE);
+        when(terminalRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(null);
+
+        Terminal terminalToSave = new Terminal();
+        terminalToSave.setLatitude(BigDecimal.ONE);
+        terminalToSave.setLongitude(BigDecimal.ONE);
+
+        sut.save(terminalToSave);
+
+        ArgumentCaptor<Terminal> captor = ArgumentCaptor.forClass(Terminal.class);
+        verify(terminalRepositoryMock).save(captor.capture());
+        assertThat(captor.getValue().getUniqueId(), notNullValue());
+        assertThat(terminalToSave.getUniqueId(), is(BigInteger.ONE));
+    }
+
+
+    @Test
+    public void determineUniqueId() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Terminal")).thenReturn(BigInteger.ONE);
+        when(terminalRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(null);
+
+        sut.determineUniqueId();
+
+        verify(uniqueIdSequenceServiceMock).getNextId("Terminal");
+    }
+
+
+    @Test
+    public void determineUniqueIdWithSecondRetry() {
+
+        when(uniqueIdSequenceServiceMock.getNextId("Terminal")).thenReturn(BigInteger.ONE);
+        when(terminalRepositoryMock.findByUniqueId(BigInteger.ONE)).thenReturn(new Terminal());
+
+        sut.determineUniqueId();
+
+        InOrder order = inOrder(uniqueIdSequenceServiceMock);
+        order.verify(uniqueIdSequenceServiceMock).getNextId("Terminal");
+        order.verify(uniqueIdSequenceServiceMock).setNextId("Terminal", new BigInteger("2"));
+    }
+
+
+    @Test
+    public void getByUniqueId() {
+
+        BigInteger uniqueId = BigInteger.TEN;
+
+        when(terminalRepositoryMock.findByUniqueId(uniqueId)).thenReturn(terminals.get(0));
+
+        Terminal terminal = sut.getByUniqueId(uniqueId);
+
+        assertThat(terminal, is(terminals.get(0)));
+    }
+
+
+    @Test
+    public void existsByUniqueIdTrue() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(terminalRepositoryMock.findByUniqueId(uniqueId)).thenReturn(terminals.get(0));
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(true));
+    }
+
+
+    @Test
+    public void existsByUniqueIdFalse() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        when(terminalRepositoryMock.findByUniqueId(uniqueId)).thenReturn(null);
+
+        boolean exists = sut.existsByUniqueId(uniqueId);
+
+        assertThat(exists, is(false));
+    }
+
+
+    @Test
+    public void updateTerminal() {
+
+        BigInteger uniqueId = BigInteger.ONE;
+
+        Terminal terminal = new Terminal();
+        terminal.setUniqueId(uniqueId);
+        terminal.setEnabled(true);
+        terminal.setName("foobar");
+        terminal.setLongitude(BigDecimal.ZERO);
+        terminal.setLatitude(BigDecimal.ZERO);
+
+        Terminal savedTerminal = new Terminal(new GeoLocation(BigDecimal.ZERO, BigDecimal.ZERO));
+        savedTerminal.setId(42L);
+
+        when(terminalRepositoryMock.findByUniqueId(uniqueId)).thenReturn(savedTerminal);
+        when(terminalRepositoryMock.save(savedTerminal)).thenReturn(savedTerminal);
+
+        Terminal updatedTerminal = sut.updateTerminal(uniqueId, terminal);
+
+        assertThat(updatedTerminal.getName(), is(terminal.getName()));
+        assertThat(updatedTerminal.getId(), is(42L));
+        assertThat(updatedTerminal.isEnabled(), is(terminal.isEnabled()));
+        assertThat(updatedTerminal.getLongitude(), comparesEqualTo(terminal.getLongitude()));
+        assertThat(updatedTerminal.getLatitude(), comparesEqualTo(terminal.getLatitude()));
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsCreateWithNonUniqueCoordinates() {
+
+        Terminal terminal = new Terminal(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        terminal.setId(null);
+        terminal.setName(TERMINAL_NAME);
+
+        when(terminalRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class)))
+            .thenReturn(terminals.get(0));
+        when(terminalRepositoryMock.findByName(TERMINAL_NAME)).thenReturn(null);
+
+        try {
+            sut.checkUniqueConstraints(terminal);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueTerminalException e) {
+            assertThat(e.getBadFields(), contains("latitude", "longitude"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsCreateWithNonUniqueName() {
+
+        Terminal terminal = new Terminal(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        terminal.setId(null);
+        terminal.setName(TERMINAL_NAME);
+
+        when(terminalRepositoryMock.findByLatitudeAndLongitude(any(BigDecimal.class), any(BigDecimal.class)))
+            .thenReturn(null);
+        when(terminalRepositoryMock.findByName(TERMINAL_NAME)).thenReturn(terminals.get(0));
+
+        try {
+            sut.checkUniqueConstraints(terminal);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueTerminalException e) {
+            assertThat(e.getBadFields(), contains("name"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsUpdateWithNonUniqueCoordinates() {
+
+        Terminal terminal = new Terminal(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        terminal.setId(42L);
+        terminal.setName(TERMINAL_NAME);
+
+        when(terminalRepositoryMock.findByLatitudeAndLongitudeAndIdNot(any(BigDecimal.class), any(BigDecimal.class),
+                anyLong())).thenReturn(terminals.get(0));
+        when(terminalRepositoryMock.findByNameAndIdNot(TERMINAL_NAME, 42L)).thenReturn(null);
+
+        try {
+            sut.checkUniqueConstraints(terminal);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueTerminalException e) {
+            assertThat(e.getBadFields(), contains("latitude", "longitude"));
+        }
+    }
+
+
+    @Test
+    public void checkUniqueConstraintsUpdateWithNonUniqueName() {
+
+        Terminal terminal = new Terminal(new GeoLocation(BigDecimal.ONE, BigDecimal.TEN));
+        terminal.setId(42L);
+        terminal.setName(TERMINAL_NAME);
+
+        when(terminalRepositoryMock.findByLatitudeAndLongitudeAndIdNot(any(BigDecimal.class), any(BigDecimal.class),
+                anyLong())).thenReturn(null);
+        when(terminalRepositoryMock.findByNameAndIdNot(TERMINAL_NAME, 42L)).thenReturn(terminals.get(0));
+
+        try {
+            sut.checkUniqueConstraints(terminal);
+            fail("Expected exception did not occur.");
+        } catch (NonUniqueTerminalException e) {
+            assertThat(e.getBadFields(), contains("name"));
+        }
+    }
+}
diff --git a/src/test/java/net/contargo/iris/terminal/web/TerminalControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/terminal/web/TerminalControllerMvcUnitTest.java
new file mode 100644
index 00000000..becef3d7
--- /dev/null
+++ b/src/test/java/net/contargo/iris/terminal/web/TerminalControllerMvcUnitTest.java
@@ -0,0 +1,194 @@
+package net.contargo.iris.terminal.web;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.contargo.iris.terminal.Terminal;
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.math.BigDecimal;
+
+import java.util.Arrays;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.when;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import static org.unitils.reflectionassert.ReflectionAssert.assertReflectionEquals;
+
+
+/**
+ * MVC Unit test of {@link net.contargo.iris.terminal.web.TerminalController}.
+ *
+ * @author  Arnold Franke - franke@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath:web-api-context.xml" })
+@WebAppConfiguration
+public class TerminalControllerMvcUnitTest {
+
+    private static final int TERMINAL_ID = 2;
+    public static final long TERMINAL_ID_777 = 777L;
+    public static final String TERMINAL_NAME_1 = "Entenhausen";
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+
+    @Autowired
+    private TerminalService terminalServiceMock;
+
+    private Terminal terminal1;
+    private Terminal terminal2;
+
+    @Before
+    public void setUp() throws Exception {
+
+        terminal1 = createTerminal();
+        terminal2 = createTerminal();
+        terminal2.setName("Gotham City");
+        terminal2.setId(3L);
+        terminal2.setLatitude(BigDecimal.TEN);
+        terminal2.setLongitude(BigDecimal.TEN);
+    }
+
+
+    @Test
+    public void testGetAllTerminals() throws Exception {
+
+        when(terminalServiceMock.getAll()).thenReturn(Arrays.asList(terminal1, terminal2));
+
+        ResultActions resultActions = perform(get("/terminals/").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("terminals", Arrays.asList(terminal1, terminal2)));
+        resultActions.andExpect(view().name("terminalManagement/terminals"));
+    }
+
+
+    @Test
+    public void testCreateTerminal() throws Exception {
+
+        ResultActions resultActions = perform(get("/terminals/new").accept(APPLICATION_JSON));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(view().name("terminalManagement/terminal"));
+    }
+
+
+    @Test
+    public void testSaveTerminal() throws Exception {
+
+        String requestBody = new ObjectMapper().writeValueAsString(terminal1);
+        when(terminalServiceMock.save(any(Terminal.class))).thenReturn(terminal1);
+
+        MockHttpServletRequestBuilder builder = post("/terminals/?name=Entenhausen&latitude=1&longitude=1");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content(requestBody);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isFound());
+        resultActions.andExpect(view().name("redirect:/web/terminals/" + terminal1.getId()));
+    }
+
+
+    @Test
+    public void testSaveIncompleteTerminal() throws Exception {
+
+        Terminal incompleteTerminal = new Terminal();
+        incompleteTerminal.setName(TERMINAL_NAME_1);
+        incompleteTerminal.setLatitude(BigDecimal.ONE);
+
+        String requestBody = new ObjectMapper().writeValueAsString(terminal1);
+        when(terminalServiceMock.save(terminal1)).thenReturn(terminal1);
+
+        MockHttpServletRequestBuilder builder = post("/terminals/?name=Entenhausen&latitude=1");
+        builder.accept(APPLICATION_JSON);
+        builder.contentType(APPLICATION_JSON);
+        builder.content(requestBody);
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isOk());
+
+        ModelAndView modelAndView = resultActions.andReturn().getModelAndView();
+        assertReflectionEquals(modelAndView.getModelMap().get("terminal"), incompleteTerminal);
+        resultActions.andExpect(view().name("terminalManagement/terminal"));
+    }
+
+
+    @Test
+    public void testEditTerminal() throws Exception {
+
+        when(terminalServiceMock.getById(2L)).thenReturn(terminal1);
+
+        ResultActions resultActions = perform(get("/terminals/" + TERMINAL_ID));
+
+        resultActions.andExpect(status().isOk());
+        resultActions.andExpect(model().attribute("terminal", terminal1));
+        resultActions.andExpect(view().name("terminalManagement/terminal"));
+    }
+
+
+    @Test
+    public void testUpdateTerminal() throws Exception {
+
+        Terminal terminal777 = new Terminal();
+        terminal777.setId(TERMINAL_ID_777);
+        terminal777.setName(TERMINAL_NAME_1);
+        terminal777.setLatitude(BigDecimal.ONE);
+        terminal777.setLongitude(BigDecimal.ONE);
+        when(terminalServiceMock.getById(TERMINAL_ID_777)).thenReturn(terminal777);
+        when(terminalServiceMock.save(any(Terminal.class))).thenReturn(terminal777);
+
+        MockHttpServletRequestBuilder builder = put("/terminals/" + TERMINAL_ID_777
+                + "?name=Entenhausen&latitude=1&longitude=1");
+
+        ResultActions resultActions = perform(builder);
+        resultActions.andExpect(status().isFound());
+        resultActions.andExpect(view().name("redirect:/web/terminals/" + TERMINAL_ID_777));
+    }
+
+
+    private Terminal createTerminal() {
+
+        Terminal terminal = new Terminal();
+        terminal.setId(2L);
+        terminal.setLatitude(BigDecimal.ONE);
+        terminal.setLongitude(BigDecimal.ONE);
+        terminal.setName(TERMINAL_NAME_1);
+
+        return terminal;
+    }
+
+
+    private ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+
+        return webAppContextSetup(webApplicationContext).build().perform(builder);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/util/HttpUtilUnitTest.java b/src/test/java/net/contargo/iris/util/HttpUtilUnitTest.java
new file mode 100644
index 00000000..c480b076
--- /dev/null
+++ b/src/test/java/net/contargo/iris/util/HttpUtilUnitTest.java
@@ -0,0 +1,124 @@
+
+package net.contargo.iris.util;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import static org.hamcrest.Matchers.is;
+
+import static org.junit.Assert.fail;
+
+import static org.mockito.Matchers.any;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
+
+import static org.unitils.thirdparty.org.apache.commons.io.IOUtils.toInputStream;
+
+import static java.io.File.createTempFile;
+
+
+/**
+ * Unit test for {@link HttpUtil}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class HttpUtilUnitTest {
+
+    private static final int STATUS_CODE_5 = 5;
+
+    private HttpUtil sut;
+
+    @Mock
+    private HttpClient httpClientMock;
+    @Mock
+    private HttpResponse httpResponseMock;
+    @Mock
+    private HttpEntity entityMock;
+    @Mock
+    private StatusLine statusLineMock;
+
+    @Before
+    public void setup() throws IOException {
+
+        sut = new HttpUtil(httpClientMock);
+
+        when(httpClientMock.execute(any(HttpGet.class))).thenReturn(httpResponseMock);
+        when(httpResponseMock.getEntity()).thenReturn(entityMock);
+
+        when(httpResponseMock.getStatusLine()).thenReturn(statusLineMock);
+        when(statusLineMock.getStatusCode()).thenReturn(STATUS_CODE_5);
+    }
+
+
+    @Test(expected = RuntimeException.class)
+    public void httpGetCantBeExecuted() {
+
+        sut = new HttpUtil(HttpClientBuilder.create().build());
+        sut.getResponseContent("foo");
+    }
+
+
+    @Test
+    public void closeInputStream() throws IOException {
+
+        InputStream stream = new FileInputStream(createTempFile("tmp", "txt"));
+        when(entityMock.getContent()).thenReturn(stream);
+
+        sut.getResponseContent("bar");
+
+        try {
+            // there is no isClosed flag on InputStream so you have to check if it's closed this way
+            stream.read();
+            fail("Expected Stream closed exception");
+        } catch (IOException ex) {
+            assertThat("Stream Closed", is(ex.getMessage()));
+        }
+    }
+
+
+    @Test
+    public void closeInputStreamWithExceptionWhichGetsCaught() throws IOException {
+
+        when(entityMock.getContent()).thenReturn(toInputStream("inputstream stub"));
+
+        sut.getResponseContent("bar");
+    }
+
+
+    @Test(expected = HttpUtilException.class)
+    public void executeWithIOExceptionWhichGetsCaught() throws IOException {
+
+        doThrow(new IOException()).when(httpClientMock).execute(any(HttpGet.class));
+        sut.getResponseContent("bar");
+    }
+
+
+    @Test
+    public void closeEntityNullDoesntLeadToNullpointer() {
+
+        when(httpResponseMock.getEntity()).thenReturn(null);
+        sut.getResponseContent("bar");
+    }
+}
diff --git a/src/test/java/net/contargo/iris/util/InputStreamUtilUnitTest.java b/src/test/java/net/contargo/iris/util/InputStreamUtilUnitTest.java
new file mode 100644
index 00000000..6a39ed3f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/util/InputStreamUtilUnitTest.java
@@ -0,0 +1,93 @@
+
+package net.contargo.iris.util;
+
+import org.hamcrest.Matchers;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+
+import static org.junit.Assert.assertThat;
+
+
+/**
+ * Unit test for {@link InputStreamUtil}.
+ *
+ * @author  Aljona Murygina - murygina@synyx.de
+ */
+public class InputStreamUtilUnitTest {
+
+    private static final String SAMPLE_XML_FILE = "/openrouteservice/ors_geocoding_sample.xml";
+    private InputStream in;
+
+    @Before
+    public void setup() {
+
+        in = InputStreamUtil.getFileInputStream(SAMPLE_XML_FILE);
+    }
+
+
+    @After
+    public void shutdown() throws IOException {
+
+        in.close();
+    }
+
+
+    @Test
+    public void testGetFileInputStream() {
+
+        assertThat(in, notNullValue());
+    }
+
+
+    @Test(expected = RuntimeException.class)
+    public void testGetFileInputStreamInvalidFileName() throws IOException {
+
+        InputStream stream = InputStreamUtil.getFileInputStream("foo");
+
+        assertThat(stream, Matchers.nullValue());
+
+        stream.close();
+    }
+
+
+    @Test
+    public void testConvertInputStreamToString() throws IOException {
+
+        String result = InputStreamUtil.convertInputStreamToString(in);
+
+        assertThat(result, notNullValue());
+        assertThat(result, containsString("7.2931383 51.1526207"));
+    }
+
+
+    @Test
+    public void testGetDocument() {
+
+        Document doc = InputStreamUtil.getDocument(in);
+
+        assertThat(doc, notNullValue());
+
+        NodeList nodes = doc.getElementsByTagName("xls:GeocodeResponseList");
+        assertThat(nodes.getLength(), equalTo(1));
+
+        Node node = nodes.item(0);
+
+        String numberOfAddresses = node.getAttributes().item(0).getNodeValue();
+
+        assertThat(numberOfAddresses, notNullValue());
+        assertThat(numberOfAddresses, equalTo("4"));
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/RootControllerMvcUnitTest.java b/src/test/java/net/contargo/iris/web/RootControllerMvcUnitTest.java
new file mode 100644
index 00000000..fb968baf
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/RootControllerMvcUnitTest.java
@@ -0,0 +1,59 @@
+package net.contargo.iris.web;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration(locations = { "classpath:web-api-context.xml" })
+public class RootControllerMvcUnitTest {
+
+    @Autowired
+    private WebApplicationContext webApplicationContext;
+    private MockMvc mockMvc;
+
+    @Before
+    public void setUp() {
+
+        mockMvc = webAppContextSetup(webApplicationContext).build();
+    }
+
+
+    @Test
+    public void index() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/"));
+        resultActions.andExpect(view().name("index"));
+        resultActions.andExpect(status().isOk());
+    }
+
+
+    @Test
+    public void triangle() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(get("/triangle/"));
+        resultActions.andExpect(view().name("routing/triangle"));
+        resultActions.andExpect(status().isOk());
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/MainRunConnectionServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/MainRunConnectionServiceConfig.java
new file mode 100644
index 00000000..21e9c5c0
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/MainRunConnectionServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.connection.service.MainRunConnectionService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Sandra Thieme - thieme@synyx.de
+ */
+@Configuration
+public class MainRunConnectionServiceConfig {
+
+    @Bean
+    public MainRunConnectionService mainrunConnectionService() {
+
+        return mock(MainRunConnectionService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/SeaportDtoServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/SeaportDtoServiceConfig.java
new file mode 100644
index 00000000..343a8058
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/SeaportDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.seaport.dto.SeaportDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class SeaportDtoServiceConfig {
+
+    @Bean
+    public SeaportDtoService seaportDtoService() {
+
+        return mock(SeaportDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/SeaportServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/SeaportServiceConfig.java
new file mode 100644
index 00000000..a2fbb9a6
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/SeaportServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.seaport.service.SeaportService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class SeaportServiceConfig {
+
+    @Bean
+    public SeaportService seaportService() {
+
+        return mock(SeaportService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/StaticAddressDtoServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/StaticAddressDtoServiceConfig.java
new file mode 100644
index 00000000..8b2c6d8f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/StaticAddressDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.address.staticsearch.dto.StaticAddressDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class StaticAddressDtoServiceConfig {
+
+    @Bean
+    public StaticAddressDtoService staticAddressDtoService() {
+
+        return mock(StaticAddressDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/StaticAddressServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/StaticAddressServiceConfig.java
new file mode 100644
index 00000000..e265de42
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/StaticAddressServiceConfig.java
@@ -0,0 +1,23 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.address.staticsearch.service.StaticAddressService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  David Schilling - schilling@synyx.de
+ * @author  Tobias Schneider - schneider@synyx.de
+ */
+@Configuration
+public class StaticAddressServiceConfig {
+
+    @Bean
+    public StaticAddressService staticAddressService() {
+
+        return mock(StaticAddressService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/TerminalDtoServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/TerminalDtoServiceConfig.java
new file mode 100644
index 00000000..c751d757
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/TerminalDtoServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.terminal.dto.TerminalDtoService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class TerminalDtoServiceConfig {
+
+    @Bean
+    public TerminalDtoService terminalDtoService() {
+
+        return mock(TerminalDtoService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/TerminalServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/TerminalServiceConfig.java
new file mode 100644
index 00000000..a410638f
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/TerminalServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.terminal.service.TerminalService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  Oliver Messner - messner@synyx.de
+ */
+@Configuration
+public class TerminalServiceConfig {
+
+    @Bean
+    public TerminalService terminalService() {
+
+        return mock(TerminalService.class);
+    }
+}
diff --git a/src/test/java/net/contargo/iris/web/mock/UserAuthenticationServiceConfig.java b/src/test/java/net/contargo/iris/web/mock/UserAuthenticationServiceConfig.java
new file mode 100644
index 00000000..f13a79e1
--- /dev/null
+++ b/src/test/java/net/contargo/iris/web/mock/UserAuthenticationServiceConfig.java
@@ -0,0 +1,22 @@
+package net.contargo.iris.web.mock;
+
+import net.contargo.iris.security.UserAuthenticationService;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.mockito.Mockito.mock;
+
+
+/**
+ * @author  David Schilling - schilling@synyx.de
+ */
+@Configuration
+public class UserAuthenticationServiceConfig {
+
+    @Bean
+    public UserAuthenticationService userAuthenticationService() {
+
+        return mock(UserAuthenticationService.class);
+    }
+}
diff --git a/src/test/javascript/HelperTest.js b/src/test/javascript/HelperTest.js
new file mode 100644
index 00000000..2e13b93b
--- /dev/null
+++ b/src/test/javascript/HelperTest.js
@@ -0,0 +1,86 @@
+describe("Helper test suite", function () {
+
+    describe("formatKM", function () {
+
+        it("exists", function () {
+
+            expect(Helper.formatKM).toBeDefined();
+        });
+
+        it("returns undefined if the argument is undefined", function () {
+            var result = Helper.formatKM(undefined);
+            expect(result).toBeUndefined();
+        });
+
+        it("returns 0 min if the argument is 0", function () {
+            var result = Helper.formatKM(0);
+            expect(result).toEqual("0 km");
+        });
+
+        it("formats natural numbers correctly", function () {
+            var result = Helper.formatKM(42);
+            expect(result).toEqual("42 km");
+        });
+
+        it("formats non-natural numbers correctly", function () {
+            var result = Helper.formatKM(59.0232);
+            expect(result).toEqual("59 km");
+        });
+
+    });
+
+    describe("formatting duration in detail", function () {
+
+        it("returns '-' if duration is not defined", function () {
+
+            expect(Helper.formatDurationInDetail()).toEqual("-");
+
+        });
+
+        it("returns formatted duration for 800 min", function () {
+
+            expect(Helper.formatDurationInDetail(800)).toEqual("13.20hrs");
+
+        });
+
+        it("returns formatted duration for 8000 min", function () {
+
+            expect(Helper.formatDurationInDetail(8000)).toEqual("05ds 13.20hrs");
+
+        });
+
+        it("returns formatted duration for 70 min", function () {
+
+            expect(Helper.formatDurationInDetail(70)).toEqual("01.10hrs");
+
+        });
+
+        it("returns formatted duration for 5 min", function () {
+
+            expect(Helper.formatDurationInDetail(5)).toEqual("00.05hrs");
+
+        });
+
+    });
+
+    describe("closePopups", function () {
+
+        var popover;
+
+        beforeEach(function () {
+            $div = $('div').addClass("blub").append($('<span class="info"></span>'));
+            $div.append($('<div class="popover"></div>'));
+            popover = new Backbone.View({
+                el: ".blub"
+            });
+
+        });
+
+        it("for all popups", function () {
+            Helper.closeAllPopover();
+            expect($('.popover').length).toEqual(0);
+        });
+                
+    });
+
+});
\ No newline at end of file
diff --git a/src/test/javascript/SelectableAwareCollectionTest.js b/src/test/javascript/SelectableAwareCollectionTest.js
new file mode 100644
index 00000000..ca128bf4
--- /dev/null
+++ b/src/test/javascript/SelectableAwareCollectionTest.js
@@ -0,0 +1,97 @@
+describe("SelectableAwareCollection", function () {
+    
+    describe("instantiation", function () {
+
+        it("can be instantiated", function () {
+            
+            expect(new SelectableAwareCollection()).toBeDefined();
+        });
+        
+        it("can be instantiated with params", function () {
+            expect(new SelectableAwareCollection([
+                {name: "Waterway", value: "WATERWAY", defaultValue: true},
+                {name: "Rail", value: "RAILWAY"},
+                {name: "All", value: "ALL"}
+            ])).toBeDefined();
+        });
+        
+    });
+    
+    describe("selectable aware functionality", function () {
+        
+        beforeEach(function() {
+            
+            this.collection = new SelectableAwareCollection([
+                {name: "Waterway", value: "WATERWAY", defaultValue: true},
+                {name: "Rail", value: "RAILWAY"},
+                {name: "All", value: "ALL"}
+            ]);
+
+	});
+
+        it("deselect all other elements if an element is selected", function () {
+            
+            var element1 = this.collection.at(1).set("selected", true);
+            
+            expect(element1.get("selected")).toBe(true);
+            
+            for(var i = 0; i < this.collection.length; i++) {
+                if(this.collection.at(i) != element1) {
+                    expect(this.collection.at(i).get("selected")).toBe(false);
+                }
+            }
+            
+            // now change the selected element
+            this.collection.at(2).set("selected", true);
+            
+            // show that formerly selected element is not selected anymore
+            expect(element1.get("selected")).toBe(false);
+            
+        });
+        
+        it("triggers selectedchanged if an element is selected", function () {
+            
+            var spy = jasmine.createSpy("changelistener");
+
+            this.collection.bind("selectedchanged", spy);
+
+            var element1 = this.collection.at(1).set("selected", true);
+            
+            expect(element1.get("selected")).toBe(true);
+
+            expect(spy).toHaveBeenCalled();
+            expect(spy.mostRecentCall.args[0]).toEqual(element1);
+            
+        });
+        
+        it("finds selected element", function () {
+            
+            var selected = this.collection.at(1).set("selected", true);
+            
+            var searchResult = this.collection.getSelected();
+            
+            expect(searchResult.get("name")).toEqual(selected.get("name"));
+            expect(searchResult).toEqual(selected);
+        });
+        
+        it("sets the element with defaultValue = true as selected", function () {
+            
+            // element with defaultValue = true is: Waterway = this.collection.at(0)
+            
+            // show that there is no selected element
+            for(var i = 0; i < this.collection.length; i++) {
+                expect(this.collection.at(i).get("selected")).toBe(undefined);
+            }
+            
+            this.collection.setDefaultToSelected();
+            
+            var searchResult = this.collection.getSelected();
+            
+            expect(searchResult).toBe(this.collection.at(0));
+        });
+        
+    });
+    
+});
+
+
diff --git a/src/test/javascript/ServerTest.js b/src/test/javascript/ServerTest.js
new file mode 100644
index 00000000..435215b9
--- /dev/null
+++ b/src/test/javascript/ServerTest.js
@@ -0,0 +1,229 @@
+describe("Server", function () {
+    var errorMock = function () {
+        alert("foo");
+    };
+        
+    var server = new Server(undefined, errorMock);
+
+    it("can be instantiated", function () {
+        expect(server).not.toBeUndefined();
+    });
+
+    _.each([ "generateDetailsUrl", "getRouteDetails", "geoCode", "countries",
+        "getActiveSeaports", "terminals"], function(e) {
+
+        it("has function " + e, function () {
+            expect(server[e]).toBeDefined();
+        });
+    });
+});
+
+describe("Servers geoCode", function () {
+    var errorMock = function () {
+        alert("foo");
+    };
+        
+    var server = new Server(undefined, errorMock);
+
+    it("fails if no request comes in", function () {
+        expect(
+            function() {
+                server.geoCode();
+            }
+        ).toThrow();
+    });
+
+    it("fails if strange request comes in", function () {
+        expect(
+            function() {
+                server.geoCode({});
+            }
+        ).toThrow();
+    });
+
+    it("does the request", function () {
+        spyOn($, 'ajax');
+        var r = new GeoCodeRequest({countries: this.countries = new SelectableAwareCollection([{}]), city : "Karlsruhe"});
+        server.geoCode(r);
+        expect($.ajax).toHaveBeenCalled();
+    });
+
+    it("alerts if invalid structure is coming back from server", function () {
+        var result = {"foo" : {bar : "hhh"}};
+
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        spyOn(window, 'alert');
+
+        var r = new GeoCodeRequest({countries: new SelectableAwareCollection([{}]), city : "Karlsruhe"});
+        server.geoCode(r, callback);
+        expect(alert).toHaveBeenCalled();
+    });
+
+    it("executes the callback", function () {
+        var addresses = [{displayName: "foo"}];
+
+        var result = {"geoCodeResponse" : {addresses : addresses}};
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        var r = new GeoCodeRequest({countries: new SelectableAwareCollection([{}]), city : "Karlsruhe"});
+        server.geoCode(r, callback);
+        expect(callback).toHaveBeenCalledWith(addresses);
+    });
+
+});
+
+describe("Servers get active seaports", function () {
+    var errorMock = function () {
+        alert("foo");
+    };
+
+    var server = new Server(undefined, errorMock);
+
+    it("does the request", function () {
+        spyOn($, 'ajax');
+        server.getActiveSeaports();
+        expect($.ajax).toHaveBeenCalled();
+    });
+
+    it("alerts if invalid structure is coming back from server", function () {
+        var result = {"foo" : {bar : "hhh"}};
+
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        spyOn(window, 'alert');
+
+        server.getActiveSeaports(callback);
+
+        expect(alert).toHaveBeenCalled();
+    });
+
+    it("executes the callback", function () {
+
+        var ports = [{name : "Rot"}];
+
+        var result = {seaports : ports};
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+
+        server.getActiveSeaports(callback);
+        expect(callback).toHaveBeenCalledWith(ports);
+    });
+});
+
+describe("Servers terminals", function () {
+    var errorMock = function () {
+        alert("foo");
+    };
+
+    var server = new Server(undefined, errorMock);
+
+    it("does the request", function () {
+        spyOn($, 'ajax');
+        server.terminals();
+        expect($.ajax).toHaveBeenCalled();
+    });
+
+    it("alerts if invalid structure is coming back from server", function () {
+        var result = {"foo" : {bar : "hhh"}};
+
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        spyOn(window, 'alert');
+
+        server.terminals(callback);
+
+        expect(alert).toHaveBeenCalled();
+    });
+
+    it("executes the callback", function () {
+        var terminals = [{name : "DIT"}];
+
+        var result = {"response" : {terminals : terminals}};
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+
+        server.terminals(callback);
+        expect(callback).toHaveBeenCalledWith(terminals);
+    });
+});
+
+
+
+describe("Servers seaportConnections", function () {
+    var errorMock = function () {
+        alert("foo");
+    };
+        
+    var server = new Server(undefined, errorMock);
+
+    it("fails if no request comes in", function () {
+        expect(
+            function() {
+                server.seaportConnections();
+            }
+        ).toThrow();
+    });
+
+    it("alerts if invalid structure is coming back from server", function () {
+        var result = {"foo" : {bar : "hhh"}};
+
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        spyOn(window, 'alert');
+
+        var r = new GeoCodeRequest({countries: new SelectableAwareCollection([{}]), city : "Karlsruhe"});
+
+        server.geoCode(r, callback);
+        expect(alert).toHaveBeenCalled();
+    });
+
+    it("executes the callback", function () {
+        var addresses = [{displayName: "foo"}];
+
+        var result = {"geoCodeResponse" : {addresses : addresses}};
+        var callback = jasmine.createSpy('callbackspy');
+        var ajaxMock = function (x) {
+            var callback = x.success;
+            callback(result);
+        };
+
+        spyOn($, 'ajax').andCallFake(ajaxMock);
+        var r = new GeoCodeRequest({countries: new SelectableAwareCollection([{}]), city : "Karlsruhe"});
+        server.geoCode(r, callback);
+        expect(callback).toHaveBeenCalledWith(addresses);
+    });
+});
\ No newline at end of file
diff --git a/src/test/javascript/TemplateManagerTest.js b/src/test/javascript/TemplateManagerTest.js
new file mode 100644
index 00000000..21929cc0
--- /dev/null
+++ b/src/test/javascript/TemplateManagerTest.js
@@ -0,0 +1,95 @@
+describe("TemplateManager", function() {
+
+    it("can be instatiated", function() {
+
+        this.manager = new TemplateManager();
+
+        expect(this.manager).toBeDefined();
+    });
+
+    it("can be instatiated", function() {
+
+        this.manager = new TemplateManager();
+
+        expect(this.manager).toBeDefined();
+    });
+
+
+    it("has method to load a template", function() {
+
+        this.manager = new TemplateManager();
+
+        expect(this.manager.getTemplate).toBeDefined();
+    });
+
+
+
+    it("throws on error", function() {
+
+        this.manager = new TemplateManager();
+
+        spyOn($, "ajax").andCallFake(function(options) {
+            options.error(null, "argh", "argh");
+        });
+        
+        expect(function() {
+            var result = this.manager.getTemplate("foo");    
+        }).toThrow();
+
+        
+        $.ajax.reset();
+        
+
+    });
+
+
+    it("loads a template", function() {
+
+        this.manager = new TemplateManager();
+        var data = "<span class='template'><span class='foo'>Template</span> {{name}}</span>";
+        var templatename = "foo";
+
+        spyOn($, "ajax").andCallFake(function(options) {
+            expect(options.url).toContain(templatename);
+            options.success(data);
+        });
+
+        var result = this.manager.getTemplate(templatename);
+        expect(result).toBeDefined();
+        
+        var html = result({name : "wurst"});
+        expect(html).toContain("wurst");
+        expect($(html)).toContain("span.foo");
+
+        $.ajax.reset();
+
+    });
+
+
+
+
+    it("caches a template", function() {
+
+        var manager = new TemplateManager();
+        
+        var data = "<span class='template'>Template</span>";
+        var templatename = "foo";
+
+        spyOn($, "ajax").andCallFake(function(options) {
+            expect(options.url).toContain(templatename);
+            options.success(data);
+        });
+
+        var result = manager.getTemplate(templatename);
+        expect(result).toBeDefined();
+
+        var result2 = manager.getTemplate(templatename);
+        expect(result2).toBeDefined();
+        expect(result).toEqual(result2);
+
+        expect($.ajax.callCount).toEqual(1);
+        
+        $.ajax.reset();
+
+    });
+});
\ No newline at end of file
diff --git a/src/test/javascript/globalsetup.js b/src/test/javascript/globalsetup.js
new file mode 100644
index 00000000..6bf625ce
--- /dev/null
+++ b/src/test/javascript/globalsetup.js
@@ -0,0 +1,36 @@
+/** install dummy console for headless mode? */
+if (window.console == undefined) {
+    window.console = {
+        log: function (title) {
+        }
+    };
+}
+
+function getTemplate(name) {
+    if (typeof globalTemplates != "undefined") {
+        return Handlebars.compile(globalTemplates['src/main/webapp/client/js/routing/templates/' + name + '.html']);
+    }
+    else {
+        var templateManager = new TemplateManager({
+            prefix: "src/routing/templates/"
+        });
+
+        try {
+            templateManager.getTemplate("Terminal");
+        } catch (e) {
+            templateManager.set("prefix", "src/main/webapp/client/js/routing/templates/");
+        }
+
+        return templateManager.getTemplate(name);
+    }
+}
+
+/**
+ * adjust fixture-path for jasmine-jquery to work in headless and head-mode
+ */
+try {
+    jasmine.getFixtures().fixturesPath = 'spec/html';
+    loadFixtures('test.html');
+} catch (e) {
+    jasmine.getFixtures().fixturesPath = 'src/test/javascript/html';
+}
\ No newline at end of file
diff --git a/src/test/javascript/jasmine-jquery-1.3.1.js b/src/test/javascript/jasmine-jquery-1.3.1.js
new file mode 100644
index 00000000..4f7357df
--- /dev/null
+++ b/src/test/javascript/jasmine-jquery-1.3.1.js
@@ -0,0 +1,288 @@
+var readFixtures = function() {
+  return jasmine.getFixtures().proxyCallTo_('read', arguments);
+};
+
+var preloadFixtures = function() {
+  jasmine.getFixtures().proxyCallTo_('preload', arguments);
+};
+
+var loadFixtures = function() {
+  jasmine.getFixtures().proxyCallTo_('load', arguments);
+};
+
+var setFixtures = function(html) {
+  jasmine.getFixtures().set(html);
+};
+
+var sandbox = function(attributes) {
+  return jasmine.getFixtures().sandbox(attributes);
+};
+
+var spyOnEvent = function(selector, eventName) {
+  jasmine.JQuery.events.spyOn(selector, eventName);
+}
+
+jasmine.getFixtures = function() {
+  return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures();
+};
+
+jasmine.Fixtures = function() {
+  this.containerId = 'jasmine-fixtures';
+  this.fixturesCache_ = {};
+  this.fixturesPath = 'spec/javascripts/fixtures';
+};
+
+jasmine.Fixtures.prototype.set = function(html) {
+  this.cleanUp();
+  this.createContainer_(html);
+};
+
+jasmine.Fixtures.prototype.preload = function() {
+  this.read.apply(this, arguments);
+};
+
+jasmine.Fixtures.prototype.load = function() {
+  this.cleanUp();
+  this.createContainer_(this.read.apply(this, arguments));
+};
+
+jasmine.Fixtures.prototype.read = function() {
+  var htmlChunks = [];
+
+  var fixtureUrls = arguments;
+  for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
+    htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]));
+  }
+
+  return htmlChunks.join('');
+};
+
+jasmine.Fixtures.prototype.clearCache = function() {
+  this.fixturesCache_ = {};
+};
+
+jasmine.Fixtures.prototype.cleanUp = function() {
+  jQuery('#' + this.containerId).remove();
+};
+
+jasmine.Fixtures.prototype.sandbox = function(attributes) {
+  var attributesToSet = attributes || {};
+  return jQuery('<div id="sandbox" />').attr(attributesToSet);
+};
+
+jasmine.Fixtures.prototype.createContainer_ = function(html) {
+  var container;
+  if(html instanceof jQuery) {
+    container = jQuery('<div id="' + this.containerId + '" />');
+    container.html(html);
+  } else {
+    container = '<div id="' + this.containerId + '">' + html + '</div>'
+  }
+  jQuery('body').append(container);
+};
+
+jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {  
+  if (typeof this.fixturesCache_[url] == 'undefined') {
+    this.loadFixtureIntoCache_(url);
+  }
+  return this.fixturesCache_[url];
+};
+
+jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
+  var self = this;
+  var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl;
+  jQuery.ajax({
+    async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
+    cache: false,
+    dataType: 'html',
+    url: url,
+    success: function(data) {
+      self.fixturesCache_[relativeUrl] = data;
+    },
+    error: function(jqXHR, status, errorThrown) {
+        throw Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + errorThrown.message + ')');
+    }
+  });
+};
+
+jasmine.Fixtures.prototype.proxyCallTo_ = function(methodName, passedArguments) {
+  return this[methodName].apply(this, passedArguments);
+};
+
+
+jasmine.JQuery = function() {};
+
+jasmine.JQuery.browserTagCaseIndependentHtml = function(html) {
+  return jQuery('<div/>').append(html).html();
+};
+
+jasmine.JQuery.elementToString = function(element) {
+  return jQuery('<div />').append(element.clone()).html();
+};
+
+jasmine.JQuery.matchersClass = {};
+
+(function(namespace) {
+  var data = {
+    spiedEvents: {},
+    handlers:    []
+  };
+
+  namespace.events = {
+    spyOn: function(selector, eventName) {
+      var handler = function(e) {
+        data.spiedEvents[[selector, eventName]] = e;
+      };
+      jQuery(selector).bind(eventName, handler);
+      data.handlers.push(handler);
+    },
+
+    wasTriggered: function(selector, eventName) {
+      return !!(data.spiedEvents[[selector, eventName]]);
+    },
+
+    cleanUp: function() {
+      data.spiedEvents = {};
+      data.handlers    = [];
+    }
+  }
+})(jasmine.JQuery);
+
+(function(){
+  var jQueryMatchers = {
+    toHaveClass: function(className) {
+      return this.actual.hasClass(className);
+    },
+
+    toBeVisible: function() {
+      return this.actual.is(':visible');
+    },
+
+    toBeHidden: function() {
+      return this.actual.is(':hidden');
+    },
+
+    toBeSelected: function() {
+      return this.actual.is(':selected');
+    },
+
+    toBeChecked: function() {
+      return this.actual.is(':checked');
+    },
+
+    toBeEmpty: function() {
+      return this.actual.is(':empty');
+    },
+
+    toExist: function() {
+      return this.actual.size() > 0;
+    },
+
+    toHaveAttr: function(attributeName, expectedAttributeValue) {
+      return hasProperty(this.actual.attr(attributeName), expectedAttributeValue);
+    },
+
+    toHaveId: function(id) {
+      return this.actual.attr('id') == id;
+    },
+
+    toHaveHtml: function(html) {
+      return this.actual.html() == jasmine.JQuery.browserTagCaseIndependentHtml(html);
+    },
+
+    toHaveText: function(text) {
+      if (text && jQuery.isFunction(text.test)) {
+        return text.test(this.actual.text());
+      } else {
+        return this.actual.text() == text;
+      }
+    },
+
+    toHaveValue: function(value) {
+      return this.actual.val() == value;
+    },
+
+    toHaveData: function(key, expectedValue) {
+      return hasProperty(this.actual.data(key), expectedValue);
+    },
+
+    toBe: function(selector) {
+      return this.actual.is(selector);
+    },
+
+    toContain: function(selector) {
+      return this.actual.find(selector).size() > 0;
+    },
+
+    toBeDisabled: function(selector){
+      return this.actual.is(':disabled');
+    },
+
+    // tests the existence of a specific event binding
+    toHandle: function(eventName) {
+      var events = this.actual.data("events");
+      return events && events[eventName].length > 0;
+    },
+    
+    // tests the existence of a specific event binding + handler
+    toHandleWith: function(eventName, eventHandler) {
+      var stack = this.actual.data("events")[eventName];
+      var i;
+      for (i = 0; i < stack.length; i++) {
+        if (stack[i].handler == eventHandler) {
+          return true;
+        }
+      }
+      return false;
+    }
+  };
+
+  var hasProperty = function(actualValue, expectedValue) {
+    if (expectedValue === undefined) {
+      return actualValue !== undefined;
+    }
+    return actualValue == expectedValue;
+  };
+
+  var bindMatcher = function(methodName) {
+    var builtInMatcher = jasmine.Matchers.prototype[methodName];
+
+    jasmine.JQuery.matchersClass[methodName] = function() {
+      if (this.actual instanceof jQuery) {
+        var result = jQueryMatchers[methodName].apply(this, arguments);
+        this.actual = jasmine.JQuery.elementToString(this.actual);
+        return result;
+      }
+
+      if (builtInMatcher) {
+        return builtInMatcher.apply(this, arguments);
+      }
+
+      return false;
+    };
+  };
+
+  for(var methodName in jQueryMatchers) {
+    bindMatcher(methodName);
+  }
+})();
+
+beforeEach(function() {
+  this.addMatchers(jasmine.JQuery.matchersClass);
+  this.addMatchers({
+    toHaveBeenTriggeredOn: function(selector) {
+      this.message = function() {
+        return [
+          "Expected event " + this.actual + " to have been triggered on" + selector,
+          "Expected event " + this.actual + " not to have been triggered on" + selector
+        ];
+      };
+      return jasmine.JQuery.events.wasTriggered(selector, this.actual);
+    }
+  })
+});
+
+afterEach(function() {
+  jasmine.getFixtures().cleanUp();
+  jasmine.JQuery.events.cleanUp();
+});
diff --git a/src/test/javascript/models/AddressListListTest.js b/src/test/javascript/models/AddressListListTest.js
new file mode 100644
index 00000000..470eab8b
--- /dev/null
+++ b/src/test/javascript/models/AddressListListTest.js
@@ -0,0 +1,55 @@
+describe("AddressListList", function () {
+
+    var list;
+
+    beforeEach(function() {
+        list = new AddressListList();
+
+        var a1 = new Address();
+        var a2 = new Address();
+
+        var addressesList = new AddressListModel({addresses : [a1, a2]} );
+        
+        list.add(addressesList);
+    });
+
+    it("can be instantiated", function () {
+        expect(list).toBeDefined();
+    });
+
+    it("takes elements of type AddressListModel", function () {
+        expect(list.length).toBe(1);
+    });
+
+    it("has an no selected element until one is actively selected", function () {
+        expect(list.selectedAddressOfAddressList).toBeUndefined();
+    });
+
+    it("sets its selectedAddressOfAddressList property when one of its elements is selected", function () {
+        var a1 = list.at(0).get("addresses").at(0);
+
+        a1.set("selected", true);
+
+        expect(list.selectedAddressOfAddressList).toEqual(a1);
+    });
+
+    it("changes its selectedAddressOfAddressList property when another element is selected", function () {
+        var a1 = list.at(0).get("addresses").at(0);
+        var a2 = list.at(0).get("addresses").at(1);
+
+        a1.set("selected", true);
+        a2.set("selected", true);
+
+        expect(list.selectedAddressOfAddressList).toEqual(a2);
+    });
+
+    it("resets the selected flag of its members when a different member is selected", function() {
+        var a1 = list.at(0).get("addresses").at(0);
+        var a2 = list.at(0).get("addresses").at(1);
+
+        a1.set("selected", true);
+        a2.set("selected", true);
+
+        expect(a1.get("selected")).toBe(false);
+    });
+});
\ No newline at end of file
diff --git a/src/test/javascript/models/AddressListTest.js b/src/test/javascript/models/AddressListTest.js
new file mode 100644
index 00000000..65fd9de7
--- /dev/null
+++ b/src/test/javascript/models/AddressListTest.js
@@ -0,0 +1,25 @@
+
+describe("AddressList", function () {
+
+    var list;
+
+    beforeEach(function() {
+        list = new AddressList();
+
+        var a1 = new Address();
+        var a2 = new Address();
+
+        list.add([a1, a2]);
+    });
+
+    it("can be instantiated", function () {
+        expect(list).toBeDefined();
+    });
+
+    it("takes elements of type Address", function () {
+        expect(list.length).toBe(2);
+    });
+});
+
+
+
diff --git a/src/test/javascript/models/AddressTest.js b/src/test/javascript/models/AddressTest.js
new file mode 100644
index 00000000..23490400
--- /dev/null
+++ b/src/test/javascript/models/AddressTest.js
@@ -0,0 +1,19 @@
+
+describe("Address with nothing set", function () {
+    var address = new Address();
+
+    it("can be instantiated", function () {
+        expect(address).toBeDefined();
+    });
+
+    _.each([ "latitude", "longitude", "displayName"], function( e) {
+        it("has property " + e, function () {
+            expect(address.get(e), "foo").toBeDefined();
+        });
+    });
+
+});
+
+
+
+
diff --git a/src/test/javascript/models/GeoCodingRequestTest.js b/src/test/javascript/models/GeoCodingRequestTest.js
new file mode 100644
index 00000000..9e3244de
--- /dev/null
+++ b/src/test/javascript/models/GeoCodingRequestTest.js
@@ -0,0 +1,90 @@
+
+describe("GeoCodeRequest", function () {
+    var request = new GeoCodeRequest({city: "cityname", countries: new SelectableAwareCollection([{}])});
+    
+    it("with nothing set is empty", function () {
+        var r = new GeoCodeRequest({countries: new SelectableAwareCollection([{}])});
+        expect(r.isEmpty()).toBeTruthy();
+    });
+
+    it("can be instantiated", function () {
+        expect(request).not.toBeUndefined();
+    });
+
+    _.each(["street", "postalcode", "city", "country"], function( e) {
+        it("has property " + e, function () {
+            expect(request.get(e), "foo").toBeDefined();
+        });
+    });
+
+    it("has getQueryStringMethod", function () {
+        expect(request.getQueryString).toBeDefined();
+    });
+
+    it("querystring contains city parameter ", function () {
+        expect(request.getQueryString()).toContain("city=cityname");
+    });
+
+    it("querystring does not contain street parameter", function () {
+        expect(request.getQueryString()).not.toContain("street");
+    });
+    
+    it("has the default country set as selected if nothing else selected", function() {
+
+        var countries = new SelectableAwareCollection([{
+            name : "Foo",
+            value : "FOO"
+        }, {
+            name : "Bar",
+            value : "BAR",
+            defaultValue : true
+        } ]);
+
+        var req = new GeoCodeRequest({countries: countries});
+        
+        var selectedValue = req.get('countries').getSelected().get("value");
+        
+        expect(selectedValue).toBe("BAR");
+        
+    });
+
+});
+
+describe("GeoCodeRequests with mores than city set", function () {
+
+    var request = new GeoCodeRequest({city: "cityname", countries:new SelectableAwareCollection([{}])});
+    request.set("street", "xxx");
+
+    it("querystring contains city parameter ", function () {
+        expect(request.getQueryString()).toContain("city=cityname");
+    });
+    it("querystring contains street parameter ", function () {
+        expect(request.getQueryString()).toContain("street=xxx");
+    });
+    it("querystring contains concatinations", function () {
+        expect(request.getQueryString()).toContain("&");
+    });
+    it("is empty is false", function () {
+        expect(request.isEmpty()).toBeFalsy();
+    });
+
+
+
+});
+
+
+describe("GeoCodeRequests with special characters", function () {
+    var request = new GeoCodeRequest({city: "Foo Bar", countries: new SelectableAwareCollection([{}])});
+
+    it("querystring is encoded", function () {
+        expect(request.getQueryString()).toContain("city=Foo%20Bar");
+    });
+
+
+
+
+});
+
+
+
+
diff --git a/src/test/javascript/models/GeoCodingTest.js b/src/test/javascript/models/GeoCodingTest.js
new file mode 100644
index 00000000..b86ef944
--- /dev/null
+++ b/src/test/javascript/models/GeoCodingTest.js
@@ -0,0 +1,189 @@
+
+describe("GeoCoding", function () {
+
+    var errorMock = function () {
+        alert("foo");
+    };
+        
+    var server = new Server(undefined, errorMock);
+
+    beforeEach(function(){
+        this.geoCoding = new GeoCoding({server: server, countries: new SelectableAwareCollection([{}])} );
+    });
+
+    it("instanciation fails without server in options", function () {
+        expect(
+            function() {
+                return new GeoCoding({});
+            }
+        ).toThrow();
+    });
+
+    it("can be instantiated with server", function () {
+        expect(this.geoCoding).toBeDefined();
+    });
+
+    it("has request", function () {
+        expect(this.geoCoding.get('request')).toBeDefined();
+    });
+
+    it("has result list", function () {
+        expect(this.geoCoding.get('results')).toBeDefined();
+    });
+
+    it("has result list", function () {
+        expect(this.geoCoding.get('results')).toBeDefined();
+    });
+});
+
+
+
+describe("GeoCoding search interaction", function () {
+
+    var server = { "geoCode" : function(request, callback) {}};
+
+    beforeEach(function(){
+        this.geoCoding = new GeoCoding({server: server, countries: new SelectableAwareCollection([{}])} );
+    });
+
+    it("returns request", function () {
+        expect(this.geoCoding.getRequest()).toBeDefined();
+    });
+
+    it("returns results", function () {
+        expect(this.geoCoding.getResults()).toBeDefined();
+    });
+
+    it("executes server-request on changes to its request", function () {
+        spyOn(server, "geoCode");
+
+        var request = this.geoCoding.getRequest().set("city", "foo");
+        expect(server.geoCode).toHaveBeenCalledWith(request, jasmine.any(Function));
+    });
+
+    it("resets adresses on callback", function () {
+        var cityname = "Karlsruhe";
+        var result = "Some place in Karlsruhe";
+
+        var server = { "geoCode" : function(request, callback) {
+            expect(request.get("city")).toEqual(cityname);
+            callback( [{'displayName' :result} ]);
+        }};
+
+        var g = new GeoCoding({server: server, countries: new SelectableAwareCollection([{}]), searchStatus: new SearchStatus()});
+
+        g.getRequest().set("city", cityname);
+
+        var results = g.getResults();
+
+        expect(results.length).toEqual(1);
+        expect(results.at(0).get("displayName")).toEqual(result);
+    });
+});
+
+describe("GeoCoding address selection", function () {
+
+    var server = { "geoCode" : function(request, callback) {}};
+    var g = new GeoCoding({server: server, countries: new SelectableAwareCollection([{}])});
+
+    var a1;
+    var a2;
+    var a3;
+    
+    var a4;
+    var a5;
+
+    beforeEach(function() {
+
+        a1 = new Address({displayName: "placeA"});
+        a2 = new Address({displayName: "placeB"});
+        a3 = new Address({displayName: "placeC"});
+
+        a4 = new Address({displayName: "placeD"});
+        a5 = new Address({displayName: "placeE"});
+
+        var adressesA = [a1, a2, a3];
+
+        var adressesB = [a4, a5];
+
+        var adressLists =
+            [
+                {
+                    name : "foo",
+                    addresses : adressesA
+                },
+                {
+                    name : "bar",
+                    addresses : adressesB
+                }
+            ];
+        
+        g.getResults().reset(adressLists);
+    });
+
+    it("has addresses", function () {
+        // get combined address count
+        expect(g.getResults().reduce(function(memo, el) { return memo + el.get("addresses").size() }, 0)).toEqual(5);
+    });
+
+    it("has no selected one by default", function () {
+
+        expect(g.getSelected()).toBeUndefined();
+    });
+
+    it("has selected when setting one", function () {
+        var spy = jasmine.createSpy();
+        g.bind("selectedchanged", spy);
+
+        a1.set('selected', true);
+
+        expect(spy).toHaveBeenCalledWith(a1);
+    });
+
+    it("has new when setting anotherone", function () {
+        var spy = jasmine.createSpy();
+        g.bind("selectedchanged", spy);
+
+        a1.set('selected', true);
+        expect(spy).toHaveBeenCalledWith(a1);
+        a3.set('selected', true);
+        expect(spy).toHaveBeenCalledWith(a3);
+    });
+
+    it("works on double-select", function () {
+        var spy = jasmine.createSpy();
+        g.bind("selectedchanged", spy);
+
+        a1.set('selected', true);
+        a1.set('selected', true);
+
+        expect(spy.calls.length).toEqual(1);
+    });
+});
+
+describe("GeoCoding", function () {
+
+    var errorMock = function () {
+        alert("foo");
+    };
+
+    var serverMock = new Server(undefined, errorMock);
+
+    beforeEach(function(){
+        serverMock.addressByGeolocation = function (latitude, longitude, callback) {
+            callback([
+                {addresses: [{}]}
+            ]);
+        };
+        serverMock.addressByOsmId = function (osmId, callback) {
+            callback([
+                {addresses: [{}]}
+            ]);
+        };
+        this.geoCoding = new GeoCoding({server: serverMock, countries: new SelectableAwareCollection([{}])} );
+        this.geoCoding.set('searchStatus',new SearchStatus());
+    });    
+});
+
+
+
diff --git a/src/test/javascript/models/SeaportTest.js b/src/test/javascript/models/SeaportTest.js
new file mode 100644
index 00000000..df0be25d
--- /dev/null
+++ b/src/test/javascript/models/SeaportTest.js
@@ -0,0 +1,107 @@
+describe("Seaport", function() {
+	var port = new Seaport();
+
+	it("can be instantiated", function() {
+		expect(port).toBeDefined();
+	});
+
+	it("has a name", function() {
+		port.set("name", "hans");
+		expect(port.get("name")).toEqual("hans");
+	});
+
+	it("has possibleTypes", function() {
+		expect(port.get("possibleTypes")).toBeDefined();
+	});
+
+	it("has canAcceptTransport Method", function() {
+		expect(port.canAcceptTransport).toBeDefined();
+	});
+
+	// it("canAcceptTransport returns false by default", function () {
+	// expect(port.canAcceptTransport()).toBeFalsy();
+	// expect(port.canAcceptTransport("FOOT")).toBeFalsy();
+	//
+	// });
+	//
+	// it("canAcceptTransport returns true if transport is possible", function
+	// () {
+	// port.set("possibleTypes", ["ROCKET", "FOOT"]);
+	// expect(port.canAcceptTransport("FOOT")).toBeTruthy();
+	//
+	// });
+
+});
+
+describe("SeaportList", function() {
+	var list = new SeaportList();
+
+	it("can be instantiated", function() {
+		expect(list).toBeDefined();
+	});
+
+	it("has no elements by default", function() {
+		expect(list.size()).toEqual(0);
+	});
+
+	it("has filterByPossibleType function", function() {
+		expect(list.filterByPossibleType).toBeDefined();
+	});
+
+	it("filterByPossibleType returns empty array by default", function() {
+		var foos = list.filterByPossibleType("FOO");
+		expect(foos).toBeDefined();
+		expect(foos.size()).toEqual(0);
+	});
+
+	// it("filterByPossibleType returns correct ports", function() {
+	//
+	// list.reset([ {
+	// name : "A",
+	// possibleTypes : [ "A" ]
+	// }, {
+	// name : "B",
+	// possibleTypes : [ "B" ]
+	// }, {
+	// name : "AB",
+	// possibleTypes : [ "A", "B", "C" ]
+	// } ]);
+	//
+	// var as = list.filterByPossibleType("A");
+	// expect(as).toBeDefined();
+	// expect(as.size()).toEqual(2);
+	//
+	// var bs = list.filterByPossibleType("B");
+	// expect(bs).toBeDefined();
+	// expect(bs.size()).toEqual(2);
+	//
+	// var cs = list.filterByPossibleType("C");
+	// expect(cs).toBeDefined();
+	// expect(cs.size()).toEqual(1);
+	//
+	// });
+
+	// it("setvisibility sets correct visibilities", function () {
+	//
+	// var a = new Seaport({ name : "A", possibleTypes : [ "A"] });
+	// var b = new Seaport({ name : "B", possibleTypes : [ "B"] });
+	// var c = new Seaport({ name : "C", possibleTypes : [ "A", "B", "C"] });
+	//      
+	// list.reset([a,b,c]);
+	//
+	// list.setVisibility("A");
+	//
+	// expect(a.get("invisible")).toBeFalsy();
+	// expect(b.get("invisible")).toBeTruthy();
+	// expect(c.get("invisible")).toBeFalsy();
+	//
+	// list.setVisibility("C");
+	// expect(a.get("invisible")).toBeTruthy();
+	// expect(b.get("invisible")).toBeTruthy();
+	// expect(c.get("invisible")).toBeFalsy();
+	//
+	//
+	//
+	// });
+
+});
diff --git a/src/test/javascript/models/TerminalTest.js b/src/test/javascript/models/TerminalTest.js
new file mode 100644
index 00000000..2a7b9075
--- /dev/null
+++ b/src/test/javascript/models/TerminalTest.js
@@ -0,0 +1,28 @@
+/**
+ * Author: Sven Mueller - mueller@synyx.de
+ * Date: 02.07.12
+ * Time: 18:00
+ */
+
+describe("Terminal test suite", function() {
+
+    it("can be instatiated", function() {
+
+        var terminal = new Terminal();
+
+        expect(terminal).toBeDefined();
+        expect(terminal.name).toBeUndefined();
+    });
+});
+
+describe("TerminalList test suite", function() {
+
+    it("can be instantiated", function() {
+         var list = new TerminalList();
+         expect(list).toBeDefined();
+         expect(list.at).toBeDefined();
+
+        
+    });
+
+});
\ No newline at end of file
diff --git a/src/test/javascript/models/TrianglePointsTest.js b/src/test/javascript/models/TrianglePointsTest.js
new file mode 100644
index 00000000..9808453e
--- /dev/null
+++ b/src/test/javascript/models/TrianglePointsTest.js
@@ -0,0 +1,259 @@
+
+describe("TrianglePoints", function() {
+
+    beforeEach(function() {
+
+        this.serverMock = {
+            getRouteDetails : jasmine.createSpy("getRouteDetails")
+        };
+       
+        this.points = new TrianglePoints([],{server: this.serverMock});
+    });
+
+    it("can be instatiated", function() {
+
+        expect(this.points).toBeDefined();
+    });
+
+
+    it("accepts addresses", function() {
+
+        var address = new Address({name: "address"});
+        this.points.add(address);
+
+        expect(this.points.size()).toBe(1);
+        expect(this.points.at(0).get("name")).toBe(address.get("name"));
+    });
+
+    it("accepts terminals", function() {
+
+        var terminal = new Terminal({name: "DIT"});
+        this.points.add(terminal);
+
+        expect(this.points.size()).toBe(1);
+        expect(this.points.at(0).get("name")).toBe(terminal.get("name"));
+    });
+
+
+    it("accepts terminals and addresses at once", function() {
+
+        this.points.add(new Terminal({name: "DIT"}));
+        this.points.add(new Address({name: "address"}));
+        this.points.add(new Terminal({name: "DIT"}));
+
+        expect(this.points.size()).toBe(3);
+    });
+    
+    it("accepts seaports", function() {
+
+        var seaport = new Seaport({name: "Rotterdam"});
+        this.points.add(seaport);
+
+        expect(this.points.size()).toBe(1);
+        expect(this.points.at(0).get("name")).toBe(seaport.get("name"));
+    });
+    
+    it("accepts seaports, terminals and addresses at once", function() {
+
+        this.points.add(new Terminal({name: "DIT"}));
+        this.points.add(new Address({name: "address"}));
+        this.points.add(new Seaport({name: "Antwerpen"}));
+        this.points.add(new Terminal({name: "DIT"}));
+        this.points.add(new Seaport({name: "Rotterdam"}));
+
+        expect(this.points.size()).toBe(5);
+    });
+
+    it("has getRoutePairs function", function() {
+
+        expect(this.points.getRoutePairs).toBeDefined();
+
+    });
+
+    it("returns correct route pairs", function() {
+
+        this.points.add(new Terminal({name: "DIT"}));
+        this.points.add(new Address({name: "address"}));
+        this.points.add(new Terminal({name: "DIT2"}));
+
+        var pairs = this.points.getRoutePairs();
+        expect(pairs.size()).toBe(3);
+
+        var start = pairs.at(0);
+        var firstroute = pairs.at(1);
+        var secondroute = pairs.at(2);
+
+        expect(start.get("from")).toBeUndefined();
+        expect(start.get("to").get("name")).toBe("DIT");
+
+        expect(firstroute.get("from").get("name")).toBe("DIT");
+        expect(firstroute.get("to").get("name")).toBe("address");
+
+        expect(secondroute.get("from").get("name")).toBe("address");
+        expect(secondroute.get("to").get("name")).toBe("DIT2");
+    });
+
+
+    it("calls server for route-details on getRoutePairs", function() {
+        this.points.add(new Terminal({name: "DIT", latitude: 1, longitude: 2}));
+        this.points.add(new Address({name: "address", latitude: 11, longitude: 12}));
+        this.points.add(new Terminal({name: "DIT2", latitude: 21, longitude: 22}));
+
+        var pairs = this.points.getRoutePairs();
+
+        expect(this.serverMock.getRouteDetails).toHaveBeenCalled();
+
+        var parts = this.serverMock.getRouteDetails.mostRecentCall.args[0];
+
+        expect(parts.size()).toEqual(3);
+
+    });
+
+    it("sets totals and part-details correctly upon getRoutePairs", function() {
+        this.points.add(new Terminal({name: "DIT", latitude: 1, longitude: 2}));
+        this.points.add(new Address({name: "address", latitude: 11, longitude: 12}));
+        this.points.add(new Terminal({name: "DIT2", latitude: 21, longitude: 22}));
+
+        var pairs = this.points.getRoutePairs();
+
+        var status = this.points.totals;
+        
+        
+        
+        expect(status).toBeDefined();
+        expect(status.get("size")).toEqual(3);
+        expect(status.get("distance")).toBeUndefined();
+        expect(status.get("toll")).toBeUndefined();
+        expect(status.get("duration")).toBeUndefined();
+
+        var parts = this.serverMock.getRouteDetails.mostRecentCall.args[0];
+        expect(parts.size()).toEqual(3);
+
+        var callback = this.serverMock.getRouteDetails.mostRecentCall.args[1];
+
+        expect(callback).toBeDefined();
+
+        var result = {
+            data : {
+                totalDistance: 1,
+                totalTollDistance : 2,
+                totalDuration : 3,
+                parts : [
+                    {
+                        data : {
+                            distance : 4,
+                            tollDistance: 5,
+                            duration: 6
+                        }
+                    },
+                    {
+                        data : {
+                            distance : 7,
+                            tollDistance: 8,
+                            duration: 9
+                        }
+                    }
+                ]
+            }
+        };
+        
+        // calling the callback
+        callback(result);
+
+        var statusAfterCallback = this.points.totals;
+
+        expect(statusAfterCallback).toBeDefined();
+        expect(statusAfterCallback.get("size")).toEqual(3);
+        expect(statusAfterCallback.get("distance")).toEqual(Helper.formatKM(1));
+        expect(statusAfterCallback.get("toll")).toEqual(Helper.formatKM(2));
+        expect(statusAfterCallback.get("duration")).toEqual(Helper.formatDurationInDetail(3));
+
+
+        var part1 = parts.at(1);
+        expect(part1.get("distance")).toEqual(Helper.formatKM(4));
+        expect(part1.get("toll")).toEqual(Helper.formatKM(5));
+        expect(part1.get("duration")).toEqual(Helper.formatDurationInDetail(6));
+
+        var part2 = parts.at(2);
+        expect(part2.get("distance")).toEqual(Helper.formatKM(7));
+        expect(part2.get("toll")).toEqual(Helper.formatKM(8));
+        expect(part2.get("duration")).toEqual(Helper.formatDurationInDetail(9));
+
+
+    });
+    
+    
+
+
+    it("removes item when routepart is destroyed", function() {
+
+        this.points.add(new Terminal({name: "DIT"}));
+        this.points.add(new Address({name: "address"}));
+        this.points.add(new Terminal({name: "DIT2"}));
+
+        var pairs = this.points.getRoutePairs();
+        expect(this.points.pluck("name")).toEqual(["DIT", "address", "DIT2"]);
+        expect(pairs.size()).toBe(3);
+        // remove route 2 which means "address" should be removed
+        pairs.at(1).destroy();
+
+        var pairs = this.points.getRoutePairs();
+        expect(pairs.size()).toBe(2);
+        expect(this.points.pluck("name")).toEqual(["DIT", "DIT2"]);
+
+    });
+
+
+    it("moves items up and down on two", function() {
+
+        this.points.add(new Terminal({name: "A"}));
+        this.points.add(new Terminal({name: "B"}));
+
+        expect(this.points.pluck("name")).toEqual(["A", "B"]);
+
+        var start_a = this.points.getRoutePairs().at(0);
+        start_a.trigger("down", start_a);
+
+        // index   from    to
+        // 0                C
+        // 1          C     A
+        // 2          A     B
+
+        expect(this.points.pluck("name")).toEqual(["B", "A"]);
+
+
+    });
+
+    it("moves items up and down", function() {
+
+        this.points.add(new Terminal({name: "A"}));
+        this.points.add(new Terminal({name: "B"}));
+        this.points.add(new Terminal({name: "C"}));
+
+        expect(this.points.pluck("name")).toEqual(["A", "B", "C"]);
+
+        // index   from    to
+        // 0                A
+        // 1          A     B
+        // 2          B     C
+        var btoc = this.points.getRoutePairs().at(2);
+        btoc.trigger("up", btoc);
+
+        // index   from    to
+        // 0                A
+        // 1          A     C
+        // 2          C     B
+        expect(this.points.pluck("name")).toEqual(["A", "C", "B"]);
+
+
+        var start_a = this.points.getRoutePairs().at(0);
+        start_a.trigger("down", start_a);
+
+        // index   from    to
+        // 0                C
+        // 1          C     A
+        // 2          A     B
+
+        expect(this.points.pluck("name")).toEqual(["C", "A", "B"]);
+    });
+});
diff --git a/src/test/javascript/models/TriangleRoutePartTest.js b/src/test/javascript/models/TriangleRoutePartTest.js
new file mode 100644
index 00000000..b1cfa54a
--- /dev/null
+++ b/src/test/javascript/models/TriangleRoutePartTest.js
@@ -0,0 +1,27 @@
+
+describe("TriangleRoutePart", function() {
+
+    beforeEach(function() {
+        this.from = new Terminal({name : "from"});
+        this.to = new Terminal({name : "to"});
+
+        this.part = new TriangleRoutePart({from :this.from, to: this.to});
+    });
+
+    it("can be instatiated", function() {
+
+        expect(this.part).toBeDefined();
+    });
+
+
+    it("has from and to", function() {
+
+        var from = this.part.get("from");
+        var to = this.part.get("to");
+
+        expect(from).toBe(this.from);
+        expect(to).toBe(this.to);
+
+    });
+
+});
diff --git a/src/test/javascript/models/TriangleRoutingAppTest.js b/src/test/javascript/models/TriangleRoutingAppTest.js
new file mode 100644
index 00000000..07ab50d4
--- /dev/null
+++ b/src/test/javascript/models/TriangleRoutingAppTest.js
@@ -0,0 +1,14 @@
+
+describe("TriangleRoutingApp", function() {
+
+    beforeEach(function() {
+        
+        this.app = new TriangleRoutingApp();
+    });
+
+    it("can be instatiated", function() {
+
+        expect(this.app).toBeDefined();
+    });
+
+});
diff --git a/src/test/javascript/phantomjs b/src/test/javascript/phantomjs
new file mode 100755
index 00000000..729d6e80
Binary files /dev/null and b/src/test/javascript/phantomjs differ
diff --git a/src/test/javascript/views/AddressCategoryViewTest.js b/src/test/javascript/views/AddressCategoryViewTest.js
new file mode 100644
index 00000000..f93d4a50
--- /dev/null
+++ b/src/test/javascript/views/AddressCategoryViewTest.js
@@ -0,0 +1,230 @@
+describe("AddressCategoryView instanciation", function () {
+
+    var model = new AddressListList([], {server: {}});
+    var searchStatus = new SearchStatus();
+
+    it("without model fails", function () {
+
+        expect(
+            function () {
+                new AddressCategoryView({});
+            }
+        ).toThrow();
+    });
+
+    it("works all needed parameters", function () {
+        var view = new AddressCategoryView({
+            model: model,
+            searchStatus: searchStatus,
+        });
+        expect(view).toBeDefined();
+    });
+});
+
+
+describe("AddressCategoryView rendering", function () {
+
+    var model = new AddressListList([], {server: {}});
+    var searchStatus = new SearchStatus();
+
+    beforeEach(function () {
+
+        this.view = new AddressCategoryView({
+            model: model,
+            searchStatus: searchStatus
+        });
+
+    });
+
+    it("shows no message on initial load", function () {
+        this.view.render();
+        expect(this.view.$el.html()).toContain('');
+    });
+
+    it("shows 'no results found' message on search with no results", function () {
+        searchStatus.setHaveSearched(true);
+        this.view.render();
+        expect(this.view.$el.html()).toContain('');
+    });
+
+    it("shows '' message on no search with results (maybe not in real life :-))", function () {
+        searchStatus.setHaveSearched(false);
+        model.add(new AddressListModel({addresses: [new Address()]}));
+
+        this.view.render();
+        expect(this.view.$el.html()).toContain('');
+    });
+
+    it("renders itself to target on load", function () {
+        searchStatus.setHaveSearched(true);
+        this.view.render();
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on reset", function () {
+        this.view.render();
+        this.view.$el.empty();
+        model.reset();
+
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on add and remove", function () {
+        this.view.render();
+
+        var address = new Address();
+        var addressesList = new AddressListModel({addresses: [address]});
+
+        this.view.$el.empty();
+        model.add(addressesList);
+        expect(this.view.$el).toContain('.geocoding-results');
+
+        this.view.$el.empty();
+        model.remove(addressesList);
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("renders child-content", function () {
+        this.view.render();
+
+        //this relates on the template having an element with class address_table
+        var address = new Address({displayName: "foo"});
+        var addressesList = new AddressListModel({addresses: [address]});
+
+        this.view.$el.empty();
+        model.add(addressesList);
+        expect(this.view.$el.html()).toContain('foo');
+
+    });
+
+});
+
+
+describe("AddressListView instanciation", function () {
+
+    var model = new AddressListModel({});
+
+    it("without model fails", function () {
+
+        expect(
+            function () {
+                new AddressListView({});
+            }
+        ).toThrow();
+    });
+
+
+    it("works all needed parameters", function () {
+        var view = new AddressListView({model: model});
+        expect(view).toBeDefined();
+    });
+
+
+});
+
+describe("AddressListView rendering", function () {
+
+    var model = new AddressListModel({});
+
+    beforeEach(function () {
+
+        this.view = new AddressListView({model: model});
+    });
+
+    it("renders itself to target on load", function () {
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on reset", function () {
+        this.view.$el.empty();
+        model.get("addresses").reset();
+
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on add and remove", function () {
+
+        var address = new Address();
+
+        this.view.$el.empty();
+        model.get("addresses").add(address);
+        expect(this.view.$el).toContain('.iris-table');
+
+        this.view.$el.empty();
+        model.get("addresses").remove(address);
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("renders child-content", function () {
+
+        var address = new Address({displayName: "foo"});
+
+        this.view.$el.empty();
+        model.get("addresses").add(address);
+        expect(this.view.$el.html()).toContain('foo');
+
+    });
+});
+
+
+describe("AddressView", function () {
+
+
+    var model = new Address({displayName: "somewhere"});
+
+
+    it("cannot be instantiated without options", function () {
+        expect(
+            function () {
+                return new AddressView();
+            }
+        ).toThrow();
+    });
+
+    it("cannot be instantiated without template in options", function () {
+        expect(
+            function () {
+                return new AddressView({});
+            }
+        ).toThrow();
+    });
+
+    it("cannot be instantiated with non-existing template in options", function () {
+
+        expect(
+            function () {
+                new AddressView({template: "#doesnotexist"});
+            }
+        ).toThrow();
+    });
+
+
+    it("cannot be instantiated without model in options", function () {
+        expect(
+            function () {
+                new AddressView({template: "#template"});
+            }
+        ).toThrow();
+
+    });
+
+    it("can be instantiated with template and model in options", function () {
+
+
+        var view = new AddressView({template: "#template", model: model});
+        expect(view).toBeDefined();
+    });
+
+    it("renders", function () {
+        var view = new AddressView({template: "#itemtemplate", model: model});
+        view.render();
+        expect(view.$el.html()).toContain("somewhere");
+    });
+
+
+});
+
+
+
+
+
diff --git a/src/test/javascript/views/AddressListViewTest.js b/src/test/javascript/views/AddressListViewTest.js
new file mode 100644
index 00000000..af3fd629
--- /dev/null
+++ b/src/test/javascript/views/AddressListViewTest.js
@@ -0,0 +1,42 @@
+describe("A AddressListView", function () {
+
+	var view;
+	
+    describe("instantiation", function () {
+    	
+        it("cannot be instantiated without a model", function () {
+            expect(function() {
+                new AddressListView();
+            }).toThrow();
+        });
+        
+    });
+    
+    describe("rendering", function () {
+       
+        beforeEach(function(){
+        	
+            view = new AddressListView({
+                model: new AddressListModel({addresses: [new Address(), new Address()]})
+            });
+            
+        });
+
+        it("can be instantiated with a model", function () {
+
+            expect(view).toBeDefined();
+        });
+        
+        it("html contains all important classes", function () {
+
+            expect(view.el).toBeDefined();
+            expect(view.$el).toContain(".accordion-group");
+            expect(view.$el).toContain(".accordion-heading");
+            expect(view.$el).toContain(".selectAddressRow");
+
+        });
+        
+    });
+   
+});
+
diff --git a/src/test/javascript/views/AddressViewTest.js b/src/test/javascript/views/AddressViewTest.js
new file mode 100644
index 00000000..96095e04
--- /dev/null
+++ b/src/test/javascript/views/AddressViewTest.js
@@ -0,0 +1,61 @@
+describe("A AddressView", function() {
+
+	var view;
+
+	describe("instantiation", function() {
+
+		it("cannot be instantiated without a model", function() {
+			expect(function() {
+				new AddressView();
+			}).toThrow();
+		});
+
+	});
+
+	describe("rendering", function() {
+
+		beforeEach(function() {
+
+			view = new AddressView({
+				model : new Address({
+					latitude : 0,
+					longitude : 0,
+					displayName : "fooAdress",
+					selected : false
+				})
+			});
+			
+			view.render();
+
+		});
+
+		it("can be instantiated with a model", function() {
+
+			expect(view).toBeDefined();
+		});
+
+		it("displayes displayName correctly", function() {
+
+			expect(view.el).toBeDefined();
+			
+			expect(view.$el.html()).toContain("fooAdress");
+
+		});
+		
+		it("swiches selected when calling method selectAddress", function() {
+
+			var selectBefore = view.model.get("selected");
+			
+			view.selectAddress();
+			
+			var selectAfter = view.model.get("selected");
+			
+			expect(selectBefore).toBeFalsy();
+			
+			expect(selectAfter).toBeTruthy();
+
+		});
+
+	});
+
+});
\ No newline at end of file
diff --git a/src/test/javascript/views/BootstrapDropDownViewTest.js b/src/test/javascript/views/BootstrapDropDownViewTest.js
new file mode 100644
index 00000000..5d6adf22
--- /dev/null
+++ b/src/test/javascript/views/BootstrapDropDownViewTest.js
@@ -0,0 +1,102 @@
+describe("A BootstrapDropDownView", function () {
+   
+    describe("instantiation", function () {
+
+        it("cannot be instantiated without a model", function () {
+            expect(function() {
+                new BootstrapDropDownView();
+            }).toThrow();
+        });
+        
+    });
+    
+    describe("rendering", function () {
+       
+        beforeEach(function(){
+            this.list = new SelectableAwareCollection([
+                {name: "20' light", value: "TWENTY_LIGHT", defaultValue: true },
+                {name: "20' heavy", value: "TWENTY_HEAVY"},
+                {name: "30'", value: "THIRTY"}]);
+            this.view = new BootstrapDropDownView({
+                model: this.list
+                });
+        });
+
+        it("can be instantiated with a model", function () {
+
+            expect(this.view).toBeDefined();
+        });
+        
+        it("has Bootstrap button group", function () {
+
+            expect(this.view.$el).toContain("div.btn-group");
+        });
+        
+        it("renders children of Bootstrap button group", function () {
+
+            expect(this.view.el).toBeDefined();
+            expect(this.view.$el).toContain("ul.dropdown-menu");
+            expect(this.view.$el).toContain("a.dropdown-toggle");
+            expect(this.view.$("ul.dropdown-menu").html()).toContain("30");
+            expect(this.view.$("a.dropdown-toggle").html()).toContain("20"); // default value is set there
+
+        });
+        
+        it("renders new children if added", function () {
+
+            this.list.add({name : "50'", value :"FIFTY"});
+            expect(this.view.$("ul.dropdown-menu").html()).toContain("30'");
+            expect(this.view.$("ul.dropdown-menu").html()).toContain("50'");
+            expect(this.view.$("a.dropdown-toggle").html()).toContain("20'");
+        });
+        
+        it("calls selectedchanged method if an element is clicked", function () {
+
+            // element is not selected
+            expect(this.view.model.at(1).get("selected")).toBe(false);
+
+            // clicked element is set to selected = true
+            this.view.$("ul.dropdown-menu>li:eq(1) a").click();
+                        
+            // element is now selected
+            expect(this.view.model.at(1).get("selected")).toBe(true);
+                        
+        });
+
+        it("triggers change event when element was not selected", function () {
+            var triggered = false;
+
+            var model = this.view.model;
+            model.bind("change:selected", function () {
+                triggered = true;
+            });
+
+            var secondElement = model.at(1);
+            expect(secondElement.get("selected")).toBe(false);
+            this.view.changeSelectStrategy(secondElement);
+
+            expect(secondElement.get("selected")).toBe(true);
+            expect(triggered).toBeTruthy();
+
+        });
+        it("triggers no change event when element is selected", function () {
+            var triggered = false;
+
+            var model = this.view.model;
+            var secondElement = model.at(1);
+            secondElement.set('selected', true);
+
+            model.bind("change:selected", function () {
+                triggered = true;
+            });
+            this.view.changeSelectStrategy(secondElement);
+
+            expect(secondElement.get("selected")).toBe(true);
+            expect(triggered).toBeFalsy();
+
+        });
+       
+    });
+   
+});
+
diff --git a/src/test/javascript/views/GeoCodeRequestViewTest.js b/src/test/javascript/views/GeoCodeRequestViewTest.js
new file mode 100644
index 00000000..d31e39fc
--- /dev/null
+++ b/src/test/javascript/views/GeoCodeRequestViewTest.js
@@ -0,0 +1,67 @@
+describe("GeoCodeRequestView instanciation", function() {
+
+    var searchStatus = new SearchStatus();
+    
+	beforeEach(function() {
+		this.geoCodeRequest = new GeoCodeRequest({countries: new SelectableAwareCollection([{}])});
+        
+		this.view = new GeoCodeRequestView({
+			model : this.geoCodeRequest,
+            searchStatus: searchStatus
+		});
+	});
+
+	it("without model fails", function() {
+
+		expect(function() {
+			new GeoCodeRequestView({});
+		}).toThrow();
+	});
+
+	it("works all needed parameters", function() {
+		expect(this.view).toBeDefined();
+	});
+
+	it("calls resetForm method if the reset button was clicked", function() {
+
+		spyOn(this.view, "resetForm");
+
+		var postCode = this.view.$("input#postCode");
+		var reset = this.view.$("button#resetButton");
+
+		postCode.val("76227");
+
+		reset.click();
+
+		expect(this.view.resetForm).toHaveBeenCalled();
+	});
+    
+    it("has a country select box in Bootstrap Dropdown Style", function() {
+
+        expect(this.view.$el).toContain("span.country-container div.btn-group");
+        
+    });
+
+});
+
+describe("GeoCodeRequestView reset", function() {
+
+    var searchStatus = new SearchStatus();
+
+    beforeEach(function() {
+        this.geoCodeRequest = new GeoCodeRequest({countries: new SelectableAwareCollection([{}])});
+        this.view = new GeoCodeRequestView({
+            model : this.geoCodeRequest,
+            searchStatus: searchStatus
+        });
+    });
+    it("triggers reset event", function() {
+        searchStatus.setHaveSearched(true);
+        var triggered = false;
+        this.geoCodeRequest.on("reset", function(){
+            triggered = true;
+        });
+        this.view.reset();
+        expect(triggered).toBe(true);
+    });
+});
\ No newline at end of file
diff --git a/src/test/javascript/views/TerminalViewTest.js b/src/test/javascript/views/TerminalViewTest.js
new file mode 100644
index 00000000..2186c261
--- /dev/null
+++ b/src/test/javascript/views/TerminalViewTest.js
@@ -0,0 +1,42 @@
+
+describe("A TerminalView", function () {
+
+    beforeEach(function(){
+        //
+    });
+
+    describe("instantiation", function () {
+
+        it("cannot be instantiated if its template does not exist in the dom", function () {
+            expect(function() {
+                new TerminalView();
+            }).toThrow();
+        });
+    });
+
+    describe("rendering", function () {
+
+        beforeEach(function(){
+            this.terminal = new Terminal({name: "myterminal"});
+            this.view = new TerminalView({model: this.terminal});
+        });
+
+        it("can be instantiated if its template is found", function () {
+
+            expect(this.view).toBeDefined();
+
+        });
+
+
+        it("renders its name", function () {
+
+            this.view.render();
+            expect(this.view.$el.html()).toContain(this.terminal.get("name"));
+
+        });
+
+        
+
+
+    });
+});
\ No newline at end of file
diff --git a/src/test/javascript/views/TrianglePointsViewTest.js b/src/test/javascript/views/TrianglePointsViewTest.js
new file mode 100644
index 00000000..eb97aa11
--- /dev/null
+++ b/src/test/javascript/views/TrianglePointsViewTest.js
@@ -0,0 +1,125 @@
+
+describe("TrianglePointsView instanciation", function () {
+
+    beforeEach(function(){
+        this.serverMock = {
+            getRouteDetails : jasmine.createSpy("getRouteDetails")
+        };
+        this.model = new TrianglePoints([],{server: this.serverMock});
+        
+
+        this.fakeViewRenderCalled = 0;
+        var self = this;
+        this.fakeview = Backbone.View.extend({
+            initialize : function() {
+                this.render();
+            },
+            render : function() {
+                self.fakeViewRenderCalled++;
+                var name = this.model.get("to").get("name");
+                this.$el.html("<a class='CHILD'>xxx "+name+"</a>");
+            }
+        });
+        
+        this.view = new TrianglePointsView({model : this.model, childView : this.fakeview });
+       
+        
+    });
+
+    it("without model fails", function () {
+
+        expect(
+            function() {
+                new TrianglePointsView({});
+            }
+        ).toThrow();
+    });
+
+
+    it("works all needed parameters", function () {
+        
+        expect(this.view).toBeDefined();
+        expect(this.view.render).toBeDefined();
+    });
+
+
+    it("renders itself to target on load", function () {
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on reset", function () {
+        this.view.$el.empty();
+        this.model.reset();
+
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+    it("re-renders itself to target on add and remove", function () {
+
+        var address = new Address();
+        var address2 = new Address();
+
+        this.view.$el.empty();
+
+        this.model.add(address);
+        expect(this.fakeViewRenderCalled).toBe(1);
+        this.model.add(address2);
+        expect(this.fakeViewRenderCalled).toBe(3);
+        expect(this.view.$el).toContain('a.CHILD');
+
+        this.view.$el.empty();
+        this.model.remove(address);
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+
+
+    it("re-renders itself on repositioning of items", function () {
+
+        var address = new Address({name : "A"});
+        var address2 = new Address({name : "B"});
+
+        this.view.$el.empty();
+        this.model.add(address);
+        this.model.add(address2);
+
+        var children = this.view.$("a.CHILD");
+        expect(children.length).toEqual(2);
+
+        expect(children.eq(0).html()).toContain("xxx A");
+        expect(children.eq(1).html()).toContain("xxx B");
+
+
+        this.view.$el.empty();
+        var second = this.model.getRoutePairs().at(1);
+        second.trigger("up", second);
+
+        var children = this.view.$("a.CHILD");
+        expect(children.length).toEqual(2);
+
+        expect(children.eq(0).html()).toContain("xxx B");
+        expect(children.eq(1).html()).toContain("xxx A");
+
+
+    });
+
+
+    it("clears list on click on trashcan", function () {
+
+        var address = new Address({name : "A"});
+        var address2 = new Address({name : "B"});
+        this.model.add(address);
+        this.model.add(address2);
+        expect(this.model.size()).toEqual(2);
+        var button = this.view.$(".clear");
+        expect(button.length).toEqual(1);
+
+        button.click();
+        expect(this.model.size()).toEqual(0);
+
+    });
+    
+});
+
+
+
diff --git a/src/test/javascript/views/TriangleRoutePartViewTest.js b/src/test/javascript/views/TriangleRoutePartViewTest.js
new file mode 100644
index 00000000..df66204e
--- /dev/null
+++ b/src/test/javascript/views/TriangleRoutePartViewTest.js
@@ -0,0 +1,92 @@
+
+describe("TriangleRoutePartView", function () {
+
+    beforeEach(function(){
+        
+        this.from = new Address({displayName: "MyAddy", type : "ADDRESS"});
+        this.to = new Terminal( {name :"SuperTerm", type : "TERMINAL"});
+        this.model = new TriangleRoutePart({"from" : this.from, "to" : this.to});
+        this.view = new TriangleRoutePartView({model : this.model });
+        
+    });
+
+    it("without model fails", function () {
+
+        expect(
+            function() {
+                new TriangleRoutePartView({});
+            }
+        ).toThrow();
+    });
+
+
+    it("works all needed parameters", function () {
+        
+        expect(this.view).toBeDefined();
+        expect(this.view.render).toBeDefined();
+    });
+
+
+    it("renders itself to target on load", function () {
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+
+    it("renders name of location", function () {
+        expect(this.view.$el.html()).toContain("SuperTerm");
+    });
+
+
+
+    it("renders name of address", function () {
+        expect(this.view.$el.html()).toContain("MyAddy");
+    });
+
+
+
+
+
+    it("triggers destoy on trashcan-click", function () {
+
+        var spy = jasmine.createSpy("destroyspy");
+        this.model.bind("destroy", spy);
+
+        var button = this.view.$(".remove");
+        expect(button.length).toBe(1);
+
+        button.click();
+        expect(spy).toHaveBeenCalled();
+
+    });
+
+
+    it("triggers up on upclick", function () {
+
+        var spy = jasmine.createSpy("up");
+        this.model.bind("up", spy);
+
+        var button = this.view.$(".up");
+        expect(button.length).toBe(1);
+
+        button.click();
+        expect(spy).toHaveBeenCalled();
+
+    });
+
+    it("triggers down on downclick", function () {
+
+        var spy = jasmine.createSpy("down");
+        this.model.bind("down", spy);
+
+        var button = this.view.$(".down");
+        expect(button.length).toBe(1);
+
+        button.click();
+        expect(spy).toHaveBeenCalled();
+
+    });
+    
+});
+
+
+
diff --git a/src/test/javascript/views/TriangleRouteTotalViewTest.js b/src/test/javascript/views/TriangleRouteTotalViewTest.js
new file mode 100644
index 00000000..7ac3d340
--- /dev/null
+++ b/src/test/javascript/views/TriangleRouteTotalViewTest.js
@@ -0,0 +1,74 @@
+
+describe("TriangleRouteTotalView", function () {
+
+    beforeEach(function(){
+        
+        this.model = new Backbone.Model({
+            distance : 777,
+            toll : 888  ,
+            size: 999,
+            duration: 666
+        });
+        
+        this.view = new TriangleRouteTotalView({model : this.model });
+        
+    });
+
+    it("without model fails", function () {
+
+        expect(
+            function() {
+                new TriangleRouteTotalView();
+            }
+        ).toThrow();
+    });
+
+
+    it("works all needed parameters", function () {
+        
+        expect(this.view).toBeDefined();
+        expect(this.view.render).toBeDefined();
+    });
+
+
+    it("renders itself to target on load", function () {
+        expect(this.view.$el).not.toBeEmpty();
+    });
+
+
+    it("renders total stops", function () {
+        expect(this.view.$el.html()).toContain(this.model.get("size"));
+    });
+
+    it("renders distance", function () {
+        expect(this.view.$el.html()).toContain(this.model.get("distance"));
+    });
+
+    it("renders toll distance", function () {
+        expect(this.view.$el.html()).toContain(this.model.get("toll"));
+    });
+
+    it("renders duration", function () {
+        expect(this.view.$el.html()).toContain(this.model.get("duration"));
+    });
+
+    it("renders clear button", function () {
+        expect(this.view.$el).toContain("a.clear");
+    });
+
+    it("re-renders itself to target on change", function () {
+
+        this.view.$el.empty();
+
+        this.model.set("duration", "miminutes");
+        
+    
+        expect(this.view.$el.html()).toContain('miminutes');
+
+    });
+
+    
+});
+
+
+
diff --git a/src/test/javascript/views/TriangularTrafficDropDownViewTest.js b/src/test/javascript/views/TriangularTrafficDropDownViewTest.js
new file mode 100644
index 00000000..1715059d
--- /dev/null
+++ b/src/test/javascript/views/TriangularTrafficDropDownViewTest.js
@@ -0,0 +1,54 @@
+describe("A TriangularTrafficDropDownView", function () {
+
+    describe("instantiation", function () {
+        it("cannot be instantiated without a model", function () {
+            expect(function() {
+                new TriangularTrafficDropDownView();
+            }).toThrow();
+        });
+    });
+
+    describe("rendering", function () {
+
+        beforeEach(function(){
+            this.seaportAntwerp = new Seaport({name: "Antwerp"});
+            this.seaportWoerth = new Seaport({name: "Wörth"});
+
+            this.seaports = new SeaportList([this.seaportAntwerp, this.seaportWoerth]);
+            this.view = new TriangularTrafficDropDownView({model: this.seaports, el: $('<select></select>')});
+        });
+
+        it("can be instantiated with a model", function () {
+            expect(this.view).toBeDefined();
+        });
+        
+        it("renders all options", function(){
+            expect(this.view.$el.html()).toContain("Wörth");
+            expect(this.view.$el.find("option:contains(Antwerp)").html()).toContain("Antwerp");
+            expect(this.view.$el.find("option").length).toBe(2);
+        });
+        it("sets default value", function(){
+            var view = new TriangularTrafficDropDownView({model: this.seaports, el: $('<select/>'), selectedText: "Wörth"});
+            expect(this.seaportAntwerp.get("defaultValue")).toBeTruthy();
+            expect(view.$el.find("option:contains(Wörth)").attr("selected")).not.toBe("selected");
+            expect(view.$el.find("option:contains(Antwerp)").attr("selected")).toBe("selected");
+            expect(view.$el.find("option").length).toBe(2);
+        });
+        it("sets no default value - nothing in the list", function(){
+            var view = new TriangularTrafficDropDownView({model: new SeaportList(), el: $('<select/>'), selectedText: ''});
+            expect(view.$el.find("option").length).toBe(0);
+        });
+        it("sets first element to selected without default value", function(){
+            var view = new TriangularTrafficDropDownView({model: this.seaports, el: $('<select/>')});
+            expect(this.seaportAntwerp.get("defaultValue")).toBeTruthy();
+            expect(view.$el.find("option:contains(Antwerp)").attr("selected")).toBe("selected");
+            expect(view.$el.find("option:contains(Wörth)").attr("selected")).not.toBe("selected");
+            expect(view.$el.find("option").length).toBe(2);
+        });
+        it("ignores invisible elements", function(){
+            this.seaports.add(new Seaport({name: "Karlsruhe", invisible: true}));
+            var view = new TriangularTrafficDropDownView({model: this.seaports, el: $('<select/>')});
+            expect(view.$el.find("option").length).toBe(2);
+        })
+    });
+});
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..2bf023f0
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+
+    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+        <resetJUL>true</resetJUL>
+    </contextListener>
+
+    <!-- To enable JMX Management -->
+    <jmxConfigurator/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d | %5p  | %t | %-55logger{55} | %m %n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Application Loggers -->
+    <logger name="net.contargo">
+        <level value="warn" />
+    </logger>
+
+    <!-- 3rdparty Loggers -->
+    <logger name="org.springframework">
+        <level value="warn" />
+    </logger>
+
+    <logger name="org.hibernate">
+        <level value="warn" />
+    </logger>
+
+    <root>
+        <level value="warn" />
+        <appender-ref ref="console" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/src/test/resources/osrmResponse.json b/src/test/resources/osrmResponse.json
new file mode 100644
index 00000000..04d189dd
--- /dev/null
+++ b/src/test/resources/osrmResponse.json
@@ -0,0 +1,290 @@
+{
+    "hint_data": {
+        "locations": [
+            "oWcAAE9_EQBLBQAAGAAAAD4AAAB2CAAAfQAAAL4eBQDfu-wCRWx-AAsAEQA",
+            "70kFAL-ICQBQAAAAAAAAAFIBAAD4CwAADQIAANNRFABx_ewCjYOBAAYAEQA"
+        ],
+        "checksum": 4020839883
+    },
+    "route_name": [
+        "B 36/;trunk/;no/;DE",
+        "L 560/;primary/;no/;DE"
+    ],
+    "via_indices": [
+        0,
+        23
+    ],
+    "found_alternative": false,
+    "route_summary": {
+        "end_point": "/;unclassified/;no/;DE",
+        "start_point": "Hafenstraße/;tertiary/;no/;DE",
+        "total_time": 2264,
+        "total_distance": 28295
+    },
+    "via_points": [
+        [
+            49.069023,
+            8.285253
+        ],
+        [
+            49.085808,
+            8.487821
+        ]
+    ],
+    "route_instructions": [
+        [
+            "10",
+            "Hafenstraße/;tertiary/;no/;DE",
+            114,
+            0,
+            246,
+            "113m",
+            "NW",
+            326,
+            1
+        ],
+        [
+            "1",
+            "K 25/;secondary/;no/;DE",
+            169,
+            1,
+            20,
+            "168m",
+            "NW",
+            319,
+            1
+        ],
+        [
+            "2",
+            "/;trunk_link/;no/;DE",
+            320,
+            2,
+            25,
+            "319m",
+            "NW",
+            327,
+            1
+        ],
+        [
+            "1",
+            "B 9/;trunk/;yes/;DE",
+            3372,
+            3,
+            202,
+            "3371m",
+            "SW",
+            211,
+            1
+        ],
+        [
+            "1",
+            "/;trunk/;no/;DE",
+            446,
+            4,
+            26,
+            "446m",
+            "SW",
+            205,
+            1
+        ],
+        [
+            "1",
+            "/;trunk_link/;no/;DE",
+            242,
+            5,
+            19,
+            "241m",
+            "E",
+            112,
+            1
+        ],
+        [
+            "1",
+            "B 10/;trunk/;no/;DE",
+            483,
+            6,
+            29,
+            "483m",
+            "E",
+            92,
+            1
+        ],
+        [
+            "1",
+            "B 10/;trunk/;yes/;DE",
+            1097,
+            7,
+            65,
+            "1097m",
+            "E",
+            89,
+            1
+        ],
+        [
+            "1",
+            "Rheinbrücke/;trunk/;yes/;DE",
+            298,
+            8,
+            17,
+            "298m",
+            "E",
+            101,
+            1
+        ],
+        [
+            "1",
+            "Südtangente/;trunk/;yes/;DE",
+            1390,
+            9,
+            83,
+            "1389m",
+            "E",
+            101,
+            1
+        ],
+        [
+            "1",
+            "/;trunk_link/;no/;DE",
+            480,
+            10,
+            38,
+            "479m",
+            "E",
+            109,
+            1
+        ],
+        [
+            "1",
+            "Rheinbrückenstraße/;primary/;no/;DE",
+            1301,
+            11,
+            104,
+            "1301m",
+            "E",
+            72,
+            1
+        ],
+        [
+            "1",
+            "K 9650/;primary_link/;no/;DE",
+            88,
+            12,
+            12,
+            "87m",
+            "SE",
+            144,
+            1
+        ],
+        [
+            "1",
+            "Sudetenstraße/;primary/;no/;DE",
+            1832,
+            13,
+            146,
+            "1831m",
+            "NE",
+            32,
+            1
+        ],
+        [
+            "7",
+            "Neureuter Straße/;primary/;no/;DE",
+            200,
+            14,
+            16,
+            "199m",
+            "N",
+            18,
+            1
+        ],
+        [
+            "1",
+            "B 36/;trunk/;no/;DE",
+            4673,
+            15,
+            280,
+            "4673m",
+            "N",
+            17,
+            1
+        ],
+        [
+            "1",
+            "/;trunk_link/;no/;DE",
+            247,
+            16,
+            19,
+            "246m",
+            "NE",
+            49,
+            1
+        ],
+        [
+            "7",
+            "L 604/;primary/;no/;DE",
+            3779,
+            17,
+            302,
+            "3778m",
+            "SE",
+            134,
+            1
+        ],
+        [
+            "7",
+            "Theodor-Heuss-Allee/;primary/;no/;DE",
+            816,
+            18,
+            65,
+            "815m",
+            "NE",
+            48,
+            1
+        ],
+        [
+            "7",
+            "Gustav-Heinemann-Allee/;primary_link/;no/;DE",
+            195,
+            19,
+            27,
+            "195m",
+            "NE",
+            25,
+            1
+        ],
+        [
+            "8",
+            "L 560/;primary/;no/;DE",
+            6068,
+            20,
+            486,
+            "6067m",
+            "N",
+            12,
+            1
+        ],
+        [
+            "3",
+            "/;unclassified/;no/;DE",
+            688,
+            21,
+            195,
+            "687m",
+            "SE",
+            115,
+            1
+        ],
+        [
+            "15",
+            "",
+            0,
+            22,
+            0,
+            "0m",
+            "N",
+            0
+        ]
+    ],
+    "status_message": "Found route between points",
+    "status": 0
+}
\ No newline at end of file
diff --git a/src/test/resources/osrmResponseNoRoute.json b/src/test/resources/osrmResponseNoRoute.json
new file mode 100644
index 00000000..e1fb1938
--- /dev/null
+++ b/src/test/resources/osrmResponseNoRoute.json
@@ -0,0 +1,4 @@
+{
+    "status_message": "Cannot find route between points",
+    "status": 207
+}
\ No newline at end of file