diff --git a/.dependencies b/.dependencies
index 3e82e0680f..3b6e375bcf 100644
--- a/.dependencies
+++ b/.dependencies
@@ -7,6 +7,10 @@ git:
         url: https://github.com/getgrav/grav-plugin-error
         path: user/plugins/error
         branch: master
+    markdown-notices:
+        url: https://github.com/getgrav/grav-plugin-markdown-notices
+        path: user/plugins/markdown-notices
+        branch: master
     antimatter:
         url: https://github.com/getgrav/grav-theme-antimatter
         path: user/themes/antimatter
@@ -20,6 +24,10 @@ links:
         src: grav-plugin-error
         path: user/plugins/error
         scm: github
+    markdown-notices:
+        src: grav-plugin-markdown-notices
+        path: user/plugins/markdown-notices
+        scm: github
     antimatter:
         src: grav-theme-antimatter
         path: user/themes/antimatter
diff --git a/.gitignore b/.gitignore
index 221f410996..4e0c83fc12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Composer
 .composer
-vendor/
+/vendor
 
 # Sass
 .sass-cache
diff --git a/.htaccess b/.htaccess
index 6439fa16af..d41f08f3e3 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,7 +3,7 @@
 RewriteEngine On
 
 ## Begin RewriteBase
-# If you are getting 404 errors on subpages, you may have to uncomment the RewriteBase entry
+# If you are getting 500 or 404 errors on subpages, you may have to uncomment the RewriteBase entry
 # You should change the '/' to your appropriate subfolder. For example if you have
 # your Grav install at the root of your site '/' should work, else it might be something
 # along the lines of: RewriteBase /<your_sub_folder>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02d5c1927f..57fe3a4e2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,178 @@
+# v1.1.0
+## 07/14/2016
+
+1. [](#improved)
+    * Added support for validation of multiple email in the `type: email` field [grav-plugin-email#31](https://github.com/getgrav/grav-plugin-email/issues/31)
+    * Unified PHP code header styling
+    * Added 6 more languages and updated language codes
+1. [](#bugfix)
+    * Fix backend validation for file fields marked as required [grav-plugin-form#78](https://github.com/getgrav/grav-plugin-form/issues/78)
+
+# v1.1.0-rc.3
+## 06/21/2016
+
+1. [](#new)
+    * Add a onPageFallBackUrl event when starting the fallbackUrl() method to allow the Login plugin to protect the page media
+    * Conveniently allow ability to retrieve user information via config object [#913](https://github.com/getgrav/grav/pull/913) - @Vivalldi
+    * Grav served images can now use header caching [#905](https://github.com/getgrav/grav/pull/905)
+1. [](#improved)
+    * Take asset modification timestamp into consideration in pipelining [#917](https://github.com/getgrav/grav/pull/917) - @Sommerregen
+1. [](#bugfix)
+    * Respect `enable_asset_timestamp` settings for pipelined Assets [#906](https://github.com/getgrav/grav/issues/906)
+    * Fixed collections end dates for 32-bit systems [#902](https://github.com/getgrav/grav/issues/902)
+    * Fixed a recent regression (1.1.0-rc1) with parameter separator different than `:`
+
+# v1.1.0-rc.2
+## 06/14/2016
+
+1. [](#new)
+    * Added getters and setters for Assets to allow manipulation of CSS/JS/Collection based assets via plugins [#876](https://github.com/getgrav/grav/issues/876)
+1. [](#improved)
+    * Pass the exception to the `onFatalException()` event
+    * Updated to latest jQuery 2.2.4 release
+    * Moved list items in `system/config/media.yaml` config into a `types:` key which allows you delete default items.
+    * Updated `webserver-configs/nginx.conf` with `try_files` fix from @mrhein and @rondlite [#743](https://github.com/getgrav/grav/pull/743)
+    * Updated cache references to include `memecache` and `redis` [#887](https://github.com/getgrav/grav/issues/887)
+    * Updated composer libraries
+1. [](#bugfix)
+    * Fixed `Utils::normalizePath()` that was truncating 0's [#882](https://github.com/getgrav/grav/issues/882)
+
+# v1.1.0-rc.1
+## 06/01/2016
+
+1. [](#new)
+    * Added `Utils::getDotNotation()` and `Utils::setDotNotation()` methods + tests
+    * Added support for `xx-XX` locale language lookups in `LanguageCodes` class [#854](https://github.com/getgrav/grav/issues/854)
+    * New CSS/JS Minify library that does a more reliable job [#864](https://github.com/getgrav/grav/issues/864)
+1. [](#improved)
+    * GPM installation of plugins and themes into correct multisite folders [#841](https://github.com/getgrav/grav/issues/841)
+    * Use `Page::rawRoute()` in blueprints for more reliable mulit-language support
+1. [](#bugfix)
+    * Fixes for `zlib.output_compression` as well as `mod_deflate` GZIP compression
+    * Fix for corner-case redirect logic causing infinite loops and out-of-memory errors
+    * Fix for saving fields in expert mode that have no `Validation::typeX()` methods [#626](https://github.com/getgrav/grav-plugin-admin/issues/626)
+    * Detect if user really meant to extend parent blueprint, not another one (fixes old page type blueprints)
+    * Fixed a bug in `Page::relativePagePath()` when `Page::$name` is not defined
+    * Fix for poor handling of params + query element in `Uri::processParams()` [#859](https://github.com/getgrav/grav/issues/859)
+    * Fix for double encoding in markdown links [#860](https://github.com/getgrav/grav/issues/860)
+    * Correctly handle language strings to determine if it's in admin or not [#627](https://github.com/getgrav/grav-plugin-admin/issues/627)
+
+# v1.1.0-beta.5
+## 05/23/2016
+
+1. [](#improved)
+    * Updated jQuery from 2.2.0 to 2.2.3
+    * Set `Uri::ip()` to static by default so it can be used in form fields
+    * Improved `Session` class with flash storage
+    * `Page::getContentMeta()` now supports an optional key.
+1. [](#bugfix)
+    * Fixed "Invalid slug set in YAML frontmatter" when setting `Page::slug()` with empty string [#580](https://github.com/getgrav/grav-plugin-admin/issues/580)
+    * Only `.gitignore` Grav's vendor folder
+    * Fix trying to remove Grav with `GPM uninstall` of a plugin with Grav dependency
+    * Fix Page Type blueprints not being able to extend their parents
+    * `filterFile` validation method always returns an array of files, behaving like `multiple="multiple"`
+    * Fixed [#835](https://github.com/getgrav/grav-plugin-admin/issues/835) check for empty image file first to prevent getimagesize() fatal error
+    * Avoid throwing an error when Grav's Gzip and mod_deflate are enabled at the same time on a non php-fpm setup
+
+# v1.1.0-beta.4
+## 05/09/2016
+
+1. [](#bugfix)
+    * Drop dependencies calculations if plugin is installed via symlink
+    * Drop Grav from dependencies calculations
+    * Send slug name as part of installed packages
+    * Fix for summary entities not being properly decoded [#825](https://github.com/getgrav/grav/issues/825)
+
+
+# v1.1.0-beta.3
+## 05/04/2016
+
+1. [](#improved)
+    * Pass the Page type when calling `onBlueprintCreated`
+    * Changed `Page::cachePageContent()` form **private** to **public** so a page can be recached via plugin
+1. [](#bugfix)
+    * Fixed handling of `{'loading':'async'}` with Assets Pipeline
+    * Fix for new modular page modal `Page` field requiring a value [#529](https://github.com/getgrav/grav-plugin-admin/issues/529)
+    * Fix for broken `bin/gpm version` command
+    * Fix handling "grav" as a dependency
+    * Fix when installing multiple packages and one is the dependency of another, don't try to install it twice
+    * Fix using name instead of the slug to determine a package folder. Broke for packages whose name was 2+ words
+
+# v1.1.0-beta.2
+## 04/27/2016
+
+1. [](#new)
+    * Added new `Plugin::getBlueprint()` and `Theme::getBlueprint()` method
+    * Allow **page blueprints** to be added via Plugins.
+1. [](#improved)
+    * Moved to new `data-*@` format in blueprints
+    * Updated composer-based libraries
+    * Moved some hard-coded `CACHE_DIR` references to use locator
+    * Set `twig.debug: true` by default
+1. [](#bugfix)
+    * Fixed issue with link rewrites and local assets pipeline with `absolute_urls: true`
+    * Allow Cyrillic slugs [#520](https://github.com/getgrav/grav-plugin-admin/issues/520)
+    * Fix ordering issue with accented letters [#784](https://github.com/getgrav/grav/issues/784)
+    * Fix issue with Assets pipeline and missing newlines causing invalid JavaScript
+
+# v1.1.0-beta.1
+## 04/20/2016
+
+1. [](#new)
+    * **Blueprint Improvements**: The main improvements to Grav take the form of a major rewrite of our blueprint functionality. Blueprints are an essential piece of functionality within Grav that helps define configuration fields. These allow us to create a definition of a form field that can be rendered in the administrator plugin and allow the input, validation, and storage of values into the various configuration and page files that power Grav. Grav 1.0 had extensive support for building and extending blueprints, but Grav 1.1 takes this even further and adds improvements to our existing system.
+    * **Extending Blueprints**: You could extend forms in Grav 1.0, but now you can use a newer `extends@:` default syntax rather than the previous `'@extends'` string that needed to be quoted in YAML. Also this new format allows for the defining of a `context` which lets you define where to look for the base blueprint. Another new feature is the ability to extend from multiple blueprints.
+    * **Embedding/Importing Blueprints**: One feature that has been requested is the ability to embed or import one blueprint into another blueprint. This allows you to share fields or sub-form between multiple forms. This is accomplished via the `import@` syntax.
+    * **Removing Existing Fields and Properties**: Another new feature is the ability to remove completely existing fields or properties from an extended blueprint. This allows the user a lot more flexibility when creating custom forms by simply using the new `unset@: true` syntax. To remove a field property you would use `unset-<property>@: true` in your extended field definition, for example: `unset-options@: true`.
+    * **Replacing Existing Fields and Properties**: Similar to removing, you can now replace an existing field or property with the `replace@: true` syntax for the whole field, and `replace-<property>@: true` for a specific property.
+    * **Field Ordering**: Probably the most frequently requested blueprint functionality that we have added is the ability to change field ordering. Imagine that you want to extend the default page blueprint but add a new tab. Previously, this meant your tab would be added at the end of the form, but now you can define that you wish the new tab to be added right after the `content` tab. This works for any field too, so you can extend a blueprint and add your own custom fields anywhere you wish! This is accomplished by using the new `ordering@:` syntax with either an existing property name or an integer.
+    * **Configuration Properties**: Another useful new feature is the ability to directly access Grav configuration in blueprints with `config-<property>@` syntax. For example you can set a default for a field via `config-default@: site.author.name` which will use the author.name value from the `site.yaml` file as the `default` value for this field.
+    * **Function Calls**: The ability to call PHP functions for values has been improved in Grav 1.1 to be more powerful. You can use the `data-<property>@` syntax to call static methods to obtain values. For example: `data-default@: '\Grav\Plugin\Admin::route'`. You can now even pass parameters to these methods.
+    * **Validation Rules**: You can now define a custom blueprint-level validation rule and assign this rule to a form field.
+    * **Custom Form Field Types**: This advanced new functionality allows you to create a custom field type via a new plugin event called getFormFieldTypes(). This allows you to provide extra functionality or instructions on how to handle the form form field.
+    * **GPM Versioning**: A new feature that we have wanted to add to our GPM package management system is the ability to control dependencies by version. We have opted to use a syntax very similar to the Composer Package Manager that is already familiar to most PHP developers. This new versioning system allows you to define specific minimum version requirements of dependent packages within Grav. This should ensure that we have less (hopefully none!) issues when you update one package that also requires a specific minimum version of another package. The admin plugin for example may have an update that requires a specific version of Grav itself.
+    * **GPM Testing Channel**: GPM repository now comes with both a `stable` and `testing` channel. A new setting in `system.gpm.releases` allow to switch between the two channels. Developers will be able to decide whether their resource is going to be in a pre-release state or stable. Only users who switch to the **testing** channel will be able to install a pre-release version.
+    * **GPM Events**: Packages (plugins and themes) can now add event handlers to hook in the package GPM events: install, update, uninstall. A package can listen for events before and after each of these events, and can execute any PHP code, and optionally halt the procedure or return a message.
+    * Refactor of the process chain breaking out `Processors` into individual classes to allow for easier modification and addition. Thanks to toovy for this work. - [#745](https://github.com/getgrav/grav/pull/745)
+    * Added multipart downloads, resumable downloads, download throttling, and video streaming in the `Utils::download()` method.
+    * Added optional config to allow Twig processing in page frontmatter - [#788](https://github.com/getgrav/grav/pull/788)
+    * Added the ability to provide blueprints via a plugin (previously limited to Themes only).
+    * Added Developer CLI Tools to easily create a new theme or plugin
+    * Allow authentication for proxies - [#698](https://github.com/getgrav/grav/pull/698)
+    * Allow to override the default Parsedown behavior - [#747](https://github.com/getgrav/grav/pull/747)
+    * Added an option to allow to exclude external files from the pipeline, and to render the pipeline before/after excluded files
+    * Added the possibility to store translations of themes in separate files inside the `languages` folder
+    * Added a method to the Uri class to return the base relative URL including the language prefix, or the base relative url if multilanguage is not enabled
+    * Added a shortcut for pages.find() alias
+1. [](#improved)
+    * Now supporting hostnames with localhost environments for better vhost support/development
+    * Refactor hard-coded paths to use PHP Streams that allow a setup file to configure where certain parts of Grav are stored in the physical filesystem.
+    * If multilanguage is active, include the Intl Twig Extension to allow translating dates automatically (http://twig.sensiolabs.org/doc/extensions/intl.html)
+    * Allow having local themes with the same name as GPM themes, by adding `gpm: false` to the theme blueprint - [#767](https://github.com/getgrav/grav/pull/767)
+    * Caddyfile and Lighttpd config files updated
+    * Removed `node_modules` folder from backups to make them faster
+    * Display error when `bin/grav install` hasn't been run instead of throwing exception. Prevents "white page" errors if error display is off
+    * Improved command line flow when installing multiple packages: don't reinstall packages if already installed, ask once if should use symlinks if symlinks are found
+    * Added more tests to our testing suite
+    * Added x-ua-compatible to http_equiv metadata processing
+    * Added ability to have a per-page `frontmatter.yaml` file to set header frontmatter defaults. Especially useful for multilang scenarios - [#775](https://github.com/getgrav/grav/pull/775)
+    * Removed deprecated `bin/grav newuser` CLI command.  use `bin/plugin login newuser` instead.
+    * Added `webm` and `ogv` video types to the default media types list.
+1. [](#bugfix)
+    * Fix Zend Opcache `opcache.validate_timestamps=0` not detecting changes in compiled yaml and twig files
+    * Avoid losing params, query and fragment from the URL when auto-redirecting to a language-specific route - [#759](https://github.com/getgrav/grav/pull/759)
+    * Fix for non-pipeline assets getting lost when pipeline is cached to filesystem
+    * Fix for double encoding resulting from Markdown Extra
+    * Fix for a remote link breaking all CSS rewrites for pipeline
+    * Fix an issue with Retina alternatives not clearing properly between repeat uses
+    * Fix for non standard http/s external markdown links - [#738](https://github.com/getgrav/grav/issues/738)
+    * Fix for `find()` calling redirects via `dispatch()` causing infinite loops - [#781](https://github.com/getgrav/grav/issues/781)
+
 # v1.0.10
 ## 02/11/2016
-    
+
 1. [](#new)
     * Added new `Page::contentMeta()` mechanism to store content-level meta data alongside content
-    * Added Japanese language translation    
+    * Added Japanese language translation
 1. [](#improved)
     * Updated some vendor libraries
 1. [](#bugfix)
@@ -18,7 +187,7 @@
     * New **page-level SSL** functionality when using `absolute_urls`
     * Added `reverse_proxy` config option for issues with non-standard ports
     * Added `proxy_url` config option to support GPM behind proxy servers #639
-    * New `Pages::parentsRawRoutes()` method 
+    * New `Pages::parentsRawRoutes()` method
     * Enhanced `bin/gpm info` CLI command with Changelog support #559
     * Ability to add empty *Folder* via admin plugin
     * Added latest `jQuery 2.2.0` library to core
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 840d7dc2a9..5d5c527745 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,6 +55,8 @@ Guidelines for bug reports:
 6. **Isolate the problem** &mdash; create a [reduced test
    case](http://css-tricks.com/reduced-test-cases/) and provide a step-by-step instruction set on how to recreate the problem. Include code samples, page snippets or yaml configurations if needed.
 
+7. **Check the problem on Grav 1.1** &mdash; if you're using Grav 1.0, latest stable release, please also check if you can replicate the issue on Grav 1.1 RC as many bugs are already solved in the next Grav release.
+
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report.
 
@@ -119,4 +121,4 @@ accurate comments, etc.) and any other requirements.
 See [Using Pull Request](https://help.github.com/articles/using-pull-requests/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) if you're not familiar with Pull Requests.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owner to
-license your work under the same license as that used by the project.
\ No newline at end of file
+license your work under the same license as that used by the project.
diff --git a/README.md b/README.md
index 0586f6c006..4e00b75f0a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav 
+# ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav)
 
@@ -10,7 +10,7 @@ The underlying architecture of Grav is designed to use well-established and _bes
 * [Markdown](http://en.wikipedia.org/wiki/Markdown): for easy content creation
 * [YAML](http://yaml.org): for simple configuration
 * [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
-* [Doctrine Cache](http://docs.doctrine-project.org/en/2.0.x/reference/caching.html): layer for performance
+* [Doctrine Cache](http://doctrine-orm.readthedocs.io/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
 * [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
 * [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
 * [Symfony Console](http://symfony.com/doc/current/components/console/introduction.html): for CLI interface
@@ -29,7 +29,7 @@ These are the options to get Grav:
 
 You can download a **ready-built** package from the [Downloads page on http://getgrav.org](http://getgrav.org/downloads)
 
-### With composer
+### With Composer
 
 You can create a new project with the latest **stable** Grav release with the following command:
 
diff --git a/bin/composer.phar b/bin/composer.phar
index 3c67d59839..10c245e282 100755
Binary files a/bin/composer.phar and b/bin/composer.phar differ
diff --git a/bin/grav b/bin/grav
index 7c44efd2eb..faa8846f7b 100755
--- a/bin/grav
+++ b/bin/grav
@@ -32,15 +32,14 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', '0.1.0');
+$app = new Application('Grav CLI Application', GRAV_VERSION);
 $app->addCommands(array(
-    new Grav\Console\Cli\InstallCommand(),
-    new Grav\Console\Cli\ComposerCommand(),
-    new Grav\Console\Cli\SandboxCommand(),
-    new Grav\Console\Cli\CleanCommand(),
-    new Grav\Console\Cli\ClearCacheCommand(),
-    new Grav\Console\Cli\BackupCommand(),
-    new Grav\Console\Cli\NewProjectCommand(),
-    new Grav\Console\Cli\NewUserCommand(),
+    new \Grav\Console\Cli\InstallCommand(),
+    new \Grav\Console\Cli\ComposerCommand(),
+    new \Grav\Console\Cli\SandboxCommand(),
+    new \Grav\Console\Cli\CleanCommand(),
+    new \Grav\Console\Cli\ClearCacheCommand(),
+    new \Grav\Console\Cli\BackupCommand(),
+    new \Grav\Console\Cli\NewProjectCommand(),
 ));
 $app->run();
diff --git a/composer.json b/composer.json
index a467f07161..97bad168c9 100644
--- a/composer.json
+++ b/composer.json
@@ -17,19 +17,21 @@
         "symfony/polyfill-iconv": "~1.0",
         "doctrine/cache": "~1.5",
         "filp/whoops": "~2.0",
+        "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
         "gregwar/image": "~2.0",
-        "mrclay/minify": "~2.2",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "~1.2",
+        "rockettheme/toolbox": "dev-develop",
         "maximebf/debugbar": "~1.10",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "ext-zip": "*"
     },
     "require-dev": {
         "codeception/codeception": "^2.1",
+        "phpunit/php-code-coverage": "~2.0",
         "fzaninotto/faker": "^1.5"
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
index 5ff8b3311a..2ec248965c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e7fd6dac2d1a99dcd78c5572dd90a333",
-    "content-hash": "812ba1911705385948bc6b15c197f9b4",
+    "hash": "9c19c674a6ce22978364e1327bab1bbd",
+    "content-hash": "4b371a1eaef8d32d9ce9536c7c317625",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -79,16 +79,16 @@
         },
         {
             "name": "donatj/phpuseragentparser",
-            "version": "v0.5.0",
+            "version": "v0.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/donatj/PhpUserAgent.git",
-                "reference": "1acea75664179c8f0dcd57ced7e75a01af86bfa8"
+                "reference": "b00392786281877db6a51d0e48dee7296c7ba4f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/1acea75664179c8f0dcd57ced7e75a01af86bfa8",
-                "reference": "1acea75664179c8f0dcd57ced7e75a01af86bfa8",
+                "url": "https://api.github.com/repos/donatj/PhpUserAgent/zipball/b00392786281877db6a51d0e48dee7296c7ba4f8",
+                "reference": "b00392786281877db6a51d0e48dee7296c7ba4f8",
                 "shasum": ""
             },
             "require": {
@@ -97,7 +97,7 @@
             "require-dev": {
                 "camspiers/json-pretty": "0.1.*",
                 "donatj/drop": "*",
-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": ">=4.8"
             },
             "type": "library",
             "autoload": {
@@ -126,7 +126,7 @@
                 "user agent",
                 "useragent"
             ],
-            "time": "2015-09-22 21:04:13"
+            "time": "2016-03-07 17:14:32"
         },
         {
             "name": "erusev/parsedown",
@@ -134,12 +134,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "94688f21cc5d8bc85f1783b4c8b98b3288d712cb"
+                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/94688f21cc5d8bc85f1783b4c8b98b3288d712cb",
-                "reference": "94688f21cc5d8bc85f1783b4c8b98b3288d712cb",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/490a8f35a4163f59230f53c34f1fbb22a864c01e",
+                "reference": "490a8f35a4163f59230f53c34f1fbb22a864c01e",
                 "shasum": ""
             },
             "require": {
@@ -168,7 +168,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2016-01-07 17:36:51"
+            "time": "2016-03-09 17:02:39"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -216,16 +216,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.0.0",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a327942c50cbd62b25c6fbe08f173031ce25fbff"
+                "reference": "d13505b240a6f580bc75ba591da30299d6cb0eec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a327942c50cbd62b25c6fbe08f173031ce25fbff",
-                "reference": "a327942c50cbd62b25c6fbe08f173031ce25fbff",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/d13505b240a6f580bc75ba591da30299d6cb0eec",
+                "reference": "d13505b240a6f580bc75ba591da30299d6cb0eec",
                 "shasum": ""
             },
             "require": {
@@ -233,7 +233,8 @@
             },
             "require-dev": {
                 "mockery/mockery": "0.9.*",
-                "phpunit/phpunit": "^4.8 || ^5.0"
+                "phpunit/phpunit": "^4.8 || ^5.0",
+                "symfony/var-dumper": "~3.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -271,7 +272,7 @@
                 "whoops",
                 "zf2"
             ],
-            "time": "2016-01-06 17:51:21"
+            "time": "2016-04-07 06:16:25"
         },
         {
             "name": "gregwar/cache",
@@ -365,27 +366,37 @@
             "time": "2015-05-30 19:24:37"
         },
         {
-            "name": "ircmaxell/password-compat",
-            "version": "v1.0.4",
+            "name": "matthiasmullie/minify",
+            "version": "1.3.35",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+                "url": "https://github.com/matthiasmullie/minify.git",
+                "reference": "3253a81d07cd01afcb651e309900d8ad58a052da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/3253a81d07cd01afcb651e309900d8ad58a052da",
+                "reference": "3253a81d07cd01afcb651e309900d8ad58a052da",
                 "shasum": ""
             },
+            "require": {
+                "ext-pcre": "*",
+                "matthiasmullie/path-converter": "~1.0",
+                "php": ">=5.3.0"
+            },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "matthiasmullie/scrapbook": "~1.0",
+                "phpunit/phpunit": "~4.8"
             },
+            "bin": [
+                "bin/minifycss",
+                "bin/minifyjs"
+            ],
             "type": "library",
             "autoload": {
-                "files": [
-                    "lib/password.php"
-                ]
+                "psr-4": {
+                    "MatthiasMullie\\Minify\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -393,31 +404,84 @@
             ],
             "authors": [
                 {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
-                    "homepage": "http://blog.ircmaxell.com"
+                    "name": "Matthias Mullie",
+                    "email": "minify@mullie.eu",
+                    "homepage": "http://www.mullie.eu",
+                    "role": "Developer"
                 }
             ],
-            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
-            "homepage": "https://github.com/ircmaxell/password_compat",
+            "description": "CSS & JS minifier",
+            "homepage": "http://www.minifier.org",
             "keywords": [
-                "hashing",
-                "password"
+                "JS",
+                "css",
+                "javascript",
+                "minifier",
+                "minify"
             ],
-            "time": "2014-11-20 16:49:30"
+            "time": "2016-06-09 19:35:54"
+        },
+        {
+            "name": "matthiasmullie/path-converter",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/matthiasmullie/path-converter.git",
+                "reference": "7c36e5cafa95dd20008d19b153b506cffa8c2848"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/7c36e5cafa95dd20008d19b153b506cffa8c2848",
+                "reference": "7c36e5cafa95dd20008d19b153b506cffa8c2848",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "MatthiasMullie\\PathConverter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthias Mullie",
+                    "email": "pathconverter@mullie.eu",
+                    "homepage": "http://www.mullie.eu",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Relative path converter",
+            "homepage": "http://github.com/matthiasmullie/path-converter",
+            "keywords": [
+                "converter",
+                "path",
+                "paths",
+                "relative"
+            ],
+            "time": "2016-04-27 10:38:05"
         },
         {
             "name": "maximebf/debugbar",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "07741d84d39d10f00551c94284cdefcc69703e77"
+                "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/07741d84d39d10f00551c94284cdefcc69703e77",
-                "reference": "07741d84d39d10f00551c94284cdefcc69703e77",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
+                "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988",
                 "shasum": ""
             },
             "require": {
@@ -436,7 +500,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                 }
             },
             "autoload": {
@@ -465,20 +529,20 @@
                 "debug",
                 "debugbar"
             ],
-            "time": "2015-12-10 09:50:24"
+            "time": "2016-05-15 13:11:34"
         },
         {
             "name": "monolog/monolog",
-            "version": "1.17.2",
+            "version": "1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
+                "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
-                "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf",
+                "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf",
                 "shasum": ""
             },
             "require": {
@@ -493,13 +557,13 @@
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
                 "jakub-onderka/php-parallel-lint": "0.9",
+                "php-amqplib/php-amqplib": "~2.4",
                 "php-console/php-console": "^3.1.3",
                 "phpunit/phpunit": "~4.5",
                 "phpunit/phpunit-mock-objects": "2.3.0",
                 "raven/raven": "^0.13",
                 "ruflin/elastica": ">=0.90 <3.0",
-                "swiftmailer/swiftmailer": "~5.3",
-                "videlalvaro/php-amqplib": "~2.4"
+                "swiftmailer/swiftmailer": "~5.3"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
@@ -507,16 +571,17 @@
                 "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
                 "ext-mongo": "Allow sending log messages to a MongoDB server",
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
                 "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "raven/raven": "Allow sending log messages to a Sentry server",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-                "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.16.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -542,52 +607,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2015-10-14 12:51:02"
-        },
-        {
-            "name": "mrclay/minify",
-            "version": "2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mrclay/minify.git",
-                "reference": "3c11ba8232a2155a1a29552aafc528be5fb0a662"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mrclay/minify/zipball/3c11ba8232a2155a1a29552aafc528be5fb0a662",
-                "reference": "3c11ba8232a2155a1a29552aafc528be5fb0a662",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "php": ">=5.2.1"
-            },
-            "require-dev": {
-                "tubalmartin/cssmin": "~2.4.8"
-            },
-            "suggest": {
-                "tubalmartin/cssmin": "Support minify with CSSMin (YUI PHP port)"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "min/lib/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Stephen Clay",
-                    "email": "steve@mrclay.org",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
-            "homepage": "http://code.google.com/p/minify/",
-            "time": "2014-10-30 22:58:02"
+            "time": "2016-04-12 18:29:35"
         },
         {
             "name": "pimple/pimple",
@@ -675,27 +695,26 @@
         },
         {
             "name": "rockettheme/toolbox",
-            "version": "1.2.1",
+            "version": "dev-develop",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "22273dff75748eb1f51fcfa41fa85d8eff1f9f6c"
+                "reference": "12d9007979c816038ed7deacf67811c8b864c679"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/22273dff75748eb1f51fcfa41fa85d8eff1f9f6c",
-                "reference": "22273dff75748eb1f51fcfa41fa85d8eff1f9f6c",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/12d9007979c816038ed7deacf67811c8b864c679",
+                "reference": "12d9007979c816038ed7deacf67811c8b864c679",
                 "shasum": ""
             },
             "require": {
-                "ircmaxell/password-compat": "1.0.*",
                 "php": ">=5.4.0",
                 "pimple/pimple": "~3.0",
-                "symfony/event-dispatcher": "~2.5",
-                "symfony/yaml": "~2.5"
+                "symfony/event-dispatcher": ">2.5",
+                "symfony/yaml": ">2.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.0.*"
+                "phpunit/phpunit": "~5.1.5"
             },
             "type": "library",
             "autoload": {
@@ -720,20 +739,20 @@
                 "php",
                 "rockettheme"
             ],
-            "time": "2016-02-11 19:08:48"
+            "time": "2016-05-24 18:58:03"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.2",
+            "version": "v2.8.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
+                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
-                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
+                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
                 "shasum": ""
             },
             "require": {
@@ -780,20 +799,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-14 08:33:16"
+            "time": "2016-06-06 15:06:25"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.2",
+            "version": "v2.8.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
+                "reference": "2a6b8713f8bdb582058cfda463527f195b066110"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
-                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110",
+                "reference": "2a6b8713f8bdb582058cfda463527f195b066110",
                 "shasum": ""
             },
             "require": {
@@ -840,20 +859,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-13 10:28:07"
+            "time": "2016-06-06 11:11:27"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "be8627f0936f86fed0bec16fe79ebb4337299764"
+                "reference": "b287e8554b1ffd9b5b20b5df940d906930ff4a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/be8627f0936f86fed0bec16fe79ebb4337299764",
-                "reference": "be8627f0936f86fed0bec16fe79ebb4337299764",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/b287e8554b1ffd9b5b20b5df940d906930ff4a10",
+                "reference": "b287e8554b1ffd9b5b20b5df940d906930ff4a10",
                 "shasum": ""
             },
             "require": {
@@ -865,7 +884,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -899,20 +918,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-01-20 09:13:37"
+            "time": "2016-05-18 14:26:46"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "1289d16209491b584839022f29257ad859b8532d"
+                "reference": "dff51f72b0706335131b00a7f49606168c582594"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
-                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594",
                 "shasum": ""
             },
             "require": {
@@ -924,7 +943,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -958,20 +977,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-01-20 09:13:37"
+            "time": "2016-05-18 14:26:46"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v2.8.2",
+            "version": "v2.8.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "ab94426d127ad9e95433778a3a451fe9d18f3d6b"
+                "reference": "0c5970fc6cb9222b78559f20858f76db1e5ac326"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ab94426d127ad9e95433778a3a451fe9d18f3d6b",
-                "reference": "ab94426d127ad9e95433778a3a451fe9d18f3d6b",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0c5970fc6cb9222b78559f20858f76db1e5ac326",
+                "reference": "0c5970fc6cb9222b78559f20858f76db1e5ac326",
                 "shasum": ""
             },
             "require": {
@@ -1021,20 +1040,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2016-01-07 13:38:40"
+            "time": "2016-05-24 10:00:02"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.2",
+            "version": "v2.8.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8"
+                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8",
-                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34",
+                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34",
                 "shasum": ""
             },
             "require": {
@@ -1070,20 +1089,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-13 10:28:07"
+            "time": "2016-06-06 11:11:27"
         },
         {
             "name": "twig/twig",
-            "version": "v1.24.0",
+            "version": "v1.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
+                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
-                "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
+                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
                 "shasum": ""
             },
             "require": {
@@ -1131,54 +1150,121 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2016-01-25 21:22:18"
+            "time": "2016-05-30 09:11:59"
         }
     ],
     "packages-dev": [
+        {
+            "name": "behat/gherkin",
+            "version": "v4.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
+                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "symfony/yaml": "~2.1"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2015-12-30 14:47:00"
+        },
         {
             "name": "codeception/codeception",
-            "version": "2.1.6",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "b199941f5e59d1e7fd32d78296c8ab98db873d89"
+                "reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b199941f5e59d1e7fd32d78296c8ab98db873d89",
-                "reference": "b199941f5e59d1e7fd32d78296c8ab98db873d89",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f137636f0c185e7d4a495b9cea70c1afae27dfc7",
+                "reference": "f137636f0c185e7d4a495b9cea70c1afae27dfc7",
                 "shasum": ""
             },
             "require": {
+                "behat/gherkin": "~4.4.0",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "facebook/webdriver": ">=1.0.1",
+                "facebook/webdriver": ">=1.0.1 <2.0",
                 "guzzlehttp/guzzle": ">=4.1.4 <7.0",
                 "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.4.0",
-                "phpunit/phpunit": "~4.8.0",
-                "symfony/browser-kit": ">=2.4|<3.1",
-                "symfony/console": ">=2.4|<3.1",
-                "symfony/css-selector": ">=2.4|<3.1",
-                "symfony/dom-crawler": ">=2.4|<3.1",
-                "symfony/event-dispatcher": ">=2.4|<3.1",
-                "symfony/finder": ">=2.4|<3.1",
-                "symfony/yaml": ">=2.4|<3.1"
+                "php": ">=5.4.0 <8.0",
+                "phpunit/php-code-coverage": ">=2.1.3",
+                "phpunit/phpunit": ">4.8.20 <5.5",
+                "symfony/browser-kit": ">=2.7 <4.0",
+                "symfony/console": ">=2.7 <4.0",
+                "symfony/css-selector": ">=2.7 <4.0",
+                "symfony/dom-crawler": ">=2.7 <4.0",
+                "symfony/event-dispatcher": ">=2.7 <4.0",
+                "symfony/finder": ">=2.7 <4.0",
+                "symfony/yaml": ">=2.7 <4.0"
             },
             "require-dev": {
                 "codeception/specify": "~0.3",
-                "facebook/php-sdk-v4": "~4.0",
+                "facebook/php-sdk-v4": "~5.0",
                 "flow/jsonpath": "~0.2",
+                "league/factory-muffin": "^3.0",
+                "league/factory-muffin-faker": "^1.0",
+                "mongodb/mongodb": "^1.0",
                 "monolog/monolog": "~1.8",
-                "pda/pheanstalk": "~2.0",
-                "videlalvaro/php-amqplib": "~2.4"
+                "pda/pheanstalk": "~3.0",
+                "php-amqplib/php-amqplib": "~2.4",
+                "predis/predis": "^1.0",
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
-                "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests",
                 "codeception/specify": "BDD-style code blocks",
                 "codeception/verify": "BDD-style assertions",
-                "monolog/monolog": "Log test steps",
-                "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module."
+                "flow/jsonpath": "For using JSONPath in REST module",
+                "league/factory-muffin": "For DataFactory module",
+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
+                "symfony/phpunit-bridge": "For phpunit-bridge support"
             },
             "bin": [
                 "codecept"
@@ -1213,7 +1299,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "time": "2016-02-09 22:27:48"
+            "time": "2016-06-03 12:44:06"
         },
         {
             "name": "doctrine/instantiator",
@@ -1314,33 +1400,29 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3|^7.0"
             },
             "require-dev": {
+                "ext-intl": "*",
                 "phpunit/phpunit": "~4.0",
                 "squizlabs/php_codesniffer": "~1.5"
             },
-            "suggest": {
-                "ext-intl": "*"
-            },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
+                "branch-alias": []
             },
             "autoload": {
                 "psr-4": {
@@ -1362,20 +1444,20 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2015-05-29 06:29:14"
+            "time": "2016-04-29 12:21:54"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.1.1",
+            "version": "6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
+                "reference": "d094e337976dff9d8e2424e8485872194e768662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
-                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
+                "reference": "d094e337976dff9d8e2424e8485872194e768662",
                 "shasum": ""
             },
             "require": {
@@ -1391,7 +1473,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.1-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "autoload": {
@@ -1424,20 +1506,20 @@
                 "rest",
                 "web service"
             ],
-            "time": "2015-11-23 00:47:50"
+            "time": "2016-03-21 20:02:09"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.0.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
-                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/c10d860e2a9595f8883527fa0021c7da9e65f579",
+                "reference": "c10d860e2a9595f8883527fa0021c7da9e65f579",
                 "shasum": ""
             },
             "require": {
@@ -1475,20 +1557,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2015-10-15 22:28:00"
+            "time": "2016-05-18 16:56:05"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.2.2",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb"
+                "reference": "31382fef2889136415751badebbd1cb022a4ed72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb",
-                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
+                "reference": "31382fef2889136415751badebbd1cb022a4ed72",
                 "shasum": ""
             },
             "require": {
@@ -1533,41 +1615,138 @@
                 "stream",
                 "uri"
             ],
-            "time": "2016-01-23 01:23:02"
+            "time": "2016-04-13 19:56:01"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
             },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-06-10 09:48:41"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
                         "src/"
                     ]
                 }
@@ -1579,37 +1758,39 @@
             "authors": [
                 {
                     "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
+                    "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "time": "2016-06-10 07:14:17"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.5.0",
+            "version": "v1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
-                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1"
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "~2.0"
+                "phpspec/phpspec": "^2.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.6.x-dev"
                 }
             },
             "autoload": {
@@ -1642,7 +1823,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2015-08-13 10:07:40"
+            "time": "2016-06-07 08:13:47"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1796,21 +1977,24 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.7",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
             "type": "library",
             "autoload": {
                 "classmap": [
@@ -1833,7 +2017,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2015-06-21 08:01:12"
+            "time": "2016-05-12 18:03:57"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1886,16 +2070,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.8.23",
+            "version": "4.8.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6e351261f9cd33daf205a131a1ba61c6d33bd483"
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6e351261f9cd33daf205a131a1ba61c6d33bd483",
-                "reference": "6e351261f9cd33daf205a131a1ba61c6d33bd483",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
                 "shasum": ""
             },
             "require": {
@@ -1909,7 +2093,7 @@
                 "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/php-timer": "^1.0.6",
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
                 "sebastian/diff": "~1.2",
@@ -1954,7 +2138,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-02-11 14:56:33"
+            "time": "2016-05-17 03:09:28"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -2179,16 +2363,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.3",
+            "version": "1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6e7133793a8e5a5714a551a8324337374be209df"
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
-                "reference": "6e7133793a8e5a5714a551a8324337374be209df",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
                 "shasum": ""
             },
             "require": {
@@ -2225,7 +2409,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2015-12-02 08:37:27"
+            "time": "2016-05-17 03:18:57"
         },
         {
             "name": "sebastian/exporter",
@@ -2434,16 +2618,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "dde849a0485b70a24b36f826ed3fb95b904d80c3"
+                "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dde849a0485b70a24b36f826ed3fb95b904d80c3",
-                "reference": "dde849a0485b70a24b36f826ed3fb95b904d80c3",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/b645a9b23d6c0eeba5ac823fa87bf010db9aff22",
+                "reference": "b645a9b23d6c0eeba5ac823fa87bf010db9aff22",
                 "shasum": ""
             },
             "require": {
@@ -2460,7 +2644,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2487,20 +2671,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 11:34:55"
+            "time": "2016-03-04 07:56:56"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "6605602690578496091ac20ec7a5cbd160d4dff4"
+                "reference": "e17f386efef7258ac671c24e727673abd086b0cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/6605602690578496091ac20ec7a5cbd160d4dff4",
-                "reference": "6605602690578496091ac20ec7a5cbd160d4dff4",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e17f386efef7258ac671c24e727673abd086b0cf",
+                "reference": "e17f386efef7258ac671c24e727673abd086b0cf",
                 "shasum": ""
             },
             "require": {
@@ -2509,7 +2693,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2540,20 +2724,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 05:14:46"
+            "time": "2016-03-04 07:56:56"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b693a9650aa004576b593ff2e91ae749dc90123d"
+                "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b693a9650aa004576b593ff2e91ae749dc90123d",
-                "reference": "b693a9650aa004576b593ff2e91ae749dc90123d",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/12aa63fd41b060d2bee9a34623d29eda70bc8fe3",
+                "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3",
                 "shasum": ""
             },
             "require": {
@@ -2569,7 +2753,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2596,20 +2780,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-25 09:56:57"
+            "time": "2016-05-13 15:49:09"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.0.2",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723"
+                "reference": "40d17ed287bf51a2f884c4619ce8ff2a1c5cd219"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/623bda0abd9aa29e529c8e9c08b3b84171914723",
-                "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/40d17ed287bf51a2f884c4619ce8ff2a1c5cd219",
+                "reference": "40d17ed287bf51a2f884c4619ce8ff2a1c5cd219",
                 "shasum": ""
             },
             "require": {
@@ -2618,7 +2802,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2645,7 +2829,56 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 05:14:46"
+            "time": "2016-05-13 18:06:41"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2015-08-24 13:29:44"
         }
     ],
     "aliases": [
@@ -2658,7 +2891,8 @@
     ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "erusev/parsedown": 20
+        "erusev/parsedown": 20,
+        "rockettheme/toolbox": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/index.php b/index.php
index 51d9f55d8d..77725b92a2 100644
--- a/index.php
+++ b/index.php
@@ -1,20 +1,27 @@
 <?php
-namespace Grav;
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
+namespace Grav;
 
 // Ensure vendor libraries exist
 $autoload = __DIR__ . '/vendor/autoload.php';
 if (!is_file($autoload)) {
-    throw new \RuntimeException("Please run: <i>bin/grav install</i>");
+    die("Please run: <i>bin/grav install</i>");
 }
 
 use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
 
 // Register the auto-loader.
 $loader = require_once $autoload;
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    throw new \RuntimeException(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
+    die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
 // Set timezone to default, falls back to system if php.ini not set
@@ -22,7 +29,7 @@
 
 // Set internal encoding if mbstring loaded
 if (!extension_loaded('mbstring')) {
-    throw new \RuntimeException("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
 }
 mb_internal_encoding('UTF-8');
 
@@ -37,7 +44,6 @@
 try {
     $grav->process();
 } catch (\Exception $e) {
-    $grav->fireEvent('onFatalException');
+    $grav->fireEvent('onFatalException', new Event(['exception' => $e]));
     throw $e;
 }
-
diff --git a/system/assets/jquery/jquery-2.x.min.js b/system/assets/jquery/jquery-2.x.min.js
index 23e645646c..4024b6622b 100644
--- a/system/assets/jquery/jquery-2.x.min.js
+++ b/system/assets/jquery/jquery-2.x.min.js
@@ -1,4 +1,4 @@
-/*! jQuery v2.2.0 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!k.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=R.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c}catch(e){}O.set(a,b,c);
-}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return this;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ca(b),i="border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Fa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Ba.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+Oa(b,c,e||(i?"border":"content"),f,h)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=_a(this,n.extend({},a),f);(e||N.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=N.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)}}),ab={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b];
-},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(void 0===a||"boolean"===c)&&(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){return n.trim(a.value)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(n.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var hb=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!hb.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,hb.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}}),n.fn.extend({trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var ib=a.location,jb=n.now(),kb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return(!c||c.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+b),c};var lb=/#.*$/,mb=/([?&])_=[^&]*/,nb=/^(.*?):[ \t]*([^\r\n]*)$/gm,ob=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,pb=/^(?:GET|HEAD)$/,qb=/^\/\//,rb={},sb={},tb="*/".concat("*"),ub=d.createElement("a");ub.href=ib.href;function vb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function wb(a,b,c,d){var e={},f=a===sb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function xb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function yb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function zb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ib.href,type:"GET",isLocal:ob.test(ib.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":tb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?xb(xb(a,n.ajaxSettings),b):xb(n.ajaxSettings,a)},ajaxPrefilter:vb(rb),ajaxTransport:vb(sb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=nb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||ib.href)+"").replace(lb,"").replace(qb,ib.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=ub.protocol+"//"+ub.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),wb(rb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!pb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(kb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=mb.test(f)?f.replace(mb,"$1_="+jb++):f+(kb.test(f)?"&":"?")+"_="+jb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+tb+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=wb(sb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=yb(m,x,d)),u=zb(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,(b||!y)&&(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Ab=/%20/g,Bb=/\[\]$/,Cb=/\r?\n/g,Db=/^(?:submit|button|image|reset|file)$/i,Eb=/^(?:input|select|textarea|keygen)/i;function Fb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Bb.test(a)?d(a,e):Fb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Fb(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Fb(c,a[c],b,e);return d.join("&").replace(Ab,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Eb.test(this.nodeName)&&!Db.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Cb,"\r\n")}}):{name:b.name,value:c.replace(Cb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Gb={0:200,1223:204},Hb=n.ajaxSettings.xhr();l.cors=!!Hb&&"withCredentials"in Hb,l.ajax=Hb=!!Hb,n.ajaxTransport(function(b){var c,d;return l.cors||Hb&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Gb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Ib=[],Jb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Ib.pop()||n.expando+"_"+jb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Jb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Jb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Jb,"$1"+e):b.jsonp!==!1&&(b.url+=(kb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Ib.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),l.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||(l.createHTMLDocument?d.implementation.createHTMLDocument(""):d);var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Kb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Kb)return Kb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function Lb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(e=d.getBoundingClientRect(),c=Lb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0)-a.scrollTop(),d.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Lb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return K(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Mb=a.jQuery,Nb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Nb),b&&a.jQuery===n&&(a.jQuery=Mb),n},b||(a.jQuery=a.$=n),n});
\ No newline at end of file
+/*! jQuery v2.2.4 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){var b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c;
+}catch(e){}O.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ca(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Fa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ba.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Oa(a,b,c||(g?"border":"content"),d,f)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=_a(this,n.extend({},a),f);(e||N.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=N.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)}}),ab={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),
+void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\r/g,hb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(hb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(n.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var ib=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!ib.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,ib.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b)}}),n.fn.extend({trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var jb=a.location,kb=n.now(),lb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var mb=/#.*$/,nb=/([?&])_=[^&]*/,ob=/^(.*?):[ \t]*([^\r\n]*)$/gm,pb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,qb=/^(?:GET|HEAD)$/,rb=/^\/\//,sb={},tb={},ub="*/".concat("*"),vb=d.createElement("a");vb.href=jb.href;function wb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function xb(a,b,c,d){var e={},f=a===tb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function yb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function zb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Ab(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:jb.href,type:"GET",isLocal:pb.test(jb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":ub,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?yb(yb(a,n.ajaxSettings),b):yb(n.ajaxSettings,a)},ajaxPrefilter:wb(sb),ajaxTransport:wb(tb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=ob.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||jb.href)+"").replace(mb,"").replace(rb,jb.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=vb.protocol+"//"+vb.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),xb(sb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!qb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(lb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=nb.test(f)?f.replace(nb,"$1_="+kb++):f+(lb.test(f)?"&":"?")+"_="+kb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+ub+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=xb(tb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=zb(m,x,d)),u=Ab(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Bb=/%20/g,Cb=/\[\]$/,Db=/\r?\n/g,Eb=/^(?:submit|button|image|reset|file)$/i,Fb=/^(?:input|select|textarea|keygen)/i;function Gb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Cb.test(a)?d(a,e):Gb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Gb(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Gb(c,a[c],b,e);return d.join("&").replace(Bb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Fb.test(this.nodeName)&&!Eb.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Db,"\r\n")}}):{name:b.name,value:c.replace(Db,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Hb={0:200,1223:204},Ib=n.ajaxSettings.xhr();l.cors=!!Ib&&"withCredentials"in Ib,l.ajax=Ib=!!Ib,n.ajaxTransport(function(b){var c,d;return l.cors||Ib&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Hb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Jb=[],Kb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Jb.pop()||n.expando+"_"+kb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Kb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Kb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Kb,"$1"+e):b.jsonp!==!1&&(b.url+=(lb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Jb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Lb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Lb)return Lb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function Mb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(e=d.getBoundingClientRect(),c=Mb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Mb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return K(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Nb=a.jQuery,Ob=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Ob),b&&a.jQuery===n&&(a.jQuery=Nb),n},b||(a.jQuery=a.$=n),n});
diff --git a/system/blueprints/config/site.yaml b/system/blueprints/config/site.yaml
index 485f2c375e..f21121b887 100644
--- a/system/blueprints/config/site.yaml
+++ b/system/blueprints/config/site.yaml
@@ -59,6 +59,7 @@ form:
                 summary.size:
                     type: text
                     size: x-small
+                    append: PLUGIN_ADMIN.CHARACTERS
                     label: PLUGIN_ADMIN.SUMMARY_SIZE
                     help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP
                     validate:
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index 7b2bd00ad2..bfb8544057 100644
--- a/system/blueprints/config/system.yaml
+++ b/system/blueprints/config/system.yaml
@@ -56,7 +56,7 @@ form:
                     size: medium
                     classes: fancy
                     help: PLUGIN_ADMIN.TIMEZONE_HELP
-                    '@data-options': '\Grav\Common\Utils::timezones'
+                    data-options@: '\Grav\Common\Utils::timezones'
                     default: ''
                     options:
                         '': 'Default (Server Timezone)'
@@ -69,9 +69,7 @@ form:
                     label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
                     help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
                     placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
-                    '@data-options': '\Grav\Common\Utils::dateFormats'
-                    options:
-                        "": Auto Guess or Enter Custom
+                    data-options@: '\Grav\Common\Utils::dateFormats'
                     validate:
                         type: string
 
@@ -127,6 +125,7 @@ form:
                 pages.list.count:
                     type: text
                     size: x-small
+                    append: PLUGIN_ADMIN.PAGES
                     label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
                     help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
                     validate:
@@ -236,8 +235,6 @@ form:
                 pages.twig_first:
                     type: toggle
                     label: PLUGIN_ADMIN.TWIG_FIRST
-                    highlight: asc
-                    default: desc
                     help: PLUGIN_ADMIN.TWIG_FIRST_HELP
                     highlight: 0
                     options:
@@ -246,6 +243,27 @@ form:
                     validate:
                         type: bool
 
+                pages.frontmatter.process_twig:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG
+                    help: PLUGIN_ADMIN.FRONTMATTER_PROCESS_TWIG_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.frontmatter.ignore_fields:
+                    type: selectize
+                    size: large
+                    placeholder: "e.g. forms"
+                    label: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS
+                    help: PLUGIN_ADMIN.FRONTMATTER_IGNORE_FIELDS_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
         languages:
             type: section
             title: PLUGIN_ADMIN.LANGUAGES
@@ -339,6 +357,7 @@ form:
                 pages.expires:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.EXPIRES
                     help: PLUGIN_ADMIN.EXPIRES_HELP
                     validate:
@@ -460,9 +479,54 @@ form:
                         auto: Auto detect
                         file: File
                         apc: APC
-                        xcache: XCache
-                        memcache: MemCache
+                        apcu: APCu
+                        xcache: Xcache
+                        memcache: Memcache
+                        memcached: Memcached
                         wincache: WinCache
+                        redis: Redis
+
+                cache.memcache.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.MEMCACHE_SERVER
+                    help: PLUGIN_ADMIN.MEMCACHE_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.memcache.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.MEMCACHE_PORT
+                    help: PLUGIN_ADMIN.MEMCACHE_PORT_HELP
+                    placeholder: "11211"
+
+                cache.memcached.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.MEMCACHED_SERVER
+                    help: PLUGIN_ADMIN.MEMCACHED_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.memcached.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.MEMCACHED_PORT
+                    help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
+                    placeholder: "11211"
+                
+                cache.redis.server:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.REDIS_SERVER
+                    help: PLUGIN_ADMIN.REDIS_SERVER_HELP
+                    placeholder: "localhost"
+
+                cache.redis.port:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.REDIS_PORT
+                    help: PLUGIN_ADMIN.REDIS_PORT_HELP
+                    placeholder: "6379"
 
                 cache.prefix:
                     type: text
@@ -474,6 +538,7 @@ form:
                 cache.lifetime:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.LIFETIME
                     help: PLUGIN_ADMIN.LIFETIME_HELP
                     validate:
@@ -490,7 +555,6 @@ form:
                     validate:
                         type: bool
 
-
         twig:
             type: section
             title: PLUGIN_ADMIN.TWIG_TEMPLATING
@@ -512,7 +576,7 @@ form:
                     type: toggle
                     label: PLUGIN_ADMIN.TWIG_DEBUG
                     help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
-                    highlight: 0
+                    highlight: 1
                     options:
                         1: PLUGIN_ADMIN.YES
                         0: PLUGIN_ADMIN.NO
@@ -569,6 +633,28 @@ form:
                     validate:
                        type: bool
 
+                assets.css_pipeline_include_externals:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS
+                    help: PLUGIN_ADMIN.CSS_PIPELINE_INCLUDE_EXTERNALS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
+                assets.css_pipeline_before_excludes:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES
+                    help: PLUGIN_ADMIN.CSS_PIPELINE_BEFORE_EXCLUDES_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
                 assets.css_minify:
                     type: toggle
                     label: PLUGIN_ADMIN.CSS_MINIFY
@@ -613,6 +699,28 @@ form:
                     validate:
                         type: bool
 
+                assets.js_pipeline_include_externals:
+                    type: toggle
+                    label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS
+                    help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_INCLUDE_EXTERNALS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
+                assets.js_pipeline_before_excludes:
+                    type: toggle
+                    label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES
+                    help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_BEFORE_EXCLUDES_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                       type: bool
+
                 assets.js_minify:
                     type: toggle
                     label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
@@ -705,6 +813,7 @@ form:
             fields:
                 images.default_image_quality:
                     type: text
+                    append: '%'
                     label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
                     help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
                     classes: x-small
@@ -748,6 +857,7 @@ form:
 
                 media.upload_limit:
                     type: text
+                    append: bytes
                     label: PLUGIN_ADMIN.UPLOAD_LIMIT
                     help: PLUGIN_ADMIN.UPLOAD_LIMIT_HELP
                     classes: small
@@ -806,6 +916,7 @@ form:
                 session.timeout:
                     type: text
                     size: small
+                    append: NICETIME.SECOND_PLURAL
                     label: PLUGIN_ADMIN.TIMEOUT
                     help: PLUGIN_ADMIN.TIMEOUT_HELP
                     validate:
@@ -848,7 +959,16 @@ form:
             underline: true
 
             fields:
-                proxy_url:
+                gpm.releases:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_RELEASES
+                    highlight: stable
+                    help: PLUGIN_ADMIN.GPM_RELEASES_HELP
+                    options:
+                        stable: PLUGIN_ADMIN.STABLE
+                        testing: PLUGIN_ADMIN.TESTING
+
+                gpm.proxy_url:
                     type: text
                     size: medium
                     placeholder: "e.g. 127.0.0.1:3128"
diff --git a/system/blueprints/media/move.yaml b/system/blueprints/media/move.yaml
index 6287e0595c..06fc5bac8c 100644
--- a/system/blueprints/media/move.yaml
+++ b/system/blueprints/media/move.yaml
@@ -5,4 +5,4 @@ form:
       type: select
       label: PLUGIN_ADMIN.PAGE
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
+      data-options@: '\Grav\Common\Page\Pages::parents'
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index 6eab5d4644..14116aab0f 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -2,7 +2,7 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: "[a-zа-я][a-zа-я0-9_\-]+"
     min: 2
     max: 80
 
@@ -29,7 +29,6 @@ form:
 
             content:
                 type: markdown
-                showPreview: true
                 validate:
                   type: textarea
 
@@ -45,7 +44,7 @@ form:
 
             publishing:
               type: section
-              title: Publishing
+              title: PLUGIN_ADMIN.PUBLISHING
               underline: true
 
               fields:
@@ -139,8 +138,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -150,7 +149,7 @@ form:
                       label: PLUGIN_ADMIN.PAGE_FILE
                       help: PLUGIN_ADMIN.PAGE_FILE_HELP
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::pageTypes'
+                      data-options@: '\Grav\Common\Page\Pages::pageTypes'
 
                     header.body_classes:
                       type: text
@@ -178,6 +177,19 @@ form:
 
               fields:
 
+                header.dateformat:
+                  toggleable: true
+                  type: select
+                  size: medium
+                  selectize:
+                    create: true
+                  label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+                  help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+                  placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+                  data-options@: '\Grav\Common\Utils::dateFormats'
+                  validate:
+                    type: string
+
                 header.menu:
                   type: text
                   label: PLUGIN_ADMIN.MENU
@@ -203,7 +215,7 @@ form:
                   type: checkboxes
                   label: PLUGIN_ADMIN.PROCESS
                   toggleable: true
-                  '@config-default': system.pages.process
+                  config-default@: system.pages.process
                   default:
                     markdown: true
                     twig: false
@@ -218,7 +230,7 @@ form:
                   label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE
                   default: default
                   placeholder: PLUGIN_ADMIN.USE_GLOBAL
-                  '@data-options': '\Grav\Common\Page\Pages::types'
+                  data-options@: '\Grav\Common\Page\Pages::types'
 
                 header.routable:
                   type: toggle
@@ -256,12 +268,9 @@ form:
                     type: bool
 
                 header.template:
-                  type: select
+                  type: text
                   toggleable: true
-                  classes: fancy
                   label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
-                  default: default
-                  '@data-options': '\Grav\Common\Page\Pages::types'
 
                 header.append_url_extension:
                   type: text
diff --git a/system/blueprints/pages/modular.yaml b/system/blueprints/pages/modular.yaml
index ce62ecd1c4..2331ebf3ea 100644
--- a/system/blueprints/pages/modular.yaml
+++ b/system/blueprints/pages/modular.yaml
@@ -18,7 +18,7 @@ form:
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
               options:
-                '@self.modular': Children
+                '@self.modular': Modular Children
 
             header.content.order.by:
               type: select
diff --git a/system/blueprints/pages/modular_new.yaml b/system/blueprints/pages/modular_new.yaml
index 45ef1667df..57ede83e8c 100644
--- a/system/blueprints/pages/modular_new.yaml
+++ b/system/blueprints/pages/modular_new.yaml
@@ -29,10 +29,8 @@ form:
       type: select
       label: PLUGIN_ADMIN.PAGE
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::route'
-      options:
-        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\admin::rawRoute'
       validate:
         required: true
 
@@ -42,7 +40,7 @@ form:
       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
       default: default
-      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+      data-options@: '\Grav\Common\Page\Pages::modularTypes'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index 393cde5fd2..6e71eaa130 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -19,13 +19,22 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
-
+              autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia
@@ -69,8 +78,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\admin::rawRoute'
                       options:
                         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
@@ -81,7 +90,7 @@ form:
                       classes: fancy
                       label: PLUGIN_ADMIN.MODULAR_TEMPLATE
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
+                      data-options@: '\Grav\Common\Page\Pages::modularTypes'
                       validate:
                         required: true
 
diff --git a/system/blueprints/pages/move.yaml b/system/blueprints/pages/move.yaml
index 4e7bf23e5f..5fda52fd29 100644
--- a/system/blueprints/pages/move.yaml
+++ b/system/blueprints/pages/move.yaml
@@ -11,7 +11,7 @@ form:
       type: select
       label: PLUGIN_ADMIN.PARENT
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::route'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\admin::rawRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
diff --git a/system/blueprints/pages/new.yaml b/system/blueprints/pages/new.yaml
index 80c05f3751..0b2fe75fc6 100644
--- a/system/blueprints/pages/new.yaml
+++ b/system/blueprints/pages/new.yaml
@@ -31,8 +31,8 @@ form:
       type: select
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
@@ -43,8 +43,8 @@ form:
       classes: fancy
       label: PLUGIN_ADMIN.PAGE_FILE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      '@data-options': '\Grav\Common\Page\Pages::types'
-      '@data-default': '\Grav\Plugin\admin::getLastPageName'
+      data-options@: '\Grav\Common\Page\Pages::types'
+      data-default@: '\Grav\Plugin\admin::getLastPageName'
       validate:
         required: true
 
diff --git a/system/blueprints/pages/new_folder.yaml b/system/blueprints/pages/new_folder.yaml
index 311d814bd7..c4fe96165d 100644
--- a/system/blueprints/pages/new_folder.yaml
+++ b/system/blueprints/pages/new_folder.yaml
@@ -10,7 +10,7 @@ form:
 
     section:
         type: section
-        title: PLUGIN_ADMIN.ADD_PAGE
+        title: PLUGIN_ADMIN.ADD_FOLDER
 
     folder:
       type: text
@@ -24,8 +24,8 @@ form:
       type: select
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      '@data-options': '\Grav\Common\Page\Pages::parents'
-      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index bed82d5932..fe5dba2fef 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -19,13 +19,22 @@ form:
 
           fields:
             frontmatter:
-              type: frontmatter
+              classes: frontmatter
+              type: editor
               label: PLUGIN_ADMIN.FRONTMATTER
               autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              showPreview: true
 
             uploads:
               type: pagemedia
@@ -69,8 +78,8 @@ form:
                       type: select
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      '@data-options': '\Grav\Common\Page\Pages::parents'
-                      '@data-default': '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
@@ -80,7 +89,7 @@ form:
                       label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
                       help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
                       default: default
-                      '@data-options': '\Grav\Common\Page\Pages::types'
+                      data-options@: '\Grav\Common\Page\Pages::types'
                       validate:
                         required: true
 
diff --git a/system/blueprints/user/account.yaml b/system/blueprints/user/account.yaml
index 669f5c7bbf..bd1caa85f8 100644
--- a/system/blueprints/user/account.yaml
+++ b/system/blueprints/user/account.yaml
@@ -1,85 +1,92 @@
 title: Site
 form:
     validation: loose
+
     fields:
 
-        content:
-            type: section
-            title: PLUGIN_ADMIN.ACCOUNT
+            info:
+                type: userinfo
+                size: large
+
+            content:
+                type: section
+                title: PLUGIN_ADMIN.ACCOUNT
+                underline: true
+
 
-            fields:
-                username:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.USERNAME
-                    disabled: true
-                    readonly: true
+            username:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.USERNAME
+                disabled: true
+                readonly: true
 
-                email:
-                    type: email
-                    size: large
-                    label: PLUGIN_ADMIN.EMAIL
-                    validate:
-                      type: email
-                      message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                      required: true
+            email:
+                type: email
+                size: large
+                label: PLUGIN_ADMIN.EMAIL
+                validate:
+                  type: email
+                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+                  required: true
 
-                password:
-                    type: password
-                    size: large
-                    label: PLUGIN_ADMIN.PASSWORD
-                    validate:
-                      required: false
-                      message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                      pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+            password:
+                type: password
+                size: large
+                label: PLUGIN_ADMIN.PASSWORD
+                validate:
+                  required: false
+                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+                  pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 
-                fullname:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.FULL_NAME
-                    validate:
-                      required: true
+            fullname:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.FULL_NAME
+                validate:
+                  required: true
 
-                title:
-                    type: text
-                    size: large
-                    label: PLUGIN_ADMIN.TITLE
+            title:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.TITLE
 
-                language:
-                    type: select
-                    label: PLUGIN_ADMIN.LANGUAGE
-                    size: medium
-                    classes: fancy
-                    '@data-options': '\Grav\Plugin\admin::adminLanguages'
-                    default: 'en'
-                    help: PLUGIN_ADMIN.LANGUAGE_HELP
+            language:
+                type: select
+                label: PLUGIN_ADMIN.LANGUAGE
+                size: medium
+                classes: fancy
+                data-options@: '\Grav\Plugin\admin::adminLanguages'
+                default: 'en'
+                help: PLUGIN_ADMIN.LANGUAGE_HELP
 
-                security:
-                    title: PLUGIN_ADMIN.ACCESS_LEVELS
-                    type: section
-                    security: admin.super
+            security:
+                title: PLUGIN_ADMIN.ACCESS_LEVELS
+                type: section
+                security: admin.super
+                underline: true
 
-                    fields:
-                        groups:
-                            type: selectize
-                            size: large
-                            label: PLUGIN_ADMIN.GROUPS
-                            '@data-options': '\Grav\User\Groups::groups'
-                            classes: fancy
-                            help: PLUGIN_ADMIN.GROUPS_HELP
-                            validate:
-                                type: commalist
+                fields:
+                    groups:
+                        type: selectize
+                        size: large
+                        label: PLUGIN_ADMIN.GROUPS
+                        data-options@: '\Grav\User\Groups::groups'
+                        classes: fancy
+                        help: PLUGIN_ADMIN.GROUPS_HELP
+                        validate:
+                            type: commalist
 
-                        access.admin:
+                    access.admin:
+                        type: array
+                        label: PLUGIN_ADMIN.ADMIN_ACCESS
+                        multiple: false
+                        validate:
                             type: array
-                            label: PLUGIN_ADMIN.ADMIN_ACCESS
-                            multiple: false
-                            validate:
-                                type: array
 
-                        access.site:
+                    access.site:
+                        type: array
+                        label: PLUGIN_ADMIN.SITE_ACCESS
+                        multiple: false
+                        validate:
                             type: array
-                            label: PLUGIN_ADMIN.SITE_ACCESS
-                            multiple: false
-                            validate:
-                                type: array
diff --git a/system/config/media.yaml b/system/config/media.yaml
index a2e82d86bc..6f572c5190 100644
--- a/system/config/media.yaml
+++ b/system/config/media.yaml
@@ -1,194 +1,203 @@
-defaults:
-  type: file
-  thumb: media/thumb.png
-  mime: application/octet-stream
-  image:
-    filters:
-      default:
-        - enableProgressive
+types:
+  defaults:
+    type: file
+    thumb: media/thumb.png
+    mime: application/octet-stream
+    image:
+      filters:
+        default:
+          - enableProgressive
 
-jpg:
-  type: image
-  thumb: media/thumb-jpg.png
-  mime: image/jpeg
-jpe:
-  type: image
-  thumb: media/thumb-jpg.png
-  mime: image/jpeg
-jpeg:
-  type: image
-  thumb: media/thumb-jpeg.png
-  mime: image/jpeg
-png:
-  type: image
-  thumb: media/thumb-png.png
-  mime: image/png
-gif:
-  type: animated
-  thumb: media/thumb-gif.png
-  mime: image/gif
+  jpg:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpe:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpeg:
+    type: image
+    thumb: media/thumb-jpeg.png
+    mime: image/jpeg
+  png:
+    type: image
+    thumb: media/thumb-png.png
+    mime: image/png
+  gif:
+    type: animated
+    thumb: media/thumb-gif.png
+    mime: image/gif
 
-svg:
-  type: vector
-  thumb: media/thumb-gif.png
-  mime: image/svg+xml
+  svg:
+    type: vector
+    thumb: media/thumb.png
+    mime: image/svg+xml
 
-mp4:
-  type: video
-  thumb: media/thumb-mp4.png
-  mime: video/mp4
-mov:
-  type: video
-  thumb: media/thumb-mov.png
-  mime: video/quicktime
-m4v:
-  type: video
-  thumb: media/thumb-m4v.png
-  mime: video/x-m4v
-swf:
-  type: video
-  thumb: media/thumb-swf.png
-  mime: video/x-flv
-flv:
-  type: video
-  thumb: media/thumb-flv.png
-  mime: video/x-flv
+  mp4:
+    type: video
+    thumb: media/thumb-mp4.png
+    mime: video/mp4
+  mov:
+    type: video
+    thumb: media/thumb-mov.png
+    mime: video/quicktime
+  m4v:
+    type: video
+    thumb: media/thumb-m4v.png
+    mime: video/x-m4v
+  swf:
+    type: video
+    thumb: media/thumb-swf.png
+    mime: video/x-flv
+  flv:
+    type: video
+    thumb: media/thumb-flv.png
+    mime: video/x-flv
+  webm:
+    type: video
+    thumb: media/thumb.png
+    mime: video/webm
+  ogv:
+    type: video
+    thumb: media/thumb-ogg.png
+    mime: video/ogg
 
-mp3:
-  type: audio
-  thumb: media/thumb-mp3.png
-  mime: audio/mp3
-ogg:
-  type: audio
-  thumb: media/thumb-ogg.png
-  mime: audio/ogg
-wma:
-  type: audio
-  thumb: media/thumb-wma.png
-  mime: audio/wma
-m4a:
-  type: audio
-  thumb: media/thumb-m4a.png
-  mime: audio/m4a
-wav:
-  type: audio
-  thumb: media/thumb-wav.png
-  mime: audio/wav
-aiff:
-  type: audio
-  mime: audio/aiff
-aif:
-  type: audio
-  mime: audio/aif
+  mp3:
+    type: audio
+    thumb: media/thumb-mp3.png
+    mime: audio/mp3
+  ogg:
+    type: audio
+    thumb: media/thumb-ogg.png
+    mime: audio/ogg
+  wma:
+    type: audio
+    thumb: media/thumb-wma.png
+    mime: audio/wma
+  m4a:
+    type: audio
+    thumb: media/thumb-m4a.png
+    mime: audio/m4a
+  wav:
+    type: audio
+    thumb: media/thumb-wav.png
+    mime: audio/wav
+  aiff:
+    type: audio
+    mime: audio/aiff
+  aif:
+    type: audio
+    mime: audio/aif
 
-txt:
-  type: file
-  thumb: media/thumb-txt.png
-  mime: text/plain
-xml:
-  type: file
-  thumb: media/thumb-xml.png
-  mime: application/xml
-doc:
-  type: file
-  thumb: media/thumb-doc.png
-  mime: application/msword
-docx:
-  type: file
-  mime: application/msword
-xls:
-  type: file
-  mime: application/vnd.ms-excel
-xlt:
-  type: file
-  mime: application/vnd.ms-excel
-xlm:
-  type: file
-  mime: application/vnd.ms-excel
-xld:
-  type: file
-  mime: application/vnd.ms-excel
-xla:
-  type: file
-  mime: application/vnd.ms-excel
-xlc:
-  type: file
-  mime: application/vnd.ms-excel
-xlw:
-  type: file
-  mime: application/vnd.ms-excel
-xll:
-  type: file
-  mime: application/vnd.ms-excel
-ppt:
-  type: file
-  mime: application/vnd.ms-powerpoint
-pps:
-  type: file
-  mime: application/vnd.ms-powerpoint
-rtf:
-  type: file
-  mime: application/rtf
+  txt:
+    type: file
+    thumb: media/thumb-txt.png
+    mime: text/plain
+  xml:
+    type: file
+    thumb: media/thumb-xml.png
+    mime: application/xml
+  doc:
+    type: file
+    thumb: media/thumb-doc.png
+    mime: application/msword
+  docx:
+    type: file
+    mime: application/msword
+  xls:
+    type: file
+    mime: application/vnd.ms-excel
+  xlt:
+    type: file
+    mime: application/vnd.ms-excel
+  xlm:
+    type: file
+    mime: application/vnd.ms-excel
+  xld:
+    type: file
+    mime: application/vnd.ms-excel
+  xla:
+    type: file
+    mime: application/vnd.ms-excel
+  xlc:
+    type: file
+    mime: application/vnd.ms-excel
+  xlw:
+    type: file
+    mime: application/vnd.ms-excel
+  xll:
+    type: file
+    mime: application/vnd.ms-excel
+  ppt:
+    type: file
+    mime: application/vnd.ms-powerpoint
+  pps:
+    type: file
+    mime: application/vnd.ms-powerpoint
+  rtf:
+    type: file
+    mime: application/rtf
 
-bmp:
-  type: file
-  mime: image/bmp
-tiff:
-  type: file
-  mime: image/tiff
-mpeg:
-  type: file
-  mime: video/mpeg
-mpg:
-  type: file
-  mime: video/mpeg
-mpe:
-  type: file
-  mime: video/mpeg
-avi:
-  type: file
-  mime: video/msvideo
-wmv:
-  type: file
-  mime: video/x-ms-wmv
+  bmp:
+    type: file
+    mime: image/bmp
+  tiff:
+    type: file
+    mime: image/tiff
+  mpeg:
+    type: file
+    mime: video/mpeg
+  mpg:
+    type: file
+    mime: video/mpeg
+  mpe:
+    type: file
+    mime: video/mpeg
+  avi:
+    type: file
+    mime: video/msvideo
+  wmv:
+    type: file
+    mime: video/x-ms-wmv
 
-html:
-  type: file
-  thumb: media/thumb-html.png
-  mime: text/html
-htm:
-  type: file
-  thumb: media/thumb-html.png
-  mime: text/html
-pdf:
-  type: file
-  thumb: media/thumb-pdf.png
-  mime: application/pdf
-zip:
-  type: file
-  thumb: media/thumb-zip.png
-  mime: application/zip
-7z:
-  type: file
-  thumb: media/thumb-7zip.png
-  mime: application/x-7z-compressed
-gz:
-  type: file
-  thumb: media/thumb-gz.png
-  mime: application/gzip
-tar:
-  type: file
-  mime: application/x-tar
-css:
-  type: file
-  thumb: media/thumb-css.png
-  mime: text/css
-js:
-  type: file
-  thumb: media/thumb-js.png
-  mime: application/javascript
-json:
-  type: file
-  thumb: media/thumb-json.png
-  mime: application/json
+  html:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  htm:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  pdf:
+    type: file
+    thumb: media/thumb-pdf.png
+    mime: application/pdf
+  zip:
+    type: file
+    thumb: media/thumb-zip.png
+    mime: application/zip
+  7z:
+    type: file
+    thumb: media/thumb-7zip.png
+    mime: application/x-7z-compressed
+  gz:
+    type: file
+    thumb: media/thumb-gz.png
+    mime: application/gzip
+  tar:
+    type: file
+    mime: application/x-tar
+  css:
+    type: file
+    thumb: media/thumb-css.png
+    mime: text/css
+  js:
+    type: file
+    thumb: media/thumb-js.png
+    mime: application/javascript
+  json:
+    type: file
+    thumb: media/thumb-json.png
+    mime: application/json
 
diff --git a/system/config/system.yaml b/system/config/system.yaml
index 1d21cea23b..0733e599a2 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -4,7 +4,7 @@ default_locale:                             # Default locale (defaults to system
 param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
 wrapped_site: false                         # For themes/plugins to know if Grav is wrapped by another platform
 reverse_proxy_setup: false                  # Running in a reverse proxy scenario with different webserver ports than proxy
-proxy_url:                                  # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+
 
 languages:
   supported: []                             # List of languages supported. eg: [en, fr, de]
@@ -59,6 +59,9 @@ pages:
   ignore_folders: [.git, .idea]             # Folders to ignore in Pages
   ignore_hidden: true                       # Ignore all Hidden files and folders
   url_taxonomy_filters: true                # Enable auto-magic URL-based taxonomy filters for page collections
+  frontmatter:
+    process_twig: false                     # Should the frontmatter be processed to replace Twig variables?
+    ignore_fields: ['form']                 # Fields that might contain Twig variables and should not be processed
 
 cache:
   enabled: true                             # Set to true to enable caching
@@ -71,7 +74,7 @@ cache:
 
 twig:
   cache: true                               # Set to true to enable twig caching
-  debug: false                              # Enable Twig debug
+  debug: true                               # Enable Twig debug
   auto_reload: true                         # Refresh cache on changes
   autoescape: false                         # Autoescape Twig vars
   undefined_functions: true                 # Allow undefined functions
@@ -80,10 +83,14 @@ twig:
 
 assets:                                     # Configuration for Assets Manager (JS, CSS)
   css_pipeline: false                       # The CSS pipeline is the unification of multiple CSS resources into one file
+  css_pipeline_include_externals: true      # Include external URLs in the pipeline by default
+  css_pipeline_before_excludes: true        # Render the pipeline before any excluded files
   css_minify: true                          # Minify the CSS during pipelining
   css_minify_windows: false                 # Minify Override for Windows platforms. False by default due to ThreadStackSize
   css_rewrite: true                         # Rewrite any CSS relative URLs during pipelining
   js_pipeline: false                        # The JS pipeline is the unification of multiple JS resources into one file
+  js_pipeline_include_externals: true       # Include external URLs in the pipeline by default
+  js_pipeline_before_excludes: true         # Render the pipeline before any excluded files
   js_minify: true                           # Minify the JS during pipelining
   enable_asset_timestamp: false             # Enable asset timestamps
   collections:
@@ -116,3 +123,7 @@ session:
   name: grav-site                           # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
   secure: false                             # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
   httponly: true                            # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+
+gpm:
+  releases: testing                           # Set to either 'stable' or 'testing'
+  proxy_url:                                  # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
diff --git a/system/defines.php b/system/defines.php
index a561269019..dc581d3ba5 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -1,8 +1,15 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.0.10');
+define('GRAV_VERSION', '1.1.0');
+define('GRAV_TESTING', false);
 define('DS', '/');
 define('GRAV_PHP_MIN', '5.5.9');
 
@@ -13,9 +20,7 @@
 define('ROOT_DIR', GRAV_ROOT . '/');
 define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
-define('SYSTEM_DIR', ROOT_DIR .'system/');
 define('CACHE_DIR', ROOT_DIR . 'cache/');
-define('LOG_DIR', ROOT_DIR .'logs/');
 
 // DEPRECATED: Do not use!
 define('ASSETS_DIR', ROOT_DIR . 'assets/');
@@ -23,10 +28,12 @@
 define('ACCOUNTS_DIR', USER_DIR .'accounts/');
 define('PAGES_DIR', USER_DIR .'pages/');
 define('DATA_DIR', USER_DIR .'data/');
+define('SYSTEM_DIR', ROOT_DIR .'system/');
 define('LIB_DIR', SYSTEM_DIR .'src/');
 define('PLUGINS_DIR', USER_DIR .'plugins/');
 define('THEMES_DIR', USER_DIR .'themes/');
 define('VENDOR_DIR', ROOT_DIR .'vendor/');
+define('LOG_DIR', ROOT_DIR .'logs/');
 // END DEPRECATED
 
 // Some extensions
diff --git a/system/languages/ar.yaml b/system/languages/ar.yaml
new file mode 100644
index 0000000000..57a6e3707f
--- /dev/null
+++ b/system/languages/ar.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  العنوان: %1$s
+  ---
+  # خطأ: مادة أمامية غير صحيحة
+  
+  مسار: '%2$s'
+  
+  **%3$s**
+  
+  , , ,
+  
+  %4$s
+  , , ,
+NICETIME:
+  NO_DATE_PROVIDED: لم يتم تقديم التاريخ
+  BAD_DATE: تاريخ خاطئ
+  AGO: من قبل
+  FROM_NOW: من الآن
+  SECOND: ثانية
+  MINUTE: دقيقة
+  HOUR: ساعة
+  DAY: يوم
+  WEEK: أسبوع
+  MONTH: شهر
+  YEAR: سنة
+  DECADE: عقد
+  SEC: ثانية
+  MIN: دقيقة
+  HR: ساعة
+  WK: أسبوع
+  MO: شهر
+  YR: سنة
+  DEC: عقد
+  SECOND_PLURAL: ثواني
+  MINUTE_PLURAL: ‮دقائق
+  HOUR_PLURAL: ساعات
+  DAY_PLURAL: أيام
+  WEEK_PLURAL: أسابيع
+  MONTH_PLURAL: أشهر
+  YEAR_PLURAL: سنوات
+  DECADE_PLURAL: عقود
+  SEC_PLURAL: ثواني
+  MIN_PLURAL: دقائق
+  HR_PLURAL: ساعات
+  WK_PLURAL: أسابيع
+  MO_PLURAL: أشهر
+  YR_PLURAL: سنوات
+  DEC_PLURAL: عقود
+FORM:
+  VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+  INVALID_INPUT: إدخال غير صحيح في
+  MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
+MONTHS_OF_THE_YEAR:
+  - كانون الثاني
+  - شباط
+  - آذار/ مارس
+  - نيسان
+  - أيار
+  - حزيران
+  - تموز
+  - آب
+  - أيلول
+  - تشرين الأول
+  - تشرين الثاني
+  - كانون الأول
+DAYS_OF_THE_WEEK:
+  - الاثنين
+  - الثلاثاء
+  - الأربعاء
+  - الخميس
+  - الجمعة
+  - السبت
+  - الأحد
diff --git a/system/languages/ca.yaml b/system/languages/ca.yaml
new file mode 100644
index 0000000000..b9906e6b8c
--- /dev/null
+++ b/system/languages/ca.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # S'ha produït un error: Frontmatter invàlid
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: "No s'ha proporcionat data"
+  BAD_DATE: Data invàlida
+  AGO: abans
+  FROM_NOW: "des d'ara"
+  SECOND: segon
+  MINUTE: minut
+  HOUR: hora
+  DAY: dia
+  WEEK: setmana
+  MONTH: mes
+  YEAR: any
+  DECADE: dècada
+  SEC: s
+  MIN: min
+  HR: h
+  WK: setm.
+  MO: m.
+  YR: a.
+  DEC: dèc.
+  SECOND_PLURAL: segons
+  MINUTE_PLURAL: minuts
+  HOUR_PLURAL: hores
+  DAY_PLURAL: dies
+  WEEK_PLURAL: setmanes
+  MONTH_PLURAL: mesos
+  YEAR_PLURAL: anys
+  DECADE_PLURAL: dècades
+  SEC_PLURAL: s
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: setm.
+  MO_PLURAL: mesos
+  YR_PLURAL: anys
+  DEC_PLURAL: dèc.
+FORM:
+  VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+  INVALID_INPUT: Entrada no vàlida a
+  MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
+MONTHS_OF_THE_YEAR:
+  - Gener
+  - Febrer
+  - Març
+  - Abril
+  - Maig
+  - Juny
+  - Juliol
+  - Agost
+  - Setembre
+  - Octubre
+  - Novembre
+  - Desembre
+DAYS_OF_THE_WEEK:
+  - Dilluns
+  - Dimarts
+  - Dimecres
+  - Dijous
+  - Divendres
+  - Dissabte
+  - Diumenge
diff --git a/system/languages/cs.yaml b/system/languages/cs.yaml
index a97eb4cabd..68a49ebbb7 100644
--- a/system/languages/cs.yaml
+++ b/system/languages/cs.yaml
@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   - vybavení
   - informace
@@ -55,6 +56,7 @@ NICETIME:
   DEC_PLURAL: dek
 FORM:
   VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+  INVALID_INPUT: Neplatný vstup v
   MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
 MONTHS_OF_THE_YEAR:
   - ledna
diff --git a/system/languages/da.yaml b/system/languages/da.yaml
new file mode 100644
index 0000000000..47f5a451d8
--- /dev/null
+++ b/system/languages/da.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titel: %1$s
+  ---
+  
+  # Fejl: Ugyldigt frontmatter
+  
+  Sti: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato angivet
+  BAD_DATE: Ugyldig dato
+  AGO: siden
+  FROM_NOW: fra nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: time
+  DAY: dag
+  WEEK: uge
+  MONTH: måned
+  YEAR: år
+  DECADE: årti
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: u
+  MO: md
+  YR: år
+  DEC: årti
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dage
+  WEEK_PLURAL: uger
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtier
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uger
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+  INVALID_INPUT: Ugyldigt input i
+  MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - Marts
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Mandag
+  - Tirsdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lørdag
+  - Søndag
diff --git a/system/languages/de.yaml b/system/languages/de.yaml
index 8fcf2e6201..9dff4cb3ba 100644
--- a/system/languages/de.yaml
+++ b/system/languages/de.yaml
@@ -1,13 +1,14 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
   # Fehler: Frontmatter enthält Fehler
-
+  
   Pfad: `%2$s`
-
-  **%3$s **
-
+  
+  **%3$s ** 
+  
   ```
   %4$s
   ```
@@ -21,8 +22,13 @@ INFLECTOR_IRREGULAR:
   child: Kinder
   sex: Geschlecht
   move: Züge
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
 NICETIME:
-  NO_DATE_PROVIDED: Keine Daten vorhanden
+  NO_DATE_PROVIDED: Kein Datum angegeben
   BAD_DATE: Falsches Datum
   AGO: her
   FROM_NOW: ab jetzt
@@ -33,13 +39,14 @@ NICETIME:
   WEEK: Woche
   MONTH: Monat
   YEAR: Jahr
-  DECADE: Dekade
-  SEC: sek
-  MIN: Min
-  HR: std
-  WK: wo
-  YR: yh
-  DEC: Jz
+  DECADE: Jahrzehnt
+  SEC: Sek.
+  MIN: Min.
+  HR: Std.
+  WK: Wo.
+  MO: Mo.
+  YR: J.
+  DEC: Dek.
   SECOND_PLURAL: Sekunden
   MINUTE_PLURAL: Minuten
   HOUR_PLURAL: Stunden
@@ -47,14 +54,14 @@ NICETIME:
   WEEK_PLURAL: Wochen
   MONTH_PLURAL: Monate
   YEAR_PLURAL: Jahre
-  DECADE_PLURAL: Dekaden
+  DECADE_PLURAL: Jahrzehnte
   SEC_PLURAL: Sekunden
   MIN_PLURAL: Minuten
   HR_PLURAL: Stunden
   WK_PLURAL: Wochen
   MO_PLURAL: Monate
   YR_PLURAL: Jahre
-  DEC_PLURAL: Dekaden
+  DEC_PLURAL: Jahrzehnten
 FORM:
   VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
   INVALID_INPUT: Ungültige Eingabe in
@@ -68,7 +75,7 @@ MONTHS_OF_THE_YEAR:
   - Juni
   - Juli
   - August
-  - Semptember
+  - September
   - Oktober
   - November
   - Dezember
diff --git a/system/languages/el.yaml b/system/languages/el.yaml
index 2a03c9d7ef..16d24cbb0d 100644
--- a/system/languages/el.yaml
+++ b/system/languages/el.yaml
@@ -1,3 +1,4 @@
+---
 MONTHS_OF_THE_YEAR:
   - Ιανουάριος
   - Φεβρουάριος
@@ -13,9 +14,9 @@ MONTHS_OF_THE_YEAR:
   - Δεκέμβριος
 DAYS_OF_THE_WEEK:
   - Δευτέρα
-  - Τρλιτη
+  - Τρίτη
   - Τετάρτη
   - Πέμπτη
   - Παρασκευή
-  - Σαββάτο
+  - Σάββατο
   - Κυριακή
diff --git a/system/languages/es.yaml b/system/languages/es.yaml
index 9bfedec7f6..b19b620173 100644
--- a/system/languages/es.yaml
+++ b/system/languages/es.yaml
@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Frontmatter Inválido
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_UNCOUNTABLE:
   0: equipo
   1: información
diff --git a/system/languages/fi.yaml b/system/languages/fi.yaml
new file mode 100644
index 0000000000..dd5a79342d
--- /dev/null
+++ b/system/languages/fi.yaml
@@ -0,0 +1,60 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Päivämäärää ei annettu
+  BAD_DATE: Virheellinen päivämäärä
+  AGO: sitten
+  FROM_NOW: tästä lähtien
+  SECOND: sekunti
+  MINUTE: minuutti
+  HOUR: tunti
+  DAY: päivä
+  WEEK: viikko
+  MONTH: kuukausi
+  YEAR: vuosi
+  DECADE: vuosikymmen
+  SEC: sek
+  MIN: min
+  HR: h
+  WK: vk
+  MO: kk
+  YR: v
+  DEC: vuosikymmen
+  SECOND_PLURAL: sekuntia
+  MINUTE_PLURAL: minuuttia
+  HOUR_PLURAL: tuntia
+  DAY_PLURAL: päivää
+  WEEK_PLURAL: viikkoa
+  MONTH_PLURAL: kuukautta
+  YEAR_PLURAL: vuotta
+  DECADE_PLURAL: vuosikymmentä
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: v
+  MO_PLURAL: kk
+  YR_PLURAL: v
+  DEC_PLURAL: vuosikymmentä
+FORM:
+  VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+  MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
+MONTHS_OF_THE_YEAR:
+  - Tammikuu
+  - Helmikuu
+  - Maaliskuu
+  - Huhtikuu
+  - Toukokuu
+  - Kesäkuuta
+  - Heinäkuu
+  - Elokuu
+  - Syyskuu
+  - Lokakuu
+  - Marraskuu
+  - Joulukuu
+DAYS_OF_THE_WEEK:
+  - Maanantai
+  - Tiistai
+  - Keskiviikko
+  - Torstai
+  - Perjantai
+  - Lauantai
+  - Sunnuntai
diff --git a/system/languages/fr.yaml b/system/languages/fr.yaml
index c6d6038855..d6dd9121bc 100644
--- a/system/languages/fr.yaml
+++ b/system/languages/fr.yaml
@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
-
+  
   # Erreur : Frontmatter invalide
-
+  
   Path: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```
diff --git a/system/languages/hr.yaml b/system/languages/hr.yaml
index 8d4eeb125e..adcdde56da 100644
--- a/system/languages/hr.yaml
+++ b/system/languages/hr.yaml
@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   - oprema
   - informacije
diff --git a/system/languages/hu.yaml b/system/languages/hu.yaml
index 127353eec9..ae7662e239 100644
--- a/system/languages/hu.yaml
+++ b/system/languages/hu.yaml
@@ -1,17 +1,70 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   cím: %1$s
   ---
-
+  
   # Hiba: Érvénytelen Frontmatter
-
+  
   Elérési út: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+  /(bu)s$/i: '\1ses'
+  /(alias|status)/i: '\1es'
+  /(octop|vir)us$/i: '\1i'
+  /(ax|test)is$/i: '\1es'
+  /s$/i: s
+  /$/: s
+INFLECTOR_SINGULAR:
+  /(quiz)zes$/i: '\1'
+  /(matr)ices$/i: '\1ix'
+  /(vert|ind)ices$/i: '\1ex'
+  /^(ox)en/i: '\1'
+  /(alias|status)es$/i: '\1'
+  "/([octop|vir])i$/i": '\1us'
+  /(cris|ax|test)es$/i: '\1is'
+  /(shoe)s$/i: '\1'
+  /(o)es$/i: '\1'
+  /(bus)es$/i: '\1'
+  "/([m|l])ice$/i": '\1ouse'
+  /(x|ch|ss|sh)es$/i: '\1'
+  /(m)ovies$/i: '\1ovie'
+  /(s)eries$/i: '\1eries'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([lr])ves$/i": '\1f'
+  /(tive)s$/i: '\1'
+  /(hive)s$/i: '\1'
+  "/([^f])ves$/i": '\1fe'
+  /(^analy)ses$/i: '\1sis'
+  /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i: '\1\2sis'
+  "/([ti])a$/i": '\1um'
+  /(n)ews$/i: '\1ews'
+INFLECTOR_UNCOUNTABLE:
+  - felszerelés
+  - információ
+  - rizs
+  - pénz
+  - fajok
+  - sorozat
+  - hal
+  - juh
 INFLECTOR_IRREGULAR:
   person: személyek
   man: férfiak
@@ -62,3 +115,24 @@ FORM:
   VALIDATION_FAIL: '<b>A validáció hibát talált:</b>'
   INVALID_INPUT: 'Az itt megadott érték érvénytelen:'
   MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
+MONTHS_OF_THE_YEAR:
+  - január
+  - február
+  - március
+  - április
+  - május
+  - június
+  - július
+  - augusztus
+  - szeptember
+  - október
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - hétfő
+  - kedd
+  - szerda
+  - csütörtök
+  - péntek
+  - szombat
+  - vasárnap
diff --git a/system/languages/it.yaml b/system/languages/it.yaml
index d091e8ff37..58a89989b4 100644
--- a/system/languages/it.yaml
+++ b/system/languages/it.yaml
@@ -1,6 +1,8 @@
+---
+FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
 NICETIME:
   NO_DATE_PROVIDED: Nessuna data fornita
-  BAD_DATE: Data errata
+  BAD_DATE: Data non valida
   AGO: fa
   FROM_NOW: da adesso
   SECOND: secondo
@@ -10,6 +12,14 @@ NICETIME:
   WEEK: settimana
   MONTH: mese
   YEAR: anno
+  DECADE: decennio
+  SEC: sec
+  MIN: min
+  HR: ora
+  WK: settimana
+  MO: mese
+  YR: anno
+  DEC: decennio
   SECOND_PLURAL: secondi
   MINUTE_PLURAL: minuti
   HOUR_PLURAL: ore
@@ -18,9 +28,16 @@ NICETIME:
   MONTH_PLURAL: mesi
   YEAR_PLURAL: anni
   DECADE_PLURAL: decadi
+  SEC_PLURAL: secondi
+  MIN_PLURAL: minuti
+  HR_PLURAL: ore
+  WK_PLURAL: settimane
+  MO_PLURAL: mesi
+  YR_PLURAL: anni
+  DEC_PLURAL: decenni
 FORM:
   VALIDATION_FAIL: '<b>Validazione fallita:</b>'
-  INVALID_INPUT: Input invalido in
+  INVALID_INPUT: Input non valido in
   MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
 MONTHS_OF_THE_YEAR:
   - Gennaio
@@ -36,10 +53,10 @@ MONTHS_OF_THE_YEAR:
   - Novembre
   - Dicembre
 DAYS_OF_THE_WEEK:
-  - Lunedi
-  - Martedi
-  - Mercoledi
-  - Giovedi
-  - Venerdi
+  - Lunedì
+  - Martedì
+  - Mercoledì
+  - Giovedì
+  - Venerdì
   - Sabato
   - Domenica
diff --git a/system/languages/lt.yaml b/system/languages/lt.yaml
index fcd34ef132..6b77aa176c 100644
--- a/system/languages/lt.yaml
+++ b/system/languages/lt.yaml
@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   2: ryžiai
   3: pinigai
diff --git a/system/languages/nl.yaml b/system/languages/nl.yaml
index 383f38cc3f..757fb729f8 100644
--- a/system/languages/nl.yaml
+++ b/system/languages/nl.yaml
@@ -1,3 +1,4 @@
+---
 INFLECTOR_IRREGULAR:
   person: personen
   man: mensen
@@ -13,10 +14,15 @@ NICETIME:
   MINUTE: minuut
   HOUR: uur
   DAY: dag
+  WEEK: week
   MONTH: maand
   YEAR: jaar
   DECADE: decenium
+  SEC: s
+  MIN: min
+  HR: u
   MO: ma
+  YR: j
   SECOND_PLURAL: seconden
   MINUTE_PLURAL: minuten
   HOUR_PLURAL: uren
@@ -31,15 +37,23 @@ NICETIME:
   WK_PLURAL: weken
   MO_PLURAL: maanden
   YR_PLURAL: jaren
+FORM:
+  VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+  INVALID_INPUT: Ongeldige invoer in
+  MISSING_REQUIRED_FIELD: 'Verplicht veld ontbreekt:'
 MONTHS_OF_THE_YEAR:
-  0: Januari
-  1: Februari
-  2: Maart
-  4: Mei
-  5: Juni
-  6: Juli
-  7: Augustus
-  9: Oktober
+  - Januari
+  - Februari
+  - Maart
+  - april
+  - Mei
+  - Juni
+  - Juli
+  - Augustus
+  - september
+  - Oktober
+  - november
+  - december
 DAYS_OF_THE_WEEK:
   - Maandag
   - Dinsdag
diff --git a/system/languages/no.yaml b/system/languages/no.yaml
index 41cd4b0039..4a74da2500 100644
--- a/system/languages/no.yaml
+++ b/system/languages/no.yaml
@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   Tittel: %1$s
   ---
-
+  
   # Feilmelding: Ugyldig Frontmatter
-
+  
   Pane: '%2$s'
-
+  
   **%3$s **
-
+  
   ```
   %4$s
   ```
@@ -62,7 +63,9 @@ NICETIME:
   MIN_PLURAL: min
   HR_PLURAL: timer
   WK_PLURAL: uker
+  MO_PLURAL: mdr
   YR_PLURAL: år
+  DEC_PLURAL: årtier
 FORM:
   VALIDATION_FAIL: '<b>Validering mislyktes:</b>'
   INVALID_INPUT: Ugyldig innhold i
diff --git a/system/languages/pl.yaml b/system/languages/pl.yaml
index 9aac0940ca..6a479bf59e 100644
--- a/system/languages/pl.yaml
+++ b/system/languages/pl.yaml
@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
-
+  
   # Error: Nieprawidłowy Frontmatter
-
+  
   Path: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```
@@ -28,8 +29,8 @@ NICETIME:
   SEC: sek
   MIN: min
   HR: godz
-  WK: tydź
-  MO: mieś
+  WK: tydz
+  MO: m-c
   YR: rok
   DEC: dekada
   SECOND_PLURAL: sekund
@@ -40,16 +41,16 @@ NICETIME:
   MONTH_PLURAL: miesięcy
   YEAR_PLURAL: lat
   DECADE_PLURAL: dekad
-  SEC_PLURAL: sekund
-  MIN_PLURAL: minut
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
   HR_PLURAL: godz
   WK_PLURAL: tyg
-  MO_PLURAL: mieś
+  MO_PLURAL: m-ce
   YR_PLURAL: lat
   DEC_PLURAL: dekad
 FORM:
   VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
-  INVALID_INPUT: Nieprawidłowe dane w
+  INVALID_INPUT: Nieprawidłowe dane wejściowe
   MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
 MONTHS_OF_THE_YEAR:
   - Styczeń
diff --git a/system/languages/pt.yaml b/system/languages/pt.yaml
index f108e992c3..a9da66a02c 100644
--- a/system/languages/pt.yaml
+++ b/system/languages/pt.yaml
@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  título: %1$s
+  ---
+  
+  # Erro: Frontmatter inválida
+  
+  Caminho: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_UNCOUNTABLE:
   1: informação
   2: arroz
@@ -6,6 +21,10 @@ INFLECTOR_IRREGULAR:
   man: homens
   sex: sexos
 NICETIME:
+  NO_DATE_PROVIDED: Não foi fornecida data
+  BAD_DATE: Data inválida
+  AGO: atrás
+  FROM_NOW: a partir de agora
   SECOND: segundo
   MINUTE: minuto
   HOUR: hora
@@ -16,8 +35,11 @@ NICETIME:
   DECADE: década
   SEC: seg
   MIN: mín
-  MO: mês
-  YR: ano
+  HR: h
+  WK: sem
+  MO: m
+  YR: a
+  DEC: dec
   SECOND_PLURAL: segundos
   MINUTE_PLURAL: minutos
   HOUR_PLURAL: horas
@@ -29,9 +51,11 @@ NICETIME:
   SEC_PLURAL: seg
   MIN_PLURAL: mins
   HR_PLURAL: hrs
+  WK_PLURAL: sems
   YR_PLURAL: anos
 FORM:
   VALIDATION_FAIL: '<b>Validação falhada: </b>'
+  MISSING_REQUIRED_FIELD: 'Campo obrigatório ausente:'
 MONTHS_OF_THE_YEAR:
   - Janeiro
   - Fevereiro
diff --git a/system/languages/ro.yaml b/system/languages/ro.yaml
index a95fcde0b2..a84a3c2cfd 100644
--- a/system/languages/ro.yaml
+++ b/system/languages/ro.yaml
@@ -1,18 +1,99 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titlu: %1$s
+  ---
+  # Eroare: Frontmatter este invalid
+  
+  Calea: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+INFLECTOR_UNCOUNTABLE:
+  - echipament
+  - informaţie
+  - orez
+  - bani
+  - specii
+  - serii
+  - peşte
+  - oaie
+INFLECTOR_IRREGULAR:
+  person: persoane
+  man: bărbați
+  child: copii
+  sex: sexe
+  move: mutări
+NICETIME:
+  NO_DATE_PROVIDED: Nu există o dată prevăzută
+  BAD_DATE: Dată incorectă
+  AGO: în urmă
+  FROM_NOW: de acum
+  SECOND: secundă
+  MINUTE: minut
+  HOUR: oră
+  DAY: zi
+  WEEK: săptămână
+  MONTH: lună
+  YEAR: an
+  DECADE: decadă
+  SEC: sec
+  MIN: min
+  HR: oră
+  WK: săpt
+  MO: lună
+  YR: an
+  DEC: decadă
+  SECOND_PLURAL: secunde
+  MINUTE_PLURAL: minute
+  HOUR_PLURAL: ore
+  DAY_PLURAL: zile
+  WEEK_PLURAL: săptămâni
+  MONTH_PLURAL: luni
+  YEAR_PLURAL: ani
+  DECADE_PLURAL: decade
+  SEC_PLURAL: sec
+  MIN_PLURAL: min
+  HR_PLURAL: ore
+  WK_PLURAL: săpt
+  MO_PLURAL: luni
+  YR_PLURAL: ani
+  DEC_PLURAL: decenii
+FORM:
+  VALIDATION_FAIL: '<b>Validare nereușită</b>'
+  INVALID_INPUT: Date incorecte în
+  MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
 MONTHS_OF_THE_YEAR:
-  0: Ianuarie
-  1: Februarie
-  2: Martie
-  3: Aprilue
-  4: Mai
-  5: Iunie
-  6: Iulie
-  8: Septembrie
-  9: Octombrie
-  10: Noiembrie
-  11: Decembrie
+  - Ianuarie
+  - Februarie
+  - Martie
+  - Aprilie
+  - Mai
+  - Iunie
+  - Iulie
+  - August
+  - Septembrie
+  - Octombrie
+  - Noiembrie
+  - Decembrie
 DAYS_OF_THE_WEEK:
   - Luni
-  - Marti
+  - Marți
   - Miercuri
   - Joi
   - Vineri
diff --git a/system/languages/ru.yaml b/system/languages/ru.yaml
index 6f7600c04c..c8ba63e27b 100644
--- a/system/languages/ru.yaml
+++ b/system/languages/ru.yaml
@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Ошибка: Недопустимое содержимое
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_IRREGULAR:
   person: люди
   man: человек
@@ -20,8 +35,8 @@ NICETIME:
   SEC: с
   MIN: мин
   HR: ч
-  WK: нед
-  MO: мес
+  WK: нед.
+  MO: мес.
   YR: г.
   DEC: гг.
   SECOND_PLURAL: секунды
diff --git a/system/languages/sk.yaml b/system/languages/sk.yaml
new file mode 100644
index 0000000000..8651e7f502
--- /dev/null
+++ b/system/languages/sk.yaml
@@ -0,0 +1,42 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
+  BAD_DATE: Nesprávny dátum
+  AGO: pred
+  FROM_NOW: odteraz
+  SECOND: sekunda
+  MINUTE: minúta
+  HOUR: hodina
+  DAY: deň
+  WEEK: týždeň
+  MONTH: mesiac
+  YEAR: rok
+  DECADE: desaťročie
+  SEC: sek
+  MIN: min
+  HR: hod
+FORM:
+  VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
+MONTHS_OF_THE_YEAR:
+  - Január
+  - Február
+  - Marec
+  - Apríl
+  - Máj
+  - Jún
+  - Júl
+  - August
+  - September
+  - Október
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Pondelok
+  - Utorok
+  - Streda
+  - Štvrtok
+  - Piatok
+  - Sobota
+  - Nedeľa
diff --git a/system/languages/sv.yaml b/system/languages/sv.yaml
index 6481678490..8212eb3921 100644
--- a/system/languages/sv.yaml
+++ b/system/languages/sv.yaml
@@ -1,2 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: '--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```'
 NICETIME:
+  NO_DATE_PROVIDED: Inget datum har angivits
+  BAD_DATE: Ogiltigt datum
+  AGO: sedan
+  FROM_NOW: från nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: timme
   DAY: dag
+  WEEK: vecka
+  MONTH: månad
+  YEAR: år
+  DECADE: årtionde
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: v
+  MO: m
+  YR: år
+  DEC: dec
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minuter
+  HOUR_PLURAL: timmar
+  DAY_PLURAL: dagar
+  WEEK_PLURAL: veckor
+  MONTH_PLURAL: månader
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtionden
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: t
+  WK_PLURAL: v
+  MO_PLURAL: må
+  YR_PLURAL: år
+  DEC_PLURAL: dec
+FORM:
+  VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+  INVALID_INPUT: Ogiltig indata i
+  MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februrari
+  - Mars
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - Augusti
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Måndag
+  - Tisdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lördag
+  - Söndag
diff --git a/system/languages/th.yaml b/system/languages/th.yaml
new file mode 100644
index 0000000000..d0023c2989
--- /dev/null
+++ b/system/languages/th.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  ชื่อเรื่อง: %1$s
+  ---
+  
+  # ข้อผิดพลาด: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: ไม่มีวันที่ให้
+  BAD_DATE: รูปแบบวันที่ผิด
+  AGO: ที่ผ่านมา
+  FROM_NOW: จากตอนนี้
+  SECOND: วินาที
+  MINUTE: นาที
+  HOUR: ชั่วโมง
+  DAY: วัน
+  WEEK: สัปดาห์
+  MONTH: เดือน
+  YEAR: ปี
+  DECADE: ทศวรรษที่ผ่านมา
+  SEC: วิ
+  MIN: นาที
+  HR: ชม.
+  WK: wk
+  MO: mo
+  YR: yr
+  DEC: dec
+  SECOND_PLURAL: วินาที
+  MINUTE_PLURAL: นาที
+  HOUR_PLURAL: ชั่วโมง
+  DAY_PLURAL: วัน
+  WEEK_PLURAL: สัปดาห์
+  MONTH_PLURAL: เดือน
+  YEAR_PLURAL: ปี
+  DECADE_PLURAL: ทศวรรษที่ผ่านมา
+  SEC_PLURAL: วินาที
+  MIN_PLURAL: นาที
+  HR_PLURAL: ชั่วโมง
+  WK_PLURAL: wks
+  MO_PLURAL: mos
+  YR_PLURAL: ปี
+  DEC_PLURAL: decs
+FORM:
+  VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
+  INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+  MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
+MONTHS_OF_THE_YEAR:
+  - มกราคม
+  - กุมภาพันธ์
+  - มีนาคม
+  - เมษายน
+  - พฤษภาคม
+  - มิถุนายน
+  - กรกฏาคม
+  - สิงหาคม
+  - กันยายน
+  - ตุลาคม
+  - พฤศจิกายน
+  - ธันวาคม
+DAYS_OF_THE_WEEK:
+  - จันทร์
+  - อังคาร
+  - พุธ
+  - พฤหัสบดี
+  - ศุกร์
+  - เสาร์
+  - อาทิตย์
diff --git a/system/languages/tr.yaml b/system/languages/tr.yaml
index 28bb5c58bc..68e3a8569f 100644
--- a/system/languages/tr.yaml
+++ b/system/languages/tr.yaml
@@ -1,3 +1,4 @@
+---
 NICETIME:
   NO_DATE_PROVIDED: Tarih yok
   BAD_DATE: Yanlış tarih
@@ -33,3 +34,26 @@ NICETIME:
   MO_PLURAL: ay
   YR_PLURAL: yl
   DEC_PLURAL: onyl
+FORM:
+  VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+MONTHS_OF_THE_YEAR:
+  - Ocak
+  - Şubat
+  - Mart
+  - Nisan
+  - Mayıs
+  - Haziran
+  - Temmuz
+  - Ağustos
+  - Eylül
+  - Ekim
+  - Kasım
+  - Aralık
+DAYS_OF_THE_WEEK:
+  - Pazartesi
+  - Salı
+  - Çarşamba
+  - Perşembe
+  - Cuma
+  - Cumartesi
+  - Pazar
diff --git a/system/languages/uk.yaml b/system/languages/uk.yaml
new file mode 100644
index 0000000000..8ab79919b6
--- /dev/null
+++ b/system/languages/uk.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Помилка: Недопустимий вміст
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Не вказана дата
+  BAD_DATE: Невірна дата
+  AGO: назад
+  FROM_NOW: відтепер
+  SECOND: секунда
+  MINUTE: хвилина
+  HOUR: година
+  DAY: день
+  WEEK: тиждень
+  MONTH: місяць
+  YEAR: рік
+  DECADE: десятиріччя
+  SEC: с
+  MIN: хв
+  HR: год
+  WK: тиж.
+  MO: міс.
+  YR: р.
+  DEC: рр.
+  SECOND_PLURAL: секунди
+  MINUTE_PLURAL: хвилини
+  HOUR_PLURAL: години
+  DAY_PLURAL: дні
+  WEEK_PLURAL: тижні
+  MONTH_PLURAL: місяці
+  YEAR_PLURAL: роки
+  DECADE_PLURAL: десятиріччя
+  SEC_PLURAL: с
+  MIN_PLURAL: хв
+  HR_PLURAL: год
+  WK_PLURAL: тиж.
+  MO_PLURAL: міс.
+  YR_PLURAL: рр.
+  DEC_PLURAL: рр.
+FORM:
+  VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+  INVALID_INPUT: Невірне введення в
+  MISSING_REQUIRED_FIELD: 'Відсутнє необхідне поле:'
+MONTHS_OF_THE_YEAR:
+  - Січень
+  - Лютий
+  - Березень
+  - Квітень
+  - Травень
+  - Червень
+  - Липень
+  - Серпень
+  - Вересень
+  - Жовтень
+  - Листопад
+  - Грудень
+DAYS_OF_THE_WEEK:
+  - Понеділок
+  - Вівторок
+  - Середа
+  - Четвер
+  - "П'ятниця"
+  - Субота
+  - Неділя
diff --git a/system/languages/vi.yaml b/system/languages/vi.yaml
new file mode 100644
index 0000000000..e4269939f1
--- /dev/null
+++ b/system/languages/vi.yaml
@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Không có ngày được cung cấp
+  BAD_DATE: Ngày không hợp lệ
+  AGO: cách đây
+  FROM_NOW: từ bây giờ
+  SECOND: giây
+  MINUTE: phút
+  HOUR: giờ
+  DAY: ngày
+  WEEK: tuần
+  MONTH: tháng
+  YEAR: năm
+  DECADE: thập kỷ
+  SEC: giây
+  MIN: phút
+  HR: giờ
+  WK: tuần
+  MO: tháng
+  YR: năm
+  DEC: thập kỷ
+  SECOND_PLURAL: giây
+  MINUTE_PLURAL: phút
+  HOUR_PLURAL: giờ
+  DAY_PLURAL: ngày
+  WEEK_PLURAL: tuần
+  MONTH_PLURAL: tháng
+  YEAR_PLURAL: năm
+  DECADE_PLURAL: thập kỷ
+  SEC_PLURAL: giây
+  MIN_PLURAL: phút
+  HR_PLURAL: giờ
+  WK_PLURAL: tuần
+  MO_PLURAL: tháng
+  YR_PLURAL: năm
+  DEC_PLURAL: thập kỷ
+FORM:
+  VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+  INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+  MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
+MONTHS_OF_THE_YEAR:
+  - Tháng 1
+  - Tháng 2
+  - Tháng 3
+  - Tháng 4
+  - Tháng 5
+  - Tháng 6
+  - Tháng 7
+  - Tháng 8
+  - Tháng 9
+  - Tháng 10
+  - Tháng Mười 11
+  - Tháng 12
+DAYS_OF_THE_WEEK:
+  - Thứ 2
+  - Thứ 3
+  - Thứ 4
+  - Thứ 5
+  - Thứ 6
+  - Thứ 7
+  - Chủ Nhật
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index d482a47102..b87cd1cc3b 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Closure;
@@ -13,18 +20,8 @@
 define('CSS_ASSET', true);
 define('JS_ASSET', false);
 
-/**
- * Handles Asset management (CSS & JS) and also pipelining (combining into a single file for each asset)
- *
- * Based on stolz/assets (https://github.com/Stolz/Assets) package modified for use with Grav
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Assets
 {
-    use GravTrait;
-
     /** @const Regex to match CSS and JavaScript files */
     const DEFAULT_REGEX = '/.\.(css|js)$/i';
 
@@ -35,7 +32,7 @@ class Assets
     const JS_REGEX = '/.\.js$/i';
 
     /** @const Regex to match CSS urls */
-    const CSS_URL_REGEX = '{url\([\'\"]?((?!http|//).*?)[\'\"]?\)}';
+    const CSS_URL_REGEX = '{url\(([\'\"]?)(.*?)\1\)}';
 
     /** @const Regex to match CSS sourcemap comments */
     const CSS_SOURCEMAP_REGEX = '{\/\*# (.*) \*\/}';
@@ -62,7 +59,11 @@ class Assets
 
     // Configuration toggles to enable/disable the pipelining feature
     protected $css_pipeline = false;
+    protected $css_pipeline_include_externals = true;
+    protected $css_pipeline_before_excludes = true;
     protected $js_pipeline = false;
+    protected $js_pipeline_include_externals = true;
+    protected $js_pipeline_before_excludes = true;
 
     // The asset holding arrays
     protected $collections = [];
@@ -121,10 +122,26 @@ public function config(array $config)
             $this->css_pipeline = $config['css_pipeline'];
         }
 
+        if (isset($config['css_pipeline_include_externals'])) {
+            $this->css_pipeline_include_externals = $config['css_pipeline_include_externals'];
+        }
+
+        if (isset($config['css_pipeline_before_excludes'])) {
+            $this->css_pipeline_before_excludes = $config['css_pipeline_before_excludes'];
+        }
+
         if (isset($config['js_pipeline'])) {
             $this->js_pipeline = $config['js_pipeline'];
         }
 
+        if (isset($config['js_pipeline_include_externals'])) {
+            $this->js_pipeline_include_externals = $config['js_pipeline_include_externals'];
+        }
+
+        if (isset($config['js_pipeline_before_excludes'])) {
+            $this->js_pipeline_before_excludes = $config['js_pipeline_before_excludes'];
+        }
+
         // Pipeline requires public dir
         if (($this->js_pipeline || $this->css_pipeline) && !is_dir($this->assets_dir)) {
             throw new \Exception('Assets: Public dir not found');
@@ -167,7 +184,7 @@ public function config(array $config)
 
         // Set timestamp
         if (isset($config['enable_asset_timestamp']) && $config['enable_asset_timestamp'] === true) {
-            $this->timestamp = '?' . self::getGrav()['cache']->getKey();
+            $this->timestamp = '?' . Grav::instance()['cache']->getKey();
         }
 
         return $this;
@@ -178,13 +195,14 @@ public function config(array $config)
      */
     public function init()
     {
+        $grav = Grav::instance();
         /** @var Config $config */
-        $config = self::getGrav()['config'];
-        $base_url = self::getGrav()['base_url'];
+        $config = $grav['config'];
+        $base_url = $grav['base_url'];
         $asset_config = (array)$config->get('system.assets');
 
         /** @var UniformResourceLocator $locator */
-        $locator = self::$grav['locator'];
+        $locator = $grav['locator'];
         $this->assets_dir = $locator->findResource('asset://') . DS;
         $this->assets_url = $locator->findResource('asset://', false);
 
@@ -263,7 +281,9 @@ public function addCss($asset, $priority = null, $pipeline = true, $group = null
             return $this;
         }
 
+        $modified = 0;
         if (!$this->isRemoteLink($asset)) {
+            $modified = $this->getLastModificationTime($asset);
             $asset = $this->buildLocalLink($asset);
         }
 
@@ -276,8 +296,9 @@ public function addCss($asset, $priority = null, $pipeline = true, $group = null
             'asset'    => $asset,
             'priority' => intval($priority ?: 10),
             'order'    => count($this->css),
-            'pipeline' => (bool)$pipeline,
-            'group'    => $group ?: 'head'
+            'pipeline' => (bool) $pipeline,
+            'group'    => $group ?: 'head',
+            'modified' => $modified
         ];
 
         // check for dynamic array and merge with defaults
@@ -324,7 +345,9 @@ public function addJs($asset, $priority = null, $pipeline = true, $loading = nul
             return $this;
         }
 
+        $modified = 0;
         if (!$this->isRemoteLink($asset)) {
+            $modified = $this->getLastModificationTime($asset);
             $asset = $this->buildLocalLink($asset);
         }
 
@@ -337,9 +360,10 @@ public function addJs($asset, $priority = null, $pipeline = true, $loading = nul
             'asset'    => $asset,
             'priority' => intval($priority ?: 10),
             'order'    => count($this->js),
-            'pipeline' => (bool)$pipeline,
+            'pipeline' => (bool) $pipeline,
             'loading'  => $loading ?: '',
-            'group'    => $group ?: 'head'
+            'group'    => $group ?: 'head',
+            'modified' => $modified
         ];
 
         // check for dynamic array and merge with defaults
@@ -499,7 +523,7 @@ public function css($group = 'head', $attributes = [])
         }
 
         // Sort array by priorities (larger priority first)
-        if (self::getGrav()) {
+        if (Grav::instance()) {
             uasort($this->css, function ($a, $b) {
                 if ($a['priority'] == $b['priority']) {
                     return $b['order'] - $a['order'];
@@ -526,8 +550,10 @@ public function css($group = 'head', $attributes = [])
 
         if ($this->css_pipeline) {
             $pipeline_result = $this->pipelineCss($group);
-            if ($pipeline_result) {
-                $output .= '<link href="' . $pipeline_result . '"' . $attributes . ' />' . "\n";
+            $pipeline_html = '<link href="' . $pipeline_result . '"' . $attributes . ' />' . "\n";
+
+            if ($this->css_pipeline_before_excludes && $pipeline_result) {
+                $output .= $pipeline_html;
             }
             foreach ($this->css_no_pipeline as $file) {
                 if ($group && $file['group'] == $group) {
@@ -535,6 +561,9 @@ public function css($group = 'head', $attributes = [])
                     $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . $media . ' />' . "\n";
                 }
             }
+            if (!$this->css_pipeline_before_excludes && $pipeline_result) {
+                $output .= $pipeline_html;
+            }
         } else {
             foreach ($this->css as $file) {
                 if ($group && $file['group'] == $group) {
@@ -600,14 +629,19 @@ public function js($group = 'head', $attributes = [])
 
         if ($this->js_pipeline) {
             $pipeline_result = $this->pipelineJs($group);
-            if ($pipeline_result) {
-                $output .= '<script src="' . $pipeline_result . '"' . $attributes . ' ></script>' . "\n";
+            $pipeline_html = '<script src="' . $pipeline_result . '"' . $attributes . ' ></script>' . "\n";
+
+            if ($this->js_pipeline_before_excludes && $pipeline_result) {
+                $output .= $pipeline_html;
             }
             foreach ($this->js_no_pipeline as $file) {
                 if ($group && $file['group'] == $group) {
                     $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
                 }
             }
+            if (!$this->js_pipeline_before_excludes && $pipeline_result) {
+                $output .= $pipeline_html;
+            }
         } else {
             foreach ($this->js as $file) {
                 if ($group && $file['group'] == $group) {
@@ -639,30 +673,34 @@ public function js($group = 'head', $attributes = [])
      */
     protected function pipelineCss($group = 'head')
     {
-        /** @var Cache $cache */
-        $cache = self::getGrav()['cache'];
-        $key = '?' . $cache->getKey();
-
         // temporary list of assets to pipeline
         $temp_css = [];
 
         // clear no-pipeline assets lists
         $this->css_no_pipeline = [];
 
-        $file = md5(json_encode($this->css) . $this->css_minify . $this->css_rewrite . $group) . '.css';
+        // Compute uid based on assets and timestamp
+        $uid = md5(json_encode($this->css) . $this->css_minify . $this->css_rewrite . $group);
+        $file =  $uid . '.css';
+        $inline_file = $uid . '-inline.css';
 
         $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
-        $absolute_path = $this->assets_dir . $file;
+
+        // If inline files exist set them on object
+        if (file_exists($this->assets_dir . $inline_file)) {
+            $this->css_no_pipeline = json_decode(file_get_contents($this->assets_dir . $inline_file), true);
+        }
 
         // If pipeline exist return it
-        if (file_exists($absolute_path)) {
-            return $relative_path . $key;
+        if (file_exists($this->assets_dir . $file)) {
+            return $relative_path . $this->timestamp;
         }
 
         // Remove any non-pipeline files
         foreach ($this->css as $id => $asset) {
             if ($asset['group'] == $group) {
-                if (!$asset['pipeline']) {
+                if (!$asset['pipeline'] ||
+                    ($this->isRemoteLink($asset['asset']) && $this->css_pipeline_include_externals === false)) {
                     $this->css_no_pipeline[$id] = $asset;
                 } else {
                     $temp_css[$id] = $asset;
@@ -675,6 +713,12 @@ protected function pipelineCss($group = 'head')
             return false;
         }
 
+        // Write non-pipeline files out
+        if (!empty($this->css_no_pipeline)) {
+            file_put_contents($this->assets_dir . $inline_file, json_encode($this->css_no_pipeline));
+        }
+
+
         $css_minify = $this->css_minify;
 
         // If this is a Windows server, and minify_windows is false (default value) skip the
@@ -687,15 +731,16 @@ protected function pipelineCss($group = 'head')
         // Concatenate files
         $buffer = $this->gatherLinks($temp_css, CSS_ASSET);
         if ($css_minify) {
-            $min = new \CSSmin();
-            $buffer = $min->run($buffer);
+            $minifier = new \MatthiasMullie\Minify\CSS();
+            $minifier->add($buffer);
+            $buffer = $minifier->minify();
         }
 
         // Write file
         if (strlen(trim($buffer)) > 0) {
-            file_put_contents($absolute_path, $buffer);
+            file_put_contents($this->assets_dir . $file, $buffer);
 
-            return $relative_path . $key;
+            return $relative_path . $this->timestamp;
         } else {
             return false;
         }
@@ -710,30 +755,34 @@ protected function pipelineCss($group = 'head')
      */
     protected function pipelineJs($group = 'head')
     {
-        /** @var Cache $cache */
-        $cache = self::getGrav()['cache'];
-        $key = '?' . $cache->getKey();
-
         // temporary list of assets to pipeline
         $temp_js = [];
 
         // clear no-pipeline assets lists
         $this->js_no_pipeline = [];
 
-        $file = md5(json_encode($this->js) . $this->js_minify . $group) . '.js';
+        // Compute uid based on assets and timestamp
+        $uid = md5(json_encode($this->js) . $this->js_minify . $group);
+        $file =  $uid . '.js';
+        $inline_file = $uid . '-inline.js';
 
         $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
-        $absolute_path = $this->assets_dir . $file;
+
+        // If inline files exist set them on object
+        if (file_exists($this->assets_dir . $inline_file)) {
+            $this->js_no_pipeline = json_decode(file_get_contents($this->assets_dir . $inline_file), true);
+        }
 
         // If pipeline exist return it
-        if (file_exists($absolute_path)) {
-            return $relative_path . $key;
+        if (file_exists($this->assets_dir . $file)) {
+            return $relative_path . $this->timestamp;
         }
 
         // Remove any non-pipeline files
         foreach ($this->js as $id => $asset) {
             if ($asset['group'] == $group) {
-                if (!$asset['pipeline']) {
+                if (!$asset['pipeline'] ||
+                    ($this->isRemoteLink($asset['asset']) && $this->js_pipeline_include_externals === false)) {
                     $this->js_no_pipeline[] = $asset;
                 } else {
                     $temp_js[$id] = $asset;
@@ -746,17 +795,24 @@ protected function pipelineJs($group = 'head')
             return false;
         }
 
+        // Write non-pipeline files out
+        if (!empty($this->js_no_pipeline)) {
+            file_put_contents($this->assets_dir . $inline_file, json_encode($this->js_no_pipeline));
+        }
+
         // Concatenate files
         $buffer = $this->gatherLinks($temp_js, JS_ASSET);
         if ($this->js_minify) {
-            $buffer = \JSMin::minify($buffer);
+            $minifier = new \MatthiasMullie\Minify\JS();
+            $minifier->add($buffer);
+            $buffer = $minifier->minify();
         }
 
         // Write file
         if (strlen(trim($buffer)) > 0) {
-            file_put_contents($absolute_path, $buffer);
+            file_put_contents($this->assets_dir . $file, $buffer);
 
-            return $relative_path . $key;
+            return $relative_path . $this->timestamp;
         } else {
             return false;
         }
@@ -764,24 +820,94 @@ protected function pipelineJs($group = 'head')
 
     /**
      * Return the array of all the registered CSS assets
+     * If a $key is provided, it will try to return only that asset
+     * else it will return null
      *
+     * @param null|string $key the asset key
      * @return array
      */
-    public function getCss()
+    public function getCss($key = null)
     {
+        if (!empty($key)) {
+            $asset_key = md5($key);
+            if (isset($this->css[$asset_key])) {
+                return $this->css[$asset_key];
+            } else {
+                return null;
+            }
+        }
+
         return $this->css;
     }
 
     /**
      * Return the array of all the registered JS assets
+     * If a $key is provided, it will try to return only that asset
+     * else it will return null
      *
+     * @param null|string $key the asset key
      * @return array
      */
-    public function getJs()
+    public function getJs($key = null)
     {
+        if (!empty($key)) {
+            $asset_key = md5($key);
+            if (isset($this->js[$asset_key])) {
+                return $this->js[$asset_key];
+            } else {
+                return null;
+            }
+        }
+
         return $this->js;
     }
 
+    /**
+     * Set the whole array of CSS assets
+     *
+     * @param $css
+     */
+    public function setCss($css)
+    {
+        $this->css = $css;
+    }
+
+    /**
+     * Set the whole array of JS assets
+     *
+     * @param $js
+     */
+    public function setJs($js)
+    {
+        $this->js = $js;
+    }
+
+    /**
+     * Removes an item from the CSS array if set
+     *
+     * @param $key  the asset key
+     */
+    public function removeCss($key)
+    {
+        $asset_key = md5($key);
+        if (isset($this->css[$asset_key])) {
+            unset($this->css[$asset_key]);
+        }
+    }
+
+    /**
+     * Removes an item from the JS array if set
+     *
+     * @param $key  the asset key
+     */
+    public function removeJs($key)
+    {
+        $asset_key = md5($key);
+        if (isset($this->js[$asset_key])) {
+            unset($this->js[$asset_key]);
+        }
+    }
+
     /**
      * Return the array of all the registered collections
      *
@@ -792,6 +918,16 @@ public function getCollections()
         return $this->collections;
     }
 
+    /**
+     * Set the array of collections explicitly
+     *
+     * @param $collections
+     */
+    public function setCollection($collections)
+    {
+        $this->collections = $collections;
+    }
+
     /**
      * Determines if an asset exists as a collection, CSS or JS reference
      *
@@ -901,7 +1037,7 @@ public function addDir($directory, $pattern = self::DEFAULT_REGEX)
 
         // Check if $directory is a stream.
         if (strpos($directory, '://')) {
-            $directory = self::$grav['locator']->findResource($directory, null);
+            $directory = Grav::instance()['locator']->findResource($directory, null);
         }
 
         // Get files
@@ -949,6 +1085,13 @@ public function addDir($directory, $pattern = self::DEFAULT_REGEX)
      */
     protected function isRemoteLink($link)
     {
+        $base = Grav::instance()['uri']->rootUrl(true);
+
+        // sanity check for local URLs with absolute URL's enabled
+        if (Utils::startsWith($link, $base)) {
+            return false;
+        }
+
         return ('http://' === substr($link, 0, 7) || 'https://' === substr($link, 0, 8) || '//' === substr($link, 0,
                 2));
     }
@@ -956,18 +1099,37 @@ protected function isRemoteLink($link)
     /**
      * Build local links including grav asset shortcodes
      *
-     * @param  string $asset the asset string reference
+     * @param  string $asset    the asset string reference
+     * @param  bool   $absolute build absolute asset link
      *
-     * @return string        the final link url to the asset
+     * @return string           the final link url to the asset
      */
-    protected function buildLocalLink($asset)
+    protected function buildLocalLink($asset, $absolute = false)
     {
         try {
-            $asset = self::getGrav()['locator']->findResource($asset, false);
+            $asset = Grav::instance()['locator']->findResource($asset, $absolute);
         } catch (\Exception $e) {
         }
 
-        return $asset ? $this->base_url . ltrim($asset, '/') : false;
+        $uri = $absolute ? $asset : $this->base_url . ltrim($asset, '/');
+        return $asset ? $uri : false;
+    }
+
+    /**
+     * Get the last modification time of asset
+     *
+     * @param  string $asset    the asset string reference
+     *
+     * @return string           the last modifcation time or false on error
+     */
+    protected function getLastModificationTime($asset)
+    {
+        $file = GRAV_ROOT . $asset;
+        if (Grav::instance()['locator']->isStream($asset)) {
+            $file = $this->buildLocalLink($asset, true);
+        }
+
+        return file_exists($file) ? filemtime($file) : false;
     }
 
     /**
@@ -980,6 +1142,7 @@ protected function buildLocalLink($asset)
     protected function attributes(array $attributes)
     {
         $html = '';
+        $no_key = ['loading'];
 
         foreach ($attributes as $key => $value) {
             // For numeric keys we will assume that the key and the value are the same
@@ -992,7 +1155,12 @@ protected function attributes(array $attributes)
                 $value = implode(' ', $value);
             }
 
-            $element = $key . '="' . htmlentities($value, ENT_QUOTES, 'UTF-8', false) . '"';
+            if (in_array($key, $no_key)) {
+                $element = htmlentities($value, ENT_QUOTES, 'UTF-8', false);
+            } else {
+                $element = $key . '="' . htmlentities($value, ENT_QUOTES, 'UTF-8', false) . '"';
+            }
+
             $html .= ' ' . $element;
         }
 
@@ -1010,10 +1178,11 @@ protected function attributes(array $attributes)
     protected function gatherLinks(array $links, $css = true)
     {
         $buffer = '';
-        $local = true;
+
 
         foreach ($links as $asset) {
             $relative_dir = '';
+            $local = true;
 
             $link = $asset['asset'];
             $relative_path = $link;
@@ -1051,6 +1220,7 @@ protected function gatherLinks(array $links, $css = true)
                 $file = $this->cssRewrite($file, $relative_dir);
             }
 
+            $file = rtrim($file) . PHP_EOL;
             $buffer .= $file;
         }
 
@@ -1079,13 +1249,18 @@ protected function cssRewrite($file, $relative_path)
         // Then replace the old url with the new one
         $file = preg_replace_callback(self::CSS_URL_REGEX, function ($matches) use ($relative_path) {
 
-            $old_url = $matches[1];
+            $old_url = $matches[2];
 
             // ensure this is not a data url
             if (strpos($old_url, 'data:') === 0) {
                 return $matches[0];
             }
 
+            // ensure this is not a remote url
+            if ($this->isRemoteLink($old_url)) {
+                return $matches[0];
+            }
+
             $new_url = $this->base_url . ltrim(Utils::normalizePath($relative_path . '/' . $old_url), '/');
 
             return str_replace($old_url, $new_url, $matches[0]);
diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
index a3dedc8868..b6fb0c2b75 100644
--- a/system/src/Grav/Common/Backup/ZipBackup.php
+++ b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -1,20 +1,18 @@
 <?php
+/**
+ * @package    Grav.Common.Backup
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Backup;
 
-use Grav\Common\GravTrait;
-use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
 use Grav\Common\Inflector;
 
-/**
- * The ZipBackup class lets you create simple zip-backups of a grav site
- *
- * @author RocketTheme
- * @license MIT
- */
 class ZipBackup
 {
-    use GravTrait;
-
     protected static $ignorePaths = [
         'backup',
         'cache',
@@ -26,7 +24,8 @@ class ZipBackup
         '.git',
         '.svn',
         '.hg',
-        '.idea'
+        '.idea',
+        'node_modules'
     ];
 
     /**
@@ -40,15 +39,14 @@ class ZipBackup
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
-            $destination = self::getGrav()['locator']->findResource('backup://', true);
+            $destination = Grav::instance()['locator']->findResource('backup://', true);
 
-            if (!$destination)
+            if (!$destination) {
                 throw new \RuntimeException('The backup folder is missing.');
-
-            Folder::mkdir($destination);
+            }
         }
 
-        $name = self::getGrav()['config']->get('site.title', basename(GRAV_ROOT));
+        $name = Grav::instance()['config']->get('site.title', basename(GRAV_ROOT));
 
         $inflector = new Inflector();
 
diff --git a/system/src/Grav/Common/Browser.php b/system/src/Grav/Common/Browser.php
index bcced48994..c3e788f28b 100644
--- a/system/src/Grav/Common/Browser.php
+++ b/system/src/Grav/Common/Browser.php
@@ -1,13 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 /**
- * Handles browser and platform versions
- *
  * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
- *
- * @author  RocketTheme
- * @license MIT
  */
 class Browser
 {
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index e938c32b99..207159ab12 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -1,9 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
@@ -15,14 +23,9 @@
  * MemCache
  * MemCacheD
  * FileSystem
- *
- * @author  RocketTheme
- * @license MIT
  */
 class Cache extends Getters
 {
-    use GravTrait;
-
     /**
      * @var string Cache key.
      */
@@ -178,11 +181,18 @@ public function getCacheDriver()
                 $driver->setMemcache($memcache);
                 break;
 
+            case 'memcached':
+                $memcached = new \Memcached();
+                $memcached->connect($this->config->get('system.cache.memcached.server', 'localhost'),
+                    $this->config->get('system.cache.memcached.port', 11211));
+                $driver = new DoctrineCache\MemcachedCache();
+                $driver->setMemcached($memcached);
+                break;
+
             case 'redis':
                 $redis = new \Redis();
                 $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
                     $this->config->get('system.cache.redis.port', 6379));
-
                 $driver = new DoctrineCache\RedisCache();
                 $driver->setRedis($redis);
                 break;
@@ -228,6 +238,34 @@ public function save($id, $data, $lifetime = null)
         }
     }
 
+    /**
+     * Deletes an item in the cache based on the id
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the item was deleted successfully
+     */
+    public function delete($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->delete($id);
+        }
+        return false;
+    }
+
+    /**
+     * Returns a boolean state of whether or not the item exists in the cache based on id key
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the cached items exists
+     */
+    public function contains($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->contains(($id));
+        }
+        return false;
+    }
+
     /**
      * Getter method to get the cache key
      */
@@ -236,6 +274,15 @@ public function getKey()
         return $this->key;
     }
 
+    /**
+     * Setter method to set key (Advanced)
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+        $this->driver->setNamespace($this->key);
+    }
+
     /**
      * Helper method to clear all Grav caches
      *
@@ -245,7 +292,7 @@ public function getKey()
      */
     public static function clearCache($remove = 'standard')
     {
-        $locator = self::getGrav()['locator'];
+        $locator = Grav::instance()['locator'];
         $output = [];
         $user_config = USER_DIR . 'config/system.yaml';
 
@@ -286,7 +333,7 @@ public static function clearCache($remove = 'standard')
                             $anything = true;
                         }
                     } elseif (is_dir($file)) {
-                        if (@Folder::delete($file)) {
+                        if (Folder::delete($file)) {
                             $anything = true;
                         }
                     }
diff --git a/system/src/Grav/Common/Composer.php b/system/src/Grav/Common/Composer.php
index 804bc4c154..7069a8e17d 100644
--- a/system/src/Grav/Common/Composer.php
+++ b/system/src/Grav/Common/Composer.php
@@ -1,13 +1,13 @@
 <?php
-
-namespace Grav\Common;
-
 /**
- * Offers composer helper methods.
+ * @package    Grav.Common
  *
- * @author  eschmar
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common;
+
 class Composer
 {
     /** @const Default composer location */
diff --git a/system/src/Grav/Common/Config/CompiledBase.php b/system/src/Grav/Common/Config/CompiledBase.php
index 9f51d7d267..e8ead86fde 100644
--- a/system/src/Grav/Common/Config/CompiledBase.php
+++ b/system/src/Grav/Common/Config/CompiledBase.php
@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use RocketTheme\Toolbox\File\PhpFile;
 
-/**
- * The Compiled base class.
- */
 abstract class CompiledBase
 {
     /**
@@ -192,9 +196,9 @@ protected function loadCompiledFile($filename)
         }
 
         $this->createObject($cache['data']);
-        
+
         $this->finalizeObject();
-        
+
         return true;
     }
 
@@ -226,7 +230,7 @@ protected function saveCompiledFile($filename)
             'timestamp' => time(),
             'checksum' => $this->checksum(),
             'files' => $this->files,
-            'data' => $this->object->toArray()
+            'data' => $this->getState()
         ];
 
         $file->save($cache);
@@ -235,4 +239,9 @@ protected function saveCompiledFile($filename)
 
         $this->modified();
     }
+
+    protected function getState()
+    {
+        return $this->object->toArray();
+    }
 }
diff --git a/system/src/Grav/Common/Config/CompiledBlueprints.php b/system/src/Grav/Common/Config/CompiledBlueprints.php
index d78a0e04e7..6e2caf9b9a 100644
--- a/system/src/Grav/Common/Config/CompiledBlueprints.php
+++ b/system/src/Grav/Common/Config/CompiledBlueprints.php
@@ -1,24 +1,44 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 namespace Grav\Common\Config;
 
-use Grav\Common\File\CompiledYamlFile;
-use RocketTheme\Toolbox\Blueprints\Blueprints;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\BlueprintSchema;
+use Grav\Common\Grav;
 
-/**
- * The Compiled Blueprints class.
- */
 class CompiledBlueprints extends CompiledBase
 {
     /**
      * @var int Version number for the compiled file.
      */
-    public $version = 1;
+    public $version = 2;
 
     /**
-     * @var Blueprints  Blueprints object.
+     * @var BlueprintSchema  Blueprints object.
      */
     protected $object;
 
+    /**
+     * Returns checksum from the configuration files.
+     *
+     * You can set $this->checksum = false to disable this check.
+     *
+     * @return bool|string
+     */
+    public function checksum()
+    {
+        if (!isset($this->checksum)) {
+            $this->checksum = md5(json_encode($this->files) . json_encode($this->getTypes()) . $this->version);
+        }
+
+        return $this->checksum;
+    }
+
     /**
      * Create configuration object.
      *
@@ -26,24 +46,70 @@ class CompiledBlueprints extends CompiledBase
      */
     protected function createObject(array $data = [])
     {
-        $this->object = new Blueprints($data);
+        $this->object = (new BlueprintSchema($data))->setTypes($this->getTypes());
+    }
+
+    /**
+     * Get list of form field types.
+     *
+     * @return array
+     */
+    protected function getTypes()
+    {
+        return Grav::instance()['plugins']->formFieldTypes ?: [];
     }
 
     /**
      * Finalize configuration object.
      */
-    protected function finalizeObject() {}
+    protected function finalizeObject()
+    {
+    }
 
     /**
      * Load single configuration file and append it to the correct position.
      *
      * @param  string  $name  Name of the position.
-     * @param  string  $filename  File to be loaded.
+     * @param  array   $files  Files to be loaded.
      */
-    protected function loadFile($name, $filename)
+    protected function loadFile($name, $files)
+    {
+        // Load blueprint file.
+        $blueprint = new Blueprint($files);
+
+        $this->object->embed($name, $blueprint->load()->toArray(), '/', true);
+    }
+
+    /**
+     * Load and join all configuration files.
+     *
+     * @return bool
+     * @internal
+     */
+    protected function loadFiles()
+    {
+        $this->createObject();
+
+        // Convert file list into parent list.
+        $list = [];
+        foreach ($this->files as $files) {
+            foreach ($files as $name => $item) {
+                $list[$name][] = $this->path . $item['file'];
+            }
+        }
+
+        // Load files.
+        foreach ($list as $name => $files) {
+            $this->loadFile($name, $files);
+        }
+
+        $this->finalizeObject();
+
+        return true;
+    }
+
+    protected function getState()
     {
-        $file = CompiledYamlFile::instance($filename);
-        $this->object->embed($name, $file->content(), '/');
-        $file->free();
+        return $this->object->getState();
     }
 }
diff --git a/system/src/Grav/Common/Config/CompiledConfig.php b/system/src/Grav/Common/Config/CompiledConfig.php
index cb9e59de24..3b2e56fd48 100644
--- a/system/src/Grav/Common/Config/CompiledConfig.php
+++ b/system/src/Grav/Common/Config/CompiledConfig.php
@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Configuration class.
- */
 class CompiledConfig extends CompiledBase
 {
     /**
diff --git a/system/src/Grav/Common/Config/CompiledLanguages.php b/system/src/Grav/Common/Config/CompiledLanguages.php
index ce4eb59dc1..b03280bc6a 100644
--- a/system/src/Grav/Common/Config/CompiledLanguages.php
+++ b/system/src/Grav/Common/Config/CompiledLanguages.php
@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Languages class.
- */
 class CompiledLanguages extends CompiledBase
 {
     /**
diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index dc51697505..160b936f52 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Debugger;
@@ -6,12 +13,6 @@
 use Grav\Common\Data\Data;
 use Grav\Common\Service\ConfigServiceProvider;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Config extends Data
 {
     protected $checksum;
diff --git a/system/src/Grav/Common/Config/ConfigFileFinder.php b/system/src/Grav/Common/Config/ConfigFileFinder.php
index 887575a95a..198c00be8e 100644
--- a/system/src/Grav/Common/Config/ConfigFileFinder.php
+++ b/system/src/Grav/Common/Config/ConfigFileFinder.php
@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Filesystem\Folder;
 
-/**
- * The Configuration & Blueprints Finder class.
- */
 class ConfigFileFinder
 {
     protected $base = '';
diff --git a/system/src/Grav/Common/Config/Languages.php b/system/src/Grav/Common/Config/Languages.php
index 4d92d87e9d..7ce4240f7e 100644
--- a/system/src/Grav/Common/Config/Languages.php
+++ b/system/src/Grav/Common/Config/Languages.php
@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Data\Data;
 
-/**
- * The Languages class contains configuration rules.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Languages extends Data
 {
     public function checksum($checksum = null)
diff --git a/system/src/Grav/Common/Config/Setup.php b/system/src/Grav/Common/Config/Setup.php
index 8b6b70750e..27c7c36680 100644
--- a/system/src/Grav/Common/Config/Setup.php
+++ b/system/src/Grav/Common/Config/Setup.php
@@ -1,18 +1,20 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
+use Pimple\Container;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Setup extends Data
 {
     protected $streams = [
@@ -113,12 +115,12 @@ class Setup extends Data
         ],
     ];
 
+    /**
+     * @param Container|array $container
+     */
     public function __construct($container)
     {
-        $environment = $container['uri']->environment();
-        if (!$environment) {
-            $environment = 'localhost';
-        }
+        $environment = $container['uri']->environment() ?: 'localhost';
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php
index 68de5de81d..d4e535146c 100644
--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@@ -1,87 +1,57 @@
 <?php
-namespace Grav\Common\Data;
-
-use Grav\Common\GravTrait;
-use RocketTheme\Toolbox\ArrayTraits\Export;
-use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
-use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
-
 /**
- * Blueprint handles the inside logic of blueprints.
+ * @package    Grav.Common.Data
  *
- * @author RocketTheme
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
-class Blueprint implements \ArrayAccess, ExportInterface
-{
-    use Export, NestedArrayAccessWithGetters, GravTrait;
-
-    public $name;
 
-    public $initialized = false;
+namespace Grav\Common\Data;
 
-    protected $items;
-    protected $context;
-    protected $fields;
-    protected $rules = array();
-    protected $nested = array();
-    protected $filter = ['validation' => 1];
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Blueprints\BlueprintForm;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
+class Blueprint extends BlueprintForm
+{
     /**
-     * @param string $name
-     * @param array  $data
-     * @param Blueprints $context
+     * @var string
      */
-    public function __construct($name, array $data = array(), Blueprints $context = null)
-    {
-        $this->name = $name;
-        $this->items = $data;
-        $this->context = $context;
-    }
+    protected $context = 'blueprints://';
 
     /**
-     * Set filter for inherited properties.
-     *
-     * @param array $filter     List of field names to be inherited.
+     * @var BlueprintSchema
      */
-    public function setFilter(array $filter)
-    {
-        $this->filter = array_flip($filter);
-    }
+    protected $blueprintSchema;
 
     /**
-     * Return all form fields.
+     * Set default values for field types.
      *
-     * @return array
+     * @param array $types
+     * @return $this
      */
-    public function fields()
+    public function setTypes(array $types)
     {
-        if (!isset($this->fields)) {
-            $this->fields = [];
-            $this->embed('', $this->items);
-        }
+        $this->initInternals();
+
+        $this->blueprintSchema->setTypes($types);
 
-        return $this->fields;
+        return $this;
     }
 
     /**
-     * Validate data against blueprints.
+     * Get nested structure containing default values defined in the blueprints.
      *
-     * @param  array $data
-     * @throws \RuntimeException
+     * Fields without default value are ignored in the list.
+     *
+     * @return array
      */
-    public function validate(array $data)
+    public function getDefaults()
     {
-        // Initialize data
-        $this->fields();
-
-        try {
-            $this->validateArray($data, $this->nested);
-        } catch (\RuntimeException $e) {
-            $language = self::getGrav()['language'];
-            $message = sprintf($language->translate('FORM.VALIDATION_FAIL', null, true) . ' %s', $e->getMessage());
-            throw new \RuntimeException($message);
-        }
+        $this->initInternals();
+
+        return $this->blueprintSchema->getDefaults();
     }
 
     /**
@@ -89,26 +59,15 @@ public function validate(array $data)
      *
      * @param  array $data1
      * @param  array $data2
+     * @param  string $name         Optional
+     * @param  string $separator    Optional
      * @return array
      */
-    public function mergeData(array $data1, array $data2)
+    public function mergeData(array $data1, array $data2, $name = null, $separator = '.')
     {
-        // Initialize data
-        $this->fields();
-        return $this->mergeArrays($data1, $data2, $this->nested);
-    }
+        $this->initInternals();
 
-    /**
-     * Filter data by using blueprints.
-     *
-     * @param  array $data
-     * @return array
-     */
-    public function filter(array $data)
-    {
-        // Initialize data
-        $this->fields();
-        return $this->filterArray($data, $this->nested);
+        return $this->blueprintSchema->mergeData($data1, $data2, $name, $separator);
     }
 
     /**
@@ -120,357 +79,164 @@ public function filter(array $data)
      */
     public function extra(array $data, $prefix = '')
     {
-        // Initialize data
-        $this->fields();
-        $rules = $this->nested;
-
-        // Drill down to prefix level
-        if (!empty($prefix)) {
-            $parts = explode('.', trim($prefix, '.'));
-            foreach ($parts as $part) {
-                $rules = isset($rules[$part]) ? $rules[$part] : [];
-            }
-        }
+        $this->initInternals();
 
-        return $this->extraArray($data, $rules, $prefix);
+        return $this->blueprintSchema->extra($data, $prefix);
     }
 
     /**
-     * Extend blueprint with another blueprint.
+     * Validate data against blueprints.
      *
-     * @param Blueprint $extends
-     * @param bool $append
+     * @param  array $data
+     * @throws \RuntimeException
      */
-    public function extend(Blueprint $extends, $append = false)
+    public function validate(array $data)
     {
-        $blueprints = $append ? $this->items : $extends->toArray();
-        $appended = $append ? $extends->toArray() : $this->items;
-
-        $bref_stack = array(&$blueprints);
-        $head_stack = array($appended);
-
-        do {
-            end($bref_stack);
+        $this->initInternals();
 
-            $bref = &$bref_stack[key($bref_stack)];
-            $head = array_pop($head_stack);
-
-            unset($bref_stack[key($bref_stack)]);
-
-            foreach (array_keys($head) as $key) {
-                if (isset($key, $bref[$key]) && is_array($bref[$key]) && is_array($head[$key])) {
-                    $bref_stack[] = &$bref[$key];
-                    $head_stack[] = $head[$key];
-                } else {
-                    $bref = array_merge($bref, array($key => $head[$key]));
-                }
-            }
-        } while (count($head_stack));
-
-        $this->items = $blueprints;
+        $this->blueprintSchema->validate($data);
     }
 
     /**
-     * Convert object into an array.
+     * Filter data by using blueprints.
      *
+     * @param  array $data
      * @return array
      */
-    public function getState()
+    public function filter(array $data)
     {
-        return ['name' => $this->name, 'items' => $this->items, 'rules' => $this->rules, 'nested' => $this->nested];
+        $this->initInternals();
+
+        return $this->blueprintSchema->filter($data);
     }
 
     /**
-     * Embed an array to the blueprint.
-     *
-     * @param $name
-     * @param array $value
-     * @param string $separator
+     * Initialize validator.
      */
-    public function embed($name, array $value, $separator = '.')
+    protected function initInternals()
     {
+        if (!isset($this->blueprintSchema)) {
+            $types = Grav::instance()['plugins']->formFieldTypes;
 
-        if (!isset($value['form']['fields']) || !is_array($value['form']['fields'])) {
-            return;
+            $this->blueprintSchema = new BlueprintSchema;
+            if ($types) {
+                $this->blueprintSchema->setTypes($types);
+            }
+            $this->blueprintSchema->embed('', $this->items);
+            $this->blueprintSchema->init();
         }
-        // Initialize data
-        $this->fields();
-        $prefix = $name ? strtr($name, $separator, '.') . '.' : '';
-        $params = array_intersect_key($this->filter, $value);
-        $this->parseFormFields($value['form']['fields'], $params, $prefix, $this->fields);
     }
 
     /**
-     * @param array $data
-     * @param array $rules
-     * @throws \RuntimeException
-     * @internal
+     * @param string $filename
+     * @return string
      */
-    protected function validateArray(array $data, array $rules)
+    protected function loadFile($filename)
     {
-        $this->checkRequired($data, $rules);
-
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-                Validation::validate($field, $rule);
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $this->validateArray($field, $val);
-            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
-                 // Undefined/extra item.
-                 throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
-            }
-        }
+        $file = CompiledYamlFile::instance($filename);
+        $content = $file->content();
+        $file->free();
+
+        return $content;
     }
 
     /**
-     * @param array $data
-     * @param array $rules
+     * @param string|array $path
+     * @param string $context
      * @return array
-     * @internal
      */
-    protected function filterArray(array $data, array $rules)
+    protected function getFiles($path, $context = null)
     {
-        $results = array();
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-                $field = Validation::filter($field, $rule);
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $field = $this->filterArray($field, $val);
-            } elseif (isset($this->items['form']['validation']) && $this->items['form']['validation'] == 'strict') {
-                $field = null;
-            }
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        if (is_string($path) && !$locator->isStream($path)) {
+            // Find path overrides.
+            $paths = isset($this->overrides[$path]) ? (array) $this->overrides[$path] : [];
 
-            if (isset($field) && (!is_array($field) || !empty($field))) {
-                $results[$key] = $field;
+            // Add path pointing to default context.
+            if ($context === null) {
+                $context = $this->context;
             }
-        }
+            if ($context && $context[strlen($context)-1] !== '/') {
+                $context .= '/';
+            }
+            $path = $context . $path;
 
-        return $results;
-    }
+            if (!preg_match('/\.yaml$/', $path)) {
+                $path .= '.yaml';
+            }
 
-    /**
-     * @param array $data1
-     * @param array $data2
-     * @param array $rules
-     * @return array
-     * @internal
-     */
-    protected function mergeArrays(array $data1, array $data2, array $rules)
-    {
-        foreach ($data2 as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
+            $paths[] = $path;
+        } else {
+            $paths = (array) $path;
+        }
 
-            if (!$rule && array_key_exists($key, $data1) && is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $data1[$key] = $this->mergeArrays($data1[$key], $field, $val);
+        $files = [];
+        foreach ($paths as $lookup) {
+            if (is_string($lookup) && strpos($lookup, '://')) {
+                $files = array_merge($files, $locator->findResources($lookup));
             } else {
-                // Otherwise just take value from the data2.
-                $data1[$key] = $field;
+                $files[] = $lookup;
             }
         }
 
-        return $data1;
+        return array_values(array_unique($files));
     }
 
     /**
-     * @param array $data
-     * @param array $rules
-     * @param string $prefix
-     * @return array
-     * @internal
+     * @param array $field
+     * @param string $property
+     * @param array $call
      */
-    protected function extraArray(array $data, array $rules, $prefix)
+    protected function dynamicData(array &$field, $property, array &$call)
     {
-        $array = array();
-        foreach ($data as $key => $field) {
-            $val = isset($rules[$key]) ? $rules[$key] : null;
-            $rule = is_string($val) ? $this->rules[$val] : null;
-
-            if ($rule) {
-                // Item has been defined in blueprints.
-            } elseif (is_array($field) && is_array($val)) {
-                // Array has been defined in blueprints.
-                $array += $this->ExtraArray($field, $val, $prefix . $key . '.');
-            } else {
-                // Undefined/extra item.
-                $array[$prefix.$key] = $field;
-            }
+        $params = $call['params'];
+
+        if (is_array($params)) {
+            $function = array_shift($params);
+        } else {
+            $function = $params;
+            $params = [];
         }
-        return $array;
-    }
 
-    /**
-	 * Gets all field definitions from the blueprints.
-	 *
-	 * @param array $fields
-	 * @param array $params
-	 * @param string $prefix
-	 * @param array $current
-	 * @internal
-	 */
-	protected function parseFormFields(array &$fields, $params, $prefix, array &$current)
-	{
-		// Go though all the fields in current level.
-		foreach ($fields as $key => &$field) {
-			$current[$key] = &$field;
-			// Set name from the array key.
-			$field['name'] = $prefix . $key;
-			$field += $params;
-
-			if (isset($field['fields']) && (!isset($field['type']) || $field['type'] !== 'list')) {
-				// Recursively get all the nested fields.
-				$newParams = array_intersect_key($this->filter, $field);
-				$this->parseFormFields($field['fields'], $newParams, $prefix, $current[$key]['fields']);
-			} else if ($field['type'] !== 'ignore') {
-                $this->rules[$prefix . $key] = &$field;
-                $this->addProperty($prefix . $key);
-
-                if ($field['type'] === 'list') {
-                    // we loop through list to get the actual field
-                    if (isset($field['fields']) && $field['fields']) {
-                        foreach($field['fields'] as $subName => &$subField) {
-                            $this->parseFormField($subField);
-                        }
-                    }
-                } else {
-                    $this->parseFormField($field);
-                }
-
-                if (isset($field['validate']['rule']) && $field['type'] !== 'ignore') {
-                    $field['validate'] += $this->getRule($field['validate']['rule']);
-                }
+        list($o, $f) = preg_split('/::/', $function, 2);
+        if (!$f) {
+            if (function_exists($o)) {
+                $data = call_user_func_array($o, $params);
             }
-		}
-	}
-	/**
-	 * Parses individual field definition
-	 *
-	 * @param array $field
-	 * @internal
-	 */
-	protected function parseFormField(&$field) {
-		foreach ($field as $name => $value) {
-			// Support nested blueprints.
-			if ($this->context && $name == '@import') {
-				$values = (array) $value;
-				if (!isset($field['fields'])) {
-					$field['fields'] = array();
-				}
-				foreach ($values as $bname) {
-					$b = $this->context->get($bname);
-					$field['fields'] = array_merge($field['fields'], $b->fields());
-				}
-			}
-
-			// Support for callable data values.
-			elseif (substr($name, 0, 6) == '@data-') {
-				$property = substr($name, 6);
-				if (is_array($value)) {
-					$func = array_shift($value);
-				} else {
-					$func = $value;
-					$value = array();
-				}
-				list($o, $f) = preg_split('/::/', $func);
-				if (!$f && function_exists($o)) {
-					$data = call_user_func_array($o, $value);
-				} elseif ($f && method_exists($o, $f)) {
-					$data = call_user_func_array(array($o, $f), $value);
-				}
-
-				// If function returns a value,
-				if (isset($data)) {
-					if (isset($field[$property]) && is_array($field[$property]) && is_array($data)) {
-						// Combine field and @data-field together.
-						$field[$property] += $data;
-					} else {
-						// Or create/replace field with @data-field.
-						$field[$property] = $data;
-					}
-				}
-			}
-
-			elseif (substr($name, 0, 8) == '@config-') {
-				$property = substr($name, 8);
-				$default = isset($field[$property]) ? $field[$property] : null;
-				$config = self::getGrav()['config']->get($value, $default);
-
-				if (!is_null($config)) {
-					$field[$property] = $config;
-				}
-			}
-		}
-	}
-
-    /**
-     * Add property to the definition.
-     *
-     * @param  string  $path  Comma separated path to the property.
-     * @internal
-     */
-    protected function addProperty($path)
-    {
-        $parts = explode('.', $path);
-        $item = array_pop($parts);
-
-        $nested = &$this->nested;
-        foreach ($parts as $part) {
-            if (!isset($nested[$part])) {
-                $nested[$part] = array();
+        } else {
+            if (method_exists($o, $f)) {
+                $data = call_user_func_array(array($o, $f), $params);
             }
-            $nested = &$nested[$part];
         }
 
-        if (!isset($nested[$item])) {
-            $nested[$item] = $path;
+        // If function returns a value,
+        if (isset($data)) {
+            if (isset($field[$property]) && is_array($field[$property]) && is_array($data)) {
+                // Combine field and @data-field together.
+                $field[$property] += $data;
+            } else {
+                // Or create/replace field with @data-field.
+                $field[$property] = $data;
+            }
         }
     }
 
     /**
-     * @param $rule
-     * @return array
-     * @internal
+     * @param array $field
+     * @param string $property
+     * @param array $call
      */
-    protected function getRule($rule)
+    protected function dynamicConfig(array &$field, $property, array &$call)
     {
-        if (isset($this->items['rules'][$rule]) && is_array($this->items['rules'][$rule])) {
-            return $this->items['rules'][$rule];
-        }
-        return array();
-    }
+        $value = $call['params'];
 
-    /**
-     * @param array $data
-     * @param array $fields
-     * @throws \RuntimeException
-     * @internal
-     */
-    protected function checkRequired(array $data, array $fields)
-    {
-        foreach ($fields as $name => $field) {
-            if (!is_string($field)) {
-                continue;
-            }
-            $field = $this->rules[$field];
-            if (isset($field['validate']['required'])
-                && $field['validate']['required'] === true
-                && empty($data[$name])) {
-                $value = isset($field['label']) ? $field['label'] : $field['name'];
-                $language = self::getGrav()['language'];
-                $message  = sprintf($language->translate('FORM.MISSING_REQUIRED_FIELD', null, true) . ' %s', $value);
-                throw new \RuntimeException($message);
-            }
+        $default = isset($field[$property]) ? $field[$property] : null;
+        $config = Grav::instance()['config']->get($value, $default);
+
+        if (!is_null($config)) {
+            $field[$property] = $config;
         }
     }
 }
diff --git a/system/src/Grav/Common/Data/BlueprintSchema.php b/system/src/Grav/Common/Data/BlueprintSchema.php
new file mode 100644
index 0000000000..c1b7726f4f
--- /dev/null
+++ b/system/src/Grav/Common/Data/BlueprintSchema.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Data;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\ArrayTraits\Export;
+use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
+use RocketTheme\Toolbox\Blueprints\BlueprintSchema as BlueprintSchemaBase;
+
+class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
+{
+    use Export;
+
+    protected $ignoreFormKeys = [
+        'title' => true,
+        'help' => true,
+        'placeholder' => true,
+        'placeholder_key' => true,
+        'placeholder_value' => true,
+        'fields' => true
+    ];
+
+    /**
+     * Validate data against blueprints.
+     *
+     * @param  array $data
+     * @throws \RuntimeException
+     */
+    public function validate(array $data)
+    {
+        try {
+            $messages = $this->validateArray($data, $this->nested);
+
+        } catch (\RuntimeException $e) {
+            throw (new ValidationException($e->getMessage(), $e->getCode(), $e))->setMessages();
+        }
+
+        if (!empty($messages)) {
+            throw (new ValidationException())->setMessages($messages);
+        }
+    }
+
+    /**
+     * Filter data by using blueprints.
+     *
+     * @param  array $data
+     * @return array
+     */
+    public function filter(array $data)
+    {
+        return $this->filterArray($data, $this->nested);
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @returns array
+     * @throws \RuntimeException
+     * @internal
+     */
+    protected function validateArray(array $data, array $rules)
+    {
+        $messages = $this->checkRequired($data, $rules);
+
+        foreach ($data as $key => $field) {
+            $val = isset($rules[$key]) ? $rules[$key] : (isset($rules['*']) ? $rules['*'] : null);
+            $rule = is_string($val) ? $this->items[$val] : null;
+
+            if ($rule) {
+                // Item has been defined in blueprints.
+                $messages += Validation::validate($field, $rule);
+            } elseif (is_array($field) && is_array($val)) {
+                // Array has been defined in blueprints.
+                $messages += $this->validateArray($field, $val);
+            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+                // Undefined/extra item.
+                throw new \RuntimeException(sprintf('%s is not defined in blueprints', $key));
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * @param array $data
+     * @param array $rules
+     * @return array
+     * @internal
+     */
+    protected function filterArray(array $data, array $rules)
+    {
+        $results = array();
+        foreach ($data as $key => $field) {
+            $val = isset($rules[$key]) ? $rules[$key] : (isset($rules['*']) ? $rules['*'] : null);
+            $rule = is_string($val) ? $this->items[$val] : null;
+
+            if ($rule) {
+                // Item has been defined in blueprints.
+                $field = Validation::filter($field, $rule);
+            } elseif (is_array($field) && is_array($val)) {
+                // Array has been defined in blueprints.
+                $field = $this->filterArray($field, $val);
+            } elseif (isset($rules['validation']) && $rules['validation'] == 'strict') {
+                $field = null;
+            }
+
+            if (isset($field) && (!is_array($field) || !empty($field))) {
+                $results[$key] = $field;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param array $data
+     * @param array $fields
+     * @return array
+     */
+    protected function checkRequired(array $data, array $fields)
+    {
+        $messages = [];
+
+        foreach ($fields as $name => $field) {
+            if (!is_string($field)) {
+                continue;
+            }
+            $field = $this->items[$field];
+            if (isset($field['validate']['required'])
+                && $field['validate']['required'] === true) {
+
+                if (isset($data[$name])) {
+                    continue;
+                }
+                if ($field['type'] == 'file' && isset($data['data']['name'][$name])) { //handle case of file input fields required
+                    continue;
+                }
+
+                $value = isset($field['label']) ? $field['label'] : $field['name'];
+                $language = Grav::instance()['language'];
+                $message  = sprintf($language->translate('FORM.MISSING_REQUIRED_FIELD', null, true) . ' %s', $language->translate($value));
+                $messages[$field['name']][] = $message;
+            }
+        }
+
+        return $messages;
+    }
+
+    /**
+     * @param array $field
+     * @param string $property
+     * @param array $call
+     */
+    protected function dynamicConfig(array &$field, $property, array &$call)
+    {
+        $value = $call['params'];
+
+        $default = isset($field[$property]) ? $field[$property] : null;
+        $config = Grav::instance()['config']->get($value, $default);
+
+        if (!is_null($config)) {
+            $field[$property] = $config;
+        }
+    }
+}
diff --git a/system/src/Grav/Common/Data/Blueprints.php b/system/src/Grav/Common/Data/Blueprints.php
index 4c144a37af..479553464e 100644
--- a/system/src/Grav/Common/Data/Blueprints.php
+++ b/system/src/Grav/Common/Data/Blueprints.php
@@ -1,28 +1,26 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
-use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * Blueprints class keeps track on blueprint instances.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Blueprints
 {
-    use GravTrait;
-
     protected $search;
     protected $types;
-    protected $instances = array();
+    protected $instances = [];
 
     /**
      * @param  string|array  $search  Search path.
      */
-    public function __construct($search)
+    public function __construct($search = 'blueprints://')
     {
         $this->search = $search;
     }
@@ -37,73 +35,7 @@ public function __construct($search)
     public function get($type)
     {
         if (!isset($this->instances[$type])) {
-            $parents = [];
-            if (is_string($this->search)) {
-                $filename = $this->search . $type . YAML_EXT;
-
-                // Check if search is a stream and resolve the path.
-                if (strpos($filename, '://')) {
-                    $grav = static::getGrav();
-                    /** @var UniformResourceLocator $locator */
-                    $locator = $grav['locator'];
-                    $parents = $locator->findResources($filename);
-                    $filename = array_shift($parents);
-                }
-            } else {
-                $filename = isset($this->search[$type]) ? $this->search[$type] : '';
-            }
-
-            if ($filename && is_file($filename)) {
-                $file = CompiledYamlFile::instance($filename);
-                $blueprints = $file->content();
-            } else {
-                $blueprints = [];
-            }
-
-            $blueprint = new Blueprint($type, $blueprints, $this);
-
-            if (isset($blueprints['@extends'])) {
-                // Extend blueprint by other blueprints.
-                $extends = (array) $blueprints['@extends'];
-
-                if (is_string(key($extends))) {
-                    $extends = [ $extends ];
-                }
-
-                foreach ($extends as $extendConfig) {
-                    $extendType = !is_string($extendConfig) ? empty($extendConfig['type']) ? false : $extendConfig['type'] : $extendConfig;
-
-                    if (!$extendType) {
-                        continue;
-                    } elseif ($extendType === '@parent') {
-                        $parentFile = array_shift($parents);
-                        if (!$parentFile || !is_file($parentFile)) {
-                            continue;
-                        }
-                        $blueprints = CompiledYamlFile::instance($parentFile)->content();
-                        $parent = new Blueprint($type.'-parent', $blueprints, $this);
-                        $blueprint->extend($parent);
-                        continue;
-                    }
-
-                    if (is_string($extendConfig) || empty($extendConfig['context'])) {
-                        $context = $this;
-                    } else {
-                        // Load blueprints from external context.
-                        $array = explode('://', $extendConfig['context'], 2);
-                        $scheme = array_shift($array);
-                        $path = array_shift($array);
-                        if ($path) {
-                            $scheme .= '://';
-                            $extendType = $path ? "{$path}/{$extendType}" : $extendType;
-                        }
-                        $context = new self($scheme);
-                    }
-                    $blueprint->extend($context->get($extendType));
-                }
-            }
-
-            $this->instances[$type] = $blueprint;
+            $this->instances[$type] = $this->loadFile($type);
         }
 
         return $this->instances[$type];
@@ -119,15 +51,15 @@ public function types()
         if ($this->types === null) {
             $this->types = array();
 
-            // Check if search is a stream.
-            if (strpos($this->search, '://')) {
-                // Stream: use UniformResourceIterator.
-                $grav = static::getGrav();
-                /** @var UniformResourceLocator $locator */
-                $locator = $grav['locator'];
-                $iterator = $locator->getIterator($this->search, null);
+            $grav = Grav::instance();
+
+            /** @var UniformResourceLocator $locator */
+            $locator = $grav['locator'];
+
+            // Get stream / directory iterator.
+            if ($locator->isStream($this->search)) {
+                $iterator = $locator->getIterator($this->search);
             } else {
-                // Not a stream: use DirectoryIterator.
                 $iterator = new \DirectoryIterator($this->search);
             }
 
@@ -140,6 +72,29 @@ public function types()
                 $this->types[$name] = ucfirst(strtr($name, '_', ' '));
             }
         }
+
         return $this->types;
     }
+
+
+    /**
+     * Load blueprint file.
+     *
+     * @param  string  $name  Name of the blueprint.
+     * @return Blueprint
+     */
+    protected function loadFile($name)
+    {
+        $blueprint = new Blueprint($name);
+
+        if (is_array($this->search) || is_object($this->search)) {
+            // Page types.
+            $blueprint->setOverrides($this->search);
+            $blueprint->setContext('blueprints://pages');
+        } else {
+            $blueprint->setContext($this->search);
+        }
+
+        return $blueprint->load()->init();
+    }
 }
diff --git a/system/src/Grav/Common/Data/Data.php b/system/src/Grav/Common/Data/Data.php
index 0a08507659..b4dd231ef3 100644
--- a/system/src/Grav/Common/Data/Data.php
+++ b/system/src/Grav/Common/Data/Data.php
@@ -1,20 +1,20 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
 use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
-use RocketTheme\Toolbox\Blueprints\Blueprints;
 use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\File\FileInterface;
 
-/**
- * Recursive data object
- *
- * @author RocketTheme
- * @license MIT
- */
 class Data implements DataInterface, \ArrayAccess, \Countable, ExportInterface
 {
     use NestedArrayAccessWithGetters, Countable, Export;
@@ -211,18 +211,18 @@ public function filter()
      */
     public function extra()
     {
-        return $this->blueprints ? $this->blueprints->extra($this->items) : array();
+        return $this->blueprints()->extra($this->items);
     }
 
     /**
      * Return blueprints.
      *
-     * @return Blueprints
+     * @return Blueprint
      */
     public function blueprints()
     {
         if (!$this->blueprints){
-            $this->blueprints = new Blueprints;
+            $this->blueprints = new Blueprint;
         } elseif (is_callable($this->blueprints)) {
             // Lazy load blueprints.
             $blueprints = $this->blueprints;
diff --git a/system/src/Grav/Common/Data/DataInterface.php b/system/src/Grav/Common/Data/DataInterface.php
index 85d2fb6957..89e5382cce 100644
--- a/system/src/Grav/Common/Data/DataInterface.php
+++ b/system/src/Grav/Common/Data/DataInterface.php
@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use RocketTheme\Toolbox\File\FileInterface;
 
-/**
- * Data interface
- *
- * @author RocketTheme
- * @license MIT
- */
 interface DataInterface
 {
     /**
diff --git a/system/src/Grav/Common/Data/Validation.php b/system/src/Grav/Common/Data/Validation.php
index 059ea92cdb..984afb6127 100644
--- a/system/src/Grav/Common/Data/Validation.php
+++ b/system/src/Grav/Common/Data/Validation.php
@@ -1,70 +1,84 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser;
+use Symfony\Component\Yaml\Yaml;
 
-/**
- * Data validation.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Validation
 {
-    use GravTrait;
-
     /**
      * Validate value against a blueprint field definition.
      *
-     * @param mixed $value
+     * @param $value
      * @param array $field
-     * @throws \RuntimeException
+     * @return array
      */
     public static function validate($value, array $field)
     {
-        $validate = isset($field['validate']) ? (array) $field['validate'] : array();
+        $messages = [];
+
+        $validate = isset($field['validate']) ? (array) $field['validate'] : [];
 
         // If value isn't required, we will stop validation if empty value is given.
         if (empty($validate['required']) && ($value === null || $value === '')) {
-            return;
+            return $messages;
         }
 
-        // special case for files, value is never empty and errors with code 4 instead
-        if (empty($validate['required']) && $field['type'] == 'file' && (isset($value['error']) && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error'])))) {
-            return;
+        if (!isset($field['type'])) {
+            $field['type'] = 'text';
         }
 
-        // Get language class
-        $language = self::getGrav()['language'];
+        // Special case for files, value is never empty and errors with code 4 instead.
+        if (empty($validate['required']) && $field['type'] == 'file' && isset($value['error'])
+                && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error']))) {
+            return $messages;
+        }
+
+        // Get language class.
+        $language = Grav::instance()['language'];
 
         // Validate type with fallback type text.
         $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
         $method = 'type'.strtr($type, '-', '_');
+
         $name = ucfirst(isset($field['label']) ? $field['label'] : $field['name']);
-        $message = (string) isset($field['validate']['message']) ? $language->translate($field['validate']['message']) : $language->translate('FORM.INVALID_INPUT', null, true) . ' "' . $language->translate($name) . '"';
+        $message = (string) isset($field['validate']['message'])
+            ? $language->translate($field['validate']['message'])
+            : $language->translate('FORM.INVALID_INPUT', null, true) . ' "' . $language->translate($name) . '"';
 
         if (method_exists(__CLASS__, $method)) {
             $success = self::$method($value, $validate, $field);
         } else {
-            $success = self::typeText($value, $validate, $field);
+            $success = true;
         }
+
         if (!$success) {
-            throw new \RuntimeException($message);
+            $messages[$field['name']][] = $message;
         }
 
-        // Check individual rules
+        // Check individual rules.
         foreach ($validate as $rule => $params) {
-            $method = 'validate'.strtr($rule, '-', '_');
+            $method = 'validate' . ucfirst(strtr($rule, '-', '_'));
+
             if (method_exists(__CLASS__, $method)) {
                 $success = self::$method($value, $params);
 
                 if (!$success) {
-                    throw new \RuntimeException($message);
+                    $messages[$field['name']][] = $message;
                 }
             }
         }
+
+        return $messages;
     }
 
     /**
@@ -76,22 +90,28 @@ public static function validate($value, array $field)
      */
     public static function filter($value, array $field)
     {
-        $validate = isset($field['validate']) ? (array) $field['validate'] : array();
+        $validate = isset($field['validate']) ? (array) $field['validate'] : [];
 
         // If value isn't required, we will return null if empty value is given.
         if (empty($validate['required']) && ($value === null || $value === '')) {
             return null;
         }
 
-        // special case for files, value is never empty and errors with code 4 instead
-        if (empty($validate['required']) && $field['type'] == 'file' && (isset($value['error']) && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error'])))) {
+        if (!isset($field['type'])) {
+            $field['type'] = 'text';
+        }
+
+        // Special case for files, value is never empty and errors with code 4 instead.
+        if (empty($validate['required']) && $field['type'] == 'file' && isset($value['error'])
+            && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error']))) {
             return null;
         }
 
-        // if this is a YAML field, simply parse it and return the value
+        // If this is a YAML field, simply parse it and return the value.
         if (isset($field['yaml']) && $field['yaml'] === true) {
             try {
                 $yaml = new Parser();
+
                 return $yaml->parse($value);
             } catch (ParseException $e) {
                 throw new \RuntimeException($e->getMessage());
@@ -100,14 +120,13 @@ public static function filter($value, array $field)
 
         // Validate type with fallback type text.
         $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
-        $method = 'filter'.strtr($type, '-', '_');
-        if (method_exists(__CLASS__, $method)) {
-            $value = self::$method($value, $validate, $field);
-        } else {
-            $value = self::filterText($value, $validate, $field);
+        $method = 'filter' . ucfirst(strtr($type, '-', '_'));
+
+        if (!method_exists(__CLASS__, $method)) {
+            $method = 'filterText';
         }
 
-        return $value;
+        return self::$method($value, $validate, $field);
     }
 
     /**
@@ -283,15 +302,7 @@ public static function typeFile($value, array $params, array $field)
 
     protected static function filterFile($value, array $params, array $field)
     {
-        if (isset($field['multiple']) && $field['multiple'] === true) {
-            return (array) $value;
-        }
-
-        if (is_array($value)) {
-            return reset($value);
-        }
-
-        return $value;
+        return (array) $value;
     }
 
     /**
@@ -315,7 +326,6 @@ public static function typeSelect($value, array $params, array $field)
      * @param  array  $field   Blueprint for the field.
      * @return bool   True if validation succeeded.
      */
-
     public static function typeNumber($value, array $params, array $field)
     {
         if (!is_numeric($value)) {
@@ -345,7 +355,7 @@ protected static function filterNumber($value, array $params, array $field)
 
     protected static function filterDateTime($value, array $params, array $field)
     {
-        $format = self::getGrav()['config']->get('system.pages.dateformat.default');
+        $format = Grav::instance()['config']->get('system.pages.dateformat.default');
         if ($format) {
             $converted = new \DateTime($value);
             return $converted->format($format);
@@ -395,7 +405,15 @@ public static function typeColor($value, array $params, array $field)
      */
     public static function typeEmail($value, array $params, array $field)
     {
-        return self::typeText($value, $params, $field) && filter_var($value, FILTER_VALIDATE_EMAIL);
+        $values = !is_array($value) ? explode(',', preg_replace('/\s+/', '', $value)) : $value;
+
+        foreach ($values as $value) {
+            if (!(self::typeText($value, $params, $field) && filter_var($value, FILTER_VALIDATE_EMAIL))) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -607,6 +625,25 @@ protected static function filterList($value, array $params, array $field)
         return (array) $value;
     }
 
+    public static function typeYaml($value, $params)
+    {
+        try {
+            Yaml::parse($value);
+            return true;
+        } catch (ParseException $e) {
+            return false;
+        }
+    }
+
+    public static function filterYaml($value, $params)
+    {
+        try {
+            return (array) Yaml::parse($value);
+        } catch (ParseException $e) {
+            return null;
+        }
+    }
+
     /**
      * Custom input: ignore (will not validate)
      *
@@ -629,11 +666,11 @@ public static function filterIgnore($value, array $params, array $field)
 
     public static function validateRequired($value, $params)
     {
-        if (is_string($value)) {
-            $value = trim($value);
+        if (is_scalar($value)) {
+            return (bool) $params !== true || $value !== '';
+        } else {
+            return (bool) $params !== true || !empty($value);
         }
-
-        return (bool) $params !== true || !empty($value);
     }
 
     public static function validatePattern($value, $params)
@@ -701,13 +738,14 @@ protected static function filterInt($value, $params)
 
     public static function validateArray($value, $params)
     {
-        return is_array($value) || ($value instanceof \ArrayAccess
+        return is_array($value)
+        || ($value instanceof \ArrayAccess
             && $value instanceof \Traversable
             && $value instanceof \Countable);
     }
 
     public static function validateJson($value, $params)
     {
-        return (bool) (json_decode($value));
+        return (bool) (@json_decode($value));
     }
 }
diff --git a/system/src/Grav/Common/Data/ValidationException.php b/system/src/Grav/Common/Data/ValidationException.php
new file mode 100644
index 0000000000..ec649bf777
--- /dev/null
+++ b/system/src/Grav/Common/Data/ValidationException.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Data;
+
+use Grav\Common\Grav;
+
+class ValidationException extends \RuntimeException
+{
+    protected $messages = [];
+
+    public function setMessages(array $messages = []) {
+        $this->messages = $messages;
+
+        $language = Grav::instance()['language'];
+        $this->message = $language->translate('FORM.VALIDATION_FAIL', null, true) . ' ' . $this->message;
+
+        foreach ($messages as $variable => &$list) {
+            $list = array_unique($list);
+            foreach ($list as $message) {
+                $this->message .= "<br/>$message";
+            }
+        }
+
+        return $this;
+    }
+
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+}
diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
index 219fa6a1c4..f1dce14807 100644
--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use DebugBar\DataCollector\ConfigCollector;
@@ -6,10 +13,6 @@
 use DebugBar\StandardDebugBar;
 use Grav\Common\Config\Config;
 
-/**
- * Class Debugger
- * @package Grav\Common
- */
 class Debugger
 {
     /** @var Grav $grav */
diff --git a/system/src/Grav/Common/Errors/Errors.php b/system/src/Grav/Common/Errors/Errors.php
index 688068451c..04e26f7c21 100644
--- a/system/src/Grav/Common/Errors/Errors.php
+++ b/system/src/Grav/Common/Errors/Errors.php
@@ -1,20 +1,23 @@
 <?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Errors;
 
 use Grav\Common\Grav;
 use Whoops;
 
-/**
- * Class Debugger
- * @package Grav\Common
- */
 class Errors
 {
     public function resetHandlers()
     {
         $grav = Grav::instance();
         $config = $grav['config']->get('system.errors');
-        $jsonRequest = $_SERVER && $_SERVER['HTTP_ACCEPT'] && $_SERVER['HTTP_ACCEPT'] == 'application/json';
+        $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] == 'application/json';
 
         // Setup Whoops-based error handler
         $whoops = new \Whoops\Run;
diff --git a/system/src/Grav/Common/Errors/SimplePageHandler.php b/system/src/Grav/Common/Errors/SimplePageHandler.php
index 16d0a8829c..af9af139cd 100644
--- a/system/src/Grav/Common/Errors/SimplePageHandler.php
+++ b/system/src/Grav/Common/Errors/SimplePageHandler.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Errors;
 
 use Whoops\Handler\Handler;
diff --git a/system/src/Grav/Common/File/CompiledFile.php b/system/src/Grav/Common/File/CompiledFile.php
index 6b6b76989d..fcb0de4d23 100644
--- a/system/src/Grav/Common/File/CompiledFile.php
+++ b/system/src/Grav/Common/File/CompiledFile.php
@@ -1,17 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\PhpFile;
 
-/**
- * Class CompiledFile
- * @package Grav\Common\File
- *
- * @property string $filename
- * @property string $extension
- * @property string $raw
- * @property array|string $content
- */
 trait CompiledFile
 {
     /**
@@ -28,7 +26,8 @@ public function content($var = null)
         // If nothing has been loaded, attempt to get pre-compiled version of the file first.
         if ($var === null && $this->raw === null && $this->content === null) {
             $key = md5($this->filename);
-            $file = PhpFile::instance(CACHE_DIR . "compiled/files/{$key}{$this->extension}.php");
+            $file = PhpFile::instance(CACHE_DIR . DS . "compiled/files/{$key}{$this->extension}.php");
+
             $modified = $this->modified();
 
             if (!$modified) {
@@ -66,6 +65,11 @@ public function content($var = null)
                 if ($file->locked() !== false) {
                     $file->save($cache);
                     $file->unlock();
+
+                    // Compile cached file into bytecode cache
+                    if (function_exists('opcache_invalidate')) {
+                        opcache_invalidate($file->filename(), true);
+                    }
                 }
             }
             $file->free();
diff --git a/system/src/Grav/Common/File/CompiledMarkdownFile.php b/system/src/Grav/Common/File/CompiledMarkdownFile.php
index 669a4ebcc3..092093065f 100644
--- a/system/src/Grav/Common/File/CompiledMarkdownFile.php
+++ b/system/src/Grav/Common/File/CompiledMarkdownFile.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\MarkdownFile;
diff --git a/system/src/Grav/Common/File/CompiledYamlFile.php b/system/src/Grav/Common/File/CompiledYamlFile.php
index 08620a02c5..4b2573305e 100644
--- a/system/src/Grav/Common/File/CompiledYamlFile.php
+++ b/system/src/Grav/Common/File/CompiledYamlFile.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\YamlFile;
diff --git a/system/src/Grav/Common/Filesystem/Folder.php b/system/src/Grav/Common/Filesystem/Folder.php
index 26e90fe31a..14da7b5761 100644
--- a/system/src/Grav/Common/Filesystem/Folder.php
+++ b/system/src/Grav/Common/Filesystem/Folder.php
@@ -1,12 +1,16 @@
 <?php
-namespace Grav\Common\Filesystem;
-
 /**
- * Folder helper class.
+ * @package    Grav.Common.FileSystem
  *
- * @author RocketTheme
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Filesystem;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
 abstract class Folder
 {
     /**
@@ -19,7 +23,14 @@ public static function lastModifiedFolder($path)
     {
         $last_modified = 0;
 
-        $directory = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
+        if ($locator->isStream($path)) {
+            $directory = $locator->getRecursiveIterator($path, $flags);
+        } else {
+            $directory = new \RecursiveDirectoryIterator($path, $flags);
+        }
         $filter  = new RecursiveFolderFilterIterator($directory);
         $iterator = new \RecursiveIteratorIterator($filter, \RecursiveIteratorIterator::SELF_FIRST);
 
@@ -46,7 +57,14 @@ public static function lastModifiedFile($path, $extensions = 'md|yaml')
     {
         $last_modified = 0;
 
-        $directory = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
+        if ($locator->isStream($path)) {
+            $directory = $locator->getRecursiveIterator($path, $flags);
+        } else {
+            $directory = new \RecursiveDirectoryIterator($path, $flags);
+        }
         $recursive = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
         $iterator = new \RegexIterator($recursive, '/^.+\.'.$extensions.'$/i');
 
@@ -145,7 +163,7 @@ public static function shift(&$path)
     public static function all($path, array $params = [])
     {
         if ($path === false) {
-            throw new \RuntimeException("Path to {$path} doesn't exist.");
+            throw new \RuntimeException("Path doesn't exist.");
         }
 
         $compare = isset($params['compare']) ? 'get' . $params['compare'] : null;
@@ -158,13 +176,23 @@ public static function all($path, array $params = [])
         $folders = isset($params['folders']) ? $params['folders'] : true;
         $files = isset($params['files']) ? $params['files'] : true;
 
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
         if ($recursive) {
-            $directory = new \RecursiveDirectoryIterator($path,
-                \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS + \FilesystemIterator::CURRENT_AS_SELF);
+            $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS + \FilesystemIterator::CURRENT_AS_SELF;
+            if ($locator->isStream($path)) {
+                $directory = $locator->getRecursiveIterator($path, $flags);
+            } else {
+                $directory = new \RecursiveDirectoryIterator($path, $flags);
+            }
             $iterator = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
             $iterator->setMaxDepth(max($levels, -1));
         } else {
-            $iterator = new \FilesystemIterator($path);
+            if ($locator->isStream($path)) {
+                $iterator = $locator->getIterator($path);
+            } else {
+                $iterator = new \FilesystemIterator($path);
+            }
         }
 
         $results = [];
diff --git a/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php b/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
index a84a51906c..b2e1132621 100644
--- a/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
+++ b/system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php
@@ -1,16 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.FileSystem
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Filesystem;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 
-/**
- * Class RecursiveFolderFilterIterator
- * @package Grav\Common\Filesystem
- */
 class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
 {
-    use GravTrait;
-
     protected static $folder_ignores;
 
     /**
@@ -22,7 +23,7 @@ public function __construct(\RecursiveIterator $iterator)
     {
         parent::__construct($iterator);
         if (empty($this::$folder_ignores)) {
-            $this::$folder_ignores = self::getGrav()['config']->get('system.pages.ignore_folders');
+            $this::$folder_ignores = Grav::instance()['config']->get('system.pages.ignore_folders');
         }
     }
 
diff --git a/system/src/Grav/Common/GPM/AbstractCollection.php b/system/src/Grav/Common/GPM/AbstractCollection.php
index 7c1974d22e..d6ab766a8b 100644
--- a/system/src/Grav/Common/GPM/AbstractCollection.php
+++ b/system/src/Grav/Common/GPM/AbstractCollection.php
@@ -1,13 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
-use Grav\Common\GravTrait;
 use Grav\Common\Iterator;
 
-abstract class AbstractCollection extends Iterator {
-
-    use GravTrait;
-
+abstract class AbstractCollection extends Iterator
+{
     public function toJson()
     {
         $items = [];
diff --git a/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
index 46c9e894a9..6eef145734 100644
--- a/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Common/AbstractPackageCollection.php
@@ -1,13 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
-use Grav\Common\GravTrait;
 use Grav\Common\Iterator;
 
-abstract class AbstractPackageCollection extends Iterator {
-
-    use GravTrait;
-
+abstract class AbstractPackageCollection extends Iterator
+{
     protected $type;
 
     public function toJson()
diff --git a/system/src/Grav/Common/GPM/Common/CachedCollection.php b/system/src/Grav/Common/GPM/Common/CachedCollection.php
index fd6ae9420c..1874771791 100644
--- a/system/src/Grav/Common/GPM/Common/CachedCollection.php
+++ b/system/src/Grav/Common/GPM/Common/CachedCollection.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Iterator;
diff --git a/system/src/Grav/Common/GPM/Common/Package.php b/system/src/Grav/Common/GPM/Common/Package.php
index ff9a087c9e..c83d31b7c3 100644
--- a/system/src/Grav/Common/GPM/Common/Package.php
+++ b/system/src/Grav/Common/GPM/Common/Package.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Data\Data;
diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
index 3cdb64bba8..6d310bc5d2 100644
--- a/system/src/Grav/Common/GPM/GPM.php
+++ b/system/src/Grav/Common/GPM/GPM.php
@@ -1,9 +1,18 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
+use Grav\Common\Grav;
 use Grav\Common\Inflector;
 use Grav\Common\Iterator;
 use Grav\Common\Utils;
+use Symfony\Component\Yaml\Yaml;
 
 class GPM extends Iterator
 {
@@ -20,7 +29,7 @@ class GPM extends Iterator
     private $repository;
 
     /**
-     * @var Remote\Grav
+     * @var Remote\GravCore
      */
     public $grav;
 
@@ -30,19 +39,23 @@ class GPM extends Iterator
      */
     protected $cache;
 
-    protected $install_paths = ['plugins' => 'user/plugins/%name%', 'themes' => 'user/themes/%name%', 'skeletons' => 'user/'];
+    protected $install_paths = [
+        'plugins' => 'user/plugins/%name%',
+        'themes' => 'user/themes/%name%',
+        'skeletons' => 'user/'
+    ];
 
     /**
      * Creates a new GPM instance with Local and Remote packages available
-     * @param boolean  $refresh  Applies to Remote Packages only and forces a refetch of data
+     * @param boolean $refresh Applies to Remote Packages only and forces a refetch of data
      * @param callable $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
-        $this->installed  = new Local\Packages();
+        $this->installed = new Local\Packages();
         try {
             $this->repository = new Remote\Packages($refresh, $callback);
-            $this->grav       = new Remote\Grav($refresh, $callback);
+            $this->grav = new Remote\GravCore($refresh, $callback);
         } catch (\Exception $e) {
         }
     }
@@ -67,9 +80,26 @@ public function countInstalled()
         return count($installed['plugins']) + count($installed['themes']);
     }
 
+    /**
+     * Return the instance of a specific Package
+     *
+     * @param  string $slug The slug of the Package
+     * @return Local\Package The instance of the Package
+     */
+    public function getInstalledPackage($slug)
+    {
+        if (isset($this->installed['plugins'][$slug])) {
+            return $this->installed['plugins'][$slug];
+        }
+
+        if (isset($this->installed['themes'][$slug])) {
+            return $this->installed['themes'][$slug];
+        }
+    }
+
     /**
      * Return the instance of a specific Plugin
-     * @param  string  $slug The slug of the Plugin
+     * @param  string $slug The slug of the Plugin
      * @return Local\Package The instance of the Plugin
      */
     public function getInstalledPlugin($slug)
@@ -88,7 +118,7 @@ public function getInstalledPlugins()
 
     /**
      * Checks if a Plugin is installed
-     * @param  string  $slug The slug of the Plugin
+     * @param  string $slug The slug of the Plugin
      * @return boolean True if the Plugin has been installed. False otherwise
      */
     public function isPluginInstalled($slug)
@@ -96,9 +126,14 @@ public function isPluginInstalled($slug)
         return isset($this->installed['plugins'][$slug]);
     }
 
+    public function isPluginInstalledAsSymlink($slug)
+    {
+        return $this->installed['plugins'][$slug]->symlink;
+    }
+
     /**
      * Return the instance of a specific Theme
-     * @param  string  $slug The slug of the Theme
+     * @param  string $slug The slug of the Theme
      * @return Local\Package The instance of the Theme
      */
     public function getInstalledTheme($slug)
@@ -117,7 +152,7 @@ public function getInstalledThemes()
 
     /**
      * Checks if a Theme is installed
-     * @param  string  $slug The slug of the Theme
+     * @param  string $slug The slug of the Theme
      * @return boolean True if the Theme has been installed. False otherwise
      */
     public function isThemeInstalled($slug)
@@ -142,20 +177,23 @@ public function countUpdates()
     /**
      * Returns an array of Plugins and Themes that can be updated.
      * Plugins and Themes are extended with the `available` property that relies to the remote version
+     * @param $list_type_update specifies what type of package to update
      * @return array Array of updatable Plugins and Themes.
      *               Format: ['total' => int, 'plugins' => array, 'themes' => array]
      */
-    public function getUpdatable()
+    public function getUpdatable($list_type_update = ['plugins' => true, 'themes' => true])
     {
-        $plugins = $this->getUpdatablePlugins();
-        $themes  = $this->getUpdatableThemes();
-
-        $items = [
-            'total'   => count($plugins)+count($themes),
-            'plugins' => $plugins,
-            'themes'  => $themes
-        ];
 
+        $items = ['total' => 0];
+        foreach ($list_type_update as $type => $type_updatable) {
+            if ($type_updatable === false) {
+                continue;
+            }
+            $methodUpdatableType = 'getUpdatable' . ucfirst($type);
+            $to_update = $this->$methodUpdatableType();
+            $items[$type] = $to_update;
+            $items['total'] += count($to_update);
+        }
         return $items;
     }
 
@@ -166,7 +204,7 @@ public function getUpdatable()
      */
     public function getUpdatablePlugins()
     {
-        $items      = [];
+        $items = [];
         $repository = $this->repository['plugins'];
 
         // local cache to speed things up
@@ -175,17 +213,19 @@ public function getUpdatablePlugins()
         }
 
         foreach ($this->installed['plugins'] as $slug => $plugin) {
-            if (!isset($repository[$slug]) || $plugin->symlink) {
+            if (!isset($repository[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
                 continue;
             }
 
-            $local_version  = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ? $plugin->version : 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
                 $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version   = $local_version;
-                $items[$slug]                 = $repository[$slug];
+                $repository[$slug]->version = $local_version;
+                $repository[$slug]->name = $repository[$slug]->name;
+                $repository[$slug]->type = $repository[$slug]->release_type;
+                $items[$slug] = $repository[$slug];
             }
         }
 
@@ -194,9 +234,32 @@ public function getUpdatablePlugins()
         return $items;
     }
 
+    /**
+     * Get the latest release of a package from the GPM
+     *
+     * @param $package_name
+     *
+     * @return string|null
+     */
+    public function getLatestVersionOfPackage($package_name)
+    {
+        $repository = $this->repository['plugins'];
+        if (isset($repository[$package_name])) {
+            return $repository[$package_name]->available ?: $repository[$package_name]->version;
+        }
+
+        //Not a plugin, it's a theme?
+        $repository = $this->repository['themes'];
+        if (isset($repository[$package_name])) {
+            return $repository[$package_name]->available ?: $repository[$package_name]->version;
+        }
+
+        return null;
+    }
+
     /**
      * Check if a Plugin or Theme is updatable
-     * @param  string  $slug The slug of the package
+     * @param  string $slug The slug of the package
      * @return boolean True if updatable. False otherwise or if not found
      */
     public function isUpdatable($slug)
@@ -206,12 +269,12 @@ public function isUpdatable($slug)
 
     /**
      * Checks if a Plugin is updatable
-     * @param  string  $plugin The slug of the Plugin
+     * @param  string $plugin The slug of the Plugin
      * @return boolean True if the Plugin is updatable. False otherwise
      */
     public function isPluginUpdatable($plugin)
     {
-        return array_key_exists($plugin, (array) $this->getUpdatablePlugins());
+        return array_key_exists($plugin, (array)$this->getUpdatablePlugins());
     }
 
     /**
@@ -221,7 +284,7 @@ public function isPluginUpdatable($plugin)
      */
     public function getUpdatableThemes()
     {
-        $items      = [];
+        $items = [];
         $repository = $this->repository['themes'];
 
         // local cache to speed things up
@@ -230,17 +293,18 @@ public function getUpdatableThemes()
         }
 
         foreach ($this->installed['themes'] as $slug => $plugin) {
-            if (!isset($repository[$slug]) || $plugin->symlink) {
+            if (!isset($repository[$slug]) || $plugin->symlink || !$plugin->version || $plugin->gpm === false) {
                 continue;
             }
 
-            $local_version  = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ? $plugin->version : 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
                 $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version   = $local_version;
-                $items[$slug]                 = $repository[$slug];
+                $repository[$slug]->version = $local_version;
+                $repository[$slug]->type = $repository[$slug]->release_type;
+                $items[$slug] = $repository[$slug];
             }
         }
 
@@ -251,12 +315,62 @@ public function getUpdatableThemes()
 
     /**
      * Checks if a Theme is Updatable
-     * @param  string  $theme The slug of the Theme
+     * @param  string $theme The slug of the Theme
      * @return boolean True if the Theme is updatable. False otherwise
      */
     public function isThemeUpdatable($theme)
     {
-        return array_key_exists($theme, (array) $this->getUpdatableThemes());
+        return array_key_exists($theme, (array)$this->getUpdatableThemes());
+    }
+
+    /**
+     * Get the release type of a package (stable / testing)
+     *
+     * @param $package_name
+     *
+     * @return string|null
+     */
+    public function getReleaseType($package_name)
+    {
+        $repository = $this->repository['plugins'];
+        if (isset($repository[$package_name])) {
+            return $repository[$package_name]->release_type;
+        }
+
+        //Not a plugin, it's a theme?
+        $repository = $this->repository['themes'];
+        if (isset($repository[$package_name])) {
+            return $repository[$package_name]->release_type;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns true if the package latest release is stable
+     *
+     * @param $package_name
+     *
+     * @return boolean
+     */
+    public function isStableRelease($package_name)
+    {
+        return $this->getReleaseType($package_name) === 'stable';
+    }
+
+    /**
+     * Returns true if the package latest release is testing
+     *
+     * @param $package_name
+     *
+     * @return boolean
+     */
+    public function isTestingRelease($package_name)
+    {
+        $hasTesting = isset($this->getInstalledPackage($package_name)->testing);
+        $testing = $hasTesting ? $this->getInstalledPackage($package_name)->testing : false;
+
+        return $this->getReleaseType($package_name) === 'testing' || $testing;
     }
 
     /**
@@ -309,17 +423,20 @@ public function getRepository()
 
     /**
      * Searches for a Package in the repository
-     * @param  string  $search Can be either the slug or the name
+     * @param  string $search Can be either the slug or the name
      * @return Remote\Package Package if found, FALSE if not
      */
     public function findPackage($search)
     {
         $search = strtolower($search);
-        if ($found = $this->getRepositoryTheme($search)) {
+
+        $found = $this->getRepositoryTheme($search);
+        if ($found) {
             return $found;
         }
 
-        if ($found = $this->getRepositoryPlugin($search)) {
+        $found = $this->getRepositoryPlugin($search);
+        if ($found) {
             return $found;
         }
 
@@ -334,26 +451,25 @@ public function findPackage($search)
             throw new \RuntimeException("GPM not reachable. Please check your internet connection or check the Grav site is reachable");
         }
 
-        if ($themes) foreach ($themes as $slug => $theme) {
-            if ($search == $slug || $search == $theme->name) {
-                return $theme;
+        if ($themes) {
+            foreach ($themes as $slug => $theme) {
+                if ($search == $slug || $search == $theme->name) {
+                    return $theme;
+                }
             }
         }
 
-        if ($plugins) foreach ($plugins as $slug => $plugin) {
-            if ($search == $slug || $search == $plugin->name) {
-                return $plugin;
+        if ($plugins) {
+            foreach ($plugins as $slug => $plugin) {
+                if ($search == $slug || $search == $plugin->name) {
+                    return $plugin;
+                }
             }
         }
 
         return false;
     }
 
-    /**
-     * Returns the list of Plugins and Themes available in the repository
-     * @return array Array of available Plugins and Themes
-     *               Format: ['plugins' => array, 'themes' => array]
-     */
     /**
      * Searches for a list of Packages in the repository
      * @param  array $searches An array of either slugs or names
@@ -369,13 +485,14 @@ public function findPackages($searches = [])
             $repository = '';
             // if this is an object, get the search data from the key
             if (is_object($search)) {
-                $search = (array) $search;
+                $search = (array)$search;
                 $key = key($search);
                 $repository = $search[$key];
                 $search = $key;
             }
 
-            if ($found = $this->findPackage($search)) {
+            $found = $this->findPackage($search);
+            if ($found) {
                 // set override repository if provided
                 if ($repository) {
                     $found->override_repository = $repository;
@@ -406,4 +523,433 @@ public function findPackages($searches = [])
 
         return $packages;
     }
+
+    /**
+     * Return the list of packages that have the passed one as dependency
+     *
+     * @param string $slug The slug name of the package
+     *
+     * @return array
+     */
+    public function getPackagesThatDependOnPackage($slug)
+    {
+        $plugins = $this->getInstalledPlugins();
+        $themes = $this->getInstalledThemes();
+        $packages = array_merge($plugins->toArray(), $themes->toArray());
+
+        $dependent_packages = [];
+
+        foreach ($packages as $package_name => $package) {
+            if (isset($package['dependencies'])) {
+                foreach ($package['dependencies'] as $dependency) {
+                    if (is_array($dependency)) {
+                        $dependency = array_keys($dependency)[0];
+                    }
+
+                    if ($dependency == $slug) {
+                        $dependent_packages[] = $package_name;
+                    }
+                }
+            }
+        }
+
+        return $dependent_packages;
+    }
+
+
+    /**
+     * Get the required version of a dependency of a package
+     *
+     * @param $package_slug
+     * @param $dependency_slug
+     *
+     * @return mixed
+     */
+    public function getVersionOfDependencyRequiredByPackage($package_slug, $dependency_slug)
+    {
+        $dependencies = $this->getInstalledPackage($package_slug)->dependencies;
+        foreach ($dependencies as $dependency) {
+            if (isset($dependency[$dependency_slug])) {
+                return $dependency[$dependency_slug];
+            }
+        }
+    }
+
+    /**
+     * Check the package identified by $slug can be updated to the version passed as argument.
+     * Thrown an exception if it cannot be updated because another package installed requires it to be at an older version.
+     *
+     * @param string $slug
+     * @param string $version_with_operator
+     * @param array $ignore_packages_list
+     *
+     * @return bool
+     * @throws \Exception
+     */
+    public function checkNoOtherPackageNeedsThisDependencyInALowerVersion(
+        $slug,
+        $version_with_operator,
+        $ignore_packages_list
+    ) {
+
+        // check if any of the currently installed package need this in a lower version than the one we need. In case, abort and tell which package
+        $dependent_packages = $this->getPackagesThatDependOnPackage($slug);
+        $version = $this->calculateVersionNumberFromDependencyVersion($version_with_operator);
+
+        if (count($dependent_packages)) {
+            foreach ($dependent_packages as $dependent_package) {
+                $other_dependency_version_with_operator = $this->getVersionOfDependencyRequiredByPackage($dependent_package,
+                    $slug);
+                $other_dependency_version = $this->calculateVersionNumberFromDependencyVersion($other_dependency_version_with_operator);
+
+                // check version is compatible with the one needed by the current package
+                if ($this->versionFormatIsNextSignificantRelease($other_dependency_version_with_operator)) {
+                    $compatible = $this->checkNextSignificantReleasesAreCompatible($version,
+                        $other_dependency_version);
+                    if (!$compatible) {
+                        if (!in_array($dependent_package, $ignore_packages_list)) {
+                            throw new \Exception("Package <cyan>$slug</cyan> is required in an older version by package <cyan>$dependent_package</cyan>. This package needs a newer version, and because of this it cannot be installed. The <cyan>$dependent_package</cyan> package must be updated to use a newer release of <cyan>$slug</cyan>.",
+                                2);
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check the passed packages list can be updated
+     *
+     * @param $packages_names_list
+     *
+     * @throws \Exception
+     */
+    public function checkPackagesCanBeInstalled($packages_names_list)
+    {
+        foreach ($packages_names_list as $package_name) {
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package_name,
+                $this->getLatestVersionOfPackage($package_name), $packages_names_list);
+        }
+    }
+
+    /**
+     * Fetch the dependencies, check the installed packages and return an array with
+     * the list of packages with associated an information on what to do: install, update or ignore.
+     *
+     * `ignore` means the package is already installed and can be safely left as-is.
+     * `install` means the package is not installed and must be installed.
+     * `update` means the package is already installed and must be updated as a dependency needs a higher version.
+     *
+     * @param array $packages
+     *
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getDependencies($packages)
+    {
+        $dependencies = $this->calculateMergedDependenciesOfPackages($packages);
+        foreach ($dependencies as $dependency_slug => $dependencyVersionWithOperator) {
+            if (in_array($dependency_slug, $packages)) {
+                unset($dependencies[$dependency_slug]);
+                continue;
+            }
+
+            //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
+            if ($dependency_slug == 'grav') {
+                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
+                        GRAV_VERSION) === 1
+                ) {
+                    //Needs a Grav update first
+                    throw new \Exception("<red>One of the packages require Grav " . $dependencies['grav'] . ". Please update Grav to the latest release.");
+                } else {
+                    unset($dependencies[$dependency_slug]);
+                    continue;
+                }
+            }
+
+            if ($this->isPluginInstalled($dependency_slug)) {
+                if ($this->isPluginInstalledAsSymlink($dependency_slug)) {
+                    unset($dependencies[$dependency_slug]);
+                    continue;
+                }
+
+                $dependencyVersion = $this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator);
+
+                // get currently installed version
+                $locator = Grav::instance()['locator'];
+                $blueprints_path = $locator->findResource('plugins://' . $dependency_slug . DS . 'blueprints.yaml');
+                $package_yaml = Yaml::parse(file_get_contents($blueprints_path));
+                $currentlyInstalledVersion = $package_yaml['version'];
+
+                // if requirement is next significant release, check is compatible with currently installed version, might not be
+                if ($this->versionFormatIsNextSignificantRelease($dependencyVersionWithOperator)) {
+                    if ($this->firstVersionIsLower($dependencyVersion, $currentlyInstalledVersion)) {
+                        $compatible = $this->checkNextSignificantReleasesAreCompatible($dependencyVersion,
+                            $currentlyInstalledVersion);
+
+                        if (!$compatible) {
+                            throw new \Exception('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the one installed. This package must be updated. Please get in touch with its developer.',
+                                2);
+                        }
+                    }
+                }
+
+                //if I already have the latest release, remove the dependency
+                $latestRelease = $this->getLatestVersionOfPackage($dependency_slug);
+
+                if ($this->firstVersionIsLower($latestRelease, $dependencyVersion)) {
+                    //throw an exception if a required version cannot be found in the GPM yet
+                    throw new \Exception('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
+                        1);
+                }
+
+                if ($this->firstVersionIsLower($currentlyInstalledVersion, $dependencyVersion)) {
+                    $dependencies[$dependency_slug] = 'update';
+                } else {
+                    if ($currentlyInstalledVersion == $latestRelease) {
+                        unset($dependencies[$dependency_slug]);
+                    } else {
+                        // an update is not strictly required mark as 'ignore'
+                        $dependencies[$dependency_slug] = 'ignore';
+                    }
+                }
+            } else {
+                $dependencyVersion = $this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator);
+
+                // if requirement is next significant release, check is compatible with latest available version, might not be
+                if ($this->versionFormatIsNextSignificantRelease($dependencyVersionWithOperator)) {
+                    $latestVersionOfPackage = $this->getLatestVersionOfPackage($dependency_slug);
+                    if ($this->firstVersionIsLower($dependencyVersion, $latestVersionOfPackage)) {
+                        $compatible = $this->checkNextSignificantReleasesAreCompatible($dependencyVersion,
+                            $latestVersionOfPackage);
+
+                        if (!$compatible) {
+                            throw new \Exception('Dependency <cyan>' . $dependency_slug . '</cyan> is required in an older version than the latest release available, and it cannot be installed. This package must be updated. Please get in touch with its developer.',
+                                2);
+                        }
+                    }
+                }
+
+                $dependencies[$dependency_slug] = 'install';
+            }
+        }
+
+        $dependencies_slugs = array_keys($dependencies);
+        $this->checkNoOtherPackageNeedsTheseDependenciesInALowerVersion(array_merge($packages, $dependencies_slugs));
+
+        return $dependencies;
+    }
+
+    public function checkNoOtherPackageNeedsTheseDependenciesInALowerVersion($dependencies_slugs)
+    {
+        foreach ($dependencies_slugs as $dependency_slug) {
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($dependency_slug,
+                $this->getLatestVersionOfPackage($dependency_slug), $dependencies_slugs);
+        }
+    }
+
+    private function firstVersionIsLower($firstVersion, $secondVersion)
+    {
+        return version_compare($firstVersion, $secondVersion) == -1;
+    }
+
+    /**
+     * Calculates and merges the dependencies of a package
+     *
+     * @param string $packageName The package information
+     *
+     * @param array $dependencies The dependencies array
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function calculateMergedDependenciesOfPackage($packageName, $dependencies)
+    {
+        $packageData = $this->findPackage($packageName);
+
+        //Check for dependencies
+        if (isset($packageData->dependencies)) {
+            foreach ($packageData->dependencies as $dependency) {
+                $current_package_name = $dependency['name'];
+                if (isset($dependency['version'])) {
+                    $current_package_version_information = $dependency['version'];
+                }
+
+                if (!isset($dependencies[$current_package_name])) {
+                    // Dependency added for the first time
+
+                    if (!isset($current_package_version_information)) {
+                        $dependencies[$current_package_name] = '*';
+                    } else {
+                        $dependencies[$current_package_name] = $current_package_version_information;
+                    }
+
+                    //Factor in the package dependencies too
+                    $dependencies = $this->calculateMergedDependenciesOfPackage($current_package_name, $dependencies);
+                } else {
+                    // Dependency already added by another package
+                    //if this package requires a version higher than the currently stored one, store this requirement instead
+                    if (isset($current_package_version_information) && $current_package_version_information !== '*') {
+
+                        $currently_stored_version_information = $dependencies[$current_package_name];
+                        $currently_stored_version_number = $this->calculateVersionNumberFromDependencyVersion($currently_stored_version_information);
+
+                        $currently_stored_version_is_in_next_significant_release_format = false;
+                        if ($this->versionFormatIsNextSignificantRelease($currently_stored_version_information)) {
+                            $currently_stored_version_is_in_next_significant_release_format = true;
+                        }
+
+                        if (!$currently_stored_version_number) {
+                            $currently_stored_version_number = '*';
+                        }
+
+                        $current_package_version_number = $this->calculateVersionNumberFromDependencyVersion($current_package_version_information);
+                        if (!$current_package_version_number) {
+                            throw new \Exception('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName,
+                                1);
+                        }
+
+                        $current_package_version_is_in_next_significant_release_format = false;
+                        if ($this->versionFormatIsNextSignificantRelease($current_package_version_information)) {
+                            $current_package_version_is_in_next_significant_release_format = true;
+                        }
+
+                        //If I had stored '*', change right away with the more specific version required
+                        if ($currently_stored_version_number === '*') {
+                            $dependencies[$current_package_name] = $current_package_version_information;
+                        } else {
+                            if (!$currently_stored_version_is_in_next_significant_release_format && !$current_package_version_is_in_next_significant_release_format) {
+                                //Comparing versions equals or higher, a simple version_compare is enough
+                                if (version_compare($currently_stored_version_number,
+                                        $current_package_version_number) == -1
+                                ) { //Current package version is higher
+                                    $dependencies[$current_package_name] = $current_package_version_information;
+                                }
+                            } else {
+                                $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number,
+                                    $current_package_version_number);
+                                if (!$compatible) {
+                                    throw new \Exception('Dependency ' . $current_package_name . ' is required in two incompatible versions',
+                                        2);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * Calculates and merges the dependencies of the passed packages
+     *
+     * @param array $packages
+     *
+     * @return mixed
+     * @throws \Exception
+     */
+    public function calculateMergedDependenciesOfPackages($packages)
+    {
+        $dependencies = [];
+
+        foreach ($packages as $package) {
+            $dependencies = $this->calculateMergedDependenciesOfPackage($package, $dependencies);
+        }
+
+        return $dependencies;
+    }
+
+    /**
+     * Returns the actual version from a dependency version string.
+     * Examples:
+     *      $versionInformation == '~2.0' => returns '2.0'
+     *      $versionInformation == '>=2.0.2' => returns '2.0.2'
+     *      $versionInformation == '2.0.2' => returns '2.0.2'
+     *      $versionInformation == '*' => returns null
+     *      $versionInformation == '' => returns null
+     *
+     * @param string $version
+     *
+     * @return null|string
+     */
+    public function calculateVersionNumberFromDependencyVersion($version)
+    {
+        if ($version == '*') {
+            return null;
+        } elseif ($version == '') {
+            return null;
+        } elseif ($this->versionFormatIsNextSignificantRelease($version)) {
+            return substr($version, 1);
+        } elseif ($this->versionFormatIsEqualOrHigher($version)) {
+            return substr($version, 2);
+        } else {
+            return $version;
+        }
+    }
+
+    /**
+     * Check if the passed version information contains next significant release (tilde) operator
+     *
+     * Example: returns true for $version: '~2.0'
+     *
+     * @param $version
+     *
+     * @return bool
+     */
+    public function versionFormatIsNextSignificantRelease($version)
+    {
+        return substr($version, 0, 1) == '~';
+    }
+
+    /**
+     * Check if the passed version information contains equal or higher operator
+     *
+     * Example: returns true for $version: '>=2.0'
+     *
+     * @param $version
+     *
+     * @return bool
+     */
+    public function versionFormatIsEqualOrHigher($version)
+    {
+        return substr($version, 0, 2) == '>=';
+    }
+
+    /**
+     * Check if two releases are compatible by next significant release
+     *
+     * ~1.2 is equivalent to >=1.2 <2.0.0
+     * ~1.2.3 is equivalent to >=1.2.3 <1.3.0
+     *
+     * In short, allows the last digit specified to go up
+     *
+     * @param string $version1 the version string (e.g. '2.0.0' or '1.0')
+     * @param string $version2 the version string (e.g. '2.0.0' or '1.0')
+     *
+     * @return bool
+     */
+    public function checkNextSignificantReleasesAreCompatible($version1, $version2)
+    {
+        $version1array = explode('.', $version1);
+        $version2array = explode('.', $version2);
+
+        if (count($version1array) > count($version2array)) {
+            list($version1array, $version2array) = [$version2array, $version1array];
+        }
+
+        $i = 0;
+        while ($i < count($version1array) - 1) {
+            if ($version1array[$i] != $version2array[$i]) {
+                return false;
+            }
+            $i++;
+        }
+
+        return true;
+    }
+
 }
diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php
index c4b3f730d0..2aeeaad1ff 100644
--- a/system/src/Grav/Common/GPM/Installer.php
+++ b/system/src/Grav/Common/GPM/Installer.php
@@ -1,8 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
 use Grav\Common\Filesystem\Folder;
-use Symfony\Component\Yaml\Yaml;
+use Grav\Common\Grav;
 
 class Installer
 {
@@ -30,11 +37,15 @@ class Installer
     protected static $target;
 
     /**
-     * Error Code
-     * @var integer
+     * @var integer Error Code
      */
     protected static $error = 0;
 
+    /**
+     * @var string Post install message
+     */
+    protected static $message = '';
+
     /**
      * Default options for the install
      * @var array
@@ -43,7 +54,7 @@ class Installer
         'overwrite'       => true,
         'ignore_symlinks' => true,
         'sophisticated'   => false,
-        'theme'            => false,
+        'theme'           => false,
         'install_path'    => '',
         'exclude_checks'  => [self::EXISTS, self::NOT_FOUND, self::IS_LINK]
     ];
@@ -63,21 +74,22 @@ public static function install($package, $destination, $options = [])
         $options = array_merge(self::$options, $options);
         $install_path = rtrim($destination . DS . ltrim($options['install_path'], DS), DS);
 
-        if (!self::isGravInstance($destination) || !self::isValidDestination($install_path, $options['exclude_checks'])) {
+        if (!self::isGravInstance($destination) || !self::isValidDestination($install_path,
+                $options['exclude_checks'])
+        ) {
             return false;
         }
 
         if (self::lastErrorCode() == self::IS_LINK && $options['ignore_symlinks'] ||
-            self::lastErrorCode() == self::EXISTS && !$options['overwrite']) {
+            self::lastErrorCode() == self::EXISTS && !$options['overwrite']
+        ) {
             return false;
         }
 
-        // Pre install checks
-        static::flightProcessing('pre_install', $install_path);
-
         $zip = new \ZipArchive();
         $archive = $zip->open($package);
-        $tmp = CACHE_DIR . 'tmp/Grav-' . uniqid();
+        $cache_dir = Grav::instance()['locator']->findResource('cache://', true);
+        $tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
 
         if ($archive !== true) {
             self::$error = self::ZIP_OPEN_ERROR;
@@ -91,13 +103,35 @@ public static function install($package, $destination, $options = [])
 
         if (!$unzip) {
             self::$error = self::ZIP_EXTRACT_ERROR;
-
             $zip->close();
             Folder::delete($tmp);
 
             return false;
         }
 
+        $package_folder_name = $zip->getNameIndex(0);
+        $installer_file_folder = $tmp . '/' . $package_folder_name;
+
+        $is_install = true;
+        $installer = self::loadInstaller($installer_file_folder, $is_install);
+
+        if (isset($options['is_update']) && $options['is_update'] === true) {
+            $method = 'preUpdate';
+        } else {
+            $method = 'preInstall';
+        }
+
+        if ($installer && method_exists($installer, $method)) {
+            $method_result = $installer::$method();
+            if ($method_result !== true) {
+                self::$error = 'An error occurred';
+                if (is_string($method_result)) {
+                    self::$error = $method_result;
+                }
+
+                return false;
+            }
+        }
 
         if (!$options['sophisticated']) {
             if ($options['theme']) {
@@ -112,8 +146,16 @@ public static function install($package, $destination, $options = [])
         Folder::delete($tmp);
         $zip->close();
 
-        // Post install checks
-        static::flightProcessing('post_install', $install_path);
+        if (isset($options['is_update']) && $options['is_update'] === true) {
+            $method = 'postUpdate';
+        } else {
+            $method = 'postInstall';
+        }
+
+        self::$message = '';
+        if ($installer && method_exists($installer, $method)) {
+            self::$message = $installer::$method();
+        }
 
         self::$error = self::OK;
 
@@ -122,26 +164,50 @@ public static function install($package, $destination, $options = [])
     }
 
     /**
-     * @param $state
-     * @param $install_path
+     * Instantiates and returns the package installer class
+     *
+     * @param string $installer_file_folder The folder path that contains install.php
+     * @param bool $is_install True if install, false if removal
+     *
+     * @return null|string
      */
-    protected static function flightProcessing($state, $install_path)
+    private static function loadInstaller($installer_file_folder, $is_install)
     {
-        $blueprints_path = $install_path . DS . 'blueprints.yaml';
+        $installer = null;
 
-        if (file_exists($blueprints_path)) {
-            $package_yaml = Yaml::parse(file_get_contents($blueprints_path));
-            if (isset($package_yaml['install'][$state]['create'])) {
-                foreach ((array) $package_yaml['install']['pre_install']['create'] as $file) {
-                    Folder::mkdir($install_path . '/' . ltrim($file, '/'));
-                }
-            }
-            if (isset($package_yaml['install'][$state]['remove'])) {
-                foreach ((array) $package_yaml['install']['pre_install']['remove'] as $file) {
-                    Folder::delete($install_path . '/' . ltrim($file, '/'));
-                }
+        $installer_file_folder = rtrim($installer_file_folder, DS);
+
+        $install_file = $installer_file_folder . DS . 'install.php';
+
+        if (file_exists($install_file)) {
+            require_once($install_file);
+        } else {
+            return null;
+        }
+
+        if ($is_install) {
+            $slug = '';
+            if (($pos = strpos($installer_file_folder, 'grav-plugin-')) !== false) {
+                $slug = substr($installer_file_folder, $pos + strlen('grav-plugin-'));
+            } elseif (($pos = strpos($installer_file_folder, 'grav-theme-')) !== false) {
+                $slug = substr($installer_file_folder, $pos + strlen('grav-theme-'));
             }
+        } else {
+            $path_elements = explode('/', $installer_file_folder);
+            $slug = end($path_elements);
+        }
+
+        if (!$slug) {
+            return null;
         }
+
+        $class_name = ucfirst($slug) . 'Install';
+
+        if (class_exists($class_name)) {
+            return $class_name;
+        }
+
+        return $installer;
     }
 
     /**
@@ -228,8 +294,8 @@ public static function sophisticatedInstall(\ZipArchive $zip, $install_path, $tm
     /**
      * Uninstalls one or more given package
      *
-     * @param  string $path     The slug of the package(s)
-     * @param  array  $options     Options to use for uninstalling
+     * @param  string $path    The slug of the package(s)
+     * @param  array  $options Options to use for uninstalling
      *
      * @return boolean True if everything went fine, False otherwise.
      */
@@ -241,7 +307,30 @@ public static function uninstall($path, $options = [])
             return false;
         }
 
-        return Folder::delete($path);
+        $installer_file_folder = $path;
+        $is_install = false;
+        $installer = self::loadInstaller($installer_file_folder, $is_install);
+
+        if ($installer && method_exists($installer, 'preUninstall')) {
+            $method_result = $installer::preUninstall();
+            if ($method_result !== true) {
+                self::$error = 'An error occurred';
+                if (is_string($method_result)) {
+                    self::$error = $method_result;
+                }
+
+                return false;
+            }
+        }
+
+        $result = Folder::delete($path);
+
+        self::$message = '';
+        if ($result && $installer && method_exists($installer, 'postUninstall')) {
+            self::$message = $installer::postUninstall();
+        }
+
+        return $result;
     }
 
     /**
@@ -298,6 +387,15 @@ public static function isGravInstance($target)
         return !self::$error;
     }
 
+    /**
+     * Returns the last message added by the installer
+     * @return string The message
+     */
+    public static function getMessage()
+    {
+        return self::$message;
+    }
+
     /**
      * Returns the last error occurred in a string message format
      * @return string The message of the last error
@@ -360,6 +458,7 @@ public static function lastErrorCode()
 
     /**
      * Allows to manually set an error
+     *
      * @param int|string $error the Error code
      */
 
diff --git a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
index 617af8b9cd..ecb69e157e 100644
--- a/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common\GPM\Local;
 
diff --git a/system/src/Grav/Common/GPM/Local/Package.php b/system/src/Grav/Common/GPM/Local/Package.php
index 6505a59dde..61995b2007 100644
--- a/system/src/Grav/Common/GPM/Local/Package.php
+++ b/system/src/Grav/Common/GPM/Local/Package.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\Data\Data;
@@ -19,7 +26,7 @@ public function __construct(Data $package, $package_type = null)
         $this->data->set('slug', $package->slug);
         $this->data->set('description_html', $html_description);
         $this->data->set('description_plain', strip_tags($html_description));
-        $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->name));
+        $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->slug));
     }
 
     /**
diff --git a/system/src/Grav/Common/GPM/Local/Packages.php b/system/src/Grav/Common/GPM/Local/Packages.php
index a8ed6a455b..3e35ac4a14 100644
--- a/system/src/Grav/Common/GPM/Local/Packages.php
+++ b/system/src/Grav/Common/GPM/Local/Packages.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\GPM\Common\CachedCollection;
diff --git a/system/src/Grav/Common/GPM/Local/Plugins.php b/system/src/Grav/Common/GPM/Local/Plugins.php
index b1c3c64a7d..097b2857b1 100644
--- a/system/src/Grav/Common/GPM/Local/Plugins.php
+++ b/system/src/Grav/Common/GPM/Local/Plugins.php
@@ -1,10 +1,15 @@
 <?php
-namespace Grav\Common\GPM\Local;
-
 /**
- * Class Plugins
- * @package Grav\Common\GPM\Local
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\GPM\Local;
+
+use Grav\Common\Grav;
+
 class Plugins extends AbstractPackageCollection
 {
     /**
@@ -17,6 +22,8 @@ class Plugins extends AbstractPackageCollection
      */
     public function __construct()
     {
-        parent::__construct(self::getGrav()['plugins']->all());
+        /** @var \Grav\Common\Plugins $plugins */
+        $plugins = Grav::instance()['plugins'];
+        parent::__construct($plugins->all());
     }
 }
diff --git a/system/src/Grav/Common/GPM/Local/Themes.php b/system/src/Grav/Common/GPM/Local/Themes.php
index 64d23b9031..8abb474139 100644
--- a/system/src/Grav/Common/GPM/Local/Themes.php
+++ b/system/src/Grav/Common/GPM/Local/Themes.php
@@ -1,10 +1,15 @@
 <?php
-namespace Grav\Common\GPM\Local;
-
 /**
- * Class Themes
- * @package Grav\Common\GPM\Local
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\GPM\Local;
+
+use Grav\Common\Grav;
+
 class Themes extends AbstractPackageCollection
 {
     /**
@@ -17,6 +22,6 @@ class Themes extends AbstractPackageCollection
      */
     public function __construct()
     {
-        parent::__construct(self::getGrav()['themes']->all());
+        parent::__construct(Grav::instance()['themes']->all());
     }
 }
diff --git a/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php b/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
index 0f113b4f1a..09378a84b8 100644
--- a/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
+++ b/system/src/Grav/Common/GPM/Remote/AbstractPackageCollection.php
@@ -1,6 +1,14 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
+use Grav\Common\Grav;
 use Grav\Common\GPM\Common\AbstractPackageCollection as BaseCollection;
 use Grav\Common\GPM\Response;
 use \Doctrine\Common\Cache\FilesystemCache;
@@ -23,20 +31,33 @@ class AbstractPackageCollection extends BaseCollection
 
     protected $cache;
 
+    /**
+     * AbstractPackageCollection constructor.
+     *
+     * @param null $repository
+     * @param bool $refresh
+     * @param null $callback
+     */
     public function __construct($repository = null, $refresh = false, $callback = null)
     {
         if ($repository === null) {
             throw new \RuntimeException("A repository is required to indicate the origin of the remote collection");
         }
 
-        $cache_dir = self::getGrav()['locator']->findResource('cache://gpm', true, true);
+        $channel = Grav::instance()['config']->get('system.gpm.releases', 'stable');
+        $cache_dir = Grav::instance()['locator']->findResource('cache://gpm', true, true);
         $this->cache = new FilesystemCache($cache_dir);
 
-        $this->repository = $repository;
+        $this->repository = $repository . '?v=' . GRAV_VERSION . '&' . $channel . '=1';
         $this->raw        = $this->cache->fetch(md5($this->repository));
 
         $this->fetch($refresh, $callback);
         foreach (json_decode($this->raw, true) as $slug => $data) {
+            // Temporarily fix for using multisites
+            if (isset($data['install_path'])) {
+                $path = preg_replace('~^user/~i', 'user://', $data['install_path']);
+                $data['install_path'] = Grav::instance()['locator']->findResource($path, false, true);
+            }
             $this->items[$slug] = new Package($data, $this->type);
         }
     }
diff --git a/system/src/Grav/Common/GPM/Remote/Grav.php b/system/src/Grav/Common/GPM/Remote/GravCore.php
similarity index 65%
rename from system/src/Grav/Common/GPM/Remote/Grav.php
rename to system/src/Grav/Common/GPM/Remote/GravCore.php
index cbc3179fc8..afd7cfb3ee 100644
--- a/system/src/Grav/Common/GPM/Remote/Grav.php
+++ b/system/src/Grav/Common/GPM/Remote/GravCore.php
@@ -1,9 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
+use Grav\Common\Grav;
 use \Doctrine\Common\Cache\FilesystemCache;
 
-class Grav extends AbstractPackageCollection
+class GravCore extends AbstractPackageCollection
 {
     protected $repository = 'https://getgrav.org/downloads/grav.json';
     private $data;
@@ -17,23 +25,28 @@ class Grav extends AbstractPackageCollection
      */
     public function __construct($refresh = false, $callback = null)
     {
-        $cache_dir      = self::getGrav()['locator']->findResource('cache://gpm', true, true);
-        $this->cache    = new FilesystemCache($cache_dir);
-        $this->raw      = $this->cache->fetch(md5($this->repository));
+        $channel = Grav::instance()['config']->get('system.gpm.releases', 'stable');
+        $cache_dir   = Grav::instance()['locator']->findResource('cache://gpm', true, true);
+        $this->cache = new FilesystemCache($cache_dir);
+        $this->repository .= '?v=' . GRAV_VERSION . '&' . $channel . '=1';
+        $this->raw = $this->cache->fetch(md5($this->repository));
 
         $this->fetch($refresh, $callback);
 
-        $this->data = json_decode($this->raw, true);
+        $this->data    = json_decode($this->raw, true);
         $this->version = isset($this->data['version']) ? $this->data['version'] : '-';
-        $this->date = isset($this->data['date']) ? $this->data['date'] : '-';
+        $this->date    = isset($this->data['date']) ? $this->data['date'] : '-';
 
-        if (isset($this->data['assets'])) foreach ($this->data['assets'] as $slug => $data) {
-            $this->items[$slug] = new Package($data);
+        if (isset($this->data['assets'])) {
+            foreach ($this->data['assets'] as $slug => $data) {
+                $this->items[$slug] = new Package($data);
+            }
         }
     }
 
     /**
      * Returns the list of assets associated to the latest version of Grav
+     *
      * @return array list of assets
      */
     public function getAssets()
@@ -43,6 +56,7 @@ public function getAssets()
 
     /**
      * Returns the changelog list for each version of Grav
+     *
      * @param string $diff the version number to start the diff from
      *
      * @return array changelog list for each version
@@ -57,7 +71,9 @@ public function getChangelog($diff = null)
         foreach ($this->data['changelog'] as $version => $changelog) {
             preg_match("/[\w-\.]+/", $version, $cleanVersion);
 
-            if (!$cleanVersion || version_compare($diff, $cleanVersion[0], ">=")) { continue; }
+            if (!$cleanVersion || version_compare($diff, $cleanVersion[0], ">=")) {
+                continue;
+            }
 
             $diffLog[$version] = $changelog;
         }
@@ -65,17 +81,9 @@ public function getChangelog($diff = null)
         return $diffLog;
     }
 
-    /**
-     * Returns the latest version of Grav available remotely
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
     /**
      * Return the release date of the latest Grav
+     *
      * @return string
      */
     public function getDate()
@@ -88,6 +96,16 @@ public function isUpdatable()
         return version_compare(GRAV_VERSION, $this->getVersion(), '<');
     }
 
+    /**
+     * Returns the latest version of Grav available remotely
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
     public function isSymlink()
     {
         return is_link(GRAV_ROOT . DS . 'index.php');
diff --git a/system/src/Grav/Common/GPM/Remote/Package.php b/system/src/Grav/Common/GPM/Remote/Package.php
index 9b0367f667..f08eb0170b 100644
--- a/system/src/Grav/Common/GPM/Remote/Package.php
+++ b/system/src/Grav/Common/GPM/Remote/Package.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
 use Grav\Common\Data\Data;
diff --git a/system/src/Grav/Common/GPM/Remote/Packages.php b/system/src/Grav/Common/GPM/Remote/Packages.php
index 75f397fa3c..2b894c1450 100644
--- a/system/src/Grav/Common/GPM/Remote/Packages.php
+++ b/system/src/Grav/Common/GPM/Remote/Packages.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
 use Grav\Common\GPM\Common\CachedCollection;
diff --git a/system/src/Grav/Common/GPM/Remote/Plugins.php b/system/src/Grav/Common/GPM/Remote/Plugins.php
index 036fc0c2a6..7e222862a1 100644
--- a/system/src/Grav/Common/GPM/Remote/Plugins.php
+++ b/system/src/Grav/Common/GPM/Remote/Plugins.php
@@ -1,10 +1,13 @@
 <?php
-namespace Grav\Common\GPM\Remote;
-
 /**
- * Class Plugins
- * @package Grav\Common\GPM\Remote
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\GPM\Remote;
+
 class Plugins extends AbstractPackageCollection
 {
     /**
diff --git a/system/src/Grav/Common/GPM/Remote/Themes.php b/system/src/Grav/Common/GPM/Remote/Themes.php
index 43a5af54db..5fcc519071 100644
--- a/system/src/Grav/Common/GPM/Remote/Themes.php
+++ b/system/src/Grav/Common/GPM/Remote/Themes.php
@@ -1,10 +1,13 @@
 <?php
-namespace Grav\Common\GPM\Remote;
-
 /**
- * Class Themes
- * @package Grav\Common\GPM\Remote
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\GPM\Remote;
+
 class Themes extends AbstractPackageCollection
 {
     /**
diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php
index 0e57ec0c6b..5e7e8e9a36 100644
--- a/system/src/Grav/Common/GPM/Response.php
+++ b/system/src/Grav/Common/GPM/Response.php
@@ -1,17 +1,18 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
 use Grav\Common\Utils;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 
-/**
- * Class Response
- * @package Grav\Common\GPM
- */
 class Response
 {
-    use GravTrait;
-
     /**
      * The callback for the progress
      *
@@ -199,9 +200,18 @@ private static function getFopen()
         $callback = $args[2];
 
         // if proxy set add that
-        $proxy_url = self::getGrav()['config']->get('system.proxy_url');
+        $config = Grav::instance()['config'];
+        $proxy_url = $config->get('system.gpm.proxy_url', $config->get('system.proxy_url'));
         if ($proxy_url) {
-            $options['fopen']['proxy'] = $proxy_url;
+            $parsed_url = parse_url($proxy_url);
+
+            $options['fopen']['proxy'] = ($parsed_url['scheme'] ?: 'http') . '://' . $parsed_url['host'] . (isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '');
+            $options['fopen']['request_fulluri'] = true;
+
+            if (isset($parsed_url['user']) && isset($parsed_url['pass'])) {
+                $auth = base64_encode($parsed_url['user'] . ':' . $parsed_url['pass']);
+                $options['fopen']['header'] = "Proxy-Authorization: Basic $auth";
+            }
         }
 
         if ($callback) {
@@ -267,9 +277,21 @@ private static function curlExecFollow($ch, $options, $callback)
         }
 
         // if proxy set add that
-        $proxy_url = self::getGrav()['config']->get('system.proxy_url');
+        $config = Grav::instance()['config'];
+        $proxy_url = $config->get('system.gpm.proxy_url', $config->get('system.proxy_url'));
         if ($proxy_url) {
-            $options['curl'][CURLOPT_PROXY] = $proxy_url;
+            $parsed_url = parse_url($proxy_url);
+
+            $options['curl'][CURLOPT_PROXY] = $parsed_url['host'];
+            $options['curl'][CURLOPT_PROXYTYPE] = 'HTTP';
+
+            if (isset($parsed_url['port'])) {
+                $options['curl'][CURLOPT_PROXYPORT] = $parsed_url['port'];
+            }
+
+            if (isset($parsed_url['user']) && isset($parsed_url['pass'])) {
+                $options['curl'][CURLOPT_PROXYUSERPWD] = $parsed_url['user'] . ':' . $parsed_url['pass'];
+            }
         }
 
         // no open_basedir set, we can proceed normally
@@ -278,7 +300,7 @@ private static function curlExecFollow($ch, $options, $callback)
             return curl_exec($ch);
         }
 
-        $max_redirects                           = isset($options['curl'][CURLOPT_MAXREDIRS]) ? $options['curl'][CURLOPT_MAXREDIRS] : 3;
+        $max_redirects = isset($options['curl'][CURLOPT_MAXREDIRS]) ? $options['curl'][CURLOPT_MAXREDIRS] : 3;
         $options['curl'][CURLOPT_FOLLOWLOCATION] = false;
 
         // open_basedir set but no redirects to follow, we can disable followlocation and proceed normally
diff --git a/system/src/Grav/Common/GPM/Upgrader.php b/system/src/Grav/Common/GPM/Upgrader.php
index 61c9ad5ce7..047797f270 100644
--- a/system/src/Grav/Common/GPM/Upgrader.php
+++ b/system/src/Grav/Common/GPM/Upgrader.php
@@ -1,7 +1,12 @@
 <?php
-namespace Grav\Common\GPM;
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
-use Grav\Common\Grav;
+namespace Grav\Common\GPM;
 
 /**
  * Class Upgrader
@@ -32,7 +37,7 @@ class Upgrader
      */
     public function __construct($refresh = false, $callback = null)
     {
-        $this->remote = new Remote\Grav($refresh, $callback);
+        $this->remote = new Remote\GravCore($refresh, $callback);
     }
 
     /**
diff --git a/system/src/Grav/Common/Getters.php b/system/src/Grav/Common/Getters.php
index 8db51d3249..cc55050f21 100644
--- a/system/src/Grav/Common/Getters.php
+++ b/system/src/Grav/Common/Getters.php
@@ -1,13 +1,13 @@
 <?php
-namespace Grav\Common;
-
 /**
- * Abstract class to implement magic __get(), __set(), __isset() and __unset().
- * Also implements ArrayAccess.
+ * @package    Grav.Common
  *
- * @author  RocketTheme
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common;
+
 abstract class Getters implements \ArrayAccess, \Countable
 {
     /**
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index e8a9108aaf..0ec82f8d07 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -1,41 +1,89 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
-use Grav\Common\Config\Config;
-use Grav\Common\Language\Language;
 use Grav\Common\Page\Medium\ImageMedium;
-use Grav\Common\Page\Medium\Medium;
-use Grav\Common\Page\Page;
-use Grav\Common\Page\Pages;
-use Grav\Common\Service\ConfigServiceProvider;
-use Grav\Common\Service\ErrorServiceProvider;
-use Grav\Common\Service\LoggerServiceProvider;
-use Grav\Common\Service\StreamsServiceProvider;
-use Grav\Common\Twig\Twig;
 use RocketTheme\Toolbox\DI\Container;
 use RocketTheme\Toolbox\Event\Event;
-use RocketTheme\Toolbox\Event\EventDispatcher;
 
-/**
- * Grav
- *
- * @author  Andy Miller
- * @link    http://www.rockettheme.com
- * @license http://opensource.org/licenses/MIT
- *
- * Influenced by Pico, Stacey, Kirby, PieCrust and other great platforms...
- */
 class Grav extends Container
 {
+
+    /** @var static The singleton instance */
+    protected static $instance;
+
     /**
-     * @var string
+     * @var array Contains all Services and ServicesProviders that are mapped
+     *            to the dependency injection container.
      */
-    public $output;
+    protected static $diMap = [
+        'Grav\Common\Service\LoggerServiceProvider',
+        'Grav\Common\Service\ErrorServiceProvider',
+        'uri'                     => 'Grav\Common\Uri',
+        'events'                  => 'RocketTheme\Toolbox\Event\EventDispatcher',
+        'cache'                   => 'Grav\Common\Cache',
+        'session'                 => 'Grav\Common\Session',
+        'plugins'                 => 'Grav\Common\Plugins',
+        'themes'                  => 'Grav\Common\Themes',
+        'twig'                    => 'Grav\Common\Twig\Twig',
+        'taxonomy'                => 'Grav\Common\Taxonomy',
+        'language'                => 'Grav\Common\Language\Language',
+        'pages'                   => 'Grav\Common\Page\Pages',
+        'Grav\Common\Service\TaskServiceProvider',
+        'Grav\Common\Service\AssetsServiceProvider',
+        'Grav\Common\Service\PageServiceProvider',
+        'Grav\Common\Service\OutputServiceProvider',
+        'browser'                 => 'Grav\Common\Browser',
+        'Grav\Common\Service\StreamsServiceProvider',
+        'Grav\Common\Service\ConfigServiceProvider',
+        'inflector'               => 'Grav\Common\Inflector',
+        'siteSetupProcessor'      => 'Grav\Common\Processors\SiteSetupProcessor',
+        'configurationProcessor'  => 'Grav\Common\Processors\ConfigurationProcessor',
+        'errorsProcessor'         => 'Grav\Common\Processors\ErrorsProcessor',
+        'debuggerInitProcessor'   => 'Grav\Common\Processors\DebuggerInitProcessor',
+        'initializeProcessor'     => 'Grav\Common\Processors\InitializeProcessor',
+        'pluginsProcessor'        => 'Grav\Common\Processors\PluginsProcessor',
+        'themesProcessor'         => 'Grav\Common\Processors\ThemesProcessor',
+        'tasksProcessor'          => 'Grav\Common\Processors\TasksProcessor',
+        'assetsProcessor'         => 'Grav\Common\Processors\AssetsProcessor',
+        'twigProcessor'           => 'Grav\Common\Processors\TwigProcessor',
+        'pagesProcessor'          => 'Grav\Common\Processors\PagesProcessor',
+        'debuggerAssetsProcessor' => 'Grav\Common\Processors\DebuggerAssetsProcessor',
+        'renderProcessor'         => 'Grav\Common\Processors\RenderProcessor',
+    ];
+
+    /** @var array All processors that are processed in $this->process() */
+    protected $processors = [
+        'siteSetupProcessor',
+        'configurationProcessor',
+        'errorsProcessor',
+        'debuggerInitProcessor',
+        'initializeProcessor',
+        'pluginsProcessor',
+        'themesProcessor',
+        'tasksProcessor',
+        'assetsProcessor',
+        'twigProcessor',
+        'pagesProcessor',
+        'debuggerAssetsProcessor',
+        'renderProcessor',
+    ];
 
     /**
-     * @var static
+     * Reset the Grav instance.
      */
-    protected static $instance;
+    public static function resetInstance()
+    {
+        if (self::$instance) {
+            self::$instance = null;
+        }
+    }
 
     /**
      * Return the Grav instance. Create it if it's not already instanced
@@ -48,9 +96,6 @@ public static function instance(array $values = [])
     {
         if (!self::$instance) {
             self::$instance = static::load($values);
-
-            GravTrait::setGrav(self::$instance);
-
         } elseif ($values) {
             $instance = self::$instance;
             foreach ($values as $key => $value) {
@@ -61,145 +106,6 @@ public static function instance(array $values = [])
         return self::$instance;
     }
 
-    /**
-     * Initialize and return a Grav instance
-     *
-     * @param array $values
-     *
-     * @return static
-     */
-    protected static function load(array $values)
-    {
-        $container = new static($values);
-
-        $container['grav'] = $container;
-
-        $container['debugger'] = new Debugger();
-        $container['debugger']->startTimer('_services', 'Services');
-
-        $container->register(new LoggerServiceProvider);
-
-        $container->register(new ErrorServiceProvider);
-
-        $container['uri'] = function ($c) {
-            /** @var Grav $c */
-            return new Uri($c);
-        };
-
-        $container['task'] = function ($c) {
-            /** @var Grav $c */
-            return !empty($_POST['task']) ? $_POST['task'] : $c['uri']->param('task');
-        };
-
-        $container['events'] = function () {
-            return new EventDispatcher;
-        };
-        $container['cache'] = function ($c) {
-            /** @var Grav $c */
-            return new Cache($c);
-        };
-        $container['session'] = function ($c) {
-            /** @var Grav $c */
-            return new Session($c);
-        };
-        $container['plugins'] = function () {
-            return new Plugins();
-        };
-        $container['themes'] = function ($c) {
-            /** @var Grav $c */
-            return new Themes($c);
-        };
-        $container['twig'] = function ($c) {
-            /** @var Grav $c */
-            return new Twig($c);
-        };
-        $container['taxonomy'] = function ($c) {
-            /** @var Grav $c */
-            return new Taxonomy($c);
-        };
-        $container['language'] = function ($c) {
-            /** @var Grav $c */
-            return new Language($c);
-        };
-
-        $container['pages'] = function ($c) {
-            /** @var Grav $c */
-            return new Pages($c);
-        };
-
-        $container['assets'] = new Assets();
-
-        $container['page'] = function ($c) {
-            /** @var Grav $c */
-
-            /** @var Pages $pages */
-            $pages = $c['pages'];
-            /** @var Language $language */
-            $language = $c['language'];
-
-            /** @var Uri $uri */
-            $uri = $c['uri'];
-
-            $path = $uri->path(); // Don't trim to support trailing slash default routes
-            $path = $path ?: '/';
-
-            $page = $pages->dispatch($path);
-
-            // Redirection tests
-            if ($page) {
-                // Language-specific redirection scenarios
-                if ($language->enabled()) {
-                    if ($language->isLanguageInUrl() && !$language->isIncludeDefaultLanguage()) {
-                        $c->redirect($page->route());
-                    }
-                    if (!$language->isLanguageInUrl() && $language->isIncludeDefaultLanguage()) {
-                        $c->redirectLangSafe($page->route());
-                    }
-                }
-                // Default route test and redirect
-                if ($c['config']->get('system.pages.redirect_default_route') && $page->route() != $path) {
-                    $c->redirectLangSafe($page->route());
-                }
-            }
-
-            // if page is not found, try some fallback stuff
-            if (!$page || !$page->routable()) {
-
-                // Try fallback URL stuff...
-                $c->fallbackUrl($path);
-
-                // If no page found, fire event
-                $event = $c->fireEvent('onPageNotFound');
-
-                if (isset($event->page)) {
-                    $page = $event->page;
-                } else {
-                    throw new \RuntimeException('Page Not Found', 404);
-                }
-            }
-
-            return $page;
-        };
-
-        $container['output'] = function ($c) {
-            /** @var Grav $c */
-            return $c['twig']->processSite($c['uri']->extension());
-        };
-
-        $container['browser'] = function () {
-            return new Browser();
-        };
-
-        $container->register(new StreamsServiceProvider);
-        $container->register(new ConfigServiceProvider);
-
-        $container['inflector'] = new Inflector();
-
-        $container['debugger']->stopTimer('_services');
-
-        return $container;
-    }
-
     /**
      * Process a request
      */
@@ -208,89 +114,17 @@ public function process()
         /** @var Debugger $debugger */
         $debugger = $this['debugger'];
 
-        // Load site setup and initializing streams.
-        $debugger->startTimer('_setup', 'Site Setup');
-        $this['setup']->init();
-        $this['streams'];
-        $debugger->stopTimer('_setup');
-
-        // Initialize configuration.
-        $debugger->startTimer('_config', 'Configuration');
-        $this['config']->init();
-        $debugger->stopTimer('_config');
-
-        // Initialize error handlers.
-        $this['errors']->resetHandlers();
-
-        // Initialize debugger.
-        $debugger->init();
-        $debugger->startTimer('init', 'Initialize');
-        $this['config']->debug();
-
-        // Use output buffering to prevent headers from being sent too early.
-        ob_start();
-        if ($this['config']->get('system.cache.gzip')) {
-            // Enable zip/deflate with a fallback in case of if browser does not support compressing.
-            if (!ob_start("ob_gzhandler")) {
-                ob_start();
-            }
-        }
-
-        // Initialize the timezone.
-        if ($this['config']->get('system.timezone')) {
-            date_default_timezone_set($this['config']->get('system.timezone'));
+        // process all processors (e.g. config, initialize, assets, ..., render)
+        foreach ($this->processors as $processor) {
+            $processor = $this[$processor];
+            $this->measureTime($processor->id, $processor->title, function () use ($processor) {
+                $processor->process();
+            });
         }
 
-        // Initialize uri, session.
-        $this['uri']->init();
-        $this['session']->init();
-
-        // Initialize Locale if set and configured.
-        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
-            setlocale(LC_ALL, $this['language']->getLanguage());
-        } elseif ($this['config']->get('system.default_locale')) {
-            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
-        }
-
-        $debugger->stopTimer('init');
-
-        $debugger->startTimer('plugins', 'Plugins');
-        $this['plugins']->init();
-        $this->fireEvent('onPluginsInitialized');
-        $debugger->stopTimer('plugins');
-
-        $debugger->startTimer('themes', 'Themes');
-        $this['themes']->init();
-        $debugger->stopTimer('themes');
-
-        $task = $this['task'];
-        if ($task) {
-            $this->fireEvent('onTask.' . $task);
-        }
-
-        $this['assets']->init();
-        $this->fireEvent('onAssetsInitialized');
-
-        $debugger->startTimer('twig', 'Twig');
-        $this['twig']->init();
-        $debugger->stopTimer('twig');
-
-        $debugger->startTimer('pages', 'Pages');
-        $this['pages']->init();
-        $this->fireEvent('onPagesInitialized');
-        $debugger->stopTimer('pages');
-        $this->fireEvent('onPageInitialized');
-
-        $debugger->addAssets();
-
-        // Process whole page as required
-        $debugger->startTimer('render', 'Render');
-        $this->output = $this['output'];
-        $this->fireEvent('onOutputGenerated');
-        $debugger->stopTimer('render');
-
         // Set the header type
         $this->header();
+
         echo $this->output;
         $debugger->render();
 
@@ -299,6 +133,20 @@ public function process()
         register_shutdown_function([$this, 'shutdown']);
     }
 
+    /**
+     * Set the system locale based on the language and configuration
+     */
+    public function setLocale()
+    {
+        // Initialize Locale if set and configured.
+        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
+            $language = $this['language']->getLanguage();
+            setlocale(LC_ALL, count($language < 3) ? ($language . '_' . strtoupper($language)) : $language);
+        } elseif ($this['config']->get('system.default_locale')) {
+            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
+        }
+    }
+
     /**
      * Redirect browser to another location.
      *
@@ -473,9 +321,8 @@ public function shutdown()
             $success = function_exists('fastcgi_finish_request') ? @fastcgi_finish_request() : false;
 
             if (!$success) {
-                // Unfortunately without FastCGI there is no way to close the connection. We need to ask browser to
-                // close the connection for us.
-
+                // Unfortunately without FastCGI there is no way to force close the connection.
+                // We need to ask browser to close the connection for us.
                 if ($this['config']->get('system.cache.gzip')) {
                     // Flush gzhandler buffer if gzip setting was enabled.
                     ob_end_flush();
@@ -486,11 +333,11 @@ public function shutdown()
                     header('Content-Encoding: none');
                 }
 
+
                 // Get length and close the connection.
                 header('Content-Length: ' . ob_get_length());
                 header("Connection: close");
 
-                // Finally flush the regular buffer.
                 ob_end_flush();
                 @ob_flush();
                 flush();
@@ -501,13 +348,104 @@ public function shutdown()
         $this->fireEvent('onShutdown');
     }
 
+    /**
+     * Magic Catch All Function
+     * Used to call closures like measureTime on the instance.
+     * Source: http://stackoverflow.com/questions/419804/closures-as-class-members
+     */
+    public function __call($method, $args)
+    {
+        $closure = $this->$method;
+        call_user_func_array($closure, $args);
+    }
+
+    /**
+     * Initialize and return a Grav instance
+     *
+     * @param  array $values
+     *
+     * @return static
+     */
+    protected static function load(array $values)
+    {
+        $container = new static($values);
+
+        $container['grav'] = $container;
+
+        $container['debugger'] = new Debugger();
+        $debugger = $container['debugger'];
+
+        // closure that measures time by wrapping a function into startTimer and stopTimer
+        // The debugger can be passed to the closure. Should be more performant
+        // then to get it from the container all time.
+        $container->measureTime = function ($timerId, $timerTitle, $callback) use ($debugger) {
+            $debugger->startTimer($timerId, $timerTitle);
+            $callback();
+            $debugger->stopTimer($timerId);
+        };
+
+        $container->measureTime('_services', 'Services', function () use ($container) {
+            $container->registerServices($container);
+        });
+
+        return $container;
+    }
+
+    /**
+     * Register all services
+     * Services are defined in the diMap. They can either only the class
+     * of a Service Provider or a pair of serviceKey => serviceClass that
+     * gets directly mapped into the container.
+     *
+     * @return void
+     */
+    protected function registerServices()
+    {
+        foreach (self::$diMap as $serviceKey => $serviceClass) {
+            if (is_int($serviceKey)) {
+                $this->registerServiceProvider($serviceClass);
+            } else {
+                $this->registerService($serviceKey, $serviceClass);
+            }
+        }
+    }
+
+    /**
+     * Register a service provider with the container.
+     *
+     * @param  string $serviceClass
+     *
+     * @return void
+     */
+    protected function registerServiceProvider($serviceClass)
+    {
+        $this->register(new $serviceClass);
+    }
+
+    /**
+     * Register a service with the container.
+     *
+     * @param  string $serviceKey
+     * @param  string $serviceClass
+     *
+     * @return void
+     */
+    protected function registerService($serviceKey, $serviceClass)
+    {
+        $this[$serviceKey] = function ($c) use ($serviceClass) {
+            return new $serviceClass($c);
+        };
+    }
+
     /**
      * This attempts to find media, other files, and download them
      *
      * @param $path
      */
-    protected function fallbackUrl($path)
+    public function fallbackUrl($path)
     {
+      	$this->fireEvent('onPageFallBackUrl');
+
         /** @var Uri $uri */
         $uri = $this['uri'];
 
@@ -516,7 +454,7 @@ protected function fallbackUrl($path)
 
         $uri_extension = $uri->extension();
         $fallback_types = $config->get('system.media.allowed_fallback_types', null);
-        $supported_types = $config->get('media');
+        $supported_types = $config->get('media.types');
 
         // Check whitelist first, then ensure extension is a valid media type
         if (!empty($fallback_types) && !in_array($uri_extension, $fallback_types)) {
diff --git a/system/src/Grav/Common/GravTrait.php b/system/src/Grav/Common/GravTrait.php
index a8f86826c3..9746d3924f 100644
--- a/system/src/Grav/Common/GravTrait.php
+++ b/system/src/Grav/Common/GravTrait.php
@@ -1,16 +1,15 @@
 <?php
-namespace Grav\Common;
-
 /**
- * Class GravTrait
+ * @package    Grav.Common
  *
- * @package Grav\Common
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common;
+
 trait GravTrait
 {
-    /**
-     * @var Grav
-     */
     protected static $grav;
 
     /**
@@ -21,15 +20,7 @@ public static function getGrav()
         if (!self::$grav) {
             self::$grav = Grav::instance();
         }
-
         return self::$grav;
     }
-
-    /**
-     * @param Grav $grav
-     */
-    public static function setGrav(Grav $grav)
-    {
-        self::$grav = $grav;
-    }
 }
+
diff --git a/system/src/Grav/Common/Helpers/Truncator.php b/system/src/Grav/Common/Helpers/Truncator.php
index 64facbc2fe..7c8ab2f0b8 100644
--- a/system/src/Grav/Common/Helpers/Truncator.php
+++ b/system/src/Grav/Common/Helpers/Truncator.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Helpers
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Helpers;
 
 use DOMDocument;
diff --git a/system/src/Grav/Common/Inflector.php b/system/src/Grav/Common/Inflector.php
index cea2f69d59..17a11e0c48 100644
--- a/system/src/Grav/Common/Inflector.php
+++ b/system/src/Grav/Common/Inflector.php
@@ -1,27 +1,21 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
+use Grav\Common\Grav;
+
 /**
 * This file was originally part of the Akelos Framework
 */
 
-/**
- * Inflector for pluralize and singularize English nouns.
- *
- * This Inflector is a port of Ruby on Rails Inflector.
- *
- * It can be really helpful for developers that want to
- * create frameworks based on naming conventions rather than
- * configurations.
- *
- * @author  RocketTheme
- * @license MIT
- */
-
 class Inflector
 {
-    use GravTrait;
-
     protected $plural;
     protected $singular;
     protected $uncountable;
@@ -31,7 +25,7 @@ class Inflector
     public function init()
     {
         if (empty($this->plural)) {
-            $language = self::getGrav()['language'];
+            $language = Grav::instance()['language'];
             $this->plural = $language->translate('INFLECTOR_PLURALS', null, true);
             $this->singular = $language->translate('INFLECTOR_SINGULAR', null, true);
             $this->uncountable = $language->translate('INFLECTOR_UNCOUNTABLE', null, true);
diff --git a/system/src/Grav/Common/Iterator.php b/system/src/Grav/Common/Iterator.php
index 9afd9dbd04..ad5722dfc4 100644
--- a/system/src/Grav/Common/Iterator.php
+++ b/system/src/Grav/Common/Iterator.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use RocketTheme\Toolbox\ArrayTraits\ArrayAccessWithGetters;
@@ -8,10 +15,6 @@
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\Serializable;
 
-/**
- * Class Iterator
- * @package Grav\Common
- */
 class Iterator implements \ArrayAccess, \Iterator, \Countable, \Serializable
 {
     use Constructor, ArrayAccessWithGetters, ArrayIterator, Countable, Serializable, Export;
diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index eb69adcf1a..d3eed04ec9 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -1,11 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Language
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Language;
 
 use Grav\Common\Grav;
+use Grav\Common\Config\Config;
 
-/**
- * Language and translation functionality for Grav
- */
 class Language
 {
     protected $grav;
@@ -15,7 +20,10 @@ class Language
     protected $fallback_languages = [];
     protected $default;
     protected $active = null;
+
+    /** @var Config $config */
     protected $config;
+
     protected $http_accept_language;
     protected $lang_in_url = false;
 
@@ -406,7 +414,7 @@ public function translateArray($key, $index, $languages = null, $html_out = fals
             }
 
             foreach ((array)$languages as $lang) {
-                $translation_array = (array)$this->config->getLanguages()->get($lang . '.' . $key, null);
+                $translation_array = (array)Grav::instance()['languages']->get($lang . '.' . $key, null);
                 if ($translation_array && array_key_exists($index, $translation_array)) {
                     return $translation_array[$index];
                 }
@@ -431,7 +439,7 @@ public function translateArray($key, $index, $languages = null, $html_out = fals
      */
     public function getTranslation($lang, $key, $array_support = false)
     {
-        $translation = $this->config->getLanguages()->get($lang . '.' . $key, null);
+        $translation = Grav::instance()['languages']->get($lang . '.' . $key, null);
         if (!$array_support && is_array($translation)) {
             return (string)array_shift($translation);
         }
diff --git a/system/src/Grav/Common/Language/LanguageCodes.php b/system/src/Grav/Common/Language/LanguageCodes.php
index 86b130a906..ad278c24ba 100644
--- a/system/src/Grav/Common/Language/LanguageCodes.php
+++ b/system/src/Grav/Common/Language/LanguageCodes.php
@@ -1,740 +1,149 @@
 <?php
-namespace Grav\Common\Language;
-
 /**
- * Language and translation functionality for Grav
+ * @package    Grav.Common.Language
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Language;
+
 class LanguageCodes
 {
     protected static $codes = [
-        "ab" => [
-            "name"       => "Abkhaz",
-            "nativeName" => "аҧсуа"
-        ],
-        "aa" => [
-            "name"       => "Afar",
-            "nativeName" => "Afaraf"
-        ],
-        "af" => [
-            "name"       => "Afrikaans",
-            "nativeName" => "Afrikaans"
-        ],
-        "ak" => [
-            "name"       => "Akan",
-            "nativeName" => "Akan"
-        ],
-        "sq" => [
-            "name"       => "Albanian",
-            "nativeName" => "Shqip"
-        ],
-        "am" => [
-            "name"       => "Amharic",
-            "nativeName" => "አማርኛ"
-        ],
-        "ar" => [
-            "name"       => "Arabic",
-            "nativeName" => "العربية"
-        ],
-        "an" => [
-            "name"       => "Aragonese",
-            "nativeName" => "Aragonés"
-        ],
-        "hy" => [
-            "name"       => "Armenian",
-            "nativeName" => "Հայերեն"
-        ],
-        "as" => [
-            "name"       => "Assamese",
-            "nativeName" => "অসমীয়া"
-        ],
-        "av" => [
-            "name"       => "Avaric",
-            "nativeName" => "авар мацӀ"
-        ],
-        "ae" => [
-            "name"       => "Avestan",
-            "nativeName" => "avesta"
-        ],
-        "ay" => [
-            "name"       => "Aymara",
-            "nativeName" => "aymar aru"
-        ],
-        "az" => [
-            "name"       => "Azerbaijani",
-            "nativeName" => "azərbaycan dili"
-        ],
-        "bm" => [
-            "name"       => "Bambara",
-            "nativeName" => "bamanankan"
-        ],
-        "ba" => [
-            "name"       => "Bashkir",
-            "nativeName" => "башҡорт теле"
-        ],
-        "eu" => [
-            "name"       => "Basque",
-            "nativeName" => "euskara"
-        ],
-        "be" => [
-            "name"       => "Belarusian",
-            "nativeName" => "Беларуская"
-        ],
-        "bn" => [
-            "name"       => "Bengali",
-            "nativeName" => "বাংলা"
-        ],
-        "bh" => [
-            "name"       => "Bihari",
-            "nativeName" => "भोजपुरी"
-        ],
-        "bi" => [
-            "name"       => "Bislama",
-            "nativeName" => "Bislama"
-        ],
-        "bs" => [
-            "name"       => "Bosnian",
-            "nativeName" => "bosanski jezik"
-        ],
-        "br" => [
-            "name"       => "Breton",
-            "nativeName" => "brezhoneg"
-        ],
-        "bg" => [
-            "name"       => "Bulgarian",
-            "nativeName" => "български език"
-        ],
-        "my" => [
-            "name"       => "Burmese",
-            "nativeName" => "ဗမာစာ"
-        ],
-        "ca" => [
-            "name"       => "Catalan",
-            "nativeName" => "Català"
-        ],
-        "ch" => [
-            "name"       => "Chamorro",
-            "nativeName" => "Chamoru"
-        ],
-        "ce" => [
-            "name"       => "Chechen",
-            "nativeName" => "нохчийн мотт"
-        ],
-        "ny" => [
-            "name"       => "Chichewa",
-            "nativeName" => "chiCheŵa"
-        ],
-        "zh" => [
-            "name"       => "Chinese",
-            "nativeName" => "中文"
-        ],
-        "cv" => [
-            "name"       => "Chuvash",
-            "nativeName" => "чӑваш чӗлхи"
-        ],
-        "kw" => [
-            "name"       => "Cornish",
-            "nativeName" => "Kernewek"
-        ],
-        "co" => [
-            "name"       => "Corsican",
-            "nativeName" => "corsu"
-        ],
-        "cr" => [
-            "name"       => "Cree",
-            "nativeName" => "ᓀᐦᐃᔭᐍᐏᐣ"
-        ],
-        "hr" => [
-            "name"       => "Croatian",
-            "nativeName" => "hrvatski"
-        ],
-        "cs" => [
-            "name"       => "Czech",
-            "nativeName" => "česky"
-        ],
-        "da" => [
-            "name"       => "Danish",
-            "nativeName" => "dansk"
-        ],
-        "dv" => [
-            "name"       => "Divehi",
-            "nativeName" => "ދިވެހި"
-        ],
-        "nl" => [
-            "name"       => "Dutch",
-            "nativeName" => "Nederlands"
-        ],
-        "en" => [
-            "name"       => "English",
-            "nativeName" => "English"
-        ],
-        "eo" => [
-            "name"       => "Esperanto",
-            "nativeName" => "Esperanto"
-        ],
-        "et" => [
-            "name"       => "Estonian",
-            "nativeName" => "eesti"
-        ],
-        "ee" => [
-            "name"       => "Ewe",
-            "nativeName" => "Eʋegbe"
-        ],
-        "fo" => [
-            "name"       => "Faroese",
-            "nativeName" => "føroyskt"
-        ],
-        "fj" => [
-            "name"       => "Fijian",
-            "nativeName" => "vosa Vakaviti"
-        ],
-        "fi" => [
-            "name"       => "Finnish",
-            "nativeName" => "suomi"
-        ],
-        "fr" => [
-            "name"       => "French",
-            "nativeName" => "Français"
-        ],
-        "ff" => [
-            "name"       => "Fula",
-            "nativeName" => "Fulfulde"
-        ],
-        "gl" => [
-            "name"       => "Galician",
-            "nativeName" => "Galego"
-        ],
-        "ka" => [
-            "name"       => "Georgian",
-            "nativeName" => "ქართული"
-        ],
-        "de" => [
-            "name"       => "German",
-            "nativeName" => "Deutsch"
-        ],
-        "el" => [
-            "name"       => "Greek",
-            "nativeName" => "Ελληνικά"
-        ],
-        "gn" => [
-            "name"       => "Guaraní",
-            "nativeName" => "Avañeẽ"
-        ],
-        "gu" => [
-            "name"       => "Gujarati",
-            "nativeName" => "ગુજરાતી"
-        ],
-        "ht" => [
-            "name"       => "Haitian",
-            "nativeName" => "Kreyòl ayisyen"
-        ],
-        "ha" => [
-            "name"       => "Hausa",
-            "nativeName" => "هَوُسَ"
-        ],
-        "he" => [
-            "name"       => "Hebrew",
-            "nativeName" => "עברית"
-        ],
-        "hz" => [
-            "name"       => "Herero",
-            "nativeName" => "Otjiherero"
-        ],
-        "hi" => [
-            "name"       => "Hindi",
-            "nativeName" => "हिन्दी"
-        ],
-        "ho" => [
-            "name"       => "Hiri Motu",
-            "nativeName" => "Hiri Motu"
-        ],
-        "hu" => [
-            "name"       => "Hungarian",
-            "nativeName" => "Magyar"
-        ],
-        "ia" => [
-            "name"       => "Interlingua",
-            "nativeName" => "Interlingua"
-        ],
-        "id" => [
-            "name"       => "Indonesian",
-            "nativeName" => "Bahasa Indonesia"
-        ],
-        "ie" => [
-            "name"       => "Interlingue",
-            "nativeName" => "Interlingue"
-        ],
-        "ga" => [
-            "name"       => "Irish",
-            "nativeName" => "Gaeilge"
-        ],
-        "ig" => [
-            "name"       => "Igbo",
-            "nativeName" => "Asụsụ Igbo"
-        ],
-        "ik" => [
-            "name"       => "Inupiaq",
-            "nativeName" => "Iñupiaq"
-        ],
-        "io" => [
-            "name"       => "Ido",
-            "nativeName" => "Ido"
-        ],
-        "is" => [
-            "name"       => "Icelandic",
-            "nativeName" => "Íslenska"
-        ],
-        "it" => [
-            "name"       => "Italian",
-            "nativeName" => "Italiano"
-        ],
-        "iu" => [
-            "name"       => "Inuktitut",
-            "nativeName" => "ᐃᓄᒃᑎᑐᑦ"
-        ],
-        "ja" => [
-            "name"       => "Japanese",
-            "nativeName" => "日本語"
-        ],
-        "jv" => [
-            "name"       => "Javanese",
-            "nativeName" => "basa Jawa"
-        ],
-        "kl" => [
-            "name"       => "Kalaallisut",
-            "nativeName" => "kalaallisut"
-        ],
-        "kn" => [
-            "name"       => "Kannada",
-            "nativeName" => "ಕನ್ನಡ"
-        ],
-        "kr" => [
-            "name"       => "Kanuri",
-            "nativeName" => "Kanuri"
-        ],
-        "ks" => [
-            "name"       => "Kashmiri",
-            "nativeName" => "कश्मीरी"
-        ],
-        "kk" => [
-            "name"       => "Kazakh",
-            "nativeName" => "Қазақ тілі"
-        ],
-        "km" => [
-            "name"       => "Khmer",
-            "nativeName" => "ភាសាខ្មែរ"
-        ],
-        "ki" => [
-            "name"       => "Kikuyu",
-            "nativeName" => "Gĩkũyũ"
-        ],
-        "rw" => [
-            "name"       => "Kinyarwanda",
-            "nativeName" => "Ikinyarwanda"
-        ],
-        "ky" => [
-            "name"       => "Kirghiz",
-            "nativeName" => "кыргыз тили"
-        ],
-        "kv" => [
-            "name"       => "Komi",
-            "nativeName" => "коми кыв"
-        ],
-        "kg" => [
-            "name"       => "Kongo",
-            "nativeName" => "KiKongo"
-        ],
-        "ko" => [
-            "name"       => "Korean",
-            "nativeName" => "한국어"
-        ],
-        "ku" => [
-            "name"       => "Kurdish",
-            "nativeName" => "كوردی‎"
-        ],
-        "kj" => [
-            "name"       => "Kwanyama",
-            "nativeName" => "Kuanyama"
-        ],
-        "la" => [
-            "name"       => "Latin",
-            "nativeName" => "latine"
-        ],
-        "lb" => [
-            "name"       => "Luxembourgish",
-            "nativeName" => "Lëtzebuergesch"
-        ],
-        "lg" => [
-            "name"       => "Luganda",
-            "nativeName" => "Luganda"
-        ],
-        "li" => [
-            "name"       => "Limburgish",
-            "nativeName" => "Limburgs"
-        ],
-        "ln" => [
-            "name"       => "Lingala",
-            "nativeName" => "Lingála"
-        ],
-        "lo" => [
-            "name"       => "Lao",
-            "nativeName" => "ພາສາລາວ"
-        ],
-        "lt" => [
-            "name"       => "Lithuanian",
-            "nativeName" => "lietuvių kalba"
-        ],
-        "lu" => [
-            "name"       => "Luba-Katanga",
-            "nativeName" => "Luba-Katanga"
-        ],
-        "lv" => [
-            "name"       => "Latvian",
-            "nativeName" => "latviešu valoda"
-        ],
-        "gv" => [
-            "name"       => "Manx",
-            "nativeName" => "Gaelg"
-        ],
-        "mk" => [
-            "name"       => "Macedonian",
-            "nativeName" => "македонски јазик"
-        ],
-        "mg" => [
-            "name"       => "Malagasy",
-            "nativeName" => "Malagasy fiteny"
-        ],
-        "ms" => [
-            "name"       => "Malay",
-            "nativeName" => "بهاس ملايو‎"
-        ],
-        "ml" => [
-            "name"       => "Malayalam",
-            "nativeName" => "മലയാളം"
-        ],
-        "mt" => [
-            "name"       => "Maltese",
-            "nativeName" => "Malti"
-        ],
-        "mi" => [
-            "name"       => "Māori",
-            "nativeName" => "te reo Māori"
-        ],
-        "mr" => [
-            "name"       => "Marathi",
-            "nativeName" => "मराठी"
-        ],
-        "mh" => [
-            "name"       => "Marshallese",
-            "nativeName" => "Kajin M̧ajeļ"
-        ],
-        "mn" => [
-            "name"       => "Mongolian",
-            "nativeName" => "монгол"
-        ],
-        "na" => [
-            "name"       => "Nauru",
-            "nativeName" => "Ekakairũ Naoero"
-        ],
-        "nv" => [
-            "name"       => "Navajo",
-            "nativeName" => "Diné bizaad"
-        ],
-        "nb" => [
-            "name"       => "Norwegian Bokmål",
-            "nativeName" => "Norsk bokmål"
-        ],
-        "nd" => [
-            "name"       => "North Ndebele",
-            "nativeName" => "isiNdebele"
-        ],
-        "ne" => [
-            "name"       => "Nepali",
-            "nativeName" => "नेपाली"
-        ],
-        "ng" => [
-            "name"       => "Ndonga",
-            "nativeName" => "Owambo"
-        ],
-        "nn" => [
-            "name"       => "Norwegian Nynorsk",
-            "nativeName" => "Norsk nynorsk"
-        ],
-        "no" => [
-            "name"       => "Norwegian",
-            "nativeName" => "Norsk"
-        ],
-        "ii" => [
-            "name"       => "Nuosu",
-            "nativeName" => "ꆈꌠ꒿ Nuosuhxop"
-        ],
-        "nr" => [
-            "name"       => "South Ndebele",
-            "nativeName" => "isiNdebele"
-        ],
-        "oc" => [
-            "name"       => "Occitan",
-            "nativeName" => "Occitan"
-        ],
-        "oj" => [
-            "name"       => "Ojibwe, Ojibwa",
-            "nativeName" => "ᐊᓂᔑᓈᐯᒧᐎᓐ"
-        ],
-        "cu" => [
-            "name"       => "Church Slavic",
-            "nativeName" => "ѩзыкъ словѣньскъ"
-        ],
-        "om" => [
-            "name"       => "Oromo",
-            "nativeName" => "Afaan Oromoo"
-        ],
-        "or" => [
-            "name"       => "Oriya",
-            "nativeName" => "ଓଡ଼ିଆ"
-        ],
-        "os" => [
-            "name"       => "Ossetian",
-            "nativeName" => "ирон æвзаг"
-        ],
-        "pa" => [
-            "name"       => "Panjabi",
-            "nativeName" => "ਪੰਜਾਬੀ"
-        ],
-        "pi" => [
-            "name"       => "Pāli",
-            "nativeName" => "पाऴि"
-        ],
-        "fa" => [
-            "name"       => "Persian",
-            "nativeName" => "فارسی"
-        ],
-        "pl" => [
-            "name"       => "Polish",
-            "nativeName" => "polski"
-        ],
-        "ps" => [
-            "name"       => "Pashto",
-            "nativeName" => "پښتو"
-        ],
-        "pt" => [
-            "name"       => "Portuguese",
-            "nativeName" => "Português"
-        ],
-        "qu" => [
-            "name"       => "Quechua",
-            "nativeName" => "Runa Simi"
-        ],
-        "rm" => [
-            "name"       => "Romansh",
-            "nativeName" => "rumantsch grischun"
-        ],
-        "rn" => [
-            "name"       => "Kirundi",
-            "nativeName" => "kiRundi"
-        ],
-        "ro" => [
-            "name"       => "Romanian",
-            "nativeName" => "română"
-        ],
-        "ru" => [
-            "name"       => "Russian",
-            "nativeName" => "Русский"
-        ],
-        "sa" => [
-            "name"       => "Sanskrit",
-            "nativeName" => "संस्कृतम्"
-        ],
-        "sc" => [
-            "name"       => "Sardinian",
-            "nativeName" => "sardu"
-        ],
-        "sd" => [
-            "name"       => "Sindhi",
-            "nativeName" => "सिन्धी"
-        ],
-        "se" => [
-            "name"       => "Northern Sami",
-            "nativeName" => "Davvisámegiella"
-        ],
-        "sm" => [
-            "name"       => "Samoan",
-            "nativeName" => "gagana faa Samoa"
-        ],
-        "sg" => [
-            "name"       => "Sango",
-            "nativeName" => "yângâ tî sängö"
-        ],
-        "sr" => [
-            "name"       => "Serbian",
-            "nativeName" => "српски језик"
-        ],
-        "gd" => [
-            "name"       => "Scottish Gaelic",
-            "nativeName" => "Gàidhlig"
-        ],
-        "sn" => [
-            "name"       => "Shona",
-            "nativeName" => "chiShona"
-        ],
-        "si" => [
-            "name"       => "Sinhala",
-            "nativeName" => "සිංහල"
-        ],
-        "sk" => [
-            "name"       => "Slovak",
-            "nativeName" => "slovenčina"
-        ],
-        "sl" => [
-            "name"       => "Slovene",
-            "nativeName" => "slovenščina"
-        ],
-        "so" => [
-            "name"       => "Somali",
-            "nativeName" => "Soomaaliga"
-        ],
-        "st" => [
-            "name"       => "Southern Sotho",
-            "nativeName" => "Sesotho"
-        ],
-        "es" => [
-            "name"       => "Spanish",
-            "nativeName" => "Español"
-        ],
-        "su" => [
-            "name"       => "Sundanese",
-            "nativeName" => "Basa Sunda"
-        ],
-        "sw" => [
-            "name"       => "Swahili",
-            "nativeName" => "Kiswahili"
-        ],
-        "ss" => [
-            "name"       => "Swati",
-            "nativeName" => "SiSwati"
-        ],
-        "sv" => [
-            "name"       => "Swedish",
-            "nativeName" => "svenska"
-        ],
-        "ta" => [
-            "name"       => "Tamil",
-            "nativeName" => "தமிழ்"
-        ],
-        "te" => [
-            "name"       => "Telugu",
-            "nativeName" => "తెలుగు"
-        ],
-        "tg" => [
-            "name"       => "Tajik",
-            "nativeName" => "тоҷикӣ"
-        ],
-        "th" => [
-            "name"       => "Thai",
-            "nativeName" => "ไทย"
-        ],
-        "ti" => [
-            "name"       => "Tigrinya",
-            "nativeName" => "ትግርኛ"
-        ],
-        "bo" => [
-            "name"       => "Tibetan",
-            "nativeName" => "བོད་ཡིག"
-        ],
-        "tk" => [
-            "name"       => "Turkmen",
-            "nativeName" => "Türkmen"
-        ],
-        "tl" => [
-            "name"       => "Tagalog",
-            "nativeName" => "Wikang Tagalog"
-        ],
-        "tn" => [
-            "name"       => "Tswana",
-            "nativeName" => "Setswana"
-        ],
-        "to" => [
-            "name"       => "Tonga",
-            "nativeName" => "faka Tonga"
-        ],
-        "tr" => [
-            "name"       => "Turkish",
-            "nativeName" => "Türkçe"
-        ],
-        "ts" => [
-            "name"       => "Tsonga",
-            "nativeName" => "Xitsonga"
-        ],
-        "tt" => [
-            "name"       => "Tatar",
-            "nativeName" => "татарча"
-        ],
-        "tw" => [
-            "name"       => "Twi",
-            "nativeName" => "Twi"
-        ],
-        "ty" => [
-            "name"       => "Tahitian",
-            "nativeName" => "Reo Tahiti"
-        ],
-        "ug" => [
-            "name"       => "Uighur",
-            "nativeName" => "Uyƣurqə"
-        ],
-        "uk" => [
-            "name"       => "Ukrainian",
-            "nativeName" => "українська"
-        ],
-        "ur" => [
-            "name"       => "Urdu",
-            "nativeName" => "اردو"
-        ],
-        "uz" => [
-            "name"       => "Uzbek",
-            "nativeName" => "zbek"
-        ],
-        "ve" => [
-            "name"       => "Venda",
-            "nativeName" => "Tshivenḓa"
-        ],
-        "vi" => [
-            "name"       => "Vietnamese",
-            "nativeName" => "Tiếng Việt"
-        ],
-        "vo" => [
-            "name"       => "Volapük",
-            "nativeName" => "Volapük"
-        ],
-        "wa" => [
-            "name"       => "Walloon",
-            "nativeName" => "Walon"
-        ],
-        "cy" => [
-            "name"       => "Welsh",
-            "nativeName" => "Cymraeg"
-        ],
-        "wo" => [
-            "name"       => "Wolof",
-            "nativeName" => "Wollof"
-        ],
-        "fy" => [
-            "name"       => "Western Frisian",
-            "nativeName" => "Frysk"
-        ],
-        "xh" => [
-            "name"       => "Xhosa",
-            "nativeName" => "isiXhosa"
-        ],
-        "yi" => [
-            "name"       => "Yiddish",
-            "nativeName" => "ייִדיש"
-        ],
-        "yo" => [
-            "name"       => "Yoruba",
-            "nativeName" => "Yorùbá"
-        ],
-        "za" => [
-            "name"       => "Zhuang",
-            "nativeName" => "Saɯ cueŋƅ"
-        ]
+        'af'         => [ 'name' => 'Afrikaans',                 'nativeName' => 'Afrikaans' ],
+        'ak'         => [ 'name' => 'Akan',                      'nativeName' => 'Akan' ], // unverified native name
+        'ast'        => [ 'name' => 'Asturian',                  'nativeName' => 'Asturianu' ],
+        'ar'         => [ 'name' => 'Arabic',                    'nativeName' => 'عربي' ],
+        'as'         => [ 'name' => 'Assamese',                  'nativeName' => 'অসমীয়া' ],
+        'be'         => [ 'name' => 'Belarusian',                'nativeName' => 'Беларуская' ],
+        'bg'         => [ 'name' => 'Bulgarian',                 'nativeName' => 'Български' ],
+        'bn'         => [ 'name' => 'Bengali',                   'nativeName' => 'বাংলা' ],
+        'bn-BD'      => [ 'name' => 'Bengali (Bangladesh)',      'nativeName' => 'বাংলা (বাংলাদেশ)' ],
+        'bn-IN'      => [ 'name' => 'Bengali (India)',           'nativeName' => 'বাংলা (ভারত)' ],
+        'br'         => [ 'name' => 'Breton',                    'nativeName' => 'Brezhoneg' ],
+        'ca'         => [ 'name' => 'Catalan',                   'nativeName' => 'Català' ],
+        'ca-valencia'=> [ 'name' => 'Catalan (Valencian)',       'nativeName' => 'Català (valencià)' ], // not iso-639-1. a=l10n-drivers
+        'cs'         => [ 'name' => 'Czech',                     'nativeName' => 'Čeština' ],
+        'cy'         => [ 'name' => 'Welsh',                     'nativeName' => 'Cymraeg' ],
+        'da'         => [ 'name' => 'Danish',                    'nativeName' => 'Dansk' ],
+        'de'         => [ 'name' => 'German',                    'nativeName' => 'Deutsch' ],
+        'de-AT'      => [ 'name' => 'German (Austria)',          'nativeName' => 'Deutsch (Österreich)' ],
+        'de-CH'      => [ 'name' => 'German (Switzerland)',      'nativeName' => 'Deutsch (Schweiz)' ],
+        'de-DE'      => [ 'name' => 'German (Germany)',          'nativeName' => 'Deutsch (Deutschland)' ],
+        'dsb'        => [ 'name' => 'Lower Sorbian',             'nativeName' => 'Dolnoserbšćina' ], // iso-639-2
+        'el'         => [ 'name' => 'Greek',                     'nativeName' => 'Ελληνικά' ],
+        'en'         => [ 'name' => 'English',                   'nativeName' => 'English' ],
+        'en-AU'      => [ 'name' => 'English (Australian)',      'nativeName' => 'English (Australian)' ],
+        'en-CA'      => [ 'name' => 'English (Canadian)',        'nativeName' => 'English (Canadian)' ],
+        'en-GB'      => [ 'name' => 'English (British)',         'nativeName' => 'English (British)' ],
+        'en-NZ'      => [ 'name' => 'English (New Zealand)',     'nativeName' => 'English (New Zealand)' ],
+        'en-US'      => [ 'name' => 'English (US)',              'nativeName' => 'English (US)' ],
+        'en-ZA'      => [ 'name' => 'English (South African)',   'nativeName' => 'English (South African)' ],
+        'eo'         => [ 'name' => 'Esperanto',                 'nativeName' => 'Esperanto' ],
+        'es'         => [ 'name' => 'Spanish',                   'nativeName' => 'Español' ],
+        'es-AR'      => [ 'name' => 'Spanish (Argentina)',       'nativeName' => 'Español (de Argentina)' ],
+        'es-CL'      => [ 'name' => 'Spanish (Chile)',           'nativeName' => 'Español (de Chile)' ],
+        'es-ES'      => [ 'name' => 'Spanish (Spain)',           'nativeName' => 'Español (de España)' ],
+        'es-MX'      => [ 'name' => 'Spanish (Mexico)',          'nativeName' => 'Español (de México)' ],
+        'et'         => [ 'name' => 'Estonian',                  'nativeName' => 'Eesti keel' ],
+        'eu'         => [ 'name' => 'Basque',                    'nativeName' => 'Euskara' ],
+        'fa'         => [ 'name' => 'Persian',                   'nativeName' => 'فارسی' ],
+        'fi'         => [ 'name' => 'Finnish',                   'nativeName' => 'Suomi' ],
+        'fj-FJ'      => [ 'name' => 'Fijian',                    'nativeName' => 'Vosa vaka-Viti' ],
+        'fr'         => [ 'name' => 'French',                    'nativeName' => 'Français' ],
+        'fur'        => [ 'name' => 'Friulian',                  'nativeName' => 'Furlan' ],
+        'fur-IT'     => [ 'name' => 'Friulian',                  'nativeName' => 'Furlan' ],
+        'fy'         => [ 'name' => 'Frisian',                   'nativeName' => 'Frysk' ],
+        'fy-NL'      => [ 'name' => 'Frisian',                   'nativeName' => 'Frysk' ],
+        'ga'         => [ 'name' => 'Irish',                     'nativeName' => 'Gaeilge' ],
+        'ga-IE'      => [ 'name' => 'Irish (Ireland)',           'nativeName' => 'Gaeilge (Éire)' ],
+        'gd'         => [ 'name' => 'Gaelic (Scotland)',         'nativeName' => 'Gàidhlig' ],
+        'gl'         => [ 'name' => 'Galician',                  'nativeName' => 'Galego' ],
+        'gu'         => [ 'name' => 'Gujarati',                  'nativeName' => 'ગુજરાતી' ],
+        'gu-IN'      => [ 'name' => 'Gujarati',                  'nativeName' => 'ગુજરાતી' ],
+        'he'         => [ 'name' => 'Hebrew',                    'nativeName' => 'עברית' ],
+        'hi'         => [ 'name' => 'Hindi',                     'nativeName' => 'हिन्दी' ],
+        'hi-IN'      => [ 'name' => 'Hindi (India)',             'nativeName' => 'हिन्दी (भारत)' ],
+        'hr'         => [ 'name' => 'Croatian',                  'nativeName' => 'Hrvatski' ],
+        'hsb'        => [ 'name' => 'Upper Sorbian',             'nativeName' => 'Hornjoserbsce' ],
+        'hu'         => [ 'name' => 'Hungarian',                 'nativeName' => 'Magyar' ],
+        'hy'         => [ 'name' => 'Armenian',                  'nativeName' => 'Հայերեն' ],
+        'hy-AM'      => [ 'name' => 'Armenian',                  'nativeName' => 'Հայերեն' ],
+        'id'         => [ 'name' => 'Indonesian',                'nativeName' => 'Bahasa Indonesia' ],
+        'is'         => [ 'name' => 'Icelandic',                 'nativeName' => 'íslenska' ],
+        'it'         => [ 'name' => 'Italian',                   'nativeName' => 'Italiano' ],
+        'ja'         => [ 'name' => 'Japanese',                  'nativeName' => '日本語' ],
+        'ja-JP'      => [ 'name' => 'Japanese',                  'nativeName' => '日本語' ], // not iso-639-1
+        'ka'         => [ 'name' => 'Georgian',                  'nativeName' => 'ქართული' ],
+        'kk'         => [ 'name' => 'Kazakh',                    'nativeName' => 'Қазақ' ],
+        'kn'         => [ 'name' => 'Kannada',                   'nativeName' => 'ಕನ್ನಡ' ],
+        'ko'         => [ 'name' => 'Korean',                    'nativeName' => '한국어' ],
+        'ku'         => [ 'name' => 'Kurdish',                   'nativeName' => 'Kurdî' ],
+        'la'         => [ 'name' => 'Latin',                     'nativeName' => 'Latina' ],
+        'lb'         => [ 'name' => 'Luxembourgish',             'nativeName' => 'Lëtzebuergesch' ],
+        'lg'         => [ 'name' => 'Luganda',                   'nativeName' => 'Luganda' ],
+        'lt'         => [ 'name' => 'Lithuanian',                'nativeName' => 'Lietuvių kalba' ],
+        'lv'         => [ 'name' => 'Latvian',                   'nativeName' => 'Latviešu' ],
+        'mai'        => [ 'name' => 'Maithili',                  'nativeName' => 'मैथिली মৈথিলী' ],
+        'mg'         => [ 'name' => 'Malagasy',                  'nativeName' => 'Malagasy' ],
+        'mi'         => [ 'name' => 'Maori (Aotearoa)',          'nativeName' => 'Māori (Aotearoa)' ],
+        'mk'         => [ 'name' => 'Macedonian',                'nativeName' => 'Македонски' ],
+        'ml'         => [ 'name' => 'Malayalam',                 'nativeName' => 'മലയാളം' ],
+        'mn'         => [ 'name' => 'Mongolian',                 'nativeName' => 'Монгол' ],
+        'mr'         => [ 'name' => 'Marathi',                   'nativeName' => 'मराठी' ],
+        'no'         => [ 'name' => 'Norwegian',                 'nativeName' => 'Norsk' ],
+        'nb'         => [ 'name' => 'Norwegian',                 'nativeName' => 'Norsk' ],
+        'nb-NO'      => [ 'name' => 'Norwegian (Bokmål)',        'nativeName' => 'Norsk bokmål' ],
+        'ne-NP'      => [ 'name' => 'Nepali',                    'nativeName' => 'नेपाली' ],
+        'nn-NO'      => [ 'name' => 'Norwegian (Nynorsk)',       'nativeName' => 'Norsk nynorsk' ],
+        'nl'         => [ 'name' => 'Dutch',                     'nativeName' => 'Nederlands' ],
+        'nr'         => [ 'name' => 'Ndebele, South',            'nativeName' => 'IsiNdebele' ],
+        'nso'        => [ 'name' => 'Northern Sotho',            'nativeName' => 'Sepedi' ],
+        'oc'         => [ 'name' => 'Occitan (Lengadocian)',     'nativeName' => 'Occitan (lengadocian)' ],
+        'or'         => [ 'name' => 'Oriya',                     'nativeName' => 'ଓଡ଼ିଆ' ],
+        'pa'         => [ 'name' => 'Punjabi',                   'nativeName' => 'ਪੰਜਾਬੀ' ],
+        'pa-IN'      => [ 'name' => 'Punjabi',                   'nativeName' => 'ਪੰਜਾਬੀ' ],
+        'pl'         => [ 'name' => 'Polish',                    'nativeName' => 'Polski' ],
+        'pt'         => [ 'name' => 'Portuguese',                'nativeName' => 'Português' ],
+        'pt-BR'      => [ 'name' => 'Portuguese (Brazilian)',    'nativeName' => 'Português (do Brasil)' ],
+        'pt-PT'      => [ 'name' => 'Portuguese (Portugal)',     'nativeName' => 'Português (Europeu)' ],
+        'ro'         => [ 'name' => 'Romanian',                  'nativeName' => 'Română' ],
+        'rm'         => [ 'name' => 'Romansh',                   'nativeName' => 'Rumantsch' ],
+        'ru'         => [ 'name' => 'Russian',                   'nativeName' => 'Русский' ],
+        'rw'         => [ 'name' => 'Kinyarwanda',               'nativeName' => 'Ikinyarwanda' ],
+        'si'         => [ 'name' => 'Sinhala',                   'nativeName' => 'සිංහල' ],
+        'sk'         => [ 'name' => 'Slovak',                    'nativeName' => 'Slovenčina' ],
+        'sl'         => [ 'name' => 'Slovenian',                 'nativeName' => 'Slovensko' ],
+        'son'        => [ 'name' => 'Songhai',                   'nativeName' => 'Soŋay' ],
+        'sq'         => [ 'name' => 'Albanian',                  'nativeName' => 'Shqip' ],
+        'sr'         => [ 'name' => 'Serbian',                   'nativeName' => 'Српски' ],
+        'sr-Latn'    => [ 'name' => 'Serbian',                   'nativeName' => 'Srpski' ], // follows RFC 4646
+        'ss'         => [ 'name' => 'Siswati',                   'nativeName' => 'siSwati' ],
+        'st'         => [ 'name' => 'Southern Sotho',            'nativeName' => 'Sesotho' ],
+        'sv'         => [ 'name' => 'Swedish',                   'nativeName' => 'Svenska' ],
+        'sv-SE'      => [ 'name' => 'Swedish',                   'nativeName' => 'Svenska' ],
+        'ta'         => [ 'name' => 'Tamil',                     'nativeName' => 'தமிழ்' ],
+        'ta-IN'      => [ 'name' => 'Tamil (India)',             'nativeName' => 'தமிழ் (இந்தியா)' ],
+        'ta-LK'      => [ 'name' => 'Tamil (Sri Lanka)',         'nativeName' => 'தமிழ் (இலங்கை)' ],
+        'te'         => [ 'name' => 'Telugu',                    'nativeName' => 'తెలుగు' ],
+        'th'         => [ 'name' => 'Thai',                      'nativeName' => 'ไทย' ],
+        'tlh'        => [ 'name' => 'Klingon',                   'nativeName' => 'Klingon' ],
+        'tn'         => [ 'name' => 'Tswana',                    'nativeName' => 'Setswana' ],
+        'tr'         => [ 'name' => 'Turkish',                   'nativeName' => 'Türkçe' ],
+        'ts'         => [ 'name' => 'Tsonga',                    'nativeName' => 'Xitsonga' ],
+        'tt'         => [ 'name' => 'Tatar',                     'nativeName' => 'Tatarça' ],
+        'tt-RU'      => [ 'name' => 'Tatar',                     'nativeName' => 'Tatarça' ],
+        'uk'         => [ 'name' => 'Ukrainian',                 'nativeName' => 'Українська' ],
+        'ur'         => [ 'name' => 'Urdu',                      'nativeName' => 'اُردو' ],
+        've'         => [ 'name' => 'Venda',                     'nativeName' => 'Tshivenḓa' ],
+        'vi'         => [ 'name' => 'Vietnamese',                'nativeName' => 'Tiếng Việt' ],
+        'wo'         => [ 'name' => 'Wolof',                     'nativeName' => 'Wolof' ],
+        'xh'         => [ 'name' => 'Xhosa',                     'nativeName' => 'isiXhosa' ],
+        'zh'         => [ 'name' => 'Chinese (Simplified)',      'nativeName' => '中文 (简体)' ],
+        'zh-CN'      => [ 'name' => 'Chinese (Simplified)',      'nativeName' => '中文 (简体)' ],
+        'zh-TW'      => [ 'name' => 'Chinese (Traditional)',     'nativeName' => '正體中文 (繁體)' ],
+        'zu'         => [ 'name' => 'Zulu',                      'nativeName' => 'isiZulu' ]
     ];
 
     public static function getName($code)
@@ -744,10 +153,15 @@ public static function getName($code)
 
     public static function getNativeName($code)
     {
-        if (strlen($code) == 2) {
+        if (isset(static::$codes[$code])) {
             return static::get($code, 'nativeName');
         } else {
-            return static::get(substr($code, 0, 2), 'nativeName') . ' (' . substr($code, -2) . ')';
+            if (preg_match('/[a-zA-Z]{2}-[a-zA-Z]{2}/', $code)) {
+                return static::get(substr($code, 0, 2), 'nativeName') . ' (' . substr($code, -2) . ')';
+            } else {
+                return $code;
+            }
+
         }
     }
 
diff --git a/system/src/Grav/Common/Markdown/Parsedown.php b/system/src/Grav/Common/Markdown/Parsedown.php
index 95ead42d21..764298d704 100644
--- a/system/src/Grav/Common/Markdown/Parsedown.php
+++ b/system/src/Grav/Common/Markdown/Parsedown.php
@@ -1,10 +1,13 @@
 <?php
-namespace Grav\Common\Markdown;
-
 /**
- * Class Parsedown
- * @package Grav\Common\Markdown
+ * @package    Grav.Common.Markdown
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Markdown;
+
 class Parsedown extends \Parsedown
 {
     use ParsedownGravTrait;
diff --git a/system/src/Grav/Common/Markdown/ParsedownExtra.php b/system/src/Grav/Common/Markdown/ParsedownExtra.php
index 515d1dc9c3..b53f559101 100644
--- a/system/src/Grav/Common/Markdown/ParsedownExtra.php
+++ b/system/src/Grav/Common/Markdown/ParsedownExtra.php
@@ -1,10 +1,13 @@
 <?php
-namespace Grav\Common\Markdown;
-
 /**
- * Class ParsedownExtra
- * @package Grav\Common\Markdown
+ * @package    Grav.Common.Markdown
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Markdown;
+
 class ParsedownExtra extends \ParsedownExtra
 {
     use ParsedownGravTrait;
diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 2c061046e1..d0eae55e23 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -1,19 +1,20 @@
 <?php
+/**
+ * @package    Grav.Common.Markdown
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Markdown;
 
-use Grav\Common\GravTrait;
-use Grav\Common\Page\Page;
-use Grav\Common\Page\Pages;
+use Grav\Common\Grav;
 use Grav\Common\Uri;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\Event\Event;
 
-/**
- * A trait to add some custom processing to the identifyLink() method in Parsedown and ParsedownExtra
- */
 trait ParsedownGravTrait
 {
-    use GravTrait;
-
     /** @var Page $page */
     protected $page;
 
@@ -26,7 +27,6 @@ trait ParsedownGravTrait
     protected $pages_dir;
     protected $special_chars;
     protected $twig_link_regex = '/\!*\[(?:.*)\]\((\{([\{%#])\s*(.*?)\s*(?:\2|\})\})\)/';
-    protected $special_protocols = ['xmpp', 'mailto', 'tel', 'sms'];
 
     public $completable_blocks = [];
     public $continuable_blocks = [];
@@ -39,17 +39,17 @@ trait ParsedownGravTrait
      */
     protected function init($page, $defaults)
     {
-        $grav = self::getGrav();
+        $grav = Grav::instance();
 
         $this->page = $page;
         $this->pages = $grav['pages'];
         $this->uri = $grav['uri'];
         $this->BlockTypes['{'] [] = "TwigTag";
-        $this->pages_dir = self::getGrav()['locator']->findResource('page://');
+        $this->pages_dir = Grav::instance()['locator']->findResource('page://');
         $this->special_chars = ['>' => 'gt', '<' => 'lt', '"' => 'quot'];
 
         if ($defaults === null) {
-            $defaults = self::getGrav()['config']->get('system.pages.markdown');
+            $defaults = Grav::instance()['config']->get('system.pages.markdown');
         }
 
         $this->setBreaksEnabled($defaults['auto_line_breaks']);
@@ -67,9 +67,13 @@ protected function init($page, $defaults)
      * @param $type
      * @param $tag
      */
-    public function addBlockType($type, $tag, $continuable = false, $completable = false)
+    public function addBlockType($type, $tag, $continuable = false, $completable = false, $index = null)
     {
-        $this->BlockTypes[$type] [] = $tag;
+        if (!isset($index)) {
+            $this->BlockTypes[$type] [] = $tag;
+        } else {
+            array_splice($this->BlockTypes[$type], $index, 0, $tag);
+        }
 
         if ($continuable) {
             $this->continuable_blocks[] = $tag;
@@ -86,10 +90,17 @@ public function addBlockType($type, $tag, $continuable = false, $completable = f
      * @param $type
      * @param $tag
      */
-    public function addInlineType($type, $tag)
+    public function addInlineType($type, $tag, $index = null)
     {
-        $this->InlineTypes[$type] [] = $tag;
-        $this->inlineMarkerList .= $type;
+        if (!isset($index)) {
+            $this->InlineTypes[$type] [] = $tag;
+        } else {
+            array_splice($this->InlineTypes[$type], $index, 0, $tag);
+        }
+
+        if (strpos($this->inlineMarkerList, $type) === false) {
+            $this->inlineMarkerList .= $type;
+        }
     }
 
     /**
@@ -217,7 +228,7 @@ protected function inlineImage($excerpt)
                     $media = $this->page->media();
                 } else {
                     // see if this is an external page to this one
-                    $base_url = rtrim(self::getGrav()['base_url_relative'] . self::getGrav()['pages']->base(), '/');
+                    $base_url = rtrim(Grav::instance()['base_url_relative'] . Grav::instance()['pages']->base(), '/');
                     $page_route = '/' . ltrim(str_replace($base_url, '', $path_parts['dirname']), '/');
 
                     $ext_page = $this->pages->dispatch($page_route, true);
@@ -233,6 +244,7 @@ protected function inlineImage($excerpt)
 
                     // if there is a query, then parse it and build action calls
                     if (isset($url['query'])) {
+                        $url['query'] = htmlspecialchars_decode(urldecode($url['query']));
                         $actions = array_reduce(explode('&', $url['query']), function ($carry, $item) {
                             $parts = explode('=', $item, 2);
                             $value = isset($parts[1]) ? $parts[1] : null;
@@ -292,7 +304,7 @@ protected function inlineLink($excerpt)
             if (isset($url['query'])) {
                 $actions = array_reduce(explode('&', $url['query']), function ($carry, $item) {
                     $parts = explode('=', $item, 2);
-                    $value = isset($parts[1]) ? $parts[1] : true;
+                    $value = isset($parts[1]) ? rawurldecode($parts[1]) : true;
                     $carry[$parts[0]] = $value;
 
                     return $carry;
@@ -334,7 +346,7 @@ protected function inlineLink($excerpt)
             }
 
             // if special scheme, just return
-            if(isset($url['scheme']) && in_array($url['scheme'], $this->special_protocols)) {
+            if(isset($url['scheme']) && !Utils::startsWith($url['scheme'], 'http')) {
                 return $excerpt;
             }
 
diff --git a/system/src/Grav/Common/Page/Collection.php b/system/src/Grav/Common/Page/Collection.php
index 861f55b748..cdb52492ac 100644
--- a/system/src/Grav/Common/Page/Collection.php
+++ b/system/src/Grav/Common/Page/Collection.php
@@ -1,16 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page;
 
 use Grav\Common\Grav;
 use Grav\Common\Iterator;
 use Grav\Common\Utils;
 
-/**
- * Collection of Pages.
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Collection extends Iterator
 {
     /**
@@ -247,7 +248,7 @@ public function adjacentSibling($path, $direction = 1)
      *
      * @param  string $path the path the item
      *
-     * @return Page    Item in the array the the current position.
+     * @return Integer   the index of the current page.
      */
     public function currentPosition($path)
     {
@@ -270,22 +271,21 @@ public function currentPosition($path)
     public function dateRange($startDate, $endDate = false, $field = false)
     {
         $start = Utils::date2timestamp($startDate);
-        $end = $endDate ? Utils::date2timestamp($endDate) : strtotime("now +1000 years");
+        $end = $endDate ? Utils::date2timestamp($endDate) : false;
 
         $date_range = [];
-
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
             if ($page !== null) {
                 $date = $field ? strtotime($page->value($field)) : $page->date();
 
-                if ($date > $start && $date < $end) {
+                if ($date >= $start && (!$end || $date <= $end)) {
                     $date_range[$path] = $slug;
                 }
             }
         }
-        $this->items = $date_range;
 
+        $this->items = $date_range;
         return $this;
     }
 
diff --git a/system/src/Grav/Common/Page/Header.php b/system/src/Grav/Common/Page/Header.php
index ad59c26d35..cbba4af0fd 100644
--- a/system/src/Grav/Common/Page/Header.php
+++ b/system/src/Grav/Common/Page/Header.php
@@ -1,14 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common\Page;
 
 use RocketTheme\Toolbox\ArrayTraits\Constructor;
 use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccess;
 
-/**
- * Class Header
- * @package Grav\Common\Page
- */
 class Header implements \ArrayAccess
 {
     use NestedArrayAccess, Constructor;
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index dd1a381107..c8385ea155 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -1,22 +1,19 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page;
 
 use Grav\Common\Getters;
-use Grav\Common\GravTrait;
 use Grav\Common\Page\Medium\Medium;
 use Grav\Common\Page\Medium\MediumFactory;
 
-/**
- * Media is a holder object that contains references to the media of page. This object is created and
- * populated during the getMedia() method in the Pages object
- *
- * @author RocketTheme
- * @license MIT
- */
 class Media extends Getters
 {
-    use GravTrait;
-
     protected $gettersVariable = 'instances';
     protected $path;
 
@@ -89,7 +86,7 @@ public function __construct($path)
                 $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1)['file'];
             }
 
-            if (!$medium) {
+            if (empty($medium)) {
                 continue;
             }
 
diff --git a/system/src/Grav/Common/Page/Medium/AudioMedium.php b/system/src/Grav/Common/Page/Medium/AudioMedium.php
index 952b06125c..111866b999 100644
--- a/system/src/Grav/Common/Page/Medium/AudioMedium.php
+++ b/system/src/Grav/Common/Page/Medium/AudioMedium.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 class AudioMedium extends Medium
diff --git a/system/src/Grav/Common/Page/Medium/ImageFile.php b/system/src/Grav/Common/Page/Medium/ImageFile.php
index c71cd0efd1..ebbcf7e122 100644
--- a/system/src/Grav/Common/Page/Medium/ImageFile.php
+++ b/system/src/Grav/Common/Page/Medium/ImageFile.php
@@ -1,15 +1,20 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Gregwar\Image\Exceptions\GenerationError;
-use RocketTheme\Toolbox\Event\Event;
 use Gregwar\Image\Image;
+use RocketTheme\Toolbox\Event\Event;
 
 class ImageFile extends Image
 {
-    use GravTrait;
-
     /**
      * Clear previously applied operations
      */
@@ -75,12 +80,12 @@ public function cacheFile($type = 'jpg', $quality = 80, $actual = false)
                 throw new GenerationError($result);
             }
 
-            self::getGrav()->fireEvent('onImageMediumSaved', new Event(['image' => $target]));
+            Grav::instance()->fireEvent('onImageMediumSaved', new Event(['image' => $target]));
         };
 
         // Asking the cache for the cacheFile
         try {
-            $perms = self::getGrav()['config']->get('system.images.cache_perms', '0755');
+            $perms = Grav::instance()['config']->get('system.images.cache_perms', '0755');
             $perms = octdec($perms);
             $file = $this->cache->setDirectoryMode($perms)->getOrCreateFile($cacheFile, $conditions, $generate, $actual);
         } catch (GenerationError $e) {
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index 4766908122..57d949382c 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -1,8 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
-use Grav\Common\Utils;
 use Grav\Common\Data\Blueprint;
+use Grav\Common\Grav;
+use Grav\Common\Utils;
 
 class ImageMedium extends Medium
 {
@@ -77,7 +85,11 @@ public function __construct($items = [], Blueprint $blueprint = null)
     {
         parent::__construct($items, $blueprint);
 
-        $config = self::$grav['config'];
+        $config = Grav::instance()['config'];
+
+        if (filesize($this->get('filepath')) === 0) {
+            return;
+        }
 
         $image_info = getimagesize($this->get('filepath'));
         $this->def('width', $image_info[0]);
@@ -112,6 +124,14 @@ public function addMetaFile($filepath)
         return $this;
     }
 
+    /**
+     * Clear out the alternatives
+     */
+    public function clearAlternatives()
+    {
+        $this->alternatives = [];
+    }
+
     /**
      * Return PATH to image.
      *
@@ -137,8 +157,8 @@ public function path($reset = true)
      */
     public function url($reset = true)
     {
-        $image_path = self::$grav['locator']->findResource('cache://images', true);
-        $image_dir = self::$grav['locator']->findResource('cache://images', false);
+        $image_path = Grav::instance()['locator']->findResource('cache://images', true);
+        $image_dir = Grav::instance()['locator']->findResource('cache://images', false);
         $saved_image_path = $this->saveImage();
 
         $output = preg_replace('|^' . preg_quote(GRAV_ROOT) . '|', '', $saved_image_path);
@@ -151,7 +171,7 @@ public function url($reset = true)
             $this->reset();
         }
 
-        return self::$grav['base_url'] . $output . $this->querystring() . $this->urlHash();
+        return Grav::instance()['base_url'] . $output . $this->querystring() . $this->urlHash();
     }
 
     /**
@@ -273,6 +293,7 @@ public function reset()
             $this->image->clearOperations(); // Clear previously applied operations
             $this->querystring('');
             $this->filter();
+            $this->clearAlternatives();
         }
 
         $this->format = 'guess';
@@ -470,7 +491,7 @@ public function __call($method, $args)
      */
     protected function image()
     {
-        $locator = self::$grav['locator'];
+        $locator = Grav::instance()['locator'];
 
         $file = $this->get('filepath');
         $cacheDir = $locator->findResource('cache://images', true);
@@ -506,7 +527,7 @@ protected function saveImage()
                 $ratio = 1;
             }
 
-            $locator = self::$grav['locator'];
+            $locator = Grav::instance()['locator'];
             $overlay = $locator->findResource("system://assets/responsive-overlays/{$ratio}x.png") ?: $locator->findResource('system://assets/responsive-overlays/unknown.png');
             $this->image->merge(ImageFile::open($overlay));
         }
diff --git a/system/src/Grav/Common/Page/Medium/Link.php b/system/src/Grav/Common/Page/Medium/Link.php
index a92ec228e0..1b76635672 100644
--- a/system/src/Grav/Common/Page/Medium/Link.php
+++ b/system/src/Grav/Common/Page/Medium/Link.php
@@ -1,11 +1,15 @@
 <?php
-namespace Grav\Common\Page\Medium;
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
-use Grav\Common\GravTrait;
+namespace Grav\Common\Page\Medium;
 
 class Link implements RenderableInterface
 {
-    use GravTrait;
     use ParsedownHtmlTrait;
 
     /**
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index 33e734e206..029583832c 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -1,21 +1,20 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Grav\Common\Data\Data;
 use Grav\Common\Data\Blueprint;
 
-/**
- * The Medium is a general class for multimedia objects in Grav pages, specific implementations will derive from
- *
- * @author Grav
- * @license MIT
- *
- */
 class Medium extends Data implements RenderableInterface
 {
-    use GravTrait;
     use ParsedownHtmlTrait;
 
     /**
@@ -60,8 +59,8 @@ public function __construct($items = [], Blueprint $blueprint = null)
     {
         parent::__construct($items, $blueprint);
 
-        if (self::getGrav()['config']->get('system.media.enable_media_timestamp', true)) {
-            $this->querystring('&' . self::getGrav()['cache']->getKey());
+        if (Grav::instance()['config']->get('system.media.enable_media_timestamp', true)) {
+            $this->querystring('&' . Grav::instance()['cache']->getKey());
         }
 
         $this->def('mime', 'application/octet-stream');
@@ -143,7 +142,7 @@ public function url($reset = true)
             $this->reset();
         }
 
-        return self::$grav['base_url'] . $output . $this->querystring() . $this->urlHash();
+        return Grav::instance()['base_url'] . $output . $this->querystring() . $this->urlHash();
     }
 
     /**
diff --git a/system/src/Grav/Common/Page/Medium/MediumFactory.php b/system/src/Grav/Common/Page/Medium/MediumFactory.php
index aa88db73cf..c94a549e14 100644
--- a/system/src/Grav/Common/Page/Medium/MediumFactory.php
+++ b/system/src/Grav/Common/Page/Medium/MediumFactory.php
@@ -1,21 +1,18 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Grav\Common\Data\Blueprint;
 
-/**
- * MediumFactory can be used to more easily create various Medium objects from files or arrays, it should
- * contain most logic for instantiating a Medium object.
- *
- * @author Grav
- * @license MIT
- *
- */
 class MediumFactory
 {
-    use GravTrait;
-
     /**
      * Create Medium from a file
      *
@@ -35,9 +32,9 @@ public static function fromFile($file, array $params = [])
         $ext = array_pop($parts);
         $basename = implode('.', $parts);
 
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
 
-        $media_params = $config->get("media.".strtolower($ext));
+        $media_params = $config->get("media.types.".strtolower($ext));
         if (!$media_params) {
             return null;
         }
@@ -45,7 +42,7 @@ public static function fromFile($file, array $params = [])
         $params += $media_params;
 
         // Add default settings for undefined variables.
-        $params += $config->get('media.defaults');
+        $params += $config->get('media.types.defaults');
         $params += [
             'type' => 'file',
             'thumb' => 'media/thumb.png',
@@ -59,14 +56,11 @@ public static function fromFile($file, array $params = [])
             'thumbnails' => []
         ];
 
-        $locator = self::getGrav()['locator'];
+        $locator = Grav::instance()['locator'];
 
-        $lookup = $locator->findResources('image://');
-        foreach ($lookup as $lookupPath) {
-            if (is_file($lookupPath . '/' . $params['thumb'])) {
-                $params['thumbnails']['default'] = $lookupPath . '/' . $params['thumb'];
-                break;
-            }
+        $file = $locator->findResource("image://{$params['thumb']}");
+        if ($file) {
+            $params['thumbnails']['default'] = $file;
         }
 
         return static::fromArray($params);
diff --git a/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php b/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
index 7052dea821..1337daa265 100644
--- a/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
+++ b/system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 use Grav\Common\Markdown\Parsedown;
diff --git a/system/src/Grav/Common/Page/Medium/RenderableInterface.php b/system/src/Grav/Common/Page/Medium/RenderableInterface.php
index f1ebf0dfc5..522abe13a8 100644
--- a/system/src/Grav/Common/Page/Medium/RenderableInterface.php
+++ b/system/src/Grav/Common/Page/Medium/RenderableInterface.php
@@ -1,13 +1,13 @@
 <?php
-namespace Grav\Common\Page\Medium;
-
 /**
- * Renderable Medium objects can be rendered to HTML markup and Parsedown objects
- *
- * @author Grav
- * @license MIT
+ * @package    Grav.Common.Page
  *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Page\Medium;
+
 interface RenderableInterface
 {
     /**
diff --git a/system/src/Grav/Common/Page/Medium/StaticImageMedium.php b/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
index e26cfae1c1..8e540b0537 100644
--- a/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/StaticImageMedium.php
@@ -1,13 +1,13 @@
 <?php
-namespace Grav\Common\Page\Medium;
-
 /**
- * The Image medium holds information related to an individual image. These are then stored in the Media object.
- *
- * @author Grav
- * @license MIT
+ * @package    Grav.Common.Page
  *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Page\Medium;
+
 class StaticImageMedium extends Medium
 {
     use StaticResizeTrait;
diff --git a/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php b/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
index df42dcf148..38bfa37a9d 100644
--- a/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
+++ b/system/src/Grav/Common/Page/Medium/StaticResizeTrait.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 trait StaticResizeTrait
diff --git a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
index da635223db..3296fc757f 100644
--- a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 class ThumbnailImageMedium extends ImageMedium
diff --git a/system/src/Grav/Common/Page/Medium/VideoMedium.php b/system/src/Grav/Common/Page/Medium/VideoMedium.php
index 754777e47a..51690da0f9 100644
--- a/system/src/Grav/Common/Page/Medium/VideoMedium.php
+++ b/system/src/Grav/Common/Page/Medium/VideoMedium.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page\Medium;
 
 class VideoMedium extends Medium
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index b9b6db7b89..b3679bbdb0 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1,20 +1,25 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page;
 
 use Exception;
-use Grav\Common\Filesystem\Folder;
-use Grav\Common\Config\Config;
-use Grav\Common\GravTrait;
-use Grav\Common\Language\Language;
-use Grav\Common\Utils;
 use Grav\Common\Cache;
-use Grav\Common\Twig;
-use Grav\Common\Uri;
+use Grav\Common\Config\Config;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Filesystem\Folder;
 use Grav\Common\Grav;
-use Grav\Common\Taxonomy;
+use Grav\Common\Language\Language;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
-use Grav\Common\Data\Blueprint;
+use Grav\Common\Taxonomy;
+use Grav\Common\Uri;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\MarkdownFile;
 use Symfony\Component\Yaml\Exception\ParseException;
@@ -22,19 +27,8 @@
 
 define('PAGE_ORDER_PREFIX_REGEX', '/^[0-9]+\./u');
 
-/**
- * The Page object, or "Page" object is the main powerhouse of Grav.  It contains all the information
- * related to the nested pages structure that represents the content. Each page has several attributes that
- * can be retrieved via public functions. Also each page can potentially contain an array of sub-pages.
- * Recursively traversing the page structure allows Grav to create navigation systems.
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Page
 {
-    use GravTrait;
-
     /**
      * @var string Filename. Leave as null if page is folder.
      */
@@ -75,6 +69,7 @@ class Page
     protected $max_count;
     protected $menu;
     protected $date;
+    protected $dateformat;
     protected $taxonomy;
     protected $order_by;
     protected $order_dir;
@@ -102,19 +97,15 @@ class Page
 
     /**
      * Page Object Constructor
-     *
-     * @return $this
      */
     public function __construct()
     {
         /** @var Config $config */
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
 
         $this->taxonomy = [];
         $this->process = $config->get('system.pages.process');
         $this->published = true;
-
-        return $this;
     }
 
     /**
@@ -127,7 +118,7 @@ public function __construct()
      */
     public function init(\SplFileInfo $file, $extension = null)
     {
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
 
         $this->hide_home_route = $config->get('system.home.hide_in_urls', false);
         $this->home_route = $config->get('system.home.alias');
@@ -159,6 +150,23 @@ public function init(\SplFileInfo $file, $extension = null)
         return $this;
     }
 
+    protected function processFrontmatter()
+    {
+        // Quick check for twig output tags in frontmatter if enabled
+        if (Utils::contains($this->frontmatter, '{{')) {
+            $process_fields = $this->file()->header();
+            $ignored_fields = [];
+            foreach ((array)Grav::instance()['config']->get('system.pages.frontmatter.ignore_fields') as $field) {
+                if (isset($process_fields[$field])) {
+                    $ignored_fields[$field] = $process_fields[$field];
+                    unset($process_fields[$field]);
+                }
+            }
+            $text_header = Grav::instance()['twig']->processString(json_encode($process_fields), ['page'=>$this]);
+            $this->header((object) (json_decode($text_header, true) + $ignored_fields));
+        }
+    }
+
     /**
      * Return an array with the routes of other translated languages
      * @return array the page translated languages
@@ -166,7 +174,7 @@ public function init(\SplFileInfo $file, $extension = null)
     public function translatedLanguages()
     {
         $filename = substr($this->name, 0, -(strlen($this->extension())));
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
         $languages = $config->get('system.languages.supported', []);
         $translatedLanguages = [];
 
@@ -195,7 +203,7 @@ public function translatedLanguages()
     public function untranslatedLanguages()
     {
         $filename = substr($this->name, 0, -(strlen($this->extension())));
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
         $languages = $config->get('system.languages.supported', []);
         $untranslatedLanguages = [];
 
@@ -296,8 +304,22 @@ public function header($var = null)
                     $this->raw_content = $file->markdown();
                     $this->frontmatter = $file->frontmatter();
                     $this->header = (object)$file->header();
+
+                    if (!Utils::isAdminPlugin()) {
+                        // Process frontmatter with Twig if enabled
+                        if (Grav::instance()['config']->get('system.pages.frontmatter.process_twig') === true) {
+                            $this->processFrontmatter();
+                        }
+                        // If there's a `frontmatter.yaml` file merge that in with the page header
+                        // note page's own frontmatter has precedence and will overwrite any defaults
+                        $frontmatter_file = $this->path . '/' . $this->folder . '/frontmatter.yaml';
+                        if (file_exists($frontmatter_file)) {
+                            $frontmatter_data = (array)Yaml::parse(file_get_contents($frontmatter_file));
+                            $this->header = (object)array_replace_recursive($frontmatter_data, (array)$this->header);
+                        }
+                    }
                 } catch (ParseException $e) {
-                    $file->raw(self::getGrav()['language']->translate([
+                    $file->raw(Grav::instance()['language']->translate([
                         'FRONTMATTER_ERROR_PAGE',
                         $this->slug(),
                         $file->filename(),
@@ -310,11 +332,13 @@ public function header($var = null)
                 }
                 $var = true;
             }
+
+
         }
 
         if ($var) {
             if (isset($this->header->slug)) {
-                $this->slug = trim($this->header->slug);
+                $this->slug(($this->header->slug));
             }
             if (isset($this->header->routes)) {
                 $this->routes = (array)($this->header->routes);
@@ -349,6 +373,9 @@ public function header($var = null)
             if (isset($this->header->order_manual)) {
                 $this->order_manual = (array)$this->header->order_manual;
             }
+            if (isset($this->header->dateformat)) {
+                $this->dateformat($this->header->dateformat);
+            }
             if (isset($this->header->date)) {
                 $this->date($this->header->date);
             }
@@ -430,7 +457,7 @@ public function modifyHeader($key, $value)
      */
     public function summary($size = null)
     {
-        $config = (array)self::getGrav()['config']->get('site.summary');
+        $config = (array)Grav::instance()['config']->get('site.summary');
         if (isset($this->header->summary)) {
             $config = array_merge($config, $this->header->summary);
         }
@@ -471,7 +498,7 @@ public function summary($size = null)
             $size = 300;
         }
 
-        return Utils::truncateHTML($content, $size);
+        return html_entity_decode(Utils::truncateHTML($content, $size));
     }
 
     /**
@@ -512,11 +539,11 @@ public function content($var = null)
             $this->media();
 
             /** @var Config $config */
-            $config = self::getGrav()['config'];
+            $config = Grav::instance()['config'];
 
             // Load cached content
             /** @var Cache $cache */
-            $cache = self::getGrav()['cache'];
+            $cache = Grav::instance()['cache'];
             $cache_id = md5('page' . $this->id());
             $content_obj = $cache->fetch($cache_id);
 
@@ -539,7 +566,7 @@ public function content($var = null)
             // if no cached-content run everything
             if ($this->content === false || $cache_enable === false) {
                 $this->content = $this->raw_content;
-                self::getGrav()->fireEvent('onPageContentRaw', new Event(['page' => $this]));
+                Grav::instance()->fireEvent('onPageContentRaw', new Event(['page' => $this]));
 
                 if ($twig_first) {
                     if ($process_twig) {
@@ -550,7 +577,7 @@ public function content($var = null)
                     }
 
                     // Content Processed but not cached yet
-                    self::getGrav()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
+                    Grav::instance()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
 
                 } else {
                     if ($process_markdown) {
@@ -558,7 +585,7 @@ public function content($var = null)
                     }
 
                     // Content Processed but not cached yet
-                    self::getGrav()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
+                    Grav::instance()->fireEvent('onPageContentProcessed', new Event(['page' => $this]));
 
                     if ($process_twig) {
                         $this->processTwig();
@@ -610,10 +637,19 @@ public function addContentMeta($name, $value)
     /**
      * Return the whole contentMeta array as it currently stands
      *
+     * @param null $name
      * @return mixed
      */
-    public function getContentMeta()
+    public function getContentMeta($name = null)
     {
+        if ($name) {
+            if(isset($this->content_meta[$name])) {
+                return $this->content_meta[$name];
+            } else {
+                return null;
+            }
+
+        }
         return $this->content_meta;
     }
 
@@ -634,7 +670,7 @@ public function setContentMeta($content_meta)
     protected function processMarkdown()
     {
         /** @var Config $config */
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
 
         $defaults = (array)$config->get('system.pages.markdown');
         if (isset($this->header()->markdown)) {
@@ -662,16 +698,16 @@ protected function processMarkdown()
      */
     private function processTwig()
     {
-        $twig = self::getGrav()['twig'];
+        $twig = Grav::instance()['twig'];
         $this->content = $twig->processPage($this, $this->content);
     }
 
     /**
      * Fires the onPageContentProcessed event, and caches the page content using a unique ID for the page
      */
-    private function cachePageContent()
+    public function cachePageContent()
     {
-        $cache = self::getGrav()['cache'];
+        $cache = Grav::instance()['cache'];
         $cache_id = md5('page' . $this->id());
         $cache->save($cache_id, ['content' => $this->content, 'content_meta' => $this->content_meta]);
     }
@@ -851,7 +887,7 @@ public function move(Page $parent)
         if ($parent->route()) {
             $this->route($parent->route() . '/' . $this->slug());
         } else {
-            $this->route(self::getGrav()['pages']->root()->route() . '/' . $this->slug());
+            $this->route(Grav::instance()['pages']->root()->route() . '/' . $this->slug());
         }
 
         return $this;
@@ -882,12 +918,14 @@ public function copy($parent)
      */
     public function blueprints()
     {
+        $grav = Grav::instance();
+
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = $grav['pages'];
 
         $blueprint = $pages->blueprints($this->blueprintName());
         $fields = $blueprint->fields();
-        $edit_mode = isset(self::getGrav()['admin']) ? self::getGrav()['config']->get('plugins.admin.edit_mode') : null;
+        $edit_mode = isset($grav['admin']) ? $grav['config']->get('plugins.admin.edit_mode') : null;
 
         // override if you only want 'normal' mode
         if (empty($fields) && ($edit_mode == 'auto' || $edit_mode == 'normal')) {
@@ -992,7 +1030,7 @@ public function toJson()
     public function media($var = null)
     {
         /** @var Cache $cache */
-        $cache = self::getGrav()['cache'];
+        $cache = Grav::instance()['cache'];
 
         if ($var) {
             $this->media = $var;
@@ -1089,7 +1127,7 @@ public function urlExtension()
 
         // if not set in the page get the value from system config
         if (empty($this->url_extension)) {
-            $this->url_extension = trim(isset($this->header->append_url_extension) ? $this->header->append_url_extension : self::getGrav()['config']->get('system.pages.append_url_extension', false));
+            $this->url_extension = trim(isset($this->header->append_url_extension) ? $this->header->append_url_extension : Grav::instance()['config']->get('system.pages.append_url_extension', false));
         }
 
         return $this->url_extension;
@@ -1108,7 +1146,7 @@ public function expires($var = null)
             $this->expires = $var;
         }
 
-        return empty($this->expires) ? self::getGrav()['config']->get('system.pages.expires') : $this->expires;
+        return empty($this->expires) ? Grav::instance()['config']->get('system.pages.expires') : $this->expires;
     }
 
     /**
@@ -1208,7 +1246,7 @@ public function published($var = null)
     public function publishDate($var = null)
     {
         if ($var !== null) {
-            $this->publish_date = Utils::date2timestamp($var);
+            $this->publish_date = Utils::date2timestamp($var, $this->dateformat);
         }
 
         return $this->publish_date;
@@ -1224,7 +1262,7 @@ public function publishDate($var = null)
     public function unpublishDate($var = null)
     {
         if ($var !== null) {
-            $this->unpublish_date = Utils::date2timestamp($var);
+            $this->unpublish_date = Utils::date2timestamp($var, $this->dateformat);
         }
 
         return $this->unpublish_date;
@@ -1290,7 +1328,7 @@ public function metadata($var = null)
 
         // if not metadata yet, process it.
         if (null === $this->metadata) {
-            $header_tag_http_equivs = ['content-type', 'default-style', 'refresh'];
+            $header_tag_http_equivs = ['content-type', 'default-style', 'refresh', 'x-ua-compatible'];
 
             $this->metadata = [];
 
@@ -1299,7 +1337,7 @@ public function metadata($var = null)
             $metadata['generator'] = 'GravCMS';
 
             // Get initial metadata for the page
-            $metadata = array_merge($metadata, self::getGrav()['config']->get('site.metadata'));
+            $metadata = array_merge($metadata, Grav::instance()['config']->get('site.metadata'));
 
             if (isset($this->header->metadata)) {
                 // Merge any site.metadata settings in with page metadata
@@ -1313,18 +1351,20 @@ public function metadata($var = null)
                 if (is_array($value)) {
                     foreach ($value as $property => $prop_value) {
                         $prop_key                  = $key . ":" . $property;
-                        $this->metadata[$prop_key] = ['name' => $prop_key, 'property' => $prop_key, 'content' => htmlspecialchars($prop_value, ENT_QUOTES)];
+                        $this->metadata[$prop_key] = ['name' => $prop_key, 'property' => $prop_key, 'content' => htmlspecialchars($prop_value, ENT_QUOTES, 'UTF-8')];
                     }
                 } else {
                     // If it this is a standard meta data type
                     if ($value) {
                         if (in_array($key, $header_tag_http_equivs)) {
-                            $this->metadata[$key] = ['http_equiv' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
+                            $this->metadata[$key] = ['http_equiv' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
+                        } elseif ($key == 'charset') {
+                            $this->metadata[$key] = ['charset' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
                         } else {
                             // if it's a social metadata with separator, render as property
                             $separator    = strpos($key, ':');
                             $hasSeparator = $separator && $separator < strlen($key) - 1;
-                            $entry        = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
+                            $entry        = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES, 'UTF-8')];
 
                             if ($hasSeparator) {
                                 $entry['property'] = $key;
@@ -1350,14 +1390,19 @@ public function metadata($var = null)
      */
     public function slug($var = null)
     {
-        if ($var !== null) {
+        if ($var !== null && $var !== "") {
             $this->slug = $var;
+            if(!preg_match('/^[a-z0-9][-a-z0-9]*$/', $this->slug)){
+                Grav::instance()['log']->notice("Invalid slug set in YAML frontmatter: " . $this->rawRoute() . " => ".  $this->slug);
+            }
         }
 
         if (empty($this->slug)) {
-            $this->slug = preg_replace(PAGE_ORDER_PREFIX_REGEX, '', $this->folder);
+            $this->slug = strtolower(preg_replace(PAGE_ORDER_PREFIX_REGEX, '', $this->folder));
         }
 
+
+
         return $this->slug;
     }
 
@@ -1411,17 +1456,19 @@ public function link($include_host = false)
      */
     public function url($include_host = false, $canonical = false, $include_lang = true)
     {
+        $grav = Grav::instance();
+
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = $grav['pages'];
 
         /** @var Config $config */
-        $config = self::getGrav()['config'];
+        $config = $grav['config'];
 
         /** @var Language $language */
-        $language = self::getGrav()['language'];
+        $language = $grav['language'];
 
         /** @var Uri $uri */
-        $uri = self::getGrav()['uri'];
+        $uri = $grav['uri'];
 
         // get pre-route
         if ($include_lang && $language->enabled()) {
@@ -1630,7 +1677,7 @@ public function eTag($var = null)
             $this->etag = $var;
         }
         if (!isset($this->etag)) {
-            $this->etag = (bool)self::getGrav()['config']->get('system.pages.etag');
+            $this->etag = (bool)Grav::instance()['config']->get('system.pages.etag');
         }
 
         return $this->etag;
@@ -1649,7 +1696,7 @@ public function lastModified($var = null)
             $this->last_modified = $var;
         }
         if (!isset($this->last_modified)) {
-            $this->last_modified = (bool)self::getGrav()['config']->get('system.pages.last_modified');
+            $this->last_modified = (bool)Grav::instance()['config']->get('system.pages.last_modified');
         }
 
         return $this->last_modified;
@@ -1693,7 +1740,7 @@ public function filePathClean()
      */
     public function relativePagePath()
     {
-        $path = str_replace('/' . $this->name, '', $this->filePathClean());
+        $path = str_replace('/' . $this->name(), '', $this->filePathClean());
 
         return $path;
     }
@@ -1744,7 +1791,7 @@ public function folder($var = null)
     public function date($var = null)
     {
         if ($var !== null) {
-            $this->date = Utils::date2timestamp($var);
+            $this->date = Utils::date2timestamp($var, $this->dateformat);
         }
 
         if (!$this->date) {
@@ -1754,6 +1801,23 @@ public function date($var = null)
         return $this->date;
     }
 
+    /**
+     * Gets and sets the date format for this Page object. This is typically passed in via the page headers
+     * using typical PHP date string structure - http://php.net/manual/en/function.date.php
+     *
+     * @param  string $var string representation of a date format
+     *
+     * @return string      string representation of a date format
+     */
+    public function dateformat($var = null)
+    {
+        if ($var !== null) {
+            $this->dateformat = $var;
+        }
+
+        return $this->dateformat;
+    }
+
     /**
      * Gets and sets the order by which any sub-pages should be sorted.
      *
@@ -1825,7 +1889,7 @@ public function maxCount($var = null)
         }
         if (empty($this->max_count)) {
             /** @var Config $config */
-            $config = self::getGrav()['config'];
+            $config = Grav::instance()['config'];
             $this->max_count = (int)$config->get('system.pages.list.count');
         }
 
@@ -1849,7 +1913,7 @@ public function taxonomy($var = null)
     }
 
     /**
-     * Gets and sets the modular var that helps identify this parent page contains modular pages.
+     * Gets and sets the modular var that helps identify this page is a modular child
      *
      * @param  bool $var true if modular_twig
      *
@@ -1861,7 +1925,7 @@ public function modular($var = null)
     }
 
     /**
-     * Gets and sets the modular_twig var that helps identify this page as a modular page that will need
+     * Gets and sets the modular_twig var that helps identify this page as a modular child page that will need
      * twig processing handled differently from a regular page.
      *
      * @param  bool $var true if modular_twig
@@ -1913,7 +1977,7 @@ public function parent(Page $var = null)
         }
 
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = Grav::instance()['pages'];
 
         return $pages->get($this->parent);
     }
@@ -1951,7 +2015,7 @@ public function topParent()
     public function children()
     {
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = Grav::instance()['pages'];
 
         return $pages->children($this->path());
     }
@@ -2031,8 +2095,8 @@ public function adjacentSibling($direction = 1)
      */
     public function active()
     {
-        $uri_path = rtrim(self::getGrav()['uri']->path(), '/') ?: '/';
-        $routes = self::getGrav()['pages']->routes();
+        $uri_path = rtrim(Grav::instance()['uri']->path(), '/') ?: '/';
+        $routes = Grav::instance()['pages']->routes();
 
         if (isset($routes[$uri_path])) {
             if ($routes[$uri_path] == $this->path()) {
@@ -2052,10 +2116,10 @@ public function active()
      */
     public function activeChild()
     {
-        $uri = self::getGrav()['uri'];
-        $pages = self::getGrav()['pages'];
+        $uri = Grav::instance()['uri'];
+        $pages = Grav::instance()['pages'];
         $uri_path = rtrim($uri->path(), '/');
-        $routes = self::getGrav()['pages']->routes();
+        $routes = Grav::instance()['pages']->routes();
 
         if (isset($routes[$uri_path])) {
             /** @var Page $child_page */
@@ -2108,9 +2172,9 @@ public function root()
     public function find($url, $all = false)
     {
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = Grav::instance()['pages'];
 
-        return $pages->dispatch($url, $all);
+        return $pages->find($url, $all);
     }
 
     /**
@@ -2141,9 +2205,9 @@ public function collection($params = 'content', $pagination = true)
         $collection->setParams($params);
 
         /** @var Uri $uri */
-        $uri = self::getGrav()['uri'];
+        $uri = Grav::instance()['uri'];
         /** @var Config $config */
-        $config = self::getGrav()['config'];
+        $config = Grav::instance()['config'];
 
         $process_taxonomy = isset($params['url_taxonomy_filters']) ? $params['url_taxonomy_filters'] : $config->get('system.pages.url_taxonomy_filters');
 
@@ -2185,7 +2249,7 @@ public function collection($params = 'content', $pagination = true)
         }
 
         /** @var Grav $grav */
-        $grav = self::getGrav()['grav'];
+        $grav = Grav::instance()['grav'];
 
         // New Custom event to handle things like pagination.
         $grav->fireEvent('onCollectionProcessed', new Event(['collection' => $collection]));
@@ -2242,7 +2306,7 @@ public function evaluate($value)
         }
 
         /** @var Pages $pages */
-        $pages = self::getGrav()['pages'];
+        $pages = Grav::instance()['pages'];
 
         $parts = explode('.', $cmd);
         $current = array_shift($parts);
@@ -2336,7 +2400,7 @@ public function evaluate($value)
                 // @taxonomy: { category: [ blog, featured ], level: 1 }
 
                 /** @var Taxonomy $taxonomy_map */
-                $taxonomy_map = self::getGrav()['taxonomy'];
+                $taxonomy_map = Grav::instance()['taxonomy'];
 
                 if (!empty($parts)) {
                     $params = [implode('.', $parts) => $params];
@@ -2419,7 +2483,7 @@ protected function doRelocation($reorder)
         // Do reordering.
         if ($reorder && $this->order() != $this->_original->order()) {
             /** @var Pages $pages */
-            $pages = self::getGrav()['pages'];
+            $pages = Grav::instance()['pages'];
 
             $parent = $this->parent();
 
@@ -2482,20 +2546,20 @@ protected function doRelocation($reorder)
     protected function setPublishState()
     {
         // Handle publishing dates if no explict published option set
-        if (self::getGrav()['config']->get('system.pages.publish_dates') && !isset($this->header->published)) {
+        if (Grav::instance()['config']->get('system.pages.publish_dates') && !isset($this->header->published)) {
             // unpublish if required, if not clear cache right before page should be unpublished
             if ($this->unpublishDate()) {
                 if ($this->unpublishDate() < time()) {
                     $this->published(false);
                 } else {
                     $this->published();
-                    self::getGrav()['cache']->setLifeTime($this->unpublishDate());
+                    Grav::instance()['cache']->setLifeTime($this->unpublishDate());
                 }
             }
             // publish if required, if not clear cache right before page is published
             if ($this->publishDate() && $this->publishDate() && $this->publishDate() > time()) {
                 $this->published(false);
-                self::getGrav()['cache']->setLifeTime($this->publishDate());
+                Grav::instance()['cache']->setLifeTime($this->publishDate());
             }
         }
     }
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index a5d80ea4b5..87a81d60c3 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page;
 
 use Grav\Common\Cache;
@@ -15,12 +22,6 @@
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use Whoops\Exception\ErrorException;
 
-/**
- * Pages is the class that is the entry point into the hierarchy of pages
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Pages
 {
     /**
@@ -288,14 +289,29 @@ public function children($path)
     }
 
     /**
-     * Dispatch URI to a page.
+     * alias method to return find a page.
      *
      * @param string $url The relative URL of the page
      * @param bool   $all
      *
      * @return Page|null
      */
-    public function dispatch($url, $all = false)
+    public function find($url, $all = false)
+    {
+        return $this->dispatch($url, $all, false);
+    }
+
+    /**
+     * Dispatch URI to a page.
+     *
+     * @param string $url The relative URL of the page
+     * @param bool $all
+     *
+     * @param bool $redirect
+     * @return Page|null
+     * @throws \Exception
+     */
+    public function dispatch($url, $all = false, $redirect = true)
     {
         // Fetch page if there's a defined route to it.
         $page = isset($this->routes[$url]) ? $this->get($this->routes[$url]) : null;
@@ -308,49 +324,52 @@ public function dispatch($url, $all = false)
         $not_admin = !isset($this->grav['admin']);
 
         // If the page cannot be reached, look into site wide redirects, routes + wildcards
-        if (!$all && $not_admin && (!$page || ($page && !$page->routable()) || ($page && $page->redirect()))) {
+        if (!$all && $not_admin) {
 
             // If the page is a simple redirect, just do it.
-            if ($page && $page->redirect()) {
+            if ($redirect && $page && $page->redirect()) {
                 $this->grav->redirectLangSafe($page->redirect());
             }
 
-            /** @var Config $config */
-            $config = $this->grav['config'];
+            // fall back and check site based redirects
+            if (!$page || ($page && !$page->routable())) {
+                /** @var Config $config */
+                $config = $this->grav['config'];
 
-            // See if route matches one in the site configuration
-            $route = $config->get("site.routes.{$url}");
-            if ($route) {
-                $page = $this->dispatch($route, $all);
-            } else {
-                // Try Regex style redirects
-                $site_redirects = $config->get("site.redirects");
-                if (is_array($site_redirects)) {
-                    foreach ((array)$site_redirects as $pattern => $replace) {
-                        $pattern = '#' . $pattern . '#';
-                        try {
-                            $found = preg_replace($pattern, $replace, $url);
-                            if ($found != $url) {
-                                $this->grav->redirectLangSafe($found);
+                // See if route matches one in the site configuration
+                $route = $config->get("site.routes.{$url}");
+                if ($route) {
+                    $page = $this->dispatch($route, $all);
+                } else {
+                    // Try Regex style redirects
+                    $site_redirects = $config->get("site.redirects");
+                    if (is_array($site_redirects)) {
+                        foreach ((array)$site_redirects as $pattern => $replace) {
+                            $pattern = '#' . $pattern . '#';
+                            try {
+                                $found = preg_replace($pattern, $replace, $url);
+                                if ($found != $url) {
+                                    $this->grav->redirectLangSafe($found);
+                                }
+                            } catch (ErrorException $e) {
+                                $this->grav['log']->error('site.redirects: ' . $pattern . '-> ' . $e->getMessage());
                             }
-                        } catch (ErrorException $e) {
-                            $this->grav['log']->error('site.redirects: ' . $pattern . '-> ' . $e->getMessage());
                         }
                     }
-                }
 
-                // Try Regex style routes
-                $site_routes = $config->get("site.routes");
-                if (is_array($site_routes)) {
-                    foreach ((array)$site_routes as $pattern => $replace) {
-                        $pattern = '#' . $pattern . '#';
-                        try {
-                            $found = preg_replace($pattern, $replace, $url);
-                            if ($found != $url) {
-                                $page = $this->dispatch($found, $all);
+                    // Try Regex style routes
+                    $site_routes = $config->get("site.routes");
+                    if (is_array($site_routes)) {
+                        foreach ((array)$site_routes as $pattern => $replace) {
+                            $pattern = '#' . $pattern . '#';
+                            try {
+                                $found = preg_replace($pattern, $replace, $url);
+                                if ($found != $url) {
+                                    $page = $this->dispatch($found, $all);
+                                }
+                            } catch (ErrorException $e) {
+                                $this->grav['log']->error('site.routes: ' . $pattern . '-> ' . $e->getMessage());
                             }
-                        } catch (ErrorException $e) {
-                            $this->grav['log']->error('site.routes: ' . $pattern . '-> ' . $e->getMessage());
                         }
                     }
                 }
@@ -391,8 +410,8 @@ public function blueprints($type)
             $blueprint = $this->blueprints->get('default');
         }
 
-        if (!$blueprint->initialized) {
-            $this->grav->fireEvent('onBlueprintCreated', new Event(['blueprint' => $blueprint]));
+        if (empty($blueprint->initialized)) {
+            $this->grav->fireEvent('onBlueprintCreated', new Event(['blueprint' => $blueprint, 'type' => $type]));
             $blueprint->initialized = true;
         }
 
@@ -470,15 +489,45 @@ public function getList(Page $current = null, $level = 0, $rawRoutes = false)
      */
     public static function getTypes()
     {
-        $locator = Grav::instance()['locator'];
         if (!self::$types) {
-            self::$types = new Types();
-            file_exists('theme://blueprints/') && self::$types->scanBlueprints($locator->findResources('theme://blueprints/'));
-            file_exists('theme://templates/') && self::$types->scanTemplates($locator->findResources('theme://templates/'));
 
-            $event = new Event();
-            $event->types = self::$types;
-            Grav::instance()->fireEvent('onGetPageTemplates', $event);
+            $grav = Grav::instance();
+
+            $scanBlueprintsAndTemplates = function () use ($grav) {
+                // Scan blueprints
+                $event = new Event();
+                $event->types = self::$types;
+                $grav->fireEvent('onGetPageBlueprints', $event);
+
+                self::$types->scanBlueprints('theme://blueprints/');
+
+                // Scan templates
+                $event = new Event();
+                $event->types = self::$types;
+                $grav->fireEvent('onGetPageTemplates', $event);
+
+                self::$types->scanTemplates('theme://templates/');
+            };
+
+            if ($grav['config']->get('system.cache.enabled')) {
+                /** @var Cache $cache */
+                $cache = $grav['cache'];
+
+                // Use cached types if possible.
+                $types_cache_id = md5('types');
+                self::$types = $cache->fetch($types_cache_id);
+
+                if (!self::$types) {
+                    self::$types = new Types();
+                    $scanBlueprintsAndTemplates();
+                    $cache->save($types_cache_id, self::$types);
+                }
+
+            } else {
+                self::$types = new Types();
+                $scanBlueprintsAndTemplates();
+            }
+
         }
 
         return self::$types;
@@ -683,6 +732,7 @@ protected function buildPages()
 
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
+
         $pages_dir = $locator->findResource('page://');
 
         if ($config->get('system.cache.enabled')) {
@@ -704,7 +754,7 @@ protected function buildPages()
                     $last_modified = Folder::lastModifiedFile($pages_dir);
             }
 
-            $page_cache_id = md5(USER_DIR . $last_modified . $language->getActive() . $config->checksum());
+            $page_cache_id = md5($pages_dir . $last_modified . $language->getActive() . $config->checksum());
 
             list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($page_cache_id);
             if (!$this->instances) {
@@ -826,8 +876,10 @@ protected function recurse($directory, Page &$parent = null)
         // set current modified of page
         $last_modified = $page->modified();
 
+        $iterator = new \FilesystemIterator($directory);
+
         /** @var \DirectoryIterator $file */
-        foreach (new \FilesystemIterator($directory) as $file) {
+        foreach ($iterator as $file) {
             $name = $file->getFilename();
 
             // Ignore all hidden files if set.
@@ -955,6 +1007,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
         $list = [];
         $header_default = null;
         $header_query = null;
+        $sort_flags = SORT_NATURAL | SORT_FLAG_CASE;
 
         // do this header query work only once
         if (strpos($order_by, 'header.') === 0) {
@@ -976,9 +1029,11 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
                     break;
                 case 'date':
                     $list[$key] = $child->date();
+                    $sort_flags = SORT_REGULAR;
                     break;
                 case 'modified':
                     $list[$key] = $child->modified();
+                    $sort_flags = SORT_REGULAR;
                     break;
                 case 'slug':
                     $list[$key] = $child->slug();
@@ -994,11 +1049,13 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
                     } else {
                         $list[$key] = $header_default ?: $key;
                     }
+                    $sort_flags = SORT_REGULAR;
                     break;
                 case 'manual':
                 case 'default':
                 default:
                     $list[$key] = $key;
+                    $sort_flags = SORT_REGULAR;
             }
         }
 
@@ -1007,7 +1064,12 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
             $list = $this->arrayShuffle($list);
         } else {
             // else just sort the list according to specified key
-            asort($list);
+            if (extension_loaded('intl')) {
+                $col = new \Collator(setlocale(LC_COLLATE, 0)); //`setlocale` with a 0 param returns the current locale set
+                $col->asort($list, $sort_flags);
+            } else {
+                asort($list, $sort_flags);
+            }
         }
 
 
diff --git a/system/src/Grav/Common/Page/Types.php b/system/src/Grav/Common/Page/Types.php
index 5fbeaea5eb..e915c07b61 100644
--- a/system/src/Grav/Common/Page/Types.php
+++ b/system/src/Grav/Common/Page/Types.php
@@ -1,12 +1,21 @@
 <?php
+/**
+ * @package    Grav.Common.Page
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Page;
 
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
 use RocketTheme\Toolbox\ArrayTraits\ArrayAccess;
 use RocketTheme\Toolbox\ArrayTraits\Constructor;
 use RocketTheme\Toolbox\ArrayTraits\Countable;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\Iterator;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class Types implements \ArrayAccess, \Iterator, \Countable
 {
@@ -17,24 +26,45 @@ class Types implements \ArrayAccess, \Iterator, \Countable
 
     public function register($type, $blueprint = null)
     {
-        if (!$blueprint && $this->systemBlueprints && isset($this->systemBlueprints[$type])) {
-            $useBlueprint = $this->systemBlueprints[$type];
-        } else {
-            $useBlueprint = $blueprint;
+        if (!isset($this->items[$type])) {
+            $this->items[$type] = [];
+        } elseif (!$blueprint) {
+            return;
+        }
+
+        if (!$blueprint && $this->systemBlueprints) {
+            $blueprint = isset($this->systemBlueprints[$type]) ? $this->systemBlueprints[$type] : $this->systemBlueprints['default'];
         }
 
-        if ($blueprint || empty($this->items[$type])) {
-            $this->items[$type] = $useBlueprint;
+        if ($blueprint) {
+            array_unshift($this->items[$type], $blueprint);
         }
     }
 
-    public function scanBlueprints($paths)
+    public function scanBlueprints($uri)
     {
-        $this->items = $this->findBlueprints($paths) + $this->items;
+        if (!is_string($uri)) {
+            throw new \InvalidArgumentException('First parameter must be URI');
+        }
+
+        if (!$this->systemBlueprints) {
+            $this->systemBlueprints = $this->findBlueprints('blueprints://pages');
+
+            // Register default by default.
+            $this->register('default');
+        }
+
+        foreach ($this->findBlueprints($uri) as $type => $blueprint) {
+            $this->register($type, $blueprint);
+        }
     }
 
-    public function scanTemplates($paths)
+    public function scanTemplates($uri)
     {
+        if (!is_string($uri)) {
+            throw new \InvalidArgumentException('First parameter must be URI');
+        }
+
         $options = [
             'compare' => 'Filename',
             'pattern' => '|\.html\.twig$|',
@@ -45,23 +75,13 @@ public function scanTemplates($paths)
             'recursive' => false
         ];
 
-        if (!$this->systemBlueprints) {
-            $this->systemBlueprints = $this->findBlueprints('blueprints://pages');
+        foreach (Folder::all($uri, $options) as $type) {
+            $this->register($type);
         }
 
-        // register default by default
-        $this->register('default');
-
-        foreach ((array) $paths as $path) {
-            foreach (Folder::all($path, $options) as $type) {
-                $this->register($type);
-            }
-            $modular_path = rtrim($path, '/') . '/modular';
-            if (file_exists($modular_path)) {
-                foreach (Folder::all($modular_path, $options) as $type) {
-                    $this->register('modular/' . $type);
-                }
-            }
+        $modular_uri = rtrim($uri, '/') . '/modular';
+        foreach (Folder::all($modular_uri, $options) as $type) {
+            $this->register('modular/' . $type);
         }
     }
 
@@ -91,7 +111,7 @@ public function modularSelect()
         return $list;
     }
 
-    private function findBlueprints($paths)
+    private function findBlueprints($uri)
     {
         $options = [
             'compare' => 'Filename',
@@ -103,11 +123,14 @@ private function findBlueprints($paths)
             'value' => 'PathName',
         ];
 
-        $list = [];
-        foreach ((array) $paths as $path) {
-            $list += Folder::all($path, $options);
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        if ($locator->isStream($uri)) {
+            $options['value'] = 'Url';
         }
 
+        $list = Folder::all($uri, $options);
+
         return $list;
     }
 }
diff --git a/system/src/Grav/Common/Plugin.php b/system/src/Grav/Common/Plugin.php
index e6fd416648..db0b64cc6d 100644
--- a/system/src/Grav/Common/Plugin.php
+++ b/system/src/Grav/Common/Plugin.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Data\Data;
@@ -7,15 +14,20 @@
 use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
 use RocketTheme\Toolbox\File\YamlFile;
+use Symfony\Component\Console\Exception\LogicException;
 
-/**
- * The Plugin object just holds the id and path to a plugin.
- *
- * @author  RocketTheme
- * @license MIT
- */
-class Plugin implements EventSubscriberInterface
+class Plugin implements EventSubscriberInterface, \ArrayAccess
 {
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var array
+     */
+    public $features = [];
+
     /**
      * @var Grav
      */
@@ -27,10 +39,7 @@ class Plugin implements EventSubscriberInterface
     protected $config;
 
     protected $active = true;
-    /**
-     * @var \Grav\Common\string
-     */
-    protected $name;
+    protected $blueprint;
 
     /**
      * By default assign all methods as listeners using the default priority.
@@ -58,20 +67,42 @@ public static function getSubscribedEvents()
      * @param Grav   $grav
      * @param Config $config
      */
-    public function __construct($name, Grav $grav, Config $config)
+    public function __construct($name, Grav $grav, Config $config = null)
     {
+        $this->name = $name;
         $this->grav = $grav;
+        if ($config) {
+            $this->setConfig($config);
+        }
+    }
+
+    /**
+     * @param Config $config
+     * @return $this
+     */
+    public function setConfig(Config $config)
+    {
         $this->config = $config;
-        $this->name = $name;
+
+        return $this;
     }
 
-    public function isAdmin()
+    /**
+     * Get configuration of the plugin.
+     *
+     * @return Config
+     */
+    public function config()
     {
-        if (isset($this->grav['admin'])) {
-            return true;
-        }
+        return $this->config["plugins.{$this->name}"];
+    }
 
-        return false;
+    /**
+     * @return bool
+     */
+    public function isAdmin()
+    {
+        return Utils::isAdminPlugin();
     }
 
     /**
@@ -116,6 +147,59 @@ protected function disable(array $events)
         }
     }
 
+    /**
+     * Whether or not an offset exists.
+     *
+     * @param mixed $offset  An offset to check for.
+     * @return bool          Returns TRUE on success or FALSE on failure.
+     */
+    public function offsetExists($offset)
+    {
+        $this->loadBlueprint();
+
+        if ($offset === 'title') {
+            $offset = 'name';
+        }
+        return isset($this->blueprint[$offset]);
+    }
+
+    /**
+     * Returns the value at specified offset.
+     *
+     * @param mixed $offset  The offset to retrieve.
+     * @return mixed         Can return all value types.
+     */
+    public function offsetGet($offset)
+    {
+        $this->loadBlueprint();
+
+        if ($offset === 'title') {
+            $offset = 'name';
+        }
+        return isset($this->blueprint[$offset]) ? $this->blueprint[$offset] : null;
+    }
+
+    /**
+     * Assigns a value to the specified offset.
+     *
+     * @param mixed $offset  The offset to assign the value to.
+     * @param mixed $value   The value to set.
+     */
+    public function offsetSet($offset, $value)
+    {
+        throw new LogicException(__CLASS__ . ' blueprints cannot be modified.');
+    }
+
+    /**
+     * Unsets an offset.
+     *
+     * @param mixed $offset  The offset to unset.
+     */
+    public function offsetUnset($offset)
+    {
+        throw new LogicException(__CLASS__ . ' blueprints cannot be modified.');
+    }
+
     /**
      * This function will search a string for markdown links in a specific format.  The link value can be
      * optionally compared against via the $internal_regex and operated on by the callback $function
@@ -200,13 +284,39 @@ public static function saveConfig($plugin_name)
             return false;
         }
 
-        $locator = Grav::instance()['locator'];
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
         $filename = 'config://plugins/' . $plugin_name . '.yaml';
         $file = YamlFile::instance($locator->findResource($filename, true, true));
-        $content = Grav::instance()['config']->get('plugins.' . $plugin_name);
+        $content = $grav['config']->get('plugins.' . $plugin_name);
         $file->save($content);
         $file->free();
 
         return true;
     }
+
+    /**
+     * Simpler getter for the plugin blueprint
+     *
+     * @return mixed
+     */
+    public function getBlueprint()
+    {
+        if (!$this->blueprint) {
+            $this->loadBlueprint();
+        }
+        return $this->blueprint;
+    }
+
+    /**
+     * Load blueprints.
+     */
+    protected function loadBlueprint()
+    {
+        if (!$this->blueprint) {
+            $grav = Grav::instance();
+            $plugins = $grav['plugins'];
+            $this->blueprint = $plugins->get($this->name)->blueprints();
+        }
+    }
 }
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index 7088e2ade6..2c61659ca3 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Config\Config;
@@ -6,71 +13,94 @@
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
 use RocketTheme\Toolbox\Event\EventDispatcher;
-use RocketTheme\Toolbox\Event\EventSubscriberInterface;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Plugins object holds an array of all the plugin objects that
- * Grav knows about
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Plugins extends Iterator
 {
-    use GravTrait;
+    public $formFieldTypes;
 
-    /**
-     * Recurses through the plugins directory creating Plugin objects for each plugin it finds.
-     *
-     * @return array|Plugin[] array of Plugin objects
-     * @throws \RuntimeException
-     */
-    public function init()
+    public function __construct()
     {
-        /** @var Config $config */
-        $config = self::getGrav()['config'];
-        $plugins = (array)$config->get('plugins');
-
-        $inflector = self::getGrav()['inflector'];
+        parent::__construct();
 
-        /** @var EventDispatcher $events */
-        $events = self::getGrav()['events'];
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
 
-        foreach ($plugins as $plugin => $data) {
-            if (empty($data['enabled'])) {
-                // Only load enabled plugins.
+        $iterator = $locator->getIterator('plugins://');
+        foreach ($iterator as $directory) {
+            if (!$directory->isDir()) {
                 continue;
             }
 
-            $locator = self::getGrav()['locator'];
-            $filePath = $locator->findResource('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
-            if (!is_file($filePath)) {
-                self::getGrav()['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
-                continue;
-            }
+            $plugin = $directory->getBasename();
 
-            require_once $filePath;
+            $this->add($this->loadPlugin($plugin));
+        }
+    }
 
-            $pluginClassFormat = [
-                'Grav\\Plugin\\' . ucfirst($plugin) . 'Plugin',
-                'Grav\\Plugin\\' . $inflector->camelize($plugin) . 'Plugin'
-            ];
-            $pluginClassName = false;
+    /**
+     * @return $this
+     */
+    public function setup()
+    {
+        $blueprints = [];
+        $formFields = [];
 
-            foreach ($pluginClassFormat as $pluginClass) {
-                if (class_exists($pluginClass)) {
-                    $pluginClassName = $pluginClass;
-                    break;
-                }
+        /** @var Plugin $plugin */
+        foreach ($this->items as $plugin) {
+            if (isset($plugin->features['blueprints'])) {
+                $blueprints["plugin://{$plugin->name}/blueprints"] = $plugin->features['blueprints'];
             }
+            if (method_exists($plugin, 'getFormFieldTypes')) {
+                $formFields[get_class($plugin)] = isset($plugin->features['formfields']) ? $plugin->features['formfields'] : 0;
+            }
+        }
+
+        if ($blueprints) {
+            // Order by priority.
+            arsort($blueprints);
+
+            /** @var UniformResourceLocator $locator */
+            $locator = Grav::instance()['locator'];
+            $locator->addPath('blueprints', '', array_keys($blueprints), 'system/blueprints');
+        }
 
-            if (false === $pluginClassName) {
-                throw new \RuntimeException(sprintf("Plugin '%s' class not found! Try reinstalling this plugin.",
-                    $plugin));
+        if ($formFields) {
+            // Order by priority.
+            arsort($formFields);
+
+            $list = [];
+            foreach ($formFields as $className => $priority) {
+                $plugin = $this->items[$className];
+                $list += $plugin->getFormFieldTypes();
             }
 
-            $instance = new $pluginClassName($plugin, self::getGrav(), $config);
-            if ($instance instanceof EventSubscriberInterface) {
+            $this->formFieldTypes = $list;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Registers all plugins.
+     *
+     * @return array|Plugin[] array of Plugin objects
+     * @throws \RuntimeException
+     */
+    public function init()
+    {
+        $grav = Grav::instance();
+
+        /** @var Config $config */
+        $config = $grav['config'];
+
+        /** @var EventDispatcher $events */
+        $events = $grav['events'];
+
+        foreach ($this->items as $instance) {
+            // Register only enabled plugins.
+            if ($config["plugins.{$instance->name}.enabled"] && $instance instanceof Plugin) {
+                $instance->setConfig($config);
                 $events->addSubscriber($instance);
             }
         }
@@ -97,28 +127,17 @@ public function add($plugin)
      */
     public static function all()
     {
+        $plugins = Grav::instance()['plugins'];
         $list = [];
-        $locator = Grav::instance()['locator'];
-
-        $plugins = (array)$locator->findResources('plugins://', false);
-        foreach ($plugins as $path) {
-            $iterator = new \DirectoryIterator($path);
 
-            /** @var \DirectoryIterator $directory */
-            foreach ($iterator as $directory) {
-                if (!$directory->isDir() || $directory->isDot()) {
-                    continue;
-                }
+        foreach ($plugins as $instance) {
+            $name = $instance->name;
+            $result = self::get($name);
 
-                $plugin = $directory->getBasename();
-                $result = self::get($plugin);
-
-                if ($result) {
-                    $list[$plugin] = $result;
-                }
+            if ($result) {
+                $list[$name] = $result;
             }
         }
-        ksort($list);
 
         return $list;
     }
@@ -134,7 +153,6 @@ public static function get($name)
     {
         $blueprints = new Blueprints('plugins://');
         $blueprint = $blueprints->get("{$name}/blueprints");
-        $blueprint->name = $name;
 
         // Load default configuration.
         $file = CompiledYamlFile::instance("plugins://{$name}/{$name}" . YAML_EXT);
@@ -147,7 +165,7 @@ public static function get($name)
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $obj->merge(self::getGrav()['config']->get('plugins.' . $name) ?: []);
+        $obj->merge(Grav::instance()['config']->get('plugins.' . $name) ?: []);
 
         // Save configuration always to user/config.
         $file = CompiledYamlFile::instance("config://plugins/{$name}.yaml");
@@ -156,4 +174,29 @@ public static function get($name)
         return $obj;
     }
 
+    protected function loadPlugin($name)
+    {
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
+
+        $filePath = $locator->findResource('plugins://' . $name . DS . $name . PLUGIN_EXT);
+        if (!is_file($filePath)) {
+            $grav['log']->addWarning(
+                sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $name)
+            );
+            return null;
+        }
+
+        require_once $filePath;
+
+        $pluginClassName = 'Grav\\Plugin\\' . ucfirst($name) . 'Plugin';
+        if (!class_exists($pluginClassName)) {
+            $pluginClassName = 'Grav\\Plugin\\' . $grav['inflector']->camelize($name) . 'Plugin';
+            if (!class_exists($pluginClassName)) {
+                throw new \RuntimeException(sprintf("Plugin '%s' class not found! Try reinstalling this plugin.", $name));
+            }
+        }
+        return new $pluginClassName($name, $grav);
+    }
+
 }
diff --git a/system/src/Grav/Common/Processors/AssetsProcessor.php b/system/src/Grav/Common/Processors/AssetsProcessor.php
new file mode 100644
index 0000000000..8c9c1e05d5
--- /dev/null
+++ b/system/src/Grav/Common/Processors/AssetsProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class AssetsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'assets';
+    public $title = 'Assets';
+
+    public function process() {
+		$this->container['assets']->init();
+		$this->container->fireEvent('onAssetsInitialized');
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/ConfigurationProcessor.php b/system/src/Grav/Common/Processors/ConfigurationProcessor.php
new file mode 100644
index 0000000000..eec061573e
--- /dev/null
+++ b/system/src/Grav/Common/Processors/ConfigurationProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class ConfigurationProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_config';
+    public $title = 'Configuration';
+
+    public function process() {
+      	$this->container['config']->init();
+      	return $this->container['plugins']->setup();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
new file mode 100644
index 0000000000..3dab64dad8
--- /dev/null
+++ b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class DebuggerAssetsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'debugger_assets';
+    public $title = 'Debugger Assets';
+
+    public function process() {
+      	$this->container['debugger']->addAssets();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/DebuggerInitProcessor.php b/system/src/Grav/Common/Processors/DebuggerInitProcessor.php
new file mode 100644
index 0000000000..6885227dd3
--- /dev/null
+++ b/system/src/Grav/Common/Processors/DebuggerInitProcessor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class DebuggerInitProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_debugger';
+    public $title = 'Init Debugger';
+
+    public function process() {
+      	$this->container['debugger']->init();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/ErrorsProcessor.php b/system/src/Grav/Common/Processors/ErrorsProcessor.php
new file mode 100644
index 0000000000..7e4213a66f
--- /dev/null
+++ b/system/src/Grav/Common/Processors/ErrorsProcessor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class ErrorsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_errors';
+    public $title = 'Error Handlers Reset';
+
+    public function process() {
+      	$this->container['errors']->resetHandlers();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php
new file mode 100644
index 0000000000..941264b69f
--- /dev/null
+++ b/system/src/Grav/Common/Processors/InitializeProcessor.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class InitializeProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'init';
+    public $title = 'Initialize';
+
+    public function process() {
+        $this->container['config']->debug();
+
+        // Use output buffering to prevent headers from being sent too early.
+        ob_start();
+        if ($this->container['config']->get('system.cache.gzip')) {
+            // Enable zip/deflate with a fallback in case of if browser does not support compressing.
+            if (!@ob_start("ob_gzhandler")) {
+                ob_start();
+            }
+        }
+
+        // Initialize the timezone.
+        if ($this->container['config']->get('system.timezone')) {
+            date_default_timezone_set($this->container['config']->get('system.timezone'));
+        }
+
+        // Initialize uri, session.
+        $this->container['session']->init();
+        $this->container['uri']->init();
+
+        $this->container->setLocale();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/PagesProcessor.php b/system/src/Grav/Common/Processors/PagesProcessor.php
new file mode 100644
index 0000000000..e4c6634555
--- /dev/null
+++ b/system/src/Grav/Common/Processors/PagesProcessor.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class PagesProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'pages';
+    public $title = 'Pages';
+
+    public function process() {
+      	$this->container['pages']->init();
+      	$this->container->fireEvent('onPagesInitialized');
+      	$this->container->fireEvent('onPageInitialized');
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/PluginsProcessor.php b/system/src/Grav/Common/Processors/PluginsProcessor.php
new file mode 100644
index 0000000000..f2e0656f7d
--- /dev/null
+++ b/system/src/Grav/Common/Processors/PluginsProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class PluginsProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'plugins';
+    public $title = 'Plugins';
+
+    public function process() {
+      	$this->container['plugins']->init();
+      	$this->container->fireEvent('onPluginsInitialized');
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/ProcessorBase.php b/system/src/Grav/Common/Processors/ProcessorBase.php
new file mode 100644
index 0000000000..1866124396
--- /dev/null
+++ b/system/src/Grav/Common/Processors/ProcessorBase.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class ProcessorBase {
+
+  	public function __construct($container) {
+    	$this->container = $container;
+  	}
+
+}
diff --git a/system/src/Grav/Common/Processors/ProcessorInterface.php b/system/src/Grav/Common/Processors/ProcessorInterface.php
new file mode 100644
index 0000000000..3645fbcd7d
--- /dev/null
+++ b/system/src/Grav/Common/Processors/ProcessorInterface.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+interface ProcessorInterface {
+  	public function process();
+}
diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php
new file mode 100644
index 0000000000..e63f253b94
--- /dev/null
+++ b/system/src/Grav/Common/Processors/RenderProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class RenderProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'render';
+    public $title = 'Render';
+
+    public function process() {
+      	$this->container->output = $this->container['output'];
+      	$this->container->fireEvent('onOutputGenerated');
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/SiteSetupProcessor.php b/system/src/Grav/Common/Processors/SiteSetupProcessor.php
new file mode 100644
index 0000000000..eb3a6df8e7
--- /dev/null
+++ b/system/src/Grav/Common/Processors/SiteSetupProcessor.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class SiteSetupProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = '_setup';
+    public $title = 'Site Setup';
+
+    public function process() {
+      	$this->container['setup']->init();
+      	$this->container['streams'];
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/TasksProcessor.php b/system/src/Grav/Common/Processors/TasksProcessor.php
new file mode 100644
index 0000000000..47ecbaba5c
--- /dev/null
+++ b/system/src/Grav/Common/Processors/TasksProcessor.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class TasksProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'tasks';
+    public $title = 'Tasks';
+
+    public function process() {
+        $task = $this->container['task'];
+        if ($task) {
+            $this->container->fireEvent('onTask.' . $task);
+        }
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/ThemesProcessor.php b/system/src/Grav/Common/Processors/ThemesProcessor.php
new file mode 100644
index 0000000000..ad392b1a71
--- /dev/null
+++ b/system/src/Grav/Common/Processors/ThemesProcessor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class ThemesProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'themes';
+    public $title = 'Themes';
+
+    public function process() {
+      	$this->container['themes']->init();
+    }
+
+}
diff --git a/system/src/Grav/Common/Processors/TwigProcessor.php b/system/src/Grav/Common/Processors/TwigProcessor.php
new file mode 100644
index 0000000000..f35fb38aa2
--- /dev/null
+++ b/system/src/Grav/Common/Processors/TwigProcessor.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Processors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Processors;
+
+class TwigProcessor extends ProcessorBase implements ProcessorInterface {
+
+    public $id = 'twig';
+    public $title = 'Twig';
+
+    public function process() {
+      	$this->container['twig']->init();
+    }
+
+}
diff --git a/system/src/Grav/Common/Service/AssetsServiceProvider.php b/system/src/Grav/Common/Service/AssetsServiceProvider.php
new file mode 100644
index 0000000000..4f512b265f
--- /dev/null
+++ b/system/src/Grav/Common/Service/AssetsServiceProvider.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Grav\Common\Assets;
+
+class AssetsServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['assets'] = new Assets();
+    }
+}
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index 79c99ed009..7b90736018 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Service;
 
 use Grav\Common\Config\CompiledBlueprints;
@@ -11,12 +18,6 @@
 use Pimple\ServiceProviderInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class ConfigServiceProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
@@ -90,7 +91,7 @@ public static function load(Container $container)
 
     public static function languages(Container $container)
     {
-        /** Setup $setup */
+        /** @var Setup $setup */
         $setup = $container['setup'];
 
         /** @var Config $config */
diff --git a/system/src/Grav/Common/Service/ErrorServiceProvider.php b/system/src/Grav/Common/Service/ErrorServiceProvider.php
index 3417354e4c..e6137424c9 100644
--- a/system/src/Grav/Common/Service/ErrorServiceProvider.php
+++ b/system/src/Grav/Common/Service/ErrorServiceProvider.php
@@ -1,12 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Service;
 
 use Grav\Common\Errors\Errors;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Whoops\Handler\JsonResponseHandler;
-use Whoops\Handler\PrettyPageHandler;
-use Whoops\Handler\PlainTextHandler;
 
 class ErrorServiceProvider implements ServiceProviderInterface
 {
diff --git a/system/src/Grav/Common/Service/LoggerServiceProvider.php b/system/src/Grav/Common/Service/LoggerServiceProvider.php
index edaf921789..2acea8cfe1 100644
--- a/system/src/Grav/Common/Service/LoggerServiceProvider.php
+++ b/system/src/Grav/Common/Service/LoggerServiceProvider.php
@@ -1,20 +1,34 @@
 <?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Service;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use \Monolog\Logger;
 use \Monolog\Handler\StreamHandler;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class LoggerServiceProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
     {
-        $log = new Logger('grav');
-        $log_file = LOG_DIR.'grav.log';
+        $container['log'] = function ($c) {
+            $log = new Logger('grav');
+
+            /** @var UniformResourceLocator $locator */
+            $locator = $c['locator'];
+
+            $log_file = $locator->findResource('log://grav.log', true, true);
 
-        $log->pushHandler(new StreamHandler($log_file, Logger::DEBUG));
+            $log->pushHandler(new StreamHandler($log_file, Logger::DEBUG));
 
-        $container['log'] = $log;
+            return $log;
+        };
     }
 }
diff --git a/system/src/Grav/Common/Service/OutputServiceProvider.php b/system/src/Grav/Common/Service/OutputServiceProvider.php
new file mode 100644
index 0000000000..4c0805580a
--- /dev/null
+++ b/system/src/Grav/Common/Service/OutputServiceProvider.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class OutputServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['output'] = function ($c) {
+            /** @var Grav $c */
+            return $c['twig']->processSite($c['uri']->extension());
+        };
+    }
+}
diff --git a/system/src/Grav/Common/Service/PageServiceProvider.php b/system/src/Grav/Common/Service/PageServiceProvider.php
new file mode 100644
index 0000000000..5df40c7e61
--- /dev/null
+++ b/system/src/Grav/Common/Service/PageServiceProvider.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class PageServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+
+        $container['page'] = function ($c) {
+            /** @var Grav $c */
+
+            /** @var Pages $pages */
+            $pages = $c['pages'];
+            /** @var Language $language */
+            $language = $c['language'];
+
+            /** @var Uri $uri */
+            $uri = $c['uri'];
+
+            $path = $uri->path(); // Don't trim to support trailing slash default routes
+            $path = $path ?: '/';
+
+            $page = $pages->dispatch($path);
+
+            // Redirection tests
+            if ($page) {
+
+                $url = $page->route();
+
+                if ($uri->params()) {
+                    if ($url == '/') { //Avoid double slash
+                        $url = $uri->params();
+                    } else {
+                        $url .= $uri->params();
+                    }
+                }
+                if ($uri->query()) {
+                    $url .= '?' . $uri->query();
+                }
+                if ($uri->fragment()) {
+                    $url .= '#' . $uri->fragment();
+                }
+
+                // Language-specific redirection scenarios
+                if ($language->enabled()) {
+                    if ($language->isLanguageInUrl() && !$language->isIncludeDefaultLanguage()) {
+                        $c->redirect($url);
+                    }
+                    if (!$language->isLanguageInUrl() && $language->isIncludeDefaultLanguage()) {
+                        $c->redirectLangSafe($url);
+                    }
+                }
+                // Default route test and redirect
+                if ($c['config']->get('system.pages.redirect_default_route') && $page->route() != $path) {
+                    $c->redirectLangSafe($url);
+                }
+            }
+
+            // if page is not found, try some fallback stuff
+            if (!$page || !$page->routable()) {
+
+                // Try fallback URL stuff...
+                $c->fallbackUrl($path);
+
+                // If no page found, fire event
+                $event = $c->fireEvent('onPageNotFound');
+
+                if (isset($event->page)) {
+                    $page = $event->page;
+                } else {
+                    throw new \RuntimeException('Page Not Found', 404);
+                }
+            }
+
+            return $page;
+        };
+    }
+}
diff --git a/system/src/Grav/Common/Service/StreamsServiceProvider.php b/system/src/Grav/Common/Service/StreamsServiceProvider.php
index ec7f9cd851..1f85161cc5 100644
--- a/system/src/Grav/Common/Service/StreamsServiceProvider.php
+++ b/system/src/Grav/Common/Service/StreamsServiceProvider.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Service;
 
 use Grav\Common\Config\Setup;
@@ -34,7 +41,7 @@ public function register(Container $container)
             Stream::setLocator($locator);
             ReadOnlyStream::setLocator($locator);
 
-            return new StreamBuilder($setup->getStreams($c));
+            return new StreamBuilder($setup->getStreams());
         };
     }
 }
diff --git a/system/src/Grav/Common/Service/TaskServiceProvider.php b/system/src/Grav/Common/Service/TaskServiceProvider.php
new file mode 100644
index 0000000000..98873d872e
--- /dev/null
+++ b/system/src/Grav/Common/Service/TaskServiceProvider.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package    Grav.Common.Service
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Service;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class TaskServiceProvider implements ServiceProviderInterface
+{
+    public function register(Container $container) {
+        $container['task'] = function ($c) {
+            /** @var Grav $c */
+            return !empty($_POST['task']) ? $_POST['task'] : $c['uri']->param('task');
+        };
+    }
+}
diff --git a/system/src/Grav/Common/Session.php b/system/src/Grav/Common/Session.php
index c73ddcfca0..5a3987481b 100644
--- a/system/src/Grav/Common/Session.php
+++ b/system/src/Grav/Common/Session.php
@@ -1,10 +1,16 @@
 <?php
-namespace Grav\Common;
-
 /**
- * Wrapper for Session
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
-class Session extends \RocketTheme\Toolbox\Session\Session
+
+namespace Grav\Common;
+
+use RocketTheme\Toolbox\Session\Session as BaseSession;
+
+class Session extends BaseSession
 {
     protected $grav;
     protected $session;
@@ -29,15 +35,21 @@ public function init()
         $config = $this->grav['config'];
 
         $is_admin = false;
+        $base_url = $uri->rootUrl(false);
 
         $session_timeout = $config->get('system.session.timeout', 1800);
-        $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'));
+        $session_path = $config->get('system.session.path', '/' . ltrim($base_url, '/'));
 
         // Activate admin if we're inside the admin path.
         if ($config->get('plugins.admin.enabled')) {
             $route = $config->get('plugins.admin.route');
+            // Uri::route() is not processed yet, let's quickly get what we need
+            $current_route = str_replace($base_url, '', parse_url($uri->url(true), PHP_URL_PATH));
             $base = '/' . trim($route, '/');
-            if (substr($uri->route(), 0, strlen($base)) == $base) {
+
+            if (substr($current_route, 0, strlen($base)) == $base || //handle no language specified
+                substr($current_route, 3, strlen($base)) == $base || //handle language (en)
+                substr($current_route, 6, strlen($base)) == $base) { //handle region specific language prefix (en-US)
                 $session_timeout = $config->get('plugins.admin.session.timeout', 1800);
                 $is_admin = true;
             }
@@ -48,7 +60,7 @@ public function init()
             parent::__construct($session_timeout, $session_path);
 
             $domain = $uri->host();
-            if ($domain == 'localhost') {
+            if ($domain === 'localhost') {
                 $domain = '';
             }
             $secure = $config->get('system.session.secure', false);
@@ -60,4 +72,20 @@ public function init()
             setcookie(session_name(), session_id(), time() + $session_timeout, $session_path, $domain, $secure, $httponly);
         }
     }
+
+    // Store something in session temporarily
+    public function setFlashObject($name, $object)
+    {
+        $this->$name = serialize($object);
+    }
+
+    // Return object and remove it from session
+    public function getFlashObject($name)
+    {
+        $object = unserialize($this->$name);
+
+        $this->$name = null;
+
+        return $object;
+    }
 }
diff --git a/system/src/Grav/Common/Taxonomy.php b/system/src/Grav/Common/Taxonomy.php
index ea01c99073..f4c49ab3d1 100644
--- a/system/src/Grav/Common/Taxonomy.php
+++ b/system/src/Grav/Common/Taxonomy.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Config\Config;
@@ -21,9 +28,6 @@
  * [tag][grav][path/to/item1]
  * [tag][grav][path/to/item2]
  * [tag][dog][path/to/item3]
- *
- * @author  RocketTheme
- * @license MIT
  */
 class Taxonomy
 {
@@ -76,7 +80,7 @@ public function addTaxonomy(Page $page, $page_taxonomy = null)
      * particular taxonomy.
      *
      * @param  array  $taxonomies taxonomies to search, eg ['tag'=>['animal','cat']]
-     * @param  string $operator   can be 'or' or 'and' (defaults to 'or')
+     * @param  string $operator   can be 'or' or 'and' (defaults to 'and')
      *
      * @return Collection       Collection object set to contain matches found in the taxonomy map
      */
diff --git a/system/src/Grav/Common/Theme.php b/system/src/Grav/Common/Theme.php
index f76e5f0b75..1cfe362801 100644
--- a/system/src/Grav/Common/Theme.php
+++ b/system/src/Grav/Common/Theme.php
@@ -1,17 +1,18 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Config\Config;
 use RocketTheme\Toolbox\File\YamlFile;
 
-/**
- * Class Theme
- * @package Grav\Common
- */
 class Theme extends Plugin
 {
-    public $name;
-
     /**
      * Constructor.
      *
@@ -21,11 +22,19 @@ class Theme extends Plugin
      */
     public function __construct(Grav $grav, Config $config, $name)
     {
-        $this->name = $name;
-
         parent::__construct($name, $grav, $config);
     }
 
+    /**
+     * Get configuration of the plugin.
+     *
+     * @return Config
+     */
+    public function config()
+    {
+        return $this->config["themes.{$this->name}"];
+    }
+
     /**
      * Persists to disk the theme parameters currently stored in the Grav Config object
      *
@@ -39,13 +48,39 @@ public static function saveConfig($theme_name)
             return false;
         }
 
-        $locator = Grav::instance()['locator'];
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
         $filename = 'config://themes/' . $theme_name . '.yaml';
         $file = YamlFile::instance($locator->findResource($filename, true, true));
-        $content = Grav::instance()['config']->get('themes.' . $theme_name);
+        $content = $grav['config']->get('themes.' . $theme_name);
         $file->save($content);
         $file->free();
 
         return true;
     }
+
+    /**
+     * Simpler getter for the theme blueprint
+     *
+     * @return mixed
+     */
+    public function getBlueprint()
+    {
+        if (!$this->blueprint) {
+            $this->loadBlueprint();
+        }
+        return $this->blueprint;
+    }
+
+    /**
+     * Load blueprints.
+     */
+    protected function loadBlueprint()
+    {
+        if (!$this->blueprint) {
+            $grav = Grav::instance();
+            $themes = $grav['themes'];
+            $this->blueprint = $themes->get($this->name)->blueprints();
+        }
+    }
 }
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index 9f360cc35a..e1db8d7dbc 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Config\Config;
@@ -9,12 +16,6 @@
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Themes object holds an array of all the theme objects that Grav knows about.
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Themes extends Iterator
 {
     /** @var Grav */
@@ -79,24 +80,23 @@ public function initTheme()
     public function all()
     {
         $list = [];
-        $locator = Grav::instance()['locator'];
 
-        $themes = (array)$locator->findResources('themes://', false);
-        foreach ($themes as $path) {
-            $iterator = new \DirectoryIterator($path);
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
 
-            /** @var \DirectoryIterator $directory */
-            foreach ($iterator as $directory) {
-                if (!$directory->isDir() || $directory->isDot()) {
-                    continue;
-                }
+        $iterator = $locator->getIterator('themes://');
+
+        /** @var \DirectoryIterator $directory */
+        foreach ($iterator as $directory) {
+            if (!$directory->isDir() || $directory->isDot()) {
+                continue;
+            }
 
-                $theme = $directory->getBasename();
-                $result = self::get($theme);
+            $theme = $directory->getBasename();
+            $result = self::get($theme);
 
-                if ($result) {
-                    $list[$theme] = $result;
-                }
+            if ($result) {
+                $list[$theme] = $result;
             }
         }
         ksort($list);
@@ -120,7 +120,6 @@ public function get($name)
 
         $blueprints = new Blueprints('themes://');
         $blueprint = $blueprints->get("{$name}/blueprints");
-        $blueprint->name = $name;
 
         // Load default configuration.
         $file = CompiledYamlFile::instance("themes://{$name}/{$name}" . YAML_EXT);
@@ -141,7 +140,7 @@ public function get($name)
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $obj->merge($this->grav['config']->get('themes.' . $name) ?: []);
+        $obj->merge($this->config->get('themes.' . $name) ?: []);
 
         // Save configuration always to user/config.
         $file = CompiledYamlFile::instance("config://themes/{$name}" . YAML_EXT);
@@ -280,15 +279,23 @@ protected function loadLanguages(Config $config)
         $locator = $this->grav['locator'];
 
         if ($config->get('system.languages.translations', true)) {
-            $languageFiles = array_reverse($locator->findResources("theme://languages" . YAML_EXT));
-
-            $languages = [];
-            foreach ($languageFiles as $language) {
-                $languages[] = CompiledYamlFile::instance($language)->content();
+            $language_file = $locator->findResource("theme://languages" . YAML_EXT);
+            if ($language_file) {
+                $language = CompiledYamlFile::instance($language_file)->content();
+                $this->grav['languages']->mergeRecursive($language);
             }
-
-            if ($languages) {
-                $languages = call_user_func_array('array_replace_recursive', $languages);
+            $languages_folder = $locator->findResource("theme://languages/");
+            if (file_exists($languages_folder)) {
+                $languages = [];
+                $iterator = new \DirectoryIterator($languages_folder);
+
+                /** @var \DirectoryIterator $directory */
+                foreach ($iterator as $file) {
+                    if ($file->getExtension() != 'yaml') {
+                        continue;
+                    }
+                    $languages[$file->getBasename('.yaml')] = CompiledYamlFile::instance($file->getPathname())->content();
+                }
                 $this->grav['languages']->mergeRecursive($languages);
             }
         }
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 16acf18f4f..033b967b60 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Twig
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Twig;
 
 use Grav\Common\Grav;
@@ -8,14 +15,6 @@
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use RocketTheme\Toolbox\Event\Event;
 
-/**
- * The Twig object handles all the Twig template rendering for Grav. It's a singleton object
- * that is optimized so that it only needs to be initialized once and can be reused for individual
- * page template rendering as well as the main site template rendering.
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Twig
 {
     /**
@@ -54,6 +53,8 @@ class Twig
     protected $loaderArray;
 
 
+    protected $autoescape;
+
     /**
      * Constructor
      *
@@ -105,7 +106,12 @@ public function init()
 
             $params = $config->get('system.twig');
             if (!empty($params['cache'])) {
-                $params['cache'] = $locator->findResource('cache://twig', true, true);
+                $cachePath = $locator->findResource('cache://twig', true, true);
+                $params['cache'] = new \Twig_Cache_Filesystem($cachePath, \Twig_Cache_Filesystem::FORCE_BYTECODE_INVALIDATION);
+            }
+
+            if (!empty($this->autoescape)) {
+                $params['autoescape'] = $this->autoescape;
             }
 
             $this->twig = new TwigEnvironment($loader_chain, $params);
@@ -365,4 +371,13 @@ public function template($template)
             return $template;
         }
     }
+
+    /**
+     * Overrides the autoescape setting
+     *
+     * @param boolean $state
+     */
+    public function setAutoescape($state) {
+        $this->autoescape = (bool) $state;
+    }
 }
diff --git a/system/src/Grav/Common/Twig/TwigEnvironment.php b/system/src/Grav/Common/Twig/TwigEnvironment.php
index af402ad806..2873dcbe03 100644
--- a/system/src/Grav/Common/Twig/TwigEnvironment.php
+++ b/system/src/Grav/Common/Twig/TwigEnvironment.php
@@ -1,13 +1,13 @@
 <?php
-namespace Grav\Common\Twig;
-
 /**
- * The Twig Environment class is a wrapper that handles configurable permissions
- * for the Twig cache files
+ * @package    Grav.Common.Twig
  *
- * @author RocketTheme
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\Twig;
+
 class TwigEnvironment extends \Twig_Environment
 {
     use WriteCacheFileTrait;
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index dce86fc622..6dc257b803 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Twig
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Twig;
 
 use Grav\Common\Grav;
@@ -8,12 +15,6 @@
 use Grav\Common\Uri;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Twig extension adds some filters and functions that are useful for Grav
- *
- * @author  RocketTheme
- * @license MIT
- */
 class TwigExtension extends \Twig_Extension
 {
     protected $grav;
@@ -25,9 +26,9 @@ class TwigExtension extends \Twig_Extension
      */
     public function __construct()
     {
-        $this->grav = Grav::instance();
+        $this->grav     = Grav::instance();
         $this->debugger = isset($this->grav['debugger']) ? $this->grav['debugger'] : null;
-        $this->config = $this->grav['config'];
+        $this->config   = $this->grav['config'];
     }
 
     /**
@@ -75,6 +76,7 @@ public function getFilters()
             new \Twig_SimpleFilter('modulus', [$this, 'modulusFilter']),
             new \Twig_SimpleFilter('rtrim', [$this, 'rtrimFilter']),
             new \Twig_SimpleFilter('pad', [$this, 'padFilter']),
+            new \Twig_SimpleFilter('regex_replace', [$this, 'regexReplace']),
             new \Twig_SimpleFilter('safe_email', [$this, 'safeEmailFilter']),
             new \Twig_SimpleFilter('safe_truncate', ['\Grav\Common\Utils', 'safeTruncate']),
             new \Twig_SimpleFilter('safe_truncate_html', ['\Grav\Common\Utils', 'safeTruncateHTML']),
@@ -84,6 +86,7 @@ public function getFilters()
             new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
             new \Twig_SimpleFilter('truncate', ['\Grav\Common\Utils', 'truncate']),
             new \Twig_SimpleFilter('truncate_html', ['\Grav\Common\Utils', 'truncateHTML']),
+            new \Twig_SimpleFilter('json_decode', [$this, 'jsonDecodeFilter']),
         ];
     }
 
@@ -96,6 +99,7 @@ public function getFunctions()
     {
         return [
             new \Twig_SimpleFunction('array', [$this, 'arrayFunc']),
+            new \Twig_SimpleFunction('array_key_value', [$this, 'arrayKeyValueFunc']),
             new \Twig_simpleFunction('authorize', [$this, 'authorize']),
             new \Twig_SimpleFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
             new \Twig_SimpleFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
@@ -104,12 +108,13 @@ public function getFunctions()
             new \Twig_SimpleFunction('nonce_field', [$this, 'nonceFieldFunc']),
             new \Twig_simpleFunction('random_string', [$this, 'randomStringFunc']),
             new \Twig_SimpleFunction('repeat', [$this, 'repeatFunc']),
+            new \Twig_SimpleFunction('regex_replace', [$this, 'regexReplace']),
             new \Twig_SimpleFunction('string', [$this, 'stringFunc']),
             new \Twig_simpleFunction('t', [$this, 'translate']),
             new \Twig_simpleFunction('ta', [$this, 'translateArray']),
             new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
-
-
+            new \Twig_SimpleFunction('json_decode', [$this, 'jsonDecodeFilter']),
+            new \Twig_SimpleFunction('get_cookie', [$this, 'getCookie']),
         ];
     }
 
@@ -136,7 +141,7 @@ public function fieldNameFilter($str)
      */
     public function safeEmailFilter($str)
     {
-        $email = '';
+        $email   = '';
         $str_len = strlen($str);
         for ($i = 0; $i < $str_len; $i++) {
             $email .= "&#" . ord($str[$i]) . ";";
@@ -217,7 +222,7 @@ public function modulusFilter($number, $divider, $items = null)
      * {{ 'CamelCased'|underscorize }} => camel_cased
      * {{ 'Something Text'|hyphenize }} => something-text
      * {{ 'something_text_to_read'|humanize }} => "Something text to read"
-     * {{ '181'|monthize }} => 6
+     * {{ '181'|monthize }} => 5
      * {{ '10'|ordinalize }} => 10th
      *
      * @param string $action
@@ -293,8 +298,11 @@ public function sortByKeyFilter(array $input, $filter, $direction = SORT_ASC)
      *
      * @return array
      */
-    public function ksortFilter(array $array)
+    public function ksortFilter($array)
     {
+        if (is_null($array)) {
+            $array = [];
+        }
         ksort($array);
 
         return $array;
@@ -318,7 +326,6 @@ public function containsFilter($haystack, $needle)
      *
      * @param $date
      * @param $long_strings
-     * @param String
      *
      * @return boolean
      */
@@ -371,11 +378,11 @@ public function nicetimeFilter($date, $long_strings = true)
         // is it future date or past date
         if ($now > $unix_date) {
             $difference = $now - $unix_date;
-            $tense = $this->grav['language']->translate('NICETIME.AGO', null, true);
+            $tense      = $this->grav['language']->translate('NICETIME.AGO', null, true);
 
         } else {
             $difference = $unix_date - $now;
-            $tense = $this->grav['language']->translate('NICETIME.FROM_NOW', null, true);
+            $tense      = $this->grav['language']->translate('NICETIME.FROM_NOW', null, true);
         }
 
         for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths) - 1; $j++) {
@@ -408,7 +415,7 @@ public function nicetimeFilter($date, $long_strings = true)
      */
     public function absoluteUrlFilter($string)
     {
-        $url = $this->grav['uri']->base();
+        $url    = $this->grav['uri']->base();
         $string = preg_replace('/((?:href|src) *= *[\'"](?!(http|ftp)))/i', "$1$url", $string);
 
         return $string;
@@ -422,7 +429,7 @@ public function absoluteUrlFilter($string)
      */
     public function markdownFilter($string)
     {
-        $page = $this->grav['page'];
+        $page     = $this->grav['page'];
         $defaults = $this->config->get('system.pages.markdown');
 
         // Initialize the preferred variant of Parsedown
@@ -577,6 +584,9 @@ public function urlFunc($input, $domain = false)
      */
     public function evaluateFunc($input)
     {
+        if (!$input) { //prevent an obscure Twig error if $input is not set
+            $input = '""';
+        }
         return $this->grav['twig']->processString("{{ $input }}");
     }
 
@@ -619,12 +629,17 @@ public function dump(\Twig_Environment $env, $context)
      * Output a Gist
      *
      * @param  string $id
+     * @param  string $file
      *
      * @return string
      */
-    public function gistFunc($id)
+    public function gistFunc($id, $file = false)
     {
-        return '<script src="https://gist.github.com/' . $id . '.js"></script>';
+        $url = 'https://gist.github.com/' . $id . '.js';
+        if ($file) {
+            $url .= '?file=' . $file;
+        }
+        return '<script src="' . $url . '"></script>';
     }
 
     /**
@@ -667,6 +682,26 @@ public function arrayFunc($value)
         return (array)$value;
     }
 
+    /**
+     * Workaround for twig associative array initialization
+     * Returns a key => val array
+     *
+     * @param string $key           key of item
+     * @param string $val           value of item
+     * @param string $current_array optional array to add to
+     *
+     * @return array
+     */
+    public function arrayKeyValueFunc($key, $val, $current_array = null)
+    {
+        if (empty($current_array)) {
+            return array($key => $val);
+        } else {
+            $current_array[$key] = $val;
+            return $current_array;
+        }
+    }
+
     /**
      * Returns a string from a value. If the value is array, return it json encoded
      *
@@ -733,4 +768,45 @@ public function nonceFieldFunc($action, $nonceParamName = 'nonce')
 
         return $string;
     }
+
+    /**
+     * Decodes string from JSON.
+     *
+     * @param  string  $str
+     * @param  bool  $assoc
+     * @param int $depth
+     * @param int $options
+     * @return array
+     */
+    public function jsonDecodeFilter($str, $assoc = false, $depth = 512, $options = 0)
+    {
+        return json_decode(html_entity_decode($str), $assoc, $depth, $options);
+    }
+
+    /**
+     * Used to retrieve a cookie value
+     *
+     * @param string $key     The cookie name to retrieve
+     *
+     * @return mixed
+     */
+    public function getCookie($key)
+    {
+        return filter_input(INPUT_COOKIE, $key, FILTER_SANITIZE_STRING);
+    }
+
+    /**
+     * Twig wrapper for PHP's preg_replace method
+     *
+     * @param mixed $subject the content to perform the replacement on
+     * @param mixed $pattern the regex pattern to use for matches
+     * @param mixed $replace the replacement value either as a string or an array of replacements
+     * @param int   $limit   the maximum possible replacements for each pattern in each subject
+     *
+     * @return mixed the resulting content
+     */
+    public function regexReplace($subject, $pattern, $replace, $limit = -1)
+    {
+        return preg_replace($pattern, $replace, $subject, $limit);
+    }
 }
diff --git a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
index 2c9def3bda..663b070240 100644
--- a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
+++ b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
@@ -1,15 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common.Twig
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Twig;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 
-/**
- * A trait to add some custom processing to the identifyLink() method in Parsedown and ParsedownExtra
- */
 trait WriteCacheFileTrait
 {
-    use GravTrait;
-
     protected static $umask;
 
     /**
@@ -26,7 +28,7 @@ protected function writeCacheFile($file, $content)
         }
 
         if (!isset(self::$umask)) {
-            self::$umask = self::getGrav()['config']->get('system.twig.umask_fix', false);
+            self::$umask = Grav::instance()['config']->get('system.twig.umask_fix', false);
         }
 
         if (self::$umask) {
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 4a7006447d..69f6b38023 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Grav\Common\Page\Page;
 
-/**
- * The URI object provides information about the current URL
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Uri
 {
     const HOSTNAME_REGEX = '/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/';
@@ -28,6 +29,7 @@ class Uri
     protected $scheme;
     protected $port;
     protected $query;
+    protected $fragment;
     protected $root;
     protected $root_path;
     protected $uri;
@@ -71,6 +73,16 @@ private function buildHostname()
         return $hostname;
     }
 
+    /**
+     * Calculate the parameter regex based on the param_sep setting
+     *
+     * @return string
+     */
+    public function paramsRegex()
+    {
+        return '/\/([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
+    }
+
     /**
      * Validate a hostname
      *
@@ -104,7 +116,7 @@ private function buildUri()
     {
         $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 
-        return $uri;
+        return rawurldecode($uri);
     }
 
     private function buildScheme()
@@ -158,17 +170,12 @@ private function buildHost()
 
     private function buildEnvironment()
     {
-        // set hostname
-        $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
-
         // check for localhost variations
-        if ($this->name == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
-            $env = 'localhost';
+        if ($this->name == '127.0.0.1' || $this->name== '::1') {
+            return 'localhost';
         } else {
-            $env = $this->name;
+            return $this->name;
         }
-
-        return $env;
     }
 
     /**
@@ -196,6 +203,7 @@ public function initializeWithUrl($url = '')
         $this->host     = [];
         $this->root     = [];
         $this->url      = [];
+        $this->fragment = [];
 
         $grav = Grav::instance();
 
@@ -220,6 +228,10 @@ public function initializeWithUrl($url = '')
             parse_str($uri_bits['query'], $this->query);
         }
 
+        if (isset($uri_bits['fragment'])) {
+            $this->fragment = $uri_bits['fragment'];
+        }
+
         $this->base = $this->buildBaseUrl();
         $this->host = $this->buildHost();
         $this->env = $this->buildEnvironment();
@@ -300,6 +312,11 @@ public function init()
             $uri = $bits['path'];
         }
 
+        //process fragment
+        if (isset($bits['fragment'])) {
+            $this->fragment = $bits['fragment'];
+        }
+
         // remove the extension if there is one set
         $parts = pathinfo($uri);
 
@@ -314,7 +331,7 @@ public function init()
         $valid_page_types = implode('|', $config->get('system.pages.types'));
 
         // Strip the file extension for valid page types
-        if (preg_match("/\.(" . $valid_page_types . ")$/", $parts['basename'])) {
+        if (preg_match('/\.(' . $valid_page_types . ')$/', $parts['basename'])) {
             $uri = rtrim(str_replace(DIRECTORY_SEPARATOR, DS, $parts['dirname']), DS) . '/' . $parts['filename'];
         }
 
@@ -343,22 +360,17 @@ public function init()
     private function processParams($uri, $delimiter = ':')
     {
         if (strpos($uri, $delimiter) !== false) {
-            $bits = explode('/', $uri);
-            $path = [];
-            foreach ($bits as $bit) {
-                if (strpos($bit, $delimiter) !== false) {
-                    $param = explode($delimiter, $bit);
-                    if (count($param) == 2) {
-                        $plain_var = filter_var(rawurldecode($param[1]), FILTER_SANITIZE_STRING);
-                        $this->params[$param[0]] = $plain_var;
-                    }
-                } else {
-                    $path[] = $bit;
+            preg_match_all(Uri::paramsRegex(), $uri, $matches, PREG_SET_ORDER);
+
+            foreach ($matches as $match) {
+                $param = explode($delimiter, $match[1]);
+                if (count($param) == 2) {
+                    $plain_var = filter_var(rawurldecode($param[1]), FILTER_SANITIZE_STRING);
+                    $this->params[$param[0]] = $plain_var;
+                    $uri = str_replace($match[0], '', $uri);
                 }
             }
-            $uri = '/' . ltrim(implode('/', $path), '/');
         }
-
         return $uri;
     }
 
@@ -464,6 +476,21 @@ public function param($id)
         }
     }
 
+    /**
+     * Gets the Fragment portion of a URI (eg #target)
+     *
+     * @param null $fragment
+     *
+     * @return null
+     */
+    public function fragment($fragment = null)
+    {
+        if ($fragment !== null) {
+            $this->fragment = $fragment;
+        }
+        return $this->fragment;
+    }
+
     /**
      * Return URL.
      *
@@ -575,6 +602,27 @@ public function base()
         return $this->base;
     }
 
+    /**
+     * Return the base relative URL including the language prefix
+     * or the base relative url if multilanguage is not enabled
+     *
+     * @return String The base of the URI
+     */
+    public function baseIncludingLanguage()
+    {
+        $grav = Grav::instance();
+
+        // Link processing should prepend language
+        $language = $grav['language'];
+        $language_append = '';
+        if ($language->enabled()) {
+            $language_append = $language->getLanguageURLPrefix();
+        }
+
+        $base = $grav['base_url_relative'];
+        return rtrim($base . $grav['pages']->base(), '/') . $language_append;
+    }
+
     /**
      * Return root URL to the site.
      *
@@ -645,7 +693,7 @@ public function referrer($default = null, $attributes = null)
      *
      * @return string ip address
      */
-    public function ip()
+    public static function ip()
     {
         if (getenv('HTTP_CLIENT_IP'))
             $ipaddress = getenv('HTTP_CLIENT_IP');
@@ -722,7 +770,7 @@ public static function buildParams($params)
      * @param Page   $page         the current page to use as reference
      * @param string $url the URL as it was written in the markdown
      * @param string $type         the type of URL, image | link
-     * @param null   $absolute     if null, will use system default, if true will use absolute links internally
+     * @param bool   $absolute     if null, will use system default, if true will use absolute links internally
      *
      * @return string the more friendly formatted url
      */
@@ -746,18 +794,18 @@ public static function convertUrl(Page $page, $url, $type = 'link', $absolute =
             $url_path = $url;
         }
 
-        $external   = false;
-        $base       = $grav['base_url_relative'];
-        $base_url   = rtrim($base . $grav['pages']->base(), '/') . $language_append;
-        $pages_dir  = $grav['locator']->findResource('page://');
+        $external          = false;
+        $base              = $grav['base_url_relative'];
+        $base_url          = rtrim($base . $grav['pages']->base(), '/') . $language_append;
+        $pages_dir         = $grav['locator']->findResource('page://');
 
         // if absolute and starts with a base_url move on
         if (isset($url['scheme']) && Utils::startsWith($url['scheme'], 'http')) {
             $external = true;
-        } elseif (($base_url != '' && Utils::startsWith($url_path, $base_url)) ||
-                   $url_path == '/' ||
-                   Utils::startsWith($url_path, '#')) {
-                       $url_path = $base_url . $url_path;
+        } elseif ($url_path == '' && isset($url['fragment'])) {
+            $external = true;
+        } elseif (($base_url != '' && Utils::startsWith($url_path, $base_url)) || $url_path == '/') {
+            $url_path = $base_url . $url_path;
         } else {
 
             // see if page is relative to this or absolute
@@ -899,20 +947,16 @@ public static function extractParams($uri, $delimiter)
         $params = [];
 
         if (strpos($uri, $delimiter) !== false) {
-            $bits = explode('/', $uri);
-            $path = [];
-            foreach ($bits as $bit) {
-                if (strpos($bit, $delimiter) !== false) {
-                    $param = explode($delimiter, $bit);
-                    if (count($param) == 2) {
-                        $plain_var = filter_var(rawurldecode($param[1]), FILTER_SANITIZE_STRING);
-                        $params[$param[0]] = $plain_var;
-                    }
-                } else {
-                    $path[] = $bit;
+            preg_match_all(Uri::paramsRegex(), $uri, $matches, PREG_SET_ORDER);
+
+            foreach ($matches as $match) {
+                $param = explode($delimiter, $match[1]);
+                if (count($param) == 2) {
+                    $plain_var = filter_var(rawurldecode($param[1]), FILTER_SANITIZE_STRING);
+                    $params[$param[0]] = $plain_var;
+                    $uri = str_replace($match[0], '', $uri);
                 }
             }
-            $uri = '/' . ltrim(implode('/', $path), '/');
         }
 
         return [$uri, $params];
@@ -939,7 +983,6 @@ public static function convertUrlOld(Page $page, $markdown_url, $type = 'link',
         if ($type == 'link' && $language->enabled()) {
             $language_append = $language->getLanguageURLPrefix();
         }
-
         $pages_dir = $grav['locator']->findResource('page://');
         if (is_null($relative)) {
             $base = $grav['base_url'];
diff --git a/system/src/Grav/Common/User/Authentication.php b/system/src/Grav/Common/User/Authentication.php
index 4d36603856..9982e39f03 100644
--- a/system/src/Grav/Common/User/Authentication.php
+++ b/system/src/Grav/Common/User/Authentication.php
@@ -1,12 +1,13 @@
 <?php
-namespace Grav\Common\User;
-
 /**
- * User authentication
+ * @package    Grav.Common.User
  *
- * @author  RocketTheme
- * @license MIT
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
  */
+
+namespace Grav\Common\User;
+
 abstract class Authentication
 {
     /**
diff --git a/system/src/Grav/Common/User/Group.php b/system/src/Grav/Common/User/Group.php
index f32402b5a8..50648c5bb6 100644
--- a/system/src/Grav/Common/User/Group.php
+++ b/system/src/Grav/Common/User/Group.php
@@ -1,22 +1,21 @@
 <?php
+/**
+ * @package    Grav.Common.User
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\User;
 
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Grav\Common\Utils;
 
-/**
- * Group object
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Group extends Data
 {
-    use GravTrait;
-
     /**
      * Get the groups list
      *
@@ -24,7 +23,7 @@ class Group extends Data
      */
     private static function groups()
     {
-        $groups = self::getGrav()['config']->get('groups');
+        $groups = Grav::instance()['config']->get('groups');
 
         return $groups;
     }
@@ -56,7 +55,7 @@ public static function load($groupname)
             $content = [];
         }
 
-        $blueprints = new Blueprints('blueprints://');
+        $blueprints = new Blueprints;
         $blueprint = $blueprints->get('user/group');
         if (!isset($content['groupname'])) {
             $content['groupname'] = $groupname;
@@ -71,27 +70,30 @@ public static function load($groupname)
      */
     public function save()
     {
-        $blueprints = new Blueprints('blueprints://');
+        $grav = Grav::instance();
+        $config = $grav['config'];
+
+        $blueprints = new Blueprints;
         $blueprint = $blueprints->get('user/group');
 
         $fields = $blueprint->fields();
 
-        self::getGrav()['config']->set("groups.$this->groupname", []);
+        $config->set("groups.$this->groupname", []);
 
         foreach ($fields as $field) {
             if ($field['type'] == 'text') {
                 $value = $field['name'];
                 if (isset($this->items[$value])) {
-                    self::getGrav()['config']->set("groups.$this->groupname.$value", $this->items[$value]);
+                    $config->set("groups.$this->groupname.$value", $this->items[$value]);
                 }
             }
             if ($field['type'] == 'array') {
                 $value = $field['name'];
-                $arrayValues = Utils::resolve($this->items, $field['name']);
+                $arrayValues = Utils::getDotNotation($this->items, $field['name']);
 
                 if ($arrayValues) {
                     foreach ($arrayValues as $arrayIndex => $arrayValue) {
-                        self::getGrav()['config']->set("groups.$this->groupname.$value.$arrayIndex", $arrayValue);
+                        $config->set("groups.$this->groupname.$value.$arrayIndex", $arrayValue);
                     }
                 }
             }
@@ -99,8 +101,8 @@ public function save()
 
         $type = 'groups';
         $blueprints = $this->blueprints("config/{$type}");
-        $obj = new Data(self::getGrav()['config']->get($type), $blueprints);
-        $file = CompiledYamlFile::instance(self::getGrav()['locator']->findResource("config://{$type}.yaml"));
+        $obj = new Data($config->get($type), $blueprints);
+        $file = CompiledYamlFile::instance($grav['locator']->findResource("config://{$type}.yaml"));
         $obj->file($file);
         $obj->save();
     }
@@ -114,16 +116,18 @@ public function save()
      */
     public static function remove($groupname)
     {
-        $blueprints = new Blueprints('blueprints://');
+        $grav = Grav::instance();
+        $config = $grav['config'];
+        $blueprints = new Blueprints;
         $blueprint = $blueprints->get('user/group');
 
-        $groups = self::getGrav()['config']->get("groups");
+        $groups = $config->get("groups");
         unset($groups[$groupname]);
-        self::getGrav()['config']->set("groups", $groups);
+        $config->set("groups", $groups);
 
         $type = 'groups';
-        $obj = new Data(self::getGrav()['config']->get($type), $blueprint);
-        $file = CompiledYamlFile::instance(self::getGrav()['locator']->findResource("config://{$type}.yaml"));
+        $obj = new Data($config->get($type), $blueprint);
+        $file = CompiledYamlFile::instance($grav['locator']->findResource("config://{$type}.yaml"));
         $obj->file($file);
         $obj->save();
 
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index da51c12357..3407970116 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -1,25 +1,21 @@
 <?php
+/**
+ * @package    Grav.Common.User
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\User;
 
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
 use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Grav\Common\Utils;
 
-/**
- * User object
- *
- * @property mixed       authenticated
- * @property mixed       password
- * @property bool|string hashed_password
- * @author  RocketTheme
- * @license MIT
- */
 class User extends Data
 {
-    use GravTrait;
-
     /**
      * Load user account.
      *
@@ -31,12 +27,14 @@ class User extends Data
      */
     public static function load($username)
     {
-        $locator = self::getGrav()['locator'];
+        $grav = Grav::instance();
+        $locator = $grav['locator'];
+        $config = $grav['config'];
 
         // force lowercase of username
         $username = strtolower($username);
 
-        $blueprints = new Blueprints('blueprints://');
+        $blueprints = new Blueprints;
         $blueprint = $blueprints->get('user/account');
         $file_path = $locator->findResource('account://' . $username . YAML_EXT);
         $file = CompiledYamlFile::instance($file_path);
@@ -50,6 +48,9 @@ public static function load($username)
         $user = new User($content, $blueprint);
         $user->file($file);
 
+        // add user to config
+        $config->set("user", $user);
+
         return $user;
     }
 
@@ -62,7 +63,7 @@ public static function load($username)
      */
     public static function remove($username)
     {
-        $file_path = self::getGrav()['locator']->findResource('account://' . $username . YAML_EXT);
+        $file_path = Grav::instance()['locator']->findResource('account://' . $username . YAML_EXT);
         if (file_exists($file_path) && unlink($file_path)) {
             return true;
         }
@@ -91,7 +92,7 @@ public function authenticate($password)
                 // the result
                 Authentication::verify(
                     $password,
-                    self::getGrav()['config']->get('system.security.default_hash')
+                    Grav::instance()['config']->get('system.security.default_hash')
                 );
 
                 return false;
@@ -126,14 +127,21 @@ public function authenticate($password)
     public function save()
     {
         $file = $this->file();
+
         if ($file) {
+            $username = $this->get('username');
+
+            if (!$file->filename()) {
+                $locator = Grav::instance()['locator'];
+                $file->filename($locator->findResource('account://') . DS . strtolower($username) . YAML_EXT);
+            }
+
             // if plain text password, hash it and remove plain text
             if ($this->password) {
                 $this->hashed_password = Authentication::create($this->password);
                 unset($this->password);
             }
 
-            $username = $this->get('username');
             unset($this->username);
             $file->save($this->items);
             $this->set('username', $username);
@@ -163,7 +171,7 @@ public function authorize($action)
         $groups = $this->get('groups');
         if ($groups) {
             foreach ((array)$groups as $group) {
-                $permission = self::getGrav()['config']->get("groups.{$group}.access.{$action}");
+                $permission = Grav::instance()['config']->get("groups.{$group}.access.{$action}");
                 $return = Utils::isPositive($permission);
                 if ($return === true) {
                     break;
@@ -173,7 +181,7 @@ public function authorize($action)
 
         //Check user access level
         if ($this->get('access')) {
-            if (Utils::resolve($this->get('access'), $action) !== null) {
+            if (Utils::getDotNotation($this->get('access'), $action) !== null) {
                 $permission = $this->get("access.{$action}");
                 $return = Utils::isPositive($permission);
             }
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index 85702c3e7d..9e07d15241 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -1,20 +1,21 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use DateTime;
 use DateTimeZone;
+use Grav\Common\Grav;
 use Grav\Common\Helpers\Truncator;
 use RocketTheme\Toolbox\Event\Event;
 
-/**
- * Misc utilities.
- *
- * @package Grav\Common
- */
 abstract class Utils
 {
-    use GravTrait;
-
     protected static $nonces = [];
 
     /**
@@ -122,11 +123,11 @@ public static function dateFormats()
         $date_formats = [
             'd-m-Y H:i' => 'd-m-Y H:i (e.g. '.$now->format('d-m-Y H:i').')',
             'Y-m-d H:i' => 'Y-m-d H:i (e.g. '.$now->format('Y-m-d H:i').')',
-            'm/d/Y h:i a' => 'm/d/Y h:i (e.g. '.$now->format('m/d/Y h:i a').')',
+            'm/d/Y h:i a' => 'm/d/Y h:i a (e.g. '.$now->format('m/d/Y h:i a').')',
             'H:i d-m-Y' => 'H:i d-m-Y (e.g. '.$now->format('H:i d-m-Y').')',
             'h:i a m/d/Y' => 'h:i a m/d/Y (e.g. '.$now->format('h:i a m/d/Y').')',
             ];
-        $default_format = self::getGrav()['config']->get('system.pages.dateformat.default');
+        $default_format = Grav::instance()['config']->get('system.pages.dateformat.default');
         if ($default_format) {
             $date_formats = array_merge([$default_format => $default_format.' (e.g. '.$now->format($default_format).')'], $date_formats);
         }
@@ -219,56 +220,98 @@ public static function generateRandomString($length = 5)
     /**
      * Provides the ability to download a file to the browser
      *
-     * @param string $file           the full path to the file to be downloaded
-     * @param bool   $force_download as opposed to letting browser choose if to download or render
+     * @param string $file the full path to the file to be downloaded
+     * @param bool $force_download as opposed to letting browser choose if to download or render
+     * @param int $sec      Throttling, try 0.1 for some speed throttling of downloads
+     * @param int $bytes    Size of chunks to send in bytes. Default is 1024
+     * @throws \Exception
      */
-    public static function download($file, $force_download = true)
+    public static function download($file, $force_download = true, $sec = 0, $bytes = 1024)
     {
         if (file_exists($file)) {
             // fire download event
-            self::getGrav()->fireEvent('onBeforeDownload', new Event(['file' => $file]));
+            Grav::instance()->fireEvent('onBeforeDownload', new Event(['file' => $file]));
 
             $file_parts = pathinfo($file);
-            $filesize = filesize($file);
+            $mimetype = Utils::getMimeType($file_parts['extension']);
+            $size   = filesize($file); // File size
 
-            // check if this function is available, if so use it to stop any timeouts
-            try {
-                if (!Utils::isFunctionDisabled('set_time_limit') && !ini_get('safe_mode') && function_exists('set_time_limit')) {
-                    set_time_limit(0);
-                }
-            } catch (\Exception $e) {
+            // clean all buffers
+            while (ob_get_level()) {
+                ob_end_clean();
             }
 
-            ignore_user_abort(false);
-
-            if ($force_download) {
-                header('Content-Description: File Transfer');
-                header('Content-Type: application/octet-stream');
-                header('Content-Disposition: attachment; filename=' . $file_parts['basename']);
-                header('Content-Transfer-Encoding: binary');
-                header('Expires: 0');
-                header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-                header('Pragma: public');
-            } else {
-                header("Content-Type: " . Utils::getMimeType($file_parts['extension']));
+            // required for IE, otherwise Content-Disposition may be ignored
+            if (ini_get('zlib.output_compression')) {
+                ini_set('zlib.output_compression', 'Off');
             }
-            header('Content-Length: ' . $filesize);
 
-            // 8kb chunks for now
-            $chunk = 8 * 1024;
+            header("Content-Type: " . $mimetype);
+            header('Accept-Ranges: bytes');
 
-            $fh = fopen($file, "rb");
+            if ($force_download) {
+                // output the regular HTTP headers
+                header('Content-Disposition: attachment; filename="' . $file_parts['basename'] . '"');
+            }
 
-            if ($fh === false) {
-                return;
+            // multipart-download and download resuming support
+            if (isset($_SERVER['HTTP_RANGE'])) {
+                list($a, $range) = explode("=", $_SERVER['HTTP_RANGE'], 2);
+                list($range) = explode(",", $range, 2);
+                list($range, $range_end) = explode("-", $range);
+                $range = intval($range);
+                if (!$range_end) {
+                    $range_end = $size - 1;
+                } else {
+                    $range_end = intval($range_end);
+                }
+                $new_length = $range_end - $range + 1;
+                header("HTTP/1.1 206 Partial Content");
+                header("Content-Length: $new_length");
+                header("Content-Range: bytes $range-$range_end/$size");
+            } else {
+                $new_length = $size;
+                header("Content-Length: " . $size);
+
+                if (Grav::instance()['config']->get('system.cache.enabled')) {
+                    $expires = Grav::instance()['config']->get('system.pages.expires');
+                    if ($expires > 0) {
+                        $expires_date = gmdate('D, d M Y H:i:s T', time() + $expires);
+                        header('Cache-Control: max-age=' . $expires);
+                        header('Expires: ' . $expires_date);
+                        header('Pragma: cache');
+                    }
+                    header('Last-Modified: ' . gmdate("D, d M Y H:i:s T", filemtime($file)));
+
+                    // Return 304 Not Modified if the file is already cached in the browser
+                    if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
+                        strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($file))
+                    {
+                        header('HTTP/1.1 304 Not Modified');
+                        exit();
+                    }
+                }
             }
 
-            // Repeat reading until EOF
-            while (!feof($fh)) {
-                echo fread($fh, $chunk);
+            /* output the file itself */
+            $chunksize = $bytes * 8; //you may want to change this
+            $bytes_send = 0;
 
-                ob_flush();  // flush output
-                flush();
+            $fp = @fopen($file, 'r');
+            if ($fp) {
+                if (isset($_SERVER['HTTP_RANGE'])) {
+                    fseek($fp, $range);
+                }
+                while (!feof($fp) && (!connection_aborted()) && ($bytes_send < $new_length) ) {
+                    $buffer = fread($fp, $chunksize);
+                    echo($buffer); //echo($buffer); // is also possible
+                    flush();
+                    usleep($sec * 1000000);
+                    $bytes_send += strlen($buffer);
+                }
+                fclose($fp);
+            } else {
+                throw new \Exception('Error - can not open file.');
             }
 
             exit;
@@ -285,7 +328,7 @@ public static function download($file, $force_download = true)
     public static function getMimeType($extension)
     {
         $extension = strtolower($extension);
-        $config = self::getGrav()['config']->get('media');
+        $config = Grav::instance()['config']->get('media.types');
 
         if (isset($config[$extension])) {
             return $config[$extension]['mime'];
@@ -308,7 +351,7 @@ public static function normalizePath($path)
         $segments = explode('/', trim($path, '/'));
         $ret = [];
         foreach ($segments as $segment) {
-            if (($segment == '.') || empty($segment)) {
+            if (($segment == '.') || strlen($segment) == 0) {
                 continue;
             }
             if ($segment == '..') {
@@ -358,7 +401,7 @@ public static function timezones()
 
             $pretty_offset = "UTC${offset_prefix}${offset_formatted}";
 
-            $timezone_list[$timezone] = "(${pretty_offset}) $timezone";
+            $timezone_list[$timezone] = "(${pretty_offset}) ".str_replace('_', ' ', $timezone);
         }
 
         return $timezone_list;
@@ -402,7 +445,7 @@ public static function pathPrefixedByLangCode($string)
             return false;
         }
 
-        $languages_enabled = self::getGrav()['config']->get('system.languages.supported', []);
+        $languages_enabled = Grav::instance()['config']->get('system.languages.supported', []);
 
         if ($string[0] == '/' && $string[3] == '/' && in_array(substr($string, 1, 2), $languages_enabled)) {
             return true;
@@ -416,17 +459,17 @@ public static function pathPrefixedByLangCode($string)
      *
      * @param string $date a String expressed in the system.pages.dateformat.default format, with fallback to a
      *                     strtotime argument
-     *
+     * @param string $format a date format to use if possible
      * @return int the timestamp
      */
-    public static function date2timestamp($date)
+    public static function date2timestamp($date, $format = null)
     {
-        $config = self::getGrav()['config'];
-        $default_dateformat = $config->get('system.pages.dateformat.default');
+        $config = Grav::instance()['config'];
+        $dateformat = $format ?: $config->get('system.pages.dateformat.default');
 
         // try to use DateTime and default format
-        if ($default_dateformat) {
-            $datetime = DateTime::createFromFormat($default_dateformat, $date);
+        if ($dateformat) {
+            $datetime = DateTime::createFromFormat($dateformat, $date);
         } else {
             $datetime = new DateTime($date);
         }
@@ -440,28 +483,12 @@ public static function date2timestamp($date)
     }
 
     /**
-     * Get value of an array element using dot notation
+     * @deprecated Use getDotNotation() method instead
      *
-     * @param array  $array   the Array to check
-     * @param string $path    the dot notation path to check
-     * @param mixed  $default a value to be returned if $path is not found in $array
-     *
-     * @return mixed the value found
      */
     public static function resolve(array $array, $path, $default = null)
     {
-        $current = $array;
-        $p = strtok($path, '.');
-
-        while ($p !== false) {
-            if (!isset($current[$p])) {
-                return $default;
-            }
-            $current = $current[$p];
-            $p = strtok('.');
-        }
-
-        return $current;
+        return static::getDotNotation($array, $path, $default);
     }
 
     /**
@@ -489,8 +516,8 @@ public static function isPositive($value)
     private static function generateNonceString($action, $plusOneTick = false)
     {
         $username = '';
-        if (isset(self::getGrav()['user'])) {
-            $user = self::getGrav()['user'];
+        if (isset(Grav::instance()['user'])) {
+            $user = Grav::instance()['user'];
             $username = $user->username;
         }
 
@@ -501,14 +528,14 @@ private static function generateNonceString($action, $plusOneTick = false)
             $i++;
         }
 
-        return ($i . '|' . $action . '|' . $username . '|' . $token . '|' . self::getGrav()['config']->get('security.salt'));
+        return ($i . '|' . $action . '|' . $username . '|' . $token . '|' . Grav::instance()['config']->get('security.salt'));
     }
 
     //Added in version 1.0.8 to ensure that existing nonces are not broken.
     private static function generateNonceStringOldStyle($action, $plusOneTick = false)
     {
-        if (isset(self::getGrav()['user'])) {
-            $user = self::getGrav()['user'];
+        if (isset(Grav::instance()['user'])) {
+            $user = Grav::instance()['user'];
             $username = $user->username;
             if (isset($_SERVER['REMOTE_ADDR'])) {
                 $username .= $_SERVER['REMOTE_ADDR'];
@@ -522,7 +549,7 @@ private static function generateNonceStringOldStyle($action, $plusOneTick = fals
             $i++;
         }
 
-        return ($i . '|' . $action . '|' . $username . '|' . $token . '|' . self::getGrav()['config']->get('security.salt'));
+        return ($i . '|' . $action . '|' . $username . '|' . $token . '|' . Grav::instance()['config']->get('security.salt'));
     }
 
     /**
@@ -616,4 +643,78 @@ public static function verifyNonce($nonce, $action)
         //Invalid nonce
         return false;
     }
+
+    /**
+     * Simple helper method to get whether or not the admin plugin is active
+     *
+     * @return bool
+     */
+    public static function isAdminPlugin()
+    {
+        if (isset(Grav::instance()['admin'])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a portion of an array (passed by reference) with dot-notation key
+     *
+     * @param $array
+     * @param $key
+     * @param null $default
+     * @return mixed
+     */
+    public static function getDotNotation($array, $key, $default = null)
+    {
+        if (is_null($key)) return $array;
+
+        if (isset($array[$key])) return $array[$key];
+
+        foreach (explode('.', $key) as $segment)
+        {
+            if ( ! is_array($array) ||
+                ! array_key_exists($segment, $array))
+            {
+                return $default;
+            }
+
+            $array = $array[$segment];
+        }
+
+        return $array;
+    }
+
+    /**
+     * Set portion of array (passed by reference) for a dot-notation key
+     * and set the value
+     *
+     * @param $array
+     * @param $key
+     * @param $value
+     * @return mixed
+     */
+    public static function setDotNotation(&$array, $key, $value)
+    {
+        if (is_null($key)) return $array = $value;
+
+        $keys = explode('.', $key);
+
+        while (count($keys) > 1)
+        {
+            $key = array_shift($keys);
+
+            if ( ! isset($array[$key]) || ! is_array($array[$key]))
+            {
+                $array[$key] = array();
+            }
+
+            $array =& $array[$key];
+        }
+
+        $array[array_shift($keys)] = $value;
+
+        return $array;
+    }
 }
diff --git a/system/src/Grav/Console/Cli/BackupCommand.php b/system/src/Grav/Console/Cli/BackupCommand.php
index d8b8500fb8..3c7e557e95 100644
--- a/system/src/Grav/Console/Cli/BackupCommand.php
+++ b/system/src/Grav/Console/Cli/BackupCommand.php
@@ -1,19 +1,26 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
+use Grav\Common\Grav;
 use Grav\Common\Backup\ZipBackup;
 use Grav\Console\ConsoleCommand;
 use RocketTheme\Toolbox\File\JsonFile;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 
-/**
- * Class BackupCommand
- * @package Grav\Console\Cli
- */
 class BackupCommand extends ConsoleCommand
 {
+    /** @var string $source */
     protected $source;
+
+    /** @var ProgressBar $progress */
     protected $progress;
 
     /**
@@ -43,10 +50,10 @@ protected function serve()
         $this->progress = new ProgressBar($this->output);
         $this->progress->setFormat('Archiving <cyan>%current%</cyan> files [<green>%bar%</green>] %elapsed:6s% %memory:6s%');
 
-        self::getGrav()['config']->init();
+        Grav::instance()['config']->init();
 
         $destination = ($this->input->getArgument('destination')) ? $this->input->getArgument('destination') : null;
-        $log = JsonFile::instance(self::getGrav()['locator']->findResource("log://backup.log", true, true));
+        $log = JsonFile::instance(Grav::instance()['locator']->findResource("log://backup.log", true, true));
         $backup = ZipBackup::backup($destination, [$this, 'output']);
 
         $log->content([
diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
index ff6d28614c..69d05758b0 100644
--- a/system/src/Grav/Console/Cli/CleanCommand.php
+++ b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -1,17 +1,19 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Common\Filesystem\Folder;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 
-/**
- * Class CleanCommand
- * @package Grav\Console\Cli
- */
 class CleanCommand extends Command
 {
     /* @var InputInterface $output */
@@ -92,6 +94,10 @@ class CleanCommand extends Command
         'vendor/ircmaxell/password-compat/version-test.php',
         'vendor/ircmaxell/password-compat/.travis.yml',
         'vendor/ircmaxell/password-compat/test',
+        'vendor/matthiasmullie/minify/bin',
+        'vendor/matthiasmullie/minify/composer.json',
+        'vendor/matthiasmullie/minify/CONTRIBUTING.md',
+        'vendor/matthiasmullie/path-converter/composer.json',
         'vendor/maximebf/debugbar/bower.json',
         'vendor/maximebf/debugbar/composer.json',
         'vendor/maximebf/debugbar/.bowerrc',
@@ -104,21 +110,6 @@ class CleanCommand extends Command
         'vendor/monolog/monolog/doc',
         'vendor/monolog/monolog/phpunit.xml.dist',
         'vendor/monolog/monolog/tests',
-        'vendor/mrclay/minify/.editorconfig',
-        'vendor/mrclay/minify/.git',
-        'vendor/mrclay/minify/.gitignore',
-        'vendor/mrclay/minify/composer.json',
-        'vendor/mrclay/minify/min_extras',
-        'vendor/mrclay/minify/min_unit_tests',
-        'vendor/mrclay/minify/min/.htaccess',
-        'vendor/mrclay/minify/min/builder',
-        'vendor/mrclay/minify/min/config-test.php',
-        'vendor/mrclay/minify/min/config.php',
-        'vendor/mrclay/minify/min/groupsConfig.php',
-        'vendor/mrclay/minify/min/index.php',
-        'vendor/mrclay/minify/min/quick-test.css',
-        'vendor/mrclay/minify/min/quick-test.js',
-        'vendor/mrclay/minify/min/utils.php',
         'vendor/pimple/pimple/.gitignore',
         'vendor/pimple/pimple/.travis.yml',
         'vendor/pimple/pimple/composer.json',
@@ -184,6 +175,9 @@ protected function configure()
     }
 
     /**
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     *
      * @return int|null|void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -214,7 +208,7 @@ private function cleanPaths()
         }
     }
 
-        /**
+    /**
      * Set colors style definition for the formatter.
      *
      * @param InputInterface  $input
@@ -222,16 +216,16 @@ private function cleanPaths()
      */
     public function setupConsole(InputInterface $input, OutputInterface $output)
     {
-        $this->input  = $input;
+        $this->input = $input;
         $this->output = $output;
 
         $this->output->getFormatter()->setStyle('normal', new OutputFormatterStyle('white'));
-        $this->output->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, array('bold')));
-        $this->output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
-        $this->output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, array('bold')));
-        $this->output->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, array('bold')));
-        $this->output->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, array('bold')));
-        $this->output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
+        $this->output->getFormatter()->setStyle('yellow', new OutputFormatterStyle('yellow', null, ['bold']));
+        $this->output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, ['bold']));
+        $this->output->getFormatter()->setStyle('cyan', new OutputFormatterStyle('cyan', null, ['bold']));
+        $this->output->getFormatter()->setStyle('green', new OutputFormatterStyle('green', null, ['bold']));
+        $this->output->getFormatter()->setStyle('magenta', new OutputFormatterStyle('magenta', null, ['bold']));
+        $this->output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, ['bold']));
     }
 
 }
diff --git a/system/src/Grav/Console/Cli/ClearCacheCommand.php b/system/src/Grav/Console/Cli/ClearCacheCommand.php
index a675a66f21..a5d8f214be 100644
--- a/system/src/Grav/Console/Cli/ClearCacheCommand.php
+++ b/system/src/Grav/Console/Cli/ClearCacheCommand.php
@@ -1,14 +1,17 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Common\Cache;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * Class ClearCacheCommand
- * @package Grav\Console\Cli
- */
 class ClearCacheCommand extends ConsoleCommand
 {
     /**
diff --git a/system/src/Grav/Console/Cli/ComposerCommand.php b/system/src/Grav/Console/Cli/ComposerCommand.php
index 729b425a87..ed8f245ae9 100644
--- a/system/src/Grav/Console/Cli/ComposerCommand.php
+++ b/system/src/Grav/Console/Cli/ComposerCommand.php
@@ -1,14 +1,16 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Console\ConsoleCommand;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * Class ComposerCommand
- * @package Grav\Console\Cli
- */
 class ComposerCommand extends ConsoleCommand
 {
     /**
diff --git a/system/src/Grav/Console/Cli/InstallCommand.php b/system/src/Grav/Console/Cli/InstallCommand.php
index 31f0116915..a3768ba4ed 100644
--- a/system/src/Grav/Console/Cli/InstallCommand.php
+++ b/system/src/Grav/Console/Cli/InstallCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Console\ConsoleCommand;
@@ -6,10 +13,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Yaml\Yaml;
 
-/**
- * Class InstallCommand
- * @package Grav\Console\Cli
- */
 class InstallCommand extends ConsoleCommand
 {
     /**
@@ -109,10 +112,18 @@ private function gitclone()
         $this->output->writeln('');
 
         foreach ($this->config['git'] as $repo => $data) {
+            $this->destination = rtrim($this->destination, DS);
             $path = $this->destination . DS . $data['path'];
             if (!file_exists($path)) {
-                exec('cd "' . $this->destination . '" && git clone -b ' . $data['branch'] . ' ' . $data['url'] . ' ' . $data['path']);
-                $this->output->writeln('<green>SUCCESS</green> cloned <magenta>' . $data['url'] . '</magenta> -> <cyan>' . $path . '</cyan>');
+                exec('cd "' . $this->destination . '" && git clone -b ' . $data['branch'] . ' ' . $data['url'] . ' ' . $data['path'], $output, $return);
+
+                if (!$return) {
+                    $this->output->writeln('<green>SUCCESS</green> cloned <magenta>' . $data['url'] . '</magenta> -> <cyan>' . $path . '</cyan>');
+                } else {
+                    $this->output->writeln('<red>ERROR</red> cloning <magenta>' . $data['url']);
+
+                }
+
                 $this->output->writeln('');
             } else {
                 $this->output->writeln('<red>' . $path . ' already exists, skipping...</red>');
diff --git a/system/src/Grav/Console/Cli/NewProjectCommand.php b/system/src/Grav/Console/Cli/NewProjectCommand.php
index 2d63f04dd9..f93bd18cc3 100644
--- a/system/src/Grav/Console/Cli/NewProjectCommand.php
+++ b/system/src/Grav/Console/Cli/NewProjectCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Console\ConsoleCommand;
@@ -6,10 +13,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * Class NewProjectCommand
- * @package Grav\Console\Cli
- */
 class NewProjectCommand extends ConsoleCommand
 {
     /**
@@ -43,17 +46,17 @@ protected function serve()
         $sandboxCommand = $this->getApplication()->find('sandbox');
         $installCommand = $this->getApplication()->find('install');
 
-        $sandboxArguments = new ArrayInput(array(
+        $sandboxArguments = new ArrayInput([
             'command'     => 'sandbox',
             'destination' => $this->input->getArgument('destination'),
             '-s'          => $this->input->getOption('symlink')
-        ));
+        ]);
 
-        $installArguments = new ArrayInput(array(
+        $installArguments = new ArrayInput([
             'command'     => 'install',
             'destination' => $this->input->getArgument('destination'),
             '-s'          => $this->input->getOption('symlink')
-        ));
+        ]);
 
         $sandboxCommand->run($sandboxArguments, $this->output);
         $installCommand->run($installArguments, $this->output);
diff --git a/system/src/Grav/Console/Cli/NewUserCommand.php b/system/src/Grav/Console/Cli/NewUserCommand.php
deleted file mode 100644
index 694d5ee4b5..0000000000
--- a/system/src/Grav/Console/Cli/NewUserCommand.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace Grav\Console\Cli;
-
-use Grav\Console\ConsoleCommand;
-
-/**
- * Class CleanCommand
- *
- * @package Grav\Console\Cli
- */
-class NewUserCommand extends ConsoleCommand
-{
-    /**
-     * Configure the command
-     */
-    protected function configure()
-    {
-        $this
-            ->setName('newuser')
-            ->setDescription('DEPRECATED: Creates a new user')
-            ->setHelp('The <info>newuser</info> from `bin/grav` has been deprecated. Please refer to `bin/plugin login new-user')
-        ;
-    }
-
-    /**
-     * @return int|null|void
-     */
-    protected function serve()
-    {
-        $this->output->writeln('');
-        $this->output->writeln('<red>DEPRECATED COMMAND</red>');
-        $this->output->writeln('  <white>`bin/grav new-user`</white> has been <red>deprecated</red> in favor of the new <white>`bin/plugin login new-user`</white>');
-    }
-}
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index be692dc024..a593165a7b 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Cli;
 
 use Grav\Console\ConsoleCommand;
@@ -6,16 +13,12 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * Class SandboxCommand
- * @package Grav\Console\Cli
- */
 class SandboxCommand extends ConsoleCommand
 {
     /**
      * @var array
      */
-    protected $directories = array(
+    protected $directories = [
         '/backup',
         '/cache',
         '/logs',
@@ -27,22 +30,22 @@ class SandboxCommand extends ConsoleCommand
         '/user/data',
         '/user/plugins',
         '/user/themes',
-    );
+    ];
 
     /**
      * @var array
      */
-    protected $files = array(
+    protected $files = [
         '/.dependencies',
         '/.htaccess',
         '/user/config/site.yaml',
         '/user/config/system.yaml',
-    );
+    ];
 
     /**
      * @var array
      */
-    protected $mappings = array(
+    protected $mappings = [
         '/.editorconfig'        => '/.editorconfig',
         '/.gitignore'           => '/.gitignore',
         '/CHANGELOG.md'         => '/CHANGELOG.md',
@@ -56,7 +59,7 @@ class SandboxCommand extends ConsoleCommand
         '/vendor'               => '/vendor',
         '/webserver-configs'    => '/webserver-configs',
         '/codeception.yml'      => '/codeception.yml',
-    );
+    ];
 
     /**
      * @var string
@@ -200,7 +203,7 @@ private function symlink()
      */
     private function initFiles()
     {
-        $this->check($this->output);
+        $this->check();
 
         $this->output->writeln('');
         $this->output->writeln('<comment>File Initializing</comment>');
@@ -225,8 +228,6 @@ private function initFiles()
         if (!$files_init) {
             $this->output->writeln('    <red>Files already exist</red>');
         }
-
-
     }
 
     /**
@@ -239,7 +240,7 @@ private function pages()
 
         // get pages files and initialize if no pages exist
         $pages_dir = $this->destination . '/user/pages';
-        $pages_files = array_diff(scandir($pages_dir), array('..', '.'));
+        $pages_files = array_diff(scandir($pages_dir), ['..', '.']);
 
         if (count($pages_files) == 0) {
             $destination = $this->source . '/user/pages';
@@ -269,7 +270,6 @@ private function perms()
         $this->output->writeln("");
     }
 
-
     /**
      *
      */
@@ -295,6 +295,7 @@ private function check()
                 $success = false;
             }
         }
+
         if (!$success) {
             $this->output->writeln('');
             $this->output->writeln('<comment>install should be run with --symlink|--s to symlink first</comment>');
diff --git a/system/src/Grav/Console/ConsoleCommand.php b/system/src/Grav/Console/ConsoleCommand.php
index 349c77ac81..3ab7617a30 100644
--- a/system/src/Grav/Console/ConsoleCommand.php
+++ b/system/src/Grav/Console/ConsoleCommand.php
@@ -1,16 +1,18 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console;
 
+use Grav\Common\Grav;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-/**
- * Class ConsoleCommand
- *
- * @package Grav\Console
- */
 class ConsoleCommand extends Command
 {
     use ConsoleTrait;
@@ -35,4 +37,11 @@ protected function serve()
 
     }
 
+    protected function displayGPMRelease()
+    {
+        $this->output->writeln('');
+        $this->output->writeln('GPM Releases Configuration: <yellow>' . ucfirst(Grav::instance()['config']->get('system.gpm.releases')) . '</yellow>');
+        $this->output->writeln('');
+    }
+
 }
diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php
index 1ba9357a20..66ecd07fd9 100644
--- a/system/src/Grav/Console/ConsoleTrait.php
+++ b/system/src/Grav/Console/ConsoleTrait.php
@@ -1,18 +1,22 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console;
 
-use Grav\Common\GravTrait;
+use Grav\Common\Grav;
 use Grav\Common\Composer;
+use Grav\Common\GravTrait;
 use Grav\Console\Cli\ClearCacheCommand;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-/**
- * Class ConsoleTrait
- * @package Grav\Console
- */
 trait ConsoleTrait
 {
     use GravTrait;
@@ -36,8 +40,8 @@ trait ConsoleTrait
      */
     public function setupConsole(InputInterface $input, OutputInterface $output)
     {
-        if (self::getGrav()) {
-            self::getGrav()['config']->set('system.cache.driver', 'default');
+        if (Grav::instance()) {
+            Grav::instance()['config']->set('system.cache.driver', 'default');
         }
 
         $this->argv = $_SERVER['argv'][0];
@@ -107,10 +111,10 @@ public function clearCache($all = [])
         $input = new ArrayInput($all);
         return $command->run($input, $this->output);
     }
-    
+
     /**
      * Validate if the system is based on windows or not.
-     * 
+     *
      * @return bool
      */
     public function isWindows()
diff --git a/system/src/Grav/Console/Gpm/IndexCommand.php b/system/src/Grav/Console/Gpm/IndexCommand.php
index 942c0f4d00..2e3edb2294 100644
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -1,15 +1,17 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputOption;
 
-/**
- * Class IndexCommand
- *
- * @package Grav\Console\Gpm
- */
 class IndexCommand extends ConsoleCommand
 {
     /**
@@ -101,9 +103,9 @@ protected function serve()
 
         $this->gpm = new GPM($this->options['force']);
 
-        $this->data = $this->gpm->getRepository();
+        $this->displayGPMRelease();
 
-        $this->output->writeln('');
+        $this->data = $this->gpm->getRepository();
 
         $data = $this->filter($this->data);
 
diff --git a/system/src/Grav/Console/Gpm/InfoCommand.php b/system/src/Grav/Console/Gpm/InfoCommand.php
index 99f8bd2e25..1036c597cc 100644
--- a/system/src/Grav/Console/Gpm/InfoCommand.php
+++ b/system/src/Grav/Console/Gpm/InfoCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
@@ -7,10 +14,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
-/**
- * Class InfoCommand
- * @package Grav\Console\Gpm
- */
 class InfoCommand extends ConsoleCommand
 {
     /**
@@ -57,6 +60,8 @@ protected function serve()
     {
         $this->gpm = new GPM($this->input->getOption('force'));
 
+        $this->displayGPMRelease();
+
         $foundPackage = $this->gpm->findPackage($this->input->getArgument('package'));
 
         if (!$foundPackage) {
@@ -83,7 +88,7 @@ protected function serve()
         $this->output->writeln("<green>" . str_pad("Author",
                 12) . ":</green> " . $foundPackage->author['name'] . ' <' . $foundPackage->author['email'] . '> ' . $packageURL);
 
-        foreach (array(
+        foreach ([
                      'version',
                      'keywords',
                      'date',
@@ -95,7 +100,7 @@ protected function serve()
                      'bugs',
                      'zipball_url',
                      'license'
-                 ) as $info) {
+                 ] as $info) {
             if (isset($foundPackage->$info)) {
                 $name = ucfirst($info);
                 $data = $foundPackage->$info;
diff --git a/system/src/Grav/Console/Gpm/InstallCommand.php b/system/src/Grav/Console/Gpm/InstallCommand.php
index dca4fe77b2..47eeeadb47 100644
--- a/system/src/Grav/Console/Gpm/InstallCommand.php
+++ b/system/src/Grav/Console/Gpm/InstallCommand.php
@@ -1,49 +1,53 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
 use Grav\Common\GPM\Response;
+use Grav\Common\GPM\Remote\Package as Package;
+use Grav\Common\Grav;
 use Grav\Common\Utils;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Yaml\Yaml;
 
 define('GIT_REGEX', '/http[s]?:\/\/(?:.*@)?(github|bitbucket)(?:.org|.com)\/.*\/(.*)/');
 
-/**
- * Class InstallCommand
- * @package Grav\Console\Gpm
- */
 class InstallCommand extends ConsoleCommand
 {
-    /**
-     * @var
-     */
+    /** @var */
     protected $data;
-    /**
-     * @var
-     */
+
+    /** @var GPM */
     protected $gpm;
-    /**
-     * @var
-     */
+
+    /** @var */
     protected $destination;
-    /**
-     * @var
-     */
+
+    /** @var */
     protected $file;
-    /**
-     * @var
-     */
+
+    /** @var */
     protected $tmp;
 
+    /** @var */
     protected $local_config;
 
+    /** @var bool */
+    protected $use_symlinks;
+
+    /** @var array */
+    protected $demo_processing = [];
 
     /**
      *
@@ -81,17 +85,30 @@ protected function configure()
     }
 
     /**
-     * @return int|null|void
+     * Allows to set the GPM object, used for testing the class
+     *
+     * @param $gpm
+     */
+    public function setGpm($gpm)
+    {
+        $this->gpm = $gpm;
+    }
+
+    /**
+     * @return int|null|void|bool
      */
     protected function serve()
     {
         $this->gpm = new GPM($this->input->getOption('force'));
+
+        $this->displayGPMRelease();
+
         $this->destination = realpath($this->input->getOption('destination'));
 
         $packages = array_map('strtolower', $this->input->getArgument('package'));
         $this->data = $this->gpm->findPackages($packages);
 
-        if (false === $this->isWindows() && @is_file(getenv("HOME").'/.grav/config')) {
+        if (false === $this->isWindows() && @is_file(getenv("HOME") . '/.grav/config')) {
             $local_config_file = exec('eval echo ~/.grav/config');
             if (file_exists($local_config_file)) {
                 $this->local_config = Yaml::parse($local_config_file);
@@ -122,115 +139,252 @@ protected function serve()
         unset($this->data['not_found']);
         unset($this->data['total']);
 
-        foreach ($this->data as $data) {
-            foreach ($data as $package) {
-                //Check for dependencies
-                if (isset($package->dependencies)) {
-                    $this->output->writeln("Package <cyan>" . $package->name . "</cyan> has ". count($package->dependencies) . " required dependencies that must be installed first...");
-                    $this->output->writeln('');
+        if (isset($this->local_config)) {
+            // Symlinks available, ask if Grav should use them
+
+            $this->use_symlinks = false;
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Should Grav use the symlinks if available? [y|N] ', false);
 
-                    $dependency_data = $this->gpm->findPackages($package->dependencies);
+            if ($helper->ask($this->input, $this->output, $question)) {
+                $this->use_symlinks = true;
+            }
+        }
 
-                    if (!$dependency_data['total']) {
-                        $this->output->writeln("No dependencies found...");
-                        $this->output->writeln('');
+        $this->output->writeln('');
+
+        try {
+            $dependencies = $this->gpm->getDependencies($packages);
+        } catch (\Exception $e) {
+            //Error out if there are incompatible packages requirements and tell which ones, and what to do
+            //Error out if there is any error in parsing the dependencies and their versions, and tell which one is broken
+            $this->output->writeln("<red>" . $e->getMessage() . "</red>");
+            return false;
+        }
+
+        if ($dependencies) {
+            try {
+                $this->installDependencies($dependencies, 'install', "The following dependencies need to be installed...");
+                $this->installDependencies($dependencies, 'update',  "The following dependencies need to be updated...");
+                $this->installDependencies($dependencies, 'ignore',  "The following dependencies can be updated as there is a newer version, but it's not mandatory...", false);
+            } catch (\Exception $e) {
+                $this->output->writeln("<red>Installation aborted</red>");
+                return false;
+            }
+
+            $this->output->writeln("<green>Dependencies are OK</green>");
+            $this->output->writeln("");
+        }
+
+
+        //We're done installing dependencies. Install the actual packages
+        foreach ($this->data as $data) {
+            foreach ($data as $package_name => $package) {
+                if (in_array($package_name, array_keys($dependencies))) {
+                    $this->output->writeln("<green>Package " . $package_name . " already installed as dependency</green>");
+                } else {
+                    $is_valid_destination = Installer::isValidDestination($this->destination . DS . $package->install_path);
+                    if ($is_valid_destination || Installer::lastErrorCode() == Installer::NOT_FOUND) {
+                        $this->processPackage($package, true, false);
                     } else {
-                        unset($dependency_data['total']);
+                        if (Installer::lastErrorCode() == Installer::EXISTS) {
+
+                            try {
+                                $this->askConfirmationIfMajorVersionUpdated($package);
+                                $this->gpm->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package->slug, $package->available, array_keys($data));
+                            } catch (\Exception $e) {
+                                $this->output->writeln("<red>" . $e->getMessage() . "</red>");
+                                return false;
+                            }
 
-                        foreach($dependency_data as $type => $dep_data) {
-                            foreach($dep_data as $name => $dep_package) {
+                            $helper = $this->getHelper('question');
+                            $question = new ConfirmationQuestion("The package <cyan>$package_name</cyan> is already installed, overwrite? [y|N] ", false);
 
-                                $this->processPackage($dep_package);
+                            if ($helper->ask($this->input, $this->output, $question)) {
+                                $is_update = true;
+                                $this->processPackage($package, true, $is_update);
+                            } else {
+                                $this->output->writeln("<yellow>Package " . $package_name . " not overwritten</yellow>");
+                            }
+                        } else {
+                            if (Installer::lastErrorCode() == Installer::IS_LINK) {
+                                $this->output->writeln("<red>Cannot overwrite existing symlink</red>");
+                                return false;
                             }
                         }
                     }
                 }
+            }
+        }
 
-                $this->processPackage($package);
+        if (count($this->demo_processing) > 0) {
+            foreach ($this->demo_processing as $package) {
+                $this->installDemoContent($package);
             }
         }
 
         // clear cache after successful upgrade
         $this->clearCache();
+
+        return true;
     }
 
     /**
+     * If the package is updated from an older major release, show warning and ask confirmation
+     *
      * @param $package
      */
-    private function processPackage($package)
+    public function askConfirmationIfMajorVersionUpdated($package)
     {
-        $install_options = ['GPM'];
+        $helper = $this->getHelper('question');
+        $package_name = $package->name;
+        $new_version = $package->available ? $package->available : $this->gpm->getLatestVersionOfPackage($package->slug);
+        $old_version = $package->version;
 
-        // if no name, not found in GPM
-        if (!isset($package->version)) {
-            unset($install_options[0]);
-        }
-        // if local config found symlink is a valid option
-        if (isset($this->local_config) && $this->getSymlinkSource($package)) {
-            $install_options[] = 'Symlink';
-        }
-        // if override set, can install via git
-        if (isset($package->override_repository)) {
-            $install_options[] = 'Git';
+        $major_version_changed = explode('.', $new_version)[0] !== explode('.', $old_version)[0];
+
+        if ($major_version_changed) {
+            $question = new ConfirmationQuestion("The package <cyan>$package_name</cyan> will be updated to a new major version <green>$new_version</green>, from <magenta>$old_version</magenta>. Be sure to read what changed with the new major release. Continue? [y|N] ", false);
+
+            if (!$helper->ask($this->input, $this->output, $question)) {
+                $this->output->writeln("<yellow>Package " . $package_name . " not updated</yellow>");
+                exit;
+            }
         }
+    }
+
+    /**
+     * Given a $dependencies list, filters their type according to $type and
+     * shows $message prior to listing them to the user. Then asks the user a confirmation prior
+     * to installing them.
+     *
+     * @param array  $dependencies The dependencies array
+     * @param string $type         The type of dependency to show: install, update, ignore
+     * @param string $message      A message to be shown prior to listing the dependencies
+     * @param bool   $required     A flag that determines if the installation is required or optional
+     *
+     * @throws \Exception
+     */
+    public function installDependencies($dependencies, $type, $message, $required = true)
+    {
+        $packages = array_filter($dependencies, function ($action) use ($type) { return $action === $type; });
+        if (count($packages) > 0) {
+            $this->output->writeln($message);
 
-        // reindex list
-        $install_options = array_values($install_options);
+            foreach ($packages as $dependencyName => $dependencyVersion) {
+                $this->output->writeln("  |- Package <cyan>" . $dependencyName . "</cyan>");
+            }
+
+            $this->output->writeln("");
 
-        if (count($install_options) == 0) {
-            // no valid install options - error and return
-            $this->output->writeln("<red>not valid installation methods found!</red>");
-            return;
-        } elseif (count($install_options) == 1) {
-            // only one option, use it...
-            $method = $install_options[0];
-        } else {
             $helper = $this->getHelper('question');
-            $question = new ChoiceQuestion(
-                'Please select installation method for <cyan>' . $package->name . '</cyan> (<magenta>'.$install_options[0].' is default</magenta>)', array_values($install_options), 0
-            );
-            $question->setErrorMessage('Method %s is invalid');
-            $method = $helper->ask($this->input, $this->output, $question);
+
+            if ($type == 'install') {
+                $questionAction = 'Install';
+            } else {
+                $questionAction = 'Update';
+            }
+
+            if (count($packages) == 1) {
+                $questionArticle = 'this';
+            } else {
+                $questionArticle = 'these';
+            }
+
+            if (count($packages) == 1) {
+                $questionNoun = 'package';
+            } else {
+                $questionNoun = 'packages';
+            }
+
+            $question = new ConfirmationQuestion("$questionAction $questionArticle $questionNoun? [y|N] ", false);
+
+            if ($helper->ask($this->input, $this->output, $question)) {
+                foreach ($packages as $dependencyName => $dependencyVersion) {
+                    $package = $this->gpm->findPackage($dependencyName);
+                    $this->processPackage($package, true, ($type == 'update') ? true : false);
+                }
+                $this->output->writeln('');
+            } else {
+                if ($required) {
+                    throw new \Exception();
+                }
+            }
         }
+    }
 
-        $this->output->writeln('');
+    /**
+     * @param      $package
+     * @param bool $skip_prompt
+     * @param bool $update      True if the package is an update
+     */
+    private function processPackage($package, $skip_prompt = false, $is_update = false)
+    {
+        if (!$package) {
+            $this->output->writeln("<red>Package not found on the GPM!</red>  ");
+            $this->output->writeln('');
+            return;
+        }
 
-        $method_name = 'process'.$method;
-        $this->$method_name($package);
+        $symlink = false;
+        if ($this->use_symlinks) {
+            if ($this->getSymlinkSource($package) || !isset($package->version)) {
+                $symlink = true;
+            }
+        }
 
-        $this->installDemoContent($package);
+        $symlink ? $this->processSymlink($package, $skip_prompt) : $this->processGpm($package, $skip_prompt, $is_update);
+
+        $this->processDemo($package);
     }
 
+    /**
+     * Add package to the queue to process the demo content, if demo content exists
+     *
+     * @param $package
+     */
+    private function processDemo($package)
+    {
+        $demo_dir = $this->destination . DS . $package->install_path . DS . '_demo';
+        if (file_exists($demo_dir)) {
+            $this->demo_processing[] = $package;
+        }
+    }
 
     /**
+     * Prompt to install the demo content of a package
+     *
      * @param $package
      */
     private function installDemoContent($package)
     {
         $demo_dir = $this->destination . DS . $package->install_path . DS . '_demo';
-        $dest_dir = $this->destination . DS . 'user';
-        $pages_dir = $dest_dir . DS . 'pages';
 
         if (file_exists($demo_dir)) {
+            $dest_dir = $this->destination . DS . 'user';
+            $pages_dir = $dest_dir . DS . 'pages';
+
             // Demo content exists, prompt to install it.
-            $this->output->writeln("<white>Attention: </white><cyan>".$package->name . "</cyan> contains demo content");
+            $this->output->writeln("<white>Attention: </white><cyan>" . $package->name . "</cyan> contains demo content");
             $helper = $this->getHelper('question');
             $question = new ConfirmationQuestion('Do you wish to install this demo content? [y|N] ', false);
 
             if (!$helper->ask($this->input, $this->output, $question)) {
                 $this->output->writeln("  '- <red>Skipped!</red>  ");
                 $this->output->writeln('');
+
                 return;
             }
 
             // if pages folder exists in demo
             if (file_exists($demo_dir . DS . 'pages')) {
                 $pages_backup = 'pages.' . date('m-d-Y-H-i-s');
-                $question = new ConfirmationQuestion('This will backup your current `user/pages` folder to `user/'. $pages_backup. '`, continue? [y|N]', false);
+                $question = new ConfirmationQuestion('This will backup your current `user/pages` folder to `user/' . $pages_backup . '`, continue? [y|N]', false);
 
                 if (!$helper->ask($this->input, $this->output, $question)) {
                     $this->output->writeln("  '- <red>Skipped!</red>  ");
                     $this->output->writeln('');
+
                     return;
                 }
 
@@ -259,9 +413,7 @@ private function installDemoContent($package)
      */
     private function getGitRegexMatches($package)
     {
-        if (isset($package->override_repository)) {
-            $repository = $package->override_repository;
-        } elseif (isset($package->repository)) {
+        if (isset($package->repository)) {
             $repository = $package->repository;
         } else {
             return false;
@@ -294,13 +446,15 @@ private function getSymlinkSource($package)
                 return $from;
             }
         }
+
         return false;
     }
 
     /**
-     * @param $package
+     * @param      $package
+     * @param bool $skip_prompt
      */
-    private function processSymlink($package)
+    private function processSymlink($package, $skip_prompt = false)
     {
 
         exec('cd ' . $this->destination);
@@ -315,7 +469,7 @@ private function processSymlink($package)
             $this->output->writeln("<green>ok</green>");
 
             $this->output->write("  |- Checking destination...  ");
-            $checks = $this->checkDestination($package);
+            $checks = $this->checkDestination($package, $skip_prompt);
 
             if (!$checks) {
                 $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
@@ -329,13 +483,11 @@ private function processSymlink($package)
 
                     // extra white spaces to clear out the buffer properly
                     $this->output->writeln("  |- Symlinking package...    <green>ok</green>                             ");
-
                     $this->output->writeln("  '- <green>Success!</green>  ");
                     $this->output->writeln('');
                 }
-
-
             }
+
             return;
         }
 
@@ -344,36 +496,10 @@ private function processSymlink($package)
     }
 
     /**
-     * @param $package
+     * @param      $package
+     * @param bool $skip_prompt
      */
-    private function processGit($package)
-    {
-        $matches = $this->getGitRegexMatches($package);
-
-        $this->output->writeln("Preparing to Git clone <cyan>" . $package->name . "</cyan> from " . $matches[0]);
-
-        $this->output->write("  |- Checking destination...  ");
-        $checks = $this->checkDestination($package);
-
-        if (!$checks) {
-            $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
-            $this->output->writeln('');
-        } else {
-            $cmd = 'cd ' . $this->destination . ' && git clone ' . $matches[0] . ' ' . $package->install_path;
-            exec($cmd);
-
-            // extra white spaces to clear out the buffer properly
-            $this->output->writeln("  |- Cloning package...    <green>ok</green>                             ");
-
-            $this->output->writeln("  '- <green>Success!</green>  ");
-            $this->output->writeln('');
-        }
-    }
-
-    /**
-     * @param $package
-     */
-    private function processGPM($package)
+    private function processGpm($package, $skip_prompt = false, $is_update = false)
     {
         $version = isset($package->available) ? $package->available : $package->version;
 
@@ -383,14 +509,14 @@ private function processGPM($package)
         $this->file = $this->downloadPackage($package);
 
         $this->output->write("  |- Checking destination...  ");
-        $checks = $this->checkDestination($package);
+        $checks = $this->checkDestination($package, $skip_prompt);
 
         if (!$checks) {
             $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
             $this->output->writeln('');
         } else {
             $this->output->write("  |- Installing package...  ");
-            $installation = $this->installPackage($package);
+            $installation = $this->installPackage($package, $is_update);
             if (!$installation) {
                 $this->output->writeln("  '- <red>Installation failed or aborted.</red>");
                 $this->output->writeln('');
@@ -402,13 +528,14 @@ private function processGPM($package)
     }
 
     /**
-     * @param $package
+     * @param Package $package
      *
      * @return string
      */
     private function downloadPackage($package)
     {
-        $this->tmp = CACHE_DIR . DS . 'tmp/Grav-' . uniqid();
+        $cache_dir = Grav::instance()['locator']->findResource('cache://', true);
+        $this->tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
         $filename = $package->slug . basename($package->zipball_url);
         $output = Response::get($package->zipball_url, [], [$this, 'progress']);
 
@@ -424,14 +551,19 @@ private function downloadPackage($package)
     }
 
     /**
-     * @param $package
+     * @param      $package
+     *
+     * @param bool $skip_prompt
      *
      * @return bool
      */
-    private function checkDestination($package)
+    private function checkDestination($package, $skip_prompt = false)
     {
         $question_helper = $this->getHelper('question');
-        $skip_prompt = $this->input->getOption('all-yes');
+
+        if (!$skip_prompt) {
+            $skip_prompt = $this->input->getOption('all-yes');
+        }
 
         Installer::isValidDestination($this->destination . DS . $package->install_path);
 
@@ -440,7 +572,7 @@ private function checkDestination($package)
                 $this->output->write("\x0D");
                 $this->output->writeln("  |- Checking destination...  <yellow>exists</yellow>");
 
-                $question = new ConfirmationQuestion("  |  '- The package has been detected as installed already, do you want to overwrite it? [y|N] ",
+                $question = new ConfirmationQuestion("  |  '- The package is already installed, do you want to overwrite it? [y|N] ",
                     false);
                 $answer = $question_helper->ask($this->input, $this->output, $question);
 
@@ -482,19 +614,22 @@ private function checkDestination($package)
     }
 
     /**
-     * @param $package
+     * Install a package
+     *
+     * @param Package $package
+     * @param bool    $is_update True if it's an update. False if it's an install
      *
      * @return bool
      */
-    private function installPackage($package)
+    private function installPackage($package, $is_update = false)
     {
         $type = $package->package_type;
 
-        Installer::install($this->file, $this->destination, ['install_path' => $package->install_path, 'theme' => (($type == 'themes'))]);
+        Installer::install($this->file, $this->destination, ['install_path' => $package->install_path, 'theme' => (($type == 'themes')), 'is_update' => $is_update]);
         $error_code = Installer::lastErrorCode();
         Folder::delete($this->tmp);
 
-        if ($error_code & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)) {
+        if ($error_code) {
             $this->output->write("\x0D");
             // extra white spaces to clear out the buffer properly
             $this->output->writeln("  |- Installing package...    <red>error</red>                             ");
@@ -503,6 +638,13 @@ private function installPackage($package)
             return false;
         }
 
+        $message = Installer::getMessage();
+        if ($message) {
+            $this->output->write("\x0D");
+            // extra white spaces to clear out the buffer properly
+            $this->output->writeln("  |- " . $message);
+        }
+
         $this->output->write("\x0D");
         // extra white spaces to clear out the buffer properly
         $this->output->writeln("  |- Installing package...    <green>ok</green>                             ");
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 5428783807..b943789db7 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -1,19 +1,23 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\GPM\Installer;
 use Grav\Common\GPM\Response;
 use Grav\Common\GPM\Upgrader;
+use Grav\Common\Grav;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
-/**
- * Class SelfupgradeCommand
- * @package Grav\Console\Gpm
- */
 class SelfupgradeCommand extends ConsoleCommand
 {
     /**
@@ -35,7 +39,7 @@ class SelfupgradeCommand extends ConsoleCommand
     /**
      * @var array
      */
-    protected $types = array('plugins', 'themes');
+    protected $types = ['plugins', 'themes'];
     /**
      * @var
      */
@@ -76,6 +80,8 @@ protected function serve()
     {
         $this->upgrader = new Upgrader($this->input->getOption('force'));
 
+        $this->displayGPMRelease();
+
         $update = $this->upgrader->getAssets()['grav-update'];
 
         $local = $this->upgrader->getLocalVersion();
@@ -171,7 +177,8 @@ protected function serve()
      */
     private function download($package)
     {
-        $this->tmp = CACHE_DIR . DS . 'tmp/Grav-' . uniqid();
+        $cache_dir = Grav::instance()['locator']->findResource('cache://', true);
+        $this->tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
         $output = Response::get($package['download'], [], [$this, 'progress']);
 
         Folder::mkdir($this->tmp);
diff --git a/system/src/Grav/Console/Gpm/UninstallCommand.php b/system/src/Grav/Console/Gpm/UninstallCommand.php
index dfe37e9ed5..3fabe29ab5 100644
--- a/system/src/Grav/Console/Gpm/UninstallCommand.php
+++ b/system/src/Grav/Console/Gpm/UninstallCommand.php
@@ -1,27 +1,31 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
 use Grav\Common\GPM\Installer;
+use Grav\Common\Grav;
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
-/**
- * Class UninstallCommand
- * @package Grav\Console\Gpm
- */
 class UninstallCommand extends ConsoleCommand
 {
     /**
      * @var
      */
     protected $data;
-    /**
-     * @var
-     */
+
+    /** @var GPM */
     protected $gpm;
+
     /**
      * @var
      */
@@ -97,7 +101,6 @@ protected function serve()
         foreach ($this->data as $slug => $package) {
             $this->output->writeln("Preparing to uninstall <cyan>" . $package->name . "</cyan> [v" . $package->version . "]");
 
-
             $this->output->write("  |- Checking destination...  ");
             $checks = $this->checkDestination($slug, $package);
 
@@ -116,6 +119,7 @@ protected function serve()
                     $this->output->writeln('');
                 }
             }
+
         }
 
         // clear cache after successful upgrade
@@ -129,9 +133,31 @@ protected function serve()
      *
      * @return bool
      */
-    private function uninstallPackage($slug, $package)
+    private function uninstallPackage($slug, $package, $is_dependency = false)
     {
-        $path = self::getGrav()['locator']->findResource($package->package_type . '://' .$slug);
+        if (!$slug) {
+            return false;
+        }
+
+        //check if there are packages that have this as a dependency. Abort and show list
+        $dependent_packages = $this->gpm->getPackagesThatDependOnPackage($slug);
+        if (count($dependent_packages) > ($is_dependency ? 1 : 0)) {
+            $this->output->writeln('');
+            $this->output->writeln('');
+            $this->output->writeln("<red>Uninstallation failed.</red>");
+            $this->output->writeln('');
+            if (count($dependent_packages) > ($is_dependency ? 2 : 1)) {
+                $this->output->writeln("The installed packages <cyan>" . implode('</cyan>, <cyan>', $dependent_packages) . "</cyan> depends on this package. Please remove those first.");
+            } else {
+                $this->output->writeln("The installed package <cyan>" . implode('</cyan>, <cyan>', $dependent_packages) . "</cyan> depends on this package. Please remove it first.");
+            }
+
+            $this->output->writeln('');
+            return false;
+        }
+
+        $locator = Grav::instance()['locator'];
+        $path = $locator->findResource($package->package_type . '://' . $slug);
         Installer::uninstall($path);
         $errorCode = Installer::lastErrorCode();
 
@@ -144,10 +170,49 @@ private function uninstallPackage($slug, $package)
             return false;
         }
 
+        $message = Installer::getMessage();
+        if ($message) {
+            $this->output->write("\x0D");
+            // extra white spaces to clear out the buffer properly
+            $this->output->writeln("  |- " . $message);
+        }
+
         $this->output->write("\x0D");
         // extra white spaces to clear out the buffer properly
         $this->output->writeln("  |- Uninstalling package...  <green>ok</green>                             ");
 
+
+        if (isset($package->dependencies)) {
+            $questionHelper = $this->getHelper('question');
+
+            foreach($package->dependencies as $dependency) {
+                if (is_array($dependency)) {
+                    $dependency = $dependency['name'];
+                }
+                if ($dependency === 'grav') {
+                    continue;
+                }
+
+                $dependencyPackage = $this->gpm->findPackage($dependency);
+                $question = new ConfirmationQuestion("  |  '- Delete dependency <cyan>" . $dependency . "</cyan> too? [y|N] ", false);
+                $answer = $questionHelper->ask($this->input, $this->output, $question);
+
+                if ($answer) {
+                    $this->output->writeln("  |     '- <red>You decided to delete " . $dependency . ".</red>");
+
+                    $uninstall = $this->uninstallPackage($dependency, $dependencyPackage, true);
+
+                    if (!$uninstall) {
+                        $this->output->writeln("  '- <red>Uninstallation failed or aborted.</red>");
+                        $this->output->writeln('');
+                    } else {
+                        $this->output->writeln("  '- <green>Success!</green>  ");
+                        $this->output->writeln('');
+                    }
+                }
+            }
+        }
+
         return true;
     }
 
@@ -160,7 +225,7 @@ private function uninstallPackage($slug, $package)
 
     private function checkDestination($slug, $package)
     {
-        $path = self::getGrav()['locator']->findResource($package->package_type . '://' . $slug);
+        $path = Grav::instance()['locator']->findResource($package->package_type . '://' . $slug);
         $questionHelper = $this->getHelper('question');
         $skipPrompt = $this->input->getOption('all-yes');
 
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index 5ca795ea85..cc9fd71431 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
@@ -9,10 +16,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
-/**
- * Class UpdateCommand
- * @package Grav\Console\Gpm
- */
 class UpdateCommand extends ConsoleCommand
 {
     /**
@@ -38,7 +41,7 @@ class UpdateCommand extends ConsoleCommand
     /**
      * @var array
      */
-    protected $types = array('plugins', 'themes');
+    protected $types = ['plugins', 'themes'];
     /**
      * @var GPM $gpm
      */
@@ -70,6 +73,18 @@ protected function configure()
                 InputOption::VALUE_NONE,
                 'Assumes yes (or best approach) instead of prompting'
             )
+            ->addOption(
+                'plugins',
+                'p',
+                InputOption::VALUE_NONE,
+                'Update only plugins'
+            )
+            ->addOption(
+                'themes',
+                't',
+                InputOption::VALUE_NONE,
+                'Update only themes'
+            )
             ->addArgument(
                 'package',
                 InputArgument::IS_ARRAY | InputArgument::OPTIONAL,
@@ -85,6 +100,9 @@ protected function configure()
     protected function serve()
     {
         $this->gpm = new GPM($this->input->getOption('force'));
+
+        $this->displayGPMRelease();
+
         $this->destination = realpath($this->input->getOption('destination'));
         $skip_prompt = $this->input->getOption('all-yes');
 
@@ -92,8 +110,14 @@ protected function serve()
             $this->output->writeln("<red>ERROR</red>: " . Installer::lastErrorMsg());
             exit;
         }
+        if ($this->input->getOption('plugins') === false and $this->input->getOption('themes') === false) {
+            $list_type_update = ['plugins' => true, 'themes' => true];
+        } else {
+            $list_type_update['plugins'] = $this->input->getOption('plugins');
+            $list_type_update['themes'] = $this->input->getOption('themes');
+        }
 
-        $this->data = $this->gpm->getUpdatable();
+        $this->data = $this->gpm->getUpdatable($list_type_update);
         $only_packages = array_map('strtolower', $this->input->getArgument('package'));
 
         if (!$this->data['total']) {
@@ -149,13 +173,13 @@ protected function serve()
         // finally update
         $install_command = $this->getApplication()->find('install');
 
-        $args = new ArrayInput(array(
+        $args = new ArrayInput([
             'command' => 'install',
             'package' => $slugs,
-            '-f'      => $this->input->getOption('force'),
-            '-d'      => $this->destination,
-            '-y'      => true
-        ));
+            '-f' => $this->input->getOption('force'),
+            '-d' => $this->destination,
+            '-y' => true
+        ]);
         $command_exec = $install_command->run($args, $this->output);
 
         if ($command_exec != 0) {
@@ -204,6 +228,7 @@ private function userInputPackages($only_packages)
             }
 
             if (count($ignore)) {
+                $this->output->writeln('');
                 $this->output->writeln("Packages not found or not requiring updates: <red>" . implode('</red>, <red>',
                         $ignore) . "</red>");
             }
diff --git a/system/src/Grav/Console/Gpm/VersionCommand.php b/system/src/Grav/Console/Gpm/VersionCommand.php
index 231645dcc4..df14fd9382 100644
--- a/system/src/Grav/Console/Gpm/VersionCommand.php
+++ b/system/src/Grav/Console/Gpm/VersionCommand.php
@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Console
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Console\Gpm;
 
 use Grav\Common\GPM\GPM;
@@ -6,11 +13,8 @@
 use Grav\Console\ConsoleCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Yaml\Yaml;
 
-/**
- * Class VersionCommand
- * @package Grav\Console\Gpm
- */
 class VersionCommand extends ConsoleCommand
 {
     /**
@@ -70,9 +74,26 @@ protected function serve()
                 }
 
             } else {
-                if ($installed = $this->gpm->findPackage($package)) {
+                // get currently installed version
+                $locator = \Grav\Common\Grav::instance()['locator'];
+                $blueprints_path = $locator->findResource('plugins://' . $package . DS . 'blueprints.yaml');
+                if (!file_exists($blueprints_path)) { // theme?
+                    $blueprints_path = $locator->findResource('themes://' . $package . DS . 'blueprints.yaml');
+                    if (!file_exists($blueprints_path)) {
+                        continue;
+                    }
+                }
+
+                $package_yaml = Yaml::parse(file_get_contents($blueprints_path));
+                $version = $package_yaml['version'];
+
+                if (!$version) {
+                    continue;
+                }
+
+                $installed = $this->gpm->findPackage($package);
+                if ($installed) {
                     $name = $installed->name;
-                    $version = $installed->version;
 
                     if ($this->gpm->isUpdatable($package)) {
                         $updatable = ' [updatable: v<green>' . $installed->available . '</green>]';
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 9aa3f78d23..1c0ffd94b8 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,55 +1,35 @@
 <?php
-// This is global bootstrap for autoloading
-
 namespace Grav;
 
 use Codeception\Util\Fixtures;
 use Faker\Factory;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
-
-ini_set('error_log', __DIR__ . '/error.log');
-
-// Ensure vendor libraries exist
-$autoload = __DIR__ . '/../vendor/autoload.php';
-
-if (!is_file($autoload)) {
-    throw new \RuntimeException("Please run: <i>bin/grav install</i>");
-}
-
 use Grav\Common\Grav;
 
-// Register the auto-loader.
-$loader = require_once $autoload;
-
-if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
-    throw new \RuntimeException(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
-}
+ini_set('error_log', __DIR__ . '/error.log');
 
-// Set timezone to default, falls back to system if php.ini not set
-date_default_timezone_set(@date_default_timezone_get());
+$grav = function() {
+    Grav::resetInstance();
+    $grav = Grav::instance();
+    $grav['config']->init();
 
-// Set internal encoding if mbstring loaded
-if (!extension_loaded('mbstring')) {
-    throw new \RuntimeException("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
-}
-mb_internal_encoding('UTF-8');
+    foreach (array_keys($grav['setup']->getStreams()) as $stream) {
+        @stream_wrapper_unregister($stream);
+    }
 
-// Get the Grav instance
-$grav = Grav::instance(['loader' => $loader]);
+    $grav['streams'];
 
-$grav['uri']->init();
-$grav['debugger']->init();
-$grav['assets']->init();
+    $grav['uri']->init();
+    $grav['debugger']->init();
+    $grav['assets']->init();
 
-$grav['config']->set('system.cache.enabled', false);
+    $grav['config']->set('system.cache.enabled', false);
+    $grav['locator']->addPath('tests', '', 'tests', false);
 
-/** @var UniformResourceLocator $locator */
-$locator = $grav['locator'];
-$locator->addPath('tests', '', 'tests', false);
+    return $grav;
+};
 
-// Set default $_SERVER value used for nonces
-empty( $_SERVER['HTTP_CLIENT_IP'] ) && $_SERVER['HTTP_CLIENT_IP'] = '127.0.0.1';
+Fixtures::add('grav', $grav);
 
 $fake = Factory::create();
-Fixtures::add('grav', $grav);
-Fixtures::add('fake', $fake);
\ No newline at end of file
+Fixtures::add('fake', $fake);
+
diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index 65ead94d8c..b4ba6dd0d3 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -17,7 +17,8 @@ class AssetsTest extends \Codeception\TestCase\Test
 
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
         $this->assets = $this->grav['assets'];
     }
 
@@ -39,7 +40,8 @@ public function testAddingAssets()
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
 
         $this->assets->add('test.js');
@@ -52,7 +54,8 @@ public function testAddingAssets()
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
 
         //test addCss(). Test adding asset to a separate group
@@ -67,9 +70,16 @@ public function testAddingAssets()
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
 
+        //test addCss() adding asset to a separate group, and with an alternate rel attribute
+        $this->assets->reset();
+        $this->assets->addCSS('test.css', ['group' => 'alternate']);
+        $css = $this->assets->css('alternate', ['rel' => 'alternate']);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="alternate" />' . PHP_EOL, $css);
+
         //test addJs()
         $this->assets->reset();
         $this->assets->addJs('test.js');
@@ -83,7 +93,8 @@ public function testAddingAssets()
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
 
         //Test CSS Groups
@@ -100,7 +111,8 @@ public function testAddingAssets()
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
-            'group'    => 'footer'
+            'group'    => 'footer',
+            'modified' => false
         ], reset($array));
 
         //Test JS Groups
@@ -118,7 +130,8 @@ public function testAddingAssets()
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
-            'group'    => 'footer'
+            'group'    => 'footer',
+            'modified' => false
         ], reset($array));
 
         //Test async / defer
@@ -134,7 +147,8 @@ public function testAddingAssets()
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'async',
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
 
         $this->assets->reset();
@@ -149,8 +163,15 @@ public function testAddingAssets()
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'defer',
-            'group'    => 'head'
+            'group'    => 'head',
+            'modified' => false
         ], reset($array));
+
+        //Test adding media queries
+        $this->assets->reset();
+        $this->assets->add('test.css', ['media' => 'only screen and (min-width: 640px)']);
+        $css = $this->assets->css();
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" media="only screen and (min-width: 640px)" />' . PHP_EOL, $css);
     }
 
     public function testAddingAssetPropertiesWithArray()
diff --git a/tests/unit/Grav/Common/BrowserTest.php b/tests/unit/Grav/Common/BrowserTest.php
index e5aca99236..6e637384e3 100644
--- a/tests/unit/Grav/Common/BrowserTest.php
+++ b/tests/unit/Grav/Common/BrowserTest.php
@@ -13,7 +13,8 @@ class BrowserTest extends \Codeception\TestCase\Test
 
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
     }
 
     protected function _after()
diff --git a/tests/unit/Grav/Common/GPM/GPMTest.php b/tests/unit/Grav/Common/GPM/GPMTest.php
new file mode 100644
index 0000000000..1597dd8729
--- /dev/null
+++ b/tests/unit/Grav/Common/GPM/GPMTest.php
@@ -0,0 +1,323 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+use Grav\Common\GPM\GPM;
+
+define('EXCEPTION_BAD_FORMAT', 1);
+define('EXCEPTION_INCOMPATIBLE_VERSIONS', 2);
+
+class GpmStub extends GPM
+{
+    public $data;
+
+    public function findPackage($packageName)
+    {
+        if (isset($this->data[$packageName])) {
+            return $this->data[$packageName];
+        }
+
+    }
+
+    public function findPackages($searches = [])
+    {
+        return $this->data;
+    }
+}
+
+/**
+ * Class InstallCommandTest
+ */
+class GpmTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var GpmStub */
+    protected $gpm;
+
+    protected function _before()
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->gpm = new GpmStub();
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testCalculateMergedDependenciesOfPackages()
+    {
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // First working example
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "grav", "version" => ">=1.0.10"],
+                    ["name" => "form", "version" => "~2.0"],
+                    ["name" => "login", "version" => ">=2.0"],
+                    ["name" => "errors", "version" => "*"],
+                    ["name" => "problems"],
+                ]
+            ],
+            'test' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=1.0"]
+                ]
+            ],
+            'grav',
+            'form' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=3.2"]
+                ]
+            ]
+
+
+        ];
+
+        $packages = ['admin', 'test'];
+
+        $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
+
+        $this->assertTrue(is_array($dependencies));
+        $this->assertSame(5, count($dependencies));
+
+        $this->assertTrue($dependencies['grav'] == '>=1.0.10');
+        $this->assertTrue(isset($dependencies['errors']));
+        $this->assertTrue(isset($dependencies['problems']));
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Second working example
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $packages = ['admin', 'form'];
+
+        $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
+        $this->assertTrue(is_array($dependencies));
+        $this->assertSame(5, count($dependencies));
+        $this->assertTrue($dependencies['errors'] == '>=3.2');
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Third working example
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=4.0"],
+                ]
+            ],
+            'test' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=1.0"]
+                ]
+            ],
+            'another' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=3.2"]
+                ]
+            ]
+
+        ];
+
+        $packages = ['admin', 'test', 'another'];
+
+
+        $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
+        $this->assertTrue(is_array($dependencies));
+        $this->assertSame(1, count($dependencies));
+        $this->assertTrue($dependencies['errors'] == '>=4.0');
+
+
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Test alpha / beta / rc
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "package1", "version" => ">=4.0.0-rc1"],
+                    ["name" => "package4", "version" => ">=3.2.0"],
+                ]
+            ],
+            'test' => (object)[
+                'dependencies' => [
+                    ["name" => "package1", "version" => ">=4.0.0-rc2"],
+                    ["name" => "package2", "version" => ">=3.2.0-alpha"],
+                    ["name" => "package3", "version" => ">=3.2.0-alpha.2"],
+                    ["name" => "package4", "version" => ">=3.2.0-alpha"],
+                ]
+            ],
+            'another' => (object)[
+                'dependencies' => [
+                    ["name" => "package2", "version" => ">=3.2.0-beta.11"],
+                    ["name" => "package3", "version" => ">=3.2.0-alpha.1"],
+                    ["name" => "package4", "version" => ">=3.2.0-beta"],
+                ]
+            ]
+        ];
+
+        $packages = ['admin', 'test', 'another'];
+
+
+        $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
+        $this->assertTrue($dependencies['package1'] == '>=4.0.0-rc2');
+        $this->assertTrue($dependencies['package2'] == '>=3.2.0-beta.11');
+        $this->assertTrue($dependencies['package3'] == '>=3.2.0-alpha.2');
+        $this->assertTrue($dependencies['package4'] == '>=3.2.0');
+
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Raise exception if no version is specified
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">=4.0"],
+                ]
+            ],
+            'test' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => ">="]
+                ]
+            ],
+
+        ];
+
+        $packages = ['admin', 'test'];
+
+        try {
+            $this->gpm->calculateMergedDependenciesOfPackages($packages);
+            $this->fail("Expected Exception not thrown");
+        } catch (Exception $e) {
+            $this->assertEquals(EXCEPTION_BAD_FORMAT, $e->getCode());
+            $this->assertStringStartsWith("Bad format for version of dependency", $e->getMessage());
+        }
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Raise exception if incompatible versions are specified
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => "~4.0"],
+                ]
+            ],
+            'test' => (object)[
+                'dependencies' => [
+                    ["name" => "errors", "version" => "~3.0"]
+                ]
+            ],
+        ];
+
+        $packages = ['admin', 'test'];
+
+        try {
+            $this->gpm->calculateMergedDependenciesOfPackages($packages);
+            $this->fail("Expected Exception not thrown");
+        } catch (Exception $e) {
+            $this->assertEquals(EXCEPTION_INCOMPATIBLE_VERSIONS, $e->getCode());
+            $this->assertStringEndsWith("required in two incompatible versions", $e->getMessage());
+        }
+
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Test dependencies of dependencies
+        //////////////////////////////////////////////////////////////////////////////////////////
+        $this->gpm->data = [
+            'admin' => (object)[
+                'dependencies' => [
+                    ["name" => "grav", "version" => ">=1.0.10"],
+                    ["name" => "form", "version" => "~2.0"],
+                    ["name" => "login", "version" => ">=2.0"],
+                    ["name" => "errors", "version" => "*"],
+                    ["name" => "problems"],
+                ]
+            ],
+            'login' => (object)[
+                'dependencies' => [
+                    ["name" => "antimatter", "version" => ">=1.0"]
+                ]
+            ],
+            'grav',
+            'antimatter' => (object)[
+                'dependencies' => [
+                    ["name" => "something", "version" => ">=3.2"]
+                ]
+            ]
+
+
+        ];
+
+        $packages = ['admin'];
+
+        $dependencies = $this->gpm->calculateMergedDependenciesOfPackages($packages);
+
+        $this->assertTrue(is_array($dependencies));
+        $this->assertSame(7, count($dependencies));
+
+        $this->assertSame('>=1.0.10', $dependencies['grav']);
+        $this->assertTrue(isset($dependencies['errors']));
+        $this->assertTrue(isset($dependencies['problems']));
+        $this->assertTrue(isset($dependencies['antimatter']));
+        $this->assertTrue(isset($dependencies['something']));
+        $this->assertSame('>=3.2', $dependencies['something']);
+    }
+
+    public function testVersionFormatIsNextSignificantRelease()
+    {
+        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=1.0'));
+        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.4'));
+        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('>=2.3.x'));
+        $this->assertFalse($this->gpm->versionFormatIsNextSignificantRelease('1.0'));
+        $this->assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.3.x'));
+        $this->assertTrue($this->gpm->versionFormatIsNextSignificantRelease('~2.0'));
+    }
+
+    public function testVersionFormatIsEqualOrHigher()
+    {
+        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=1.0'));
+        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.4'));
+        $this->assertTrue($this->gpm->versionFormatIsEqualOrHigher('>=2.3.x'));
+        $this->assertFalse($this->gpm->versionFormatIsEqualOrHigher('~2.3.x'));
+        $this->assertFalse($this->gpm->versionFormatIsEqualOrHigher('1.0'));
+    }
+
+    public function testCheckNextSignificantReleasesAreCompatible()
+    {
+        /*
+         * ~1.0     is equivalent to >=1.0 < 2.0.0
+         * ~1.2     is equivalent to >=1.2 <2.0.0
+         * ~1.2.3   is equivalent to >=1.2.3 <1.3.0
+         */
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.2'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.2', '1.0'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.0.10'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.1', '1.1.10'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('30.0', '30.10'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.1.10'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '1.8'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.1', '1.1'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-beta', '2.0'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0.0-rc.1', '2.0'));
+        $this->assertTrue($this->gpm->checkNextSignificantReleasesAreCompatible('2.0', '2.0.0-alpha'));
+
+        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0', '2.2'));
+        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('1.0.0-beta.1', '2.0'));
+        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.0'));
+        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10'));
+        $this->assertFalse($this->gpm->checkNextSignificantReleasesAreCompatible('0.9.99', '1.0.10.2'));
+    }
+
+
+    public function testCalculateVersionNumberFromDependencyVersion()
+    {
+        $this->assertSame('2.0', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0'));
+        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('>=2.0.2'));
+        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('~2.0.2'));
+        $this->assertSame('1', $this->gpm->calculateVersionNumberFromDependencyVersion('~1'));
+        $this->assertSame(null, $this->gpm->calculateVersionNumberFromDependencyVersion(''));
+        $this->assertSame(null, $this->gpm->calculateVersionNumberFromDependencyVersion('*'));
+        $this->assertSame('2.0.2', $this->gpm->calculateVersionNumberFromDependencyVersion('2.0.2'));
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/Grav/Common/InflectorTest.php b/tests/unit/Grav/Common/InflectorTest.php
new file mode 100644
index 0000000000..9caa3e8107
--- /dev/null
+++ b/tests/unit/Grav/Common/InflectorTest.php
@@ -0,0 +1,147 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+use Grav\Common\Inflector;
+use Grav\Common\Utils;
+
+/**
+ * Class InflectorTest
+ */
+class InflectorTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var Uri $uri */
+    protected $inflector;
+
+    protected function _before()
+    {
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
+        $this->inflector = $this->grav['inflector'];
+    }
+
+    protected function _after()
+    {
+    }
+
+    public function testPluralize()
+    {
+        $this->assertSame('words',      $this->inflector->pluralize('word'));
+        $this->assertSame('kisses',     $this->inflector->pluralize('kiss'));
+        $this->assertSame('volcanoes',  $this->inflector->pluralize('volcanoe'));
+        $this->assertSame('cherries',   $this->inflector->pluralize('cherry'));
+        $this->assertSame('days',       $this->inflector->pluralize('day'));
+        $this->assertSame('knives',     $this->inflector->pluralize('knife'));
+    }
+
+    public function testSingularize()
+    {
+        $this->assertSame('word',       $this->inflector->singularize('words'));
+        $this->assertSame('kiss',       $this->inflector->singularize('kisses'));
+        $this->assertSame('volcanoe',   $this->inflector->singularize('volcanoe'));
+        $this->assertSame('cherry',     $this->inflector->singularize('cherries'));
+        $this->assertSame('day',        $this->inflector->singularize('days'));
+        $this->assertSame('knife',      $this->inflector->singularize('knives'));
+    }
+
+    public function testTitleize()
+    {
+        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('ThisStringIsTitleized'));
+        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this string is titleized'));
+        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this_string_is_titleized'));
+        $this->assertSame('This String Is Titleized',   $this->inflector->titleize('this-string-is-titleized'));
+
+        $this->assertSame('This string is titleized',   $this->inflector->titleize('ThisStringIsTitleized', 'first'));
+        $this->assertSame('This string is titleized',   $this->inflector->titleize('this string is titleized', 'first'));
+        $this->assertSame('This string is titleized',   $this->inflector->titleize('this_string_is_titleized', 'first'));
+        $this->assertSame('This string is titleized',   $this->inflector->titleize('this-string-is-titleized', 'first'));
+    }
+
+    public function testCamelize()
+    {
+        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('This String Is Camelized'));
+        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('thisStringIsCamelized'));
+        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('This_String_Is_Camelized'));
+        $this->assertSame('ThisStringIsCamelized',      $this->inflector->camelize('this string is camelized'));
+        $this->assertSame('GravSPrettyCoolMy1',         $this->inflector->camelize("Grav's Pretty Cool. My #1!"));
+    }
+
+    public function testUnderscorize()
+    {
+        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This String Is Underscorized'));
+        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('ThisStringIsUnderscorized'));
+        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This_String_Is_Underscorized'));
+        $this->assertSame('this_string_is_underscorized',   $this->inflector->underscorize('This-String-Is-Underscorized'));
+    }
+
+    public function testHyphenize()
+    {
+        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This String Is Hyphenized'));
+        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('ThisStringIsHyphenized'));
+        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This-String-Is-Hyphenized'));
+        $this->assertSame('this-string-is-hyphenized',     $this->inflector->hyphenize('This_String_Is_Hyphenized'));
+    }
+
+    public function testHumanize()
+    {
+        //$this->assertSame('This string is humanized',   $this->inflector->humanize('ThisStringIsHumanized'));
+        $this->assertSame('This string is humanized',   $this->inflector->humanize('this_string_is_humanized'));
+        //$this->assertSame('This string is humanized',   $this->inflector->humanize('this-string-is-humanized'));
+
+        $this->assertSame('This String Is Humanized',   $this->inflector->humanize('this_string_is_humanized', 'all'));
+        //$this->assertSame('This String Is Humanized',   $this->inflector->humanize('this-string-is-humanized'), 'all');
+    }
+
+    public function testVariablize()
+    {
+        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('This String Is Variablized'));
+        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('ThisStringIsVariablized'));
+        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('This_String_Is_Variablized'));
+        $this->assertSame('thisStringIsVariablized',      $this->inflector->variablize('this string is variablized'));
+        $this->assertSame('gravSPrettyCoolMy1',           $this->inflector->variablize("Grav's Pretty Cool. My #1!"));
+    }
+
+    public function testTableize()
+    {
+        $this->assertSame('people',                 $this->inflector->tableize('Person'));
+        $this->assertSame('pages',                  $this->inflector->tableize('Page'));
+        $this->assertSame('blog_pages',             $this->inflector->tableize('BlogPage'));
+        $this->assertSame('admin_dependencies',     $this->inflector->tableize('adminDependency'));
+        $this->assertSame('admin_dependencies',     $this->inflector->tableize('admin-dependency'));
+        $this->assertSame('admin_dependencies',     $this->inflector->tableize('admin_dependency'));
+    }
+
+    public function testClassify()
+    {
+        $this->assertSame('Person',                 $this->inflector->classify('people'));
+        $this->assertSame('Page',                  $this->inflector->classify('pages'));
+        $this->assertSame('BlogPage',             $this->inflector->classify('blog_pages'));
+        $this->assertSame('AdminDependency',     $this->inflector->classify('admin_dependencies'));
+    }
+
+    public function testOrdinalize()
+    {
+        $this->assertSame('1st',    $this->inflector->ordinalize(1));
+        $this->assertSame('2nd',    $this->inflector->ordinalize(2));
+        $this->assertSame('3rd',    $this->inflector->ordinalize(3));
+        $this->assertSame('4th',    $this->inflector->ordinalize(4));
+        $this->assertSame('5th',    $this->inflector->ordinalize(5));
+        $this->assertSame('16th',   $this->inflector->ordinalize(16));
+        $this->assertSame('51st',   $this->inflector->ordinalize(51));
+        $this->assertSame('111th',  $this->inflector->ordinalize(111));
+        $this->assertSame('123rd',  $this->inflector->ordinalize(123));
+    }
+
+    public function testMonthize()
+    {
+        $this->assertSame(0,    $this->inflector->monthize(10));
+        $this->assertSame(1,    $this->inflector->monthize(33));
+        $this->assertSame(1,    $this->inflector->monthize(41));
+        $this->assertSame(11,   $this->inflector->monthize(364));
+    }
+}
+
+
diff --git a/tests/unit/Grav/Common/Markdown/ParsedownTest.php b/tests/unit/Grav/Common/Markdown/ParsedownTest.php
index fd3d4e36a0..28069b14d0 100644
--- a/tests/unit/Grav/Common/Markdown/ParsedownTest.php
+++ b/tests/unit/Grav/Common/Markdown/ParsedownTest.php
@@ -34,11 +34,10 @@ class ParsedownTest extends \Codeception\TestCase\Test
 
     protected $old_home;
 
-    static $run = false;
-
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
         $this->pages = $this->grav['pages'];
         $this->config = $this->grav['config'];
         $this->uri = $this->grav['uri'];
@@ -51,13 +50,10 @@ protected function _before()
         unset($this->grav['language']);
         $this->grav['language'] = new Language($this->grav);
 
-        if (!self::$run) {
-            /** @var UniformResourceLocator $locator */
-            $locator = $this->grav['locator'];
-            $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
-            $this->pages->init();
-            self::$run = true;
-        }
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
+        $this->pages->init();
 
         $defaults = [
             'extra'            => false,
@@ -228,7 +224,7 @@ public function testRootAbsoluteLinks()
             $this->parsedown->text('[With Query](?foo=bar)'));
         $this->assertSame('<p><a href="/foo:bar">With Param</a></p>',
             $this->parsedown->text('[With Param](/foo:bar)'));
-        $this->assertSame('<p><a href="/#foo">With Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">With Anchor</a></p>',
             $this->parsedown->text('[With Anchor](#foo)'));
 
         $this->config->set('system.languages.supported', ['fr','en']);
@@ -244,7 +240,7 @@ public function testRootAbsoluteLinks()
             $this->parsedown->text('[With Query](?foo=bar)'));
         $this->assertSame('<p><a href="/fr/foo:bar">With Param</a></p>',
             $this->parsedown->text('[With Param](/foo:bar)'));
-        $this->assertSame('<p><a href="/fr/#foo">With Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">With Anchor</a></p>',
             $this->parsedown->text('[With Anchor](#foo)'));
     }
 
@@ -256,7 +252,7 @@ public function testAnchorLinksLangRelativeUrls()
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/fr/item2/item2-2#foo">Current Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
             $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="/fr/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
@@ -275,12 +271,12 @@ public function testAnchorLinksLangAbsoluteUrls()
         $this->grav['language'] = new Language($this->grav);
         $this->uri->initializeWithURL('http://testing.dev/fr/item2/item2-2')->init();
 
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor</a></p>',
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/fr/item2/item2-1#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/fr/item2/item2-2#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/fr/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
 
@@ -293,6 +289,8 @@ public function testExternalLinks()
             $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
         $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
             $this->parsedown->text('[google.com](https://www.google.com)'));
+        $this->assertSame('<p><a href="https://github.com/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
+            $this->parsedown->text('[complex url](https://github.com/getgrav/grav/issues/new?title=[add-resource]%20New%20Plugin/Theme&body=Hello%20**There**)'));
     }
 
     public function testExternalLinksSubDir()
@@ -320,7 +318,7 @@ public function testAnchorLinksRelativeUrls()
     {
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
-        $this->assertSame('<p><a href="/item2/item2-2#foo">Current Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
             $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
@@ -335,19 +333,16 @@ public function testAnchorLinksAbsoluteUrls()
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://testing.dev/item2/item2-2')->init();
 
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor</a></p>',
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/item2/item2-1#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/item2/item2-2#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
     }
 
-
-
-
     public function testAnchorLinksWithPortAbsoluteUrls()
     {
         $this->config->set('system.absolute_urls', true);
@@ -357,7 +352,7 @@ public function testAnchorLinksWithPortAbsoluteUrls()
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="http://testing.dev:8080/item2/item2-1#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev:8080/item2/item2-2#foo">Current Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
             $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev:8080/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
@@ -371,7 +366,7 @@ public function testAnchorLinksSubDirRelativeUrls()
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="/subdir/item2/item2-2#foo">Current Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
             $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="/subdir/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
@@ -386,7 +381,7 @@ public function testAnchorLinksSubDirAbsoluteUrls()
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-1#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="http://testing.dev/subdir/item2/item2-2#foo">Current Anchor</a></p>',
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
             $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://testing.dev/subdir/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
@@ -593,6 +588,8 @@ public function testSpecialProtocols()
             $this->parsedown->text('[tel](tel:123-555-12345)'));
         $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
             $this->parsedown->text('[sms](sms:123-555-12345)'));
+        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
     }
 
     public function testSpecialProtocolsSubDir()
@@ -607,6 +604,8 @@ public function testSpecialProtocolsSubDir()
             $this->parsedown->text('[tel](tel:123-555-12345)'));
         $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
             $this->parsedown->text('[sms](sms:123-555-12345)'));
+        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
     }
 
     public function testSpecialProtocolsSubDirAbsoluteUrl()
@@ -622,6 +621,8 @@ public function testSpecialProtocolsSubDirAbsoluteUrl()
             $this->parsedown->text('[tel](tel:123-555-12345)'));
         $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
             $this->parsedown->text('[sms](sms:123-555-12345)'));
+        $this->assertSame('<p><a href="rdp://ts.example.com">ts.example.com</a></p>',
+            $this->parsedown->text('[ts.example.com](rdp://ts.example.com)'));
     }
 
     public function testReferenceLinks()
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index c265567705..cf99baaa7c 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -21,23 +21,18 @@ class PagesTest extends \Codeception\TestCase\Test
     /** @var Page $root_page */
     protected $root_page;
 
-    static $run = false;
-
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
         $this->pages = $this->grav['pages'];
         $this->grav['config']->set('system.home.alias', '/home');
 
-        if (!self::$run) {
-            /** @var UniformResourceLocator $locator */
-            $locator = $this->grav['locator'];
-
-            $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
-            $this->pages->init();
-            self::$run = true;
-        }
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
 
+        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+        $this->pages->init();
     }
 
     public function testBase()
diff --git a/tests/unit/Grav/Common/Twig/TwigExtensionTest.php b/tests/unit/Grav/Common/Twig/TwigExtensionTest.php
new file mode 100644
index 0000000000..50b84f553e
--- /dev/null
+++ b/tests/unit/Grav/Common/Twig/TwigExtensionTest.php
@@ -0,0 +1,192 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+use Grav\Common\Twig\TwigExtension;
+
+/**
+ * Class TwigExtensionTest
+ */
+class TwigExtensionTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var  TwigExtension $twig_ext */
+    protected $twig_ext;
+
+    protected function _before()
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->twig_ext = new TwigExtension();
+    }
+
+    public function testInflectorFilter()
+    {
+        $this->assertSame('people',                     $this->twig_ext->inflectorFilter('plural',       'person'));
+        $this->assertSame('shoe',                       $this->twig_ext->inflectorFilter('singular',     'shoes'));
+        $this->assertSame('Welcome Page',               $this->twig_ext->inflectorFilter('title',        'welcome page'));
+        $this->assertSame('SendEmail',                  $this->twig_ext->inflectorFilter('camel',        'send_email'));
+        $this->assertSame('camel_cased',                $this->twig_ext->inflectorFilter('underscor',    'CamelCased'));
+        $this->assertSame('something-text',             $this->twig_ext->inflectorFilter('hyphen',       'Something Text'));
+        $this->assertSame('Something text to read',     $this->twig_ext->inflectorFilter('human',        'something_text_to_read'));
+        $this->assertSame(5,                            $this->twig_ext->inflectorFilter('month',        181));
+        $this->assertSame('10th',                       $this->twig_ext->inflectorFilter('ordinal',      10));
+    }
+
+    public function testMd5Filter()
+    {
+        $this->assertSame(md5('grav'),              $this->twig_ext->md5Filter('grav'));
+        $this->assertSame(md5('devs@getgrav.org'),  $this->twig_ext->md5Filter('devs@getgrav.org'));
+    }
+
+    public function testKsortFilter()
+    {
+        $object = array("name"=>"Bob","age"=>8,"colour"=>"red");
+        $this->assertSame(array("age"=>8,"colour"=>"red","name"=>"Bob"), $this->twig_ext->ksortFilter($object));
+    }
+
+    public function testContainsFilter()
+    {
+        $this->assertTrue($this->twig_ext->containsFilter('grav','grav'));
+        $this->assertTrue($this->twig_ext->containsFilter('So, I found this new cms, called grav, and it\'s pretty awesome guys','grav'));
+    }
+
+    public function testNicetimeFilter()
+    {
+        $now = time();
+        $threeMinutes = time() - (60*3);
+        $threeHours   = time() - (60*60*3);
+        $threeDays    = time() - (60*60*24*3);
+        $threeMonths  = time() - (60*60*24*30*3);
+        $threeYears   = time() - (60*60*24*365*3);
+        $measures = ['minutes','hours','days','months','years'];
+
+        $this->assertSame('No date provided', $this->twig_ext->nicetimeFilter(null));
+
+        for ($i=0; $i<count($measures); $i++) {
+            $time = 'three' . ucfirst($measures[$i]);
+            $this->assertSame('3 ' . $measures[$i] . ' ago', $this->twig_ext->nicetimeFilter($$time));
+        }
+    }
+
+    public function testSafeEmailFilter()
+    {
+        $this->assertSame('&#100;&#101;&#118;&#115;&#64;&#103;&#101;&#116;&#103;&#114;&#97;&#118;&#46;&#111;&#114;&#103;',   $this->twig_ext->safeEmailFilter('devs@getgrav.org'));
+        $this->assertSame('&#115;&#111;&#109;&#101;&#111;&#110;&#101;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;',   $this->twig_ext->safeEmailFilter('someone@example.com'));
+    }
+
+    public function testRandomizeFilter()
+    {
+        $array = [1,2,3,4,5];
+        $this->assertContains(2,        $this->twig_ext->randomizeFilter($array));
+        $this->assertSame($array,       $this->twig_ext->randomizeFilter($array, 5));
+        $this->assertSame($array[0],    $this->twig_ext->randomizeFilter($array, 1)[0]);
+        $this->assertSame($array[3],    $this->twig_ext->randomizeFilter($array, 4)[3]);
+        $this->assertSame($array[1],    $this->twig_ext->randomizeFilter($array, 4)[1]);
+    }
+
+    public function testModulusFilter()
+    {
+        $this->assertSame(3,    $this->twig_ext->modulusFilter(3,4));
+        $this->assertSame(1,    $this->twig_ext->modulusFilter(11,2));
+        $this->assertSame(0,    $this->twig_ext->modulusFilter(10,2));
+        $this->assertSame(2,    $this->twig_ext->modulusFilter(10,4));
+    }
+
+    public function testAbsoluteUrlFilter()
+    {
+
+    }
+
+    public function testMarkdownFilter()
+    {
+
+    }
+
+    public function testStartsWithFilter()
+    {
+
+    }
+
+    public function testEndsWithFilter()
+    {
+
+    }
+
+    public function testDefinedDefaultFilter()
+    {
+
+    }
+
+    public function testRtrimFilter()
+    {
+
+    }
+
+    public function testLtrimFilter()
+    {
+
+    }
+
+    public function testRepeatFunc()
+    {
+
+    }
+
+    public function testRegexReplace()
+    {
+
+    }
+
+    public function testUrlFunc()
+    {
+
+    }
+
+    public function testEvaluateFunc()
+    {
+
+    }
+
+    public function testDump()
+    {
+
+    }
+
+    public function testGistFunc()
+    {
+
+    }
+
+    public function testRandomStringFunc()
+    {
+
+    }
+
+    public function testPadFilter()
+    {
+
+    }
+
+    public function testArrayFunc()
+    {
+        $this->assertSame('this is my text',
+            $this->twig_ext->regexReplace('<p>this is my text</p>', '(<\/?p>)', ''));
+        $this->assertSame('<i>this is my text</i>',
+            $this->twig_ext->regexReplace('<p>this is my text</p>', ['(<p>)','(<\/p>)'], ['<i>','</i>']));
+    }
+
+    public function testArrayKeyValue()
+    {
+        $this->assertSame(['meat' => 'steak'],
+            $this->twig_ext->arrayKeyValueFunc('meat', 'steak'));
+        $this->assertSame(['fruit' => 'apple', 'meat' => 'steak'],
+            $this->twig_ext->arrayKeyValueFunc('meat', 'steak', ['fruit' => 'apple']));
+    }
+
+    public function stringFunc()
+    {
+
+    }
+}
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 3d40469335..c134c36021 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -18,7 +18,8 @@ class UriTest extends \Codeception\TestCase\Test
 
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
         $this->uri = $this->grav['uri'];
     }
 
@@ -147,6 +148,18 @@ public function testParams()
         $this->assertSame('/ueper:xxx/test:yyy', $this->uri->params());
         $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
         $this->assertSame('/test:yyy', $this->uri->params('test'));
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy')->init();
+        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy#something')->init();
+        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        $this->assertSame('/test:yyy', $this->uri->params('test'));
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yyy?foo=bar')->init();
+        $this->assertSame('/ueper:xxx++/test:yyy', $this->uri->params());
+        $this->assertSame('/ueper:xxx++', $this->uri->params('ueper'));
+        $this->assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
         $this->assertSame(null, $this->uri->params());
         $this->assertSame(null, $this->uri->params('ueper'));
@@ -174,6 +187,19 @@ public function testParam()
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
         $this->assertSame('xxx', $this->uri->param('ueper'));
         $this->assertSame('yyy', $this->uri->param('test'));
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx++/test:yy%20y/foo:bar_baz-bank')->init();
+        $this->assertSame('xxx++', $this->uri->param('ueper'));
+        $this->assertSame('yy y', $this->uri->param('test'));
+        $this->assertSame('bar_baz-bank', $this->uri->param('foo'));
+    }
+
+    public function testFragment()
+    {
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c#my-fragment');
+        $this->assertSame('my-fragment', $this->uri->fragment());
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c');
+        $this->uri->fragment('something-new');
+        $this->assertSame('something-new', $this->uri->fragment());
     }
 
     public function testUrl()
@@ -263,19 +289,16 @@ public function testPort()
 
     public function testEnvironment()
     {
-        $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
-        if ($this->uri->host() == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
-            $address = 'localhost';
-        }
-
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($address, $this->uri->environment());
+        $this->assertSame('localhost', $this->uri->environment());
+        $this->uri->initializeWithURL('http://127.0.0.1/a-page')->init();
+        $this->assertSame('localhost', $this->uri->environment());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($address, $this->uri->environment());
+        $this->assertSame('localhost', $this->uri->environment());
         $this->uri->initializeWithURL('http://foobar.it:443/a-page')->init();
-        $this->assertSame($address, $this->uri->environment());
+        $this->assertSame('foobar.it', $this->uri->environment());
         $this->uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($address, $this->uri->environment());
+        $this->assertSame('google.com', $this->uri->environment());
     }
 
     public function testBasename()
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index 96761282e6..5021e690e5 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -14,7 +14,8 @@ class UtilsTest extends \Codeception\TestCase\Test
 
     protected function _before()
     {
-        $this->grav = Fixtures::get('grav');
+        $grav = Fixtures::get('grav');
+        $this->grav = $grav();
     }
 
     protected function _after()
@@ -68,9 +69,9 @@ public function testContains()
 
     public function testSubstrToString()
     {
-        $this->assertEquals(Utils::substrToString('english', 'glish'), 'en');
-        $this->assertEquals(Utils::substrToString('english', 'test'), 'english');
-        $this->assertNotEquals(Utils::substrToString('english', 'lish'), 'en');
+        $this->assertEquals('en', Utils::substrToString('english', 'glish'));
+        $this->assertEquals('english', Utils::substrToString('english', 'test'));
+        $this->assertNotEquals('en', Utils::substrToString('english', 'lish'));
     }
 
     public function testMergeObjects()
@@ -101,33 +102,37 @@ public function testDateFormats()
 
     public function testTruncate()
     {
-        $this->assertEquals(Utils::truncate('english', 5), 'engli' . '&hellip;');
-        $this->assertEquals(Utils::truncate('english'), 'english');
-        $this->assertEquals(Utils::truncate('This is a string to truncate'), 'This is a string to truncate');
-        $this->assertEquals(Utils::truncate('This is a string to truncate', 2), 'Th' . '&hellip;');
-        $this->assertEquals(Utils::truncate('english', 5, true, " ", "..."), 'engli' . '...');
-        $this->assertEquals(Utils::truncate('english'), 'english');
-        $this->assertEquals(Utils::truncate('This is a string to truncate'), 'This is a string to truncate');
-        $this->assertEquals(Utils::truncate('This is a string to truncate', 3, true), 'This ');
+        $this->assertEquals('engli' . '&hellip;', Utils::truncate('english', 5));
+        $this->assertEquals('english', Utils::truncate('english'));
+        $this->assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
+        $this->assertEquals('Th' . '&hellip;', Utils::truncate('This is a string to truncate', 2));
+        $this->assertEquals('engli' . '...', Utils::truncate('english', 5, true, " ", "..."));
+        $this->assertEquals('english', Utils::truncate('english'));
+        $this->assertEquals('This is a string to truncate', Utils::truncate('This is a string to truncate'));
+        $this->assertEquals('This ', Utils::truncate('This is a string to truncate', 3, true));
+        $this->assertEquals('<input ', Utils::truncate('<input type="file" id="file" multiple />', 6, true));
+
     }
 
     public function testSafeTruncate()
     {
-        $this->assertEquals(Utils::safeTruncate('This is a string to truncate', 1), 'This ');
-        $this->assertEquals(Utils::safeTruncate('This is a string to truncate', 4), 'This ');
-        $this->assertEquals(Utils::safeTruncate('This is a string to truncate', 5), 'This is ');
+        $this->assertEquals('This ', Utils::safeTruncate('This is a string to truncate', 1));
+        $this->assertEquals('This ', Utils::safeTruncate('This is a string to truncate', 4));
+        $this->assertEquals('This is ', Utils::safeTruncate('This is a string to truncate', 5));
     }
 
     public function testTruncateHtml()
     {
-        $this->assertEquals(Utils::truncateHtml('<p>This is a string to truncate</p>', 1), '<p>T…</p>');
-        $this->assertEquals(Utils::truncateHtml('<p>This is a string to truncate</p>', 4), '<p>This…</p>');
+        $this->assertEquals('<p>T…</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 1));
+        $this->assertEquals('<p>This…</p>', Utils::truncateHtml('<p>This is a string to truncate</p>', 4));
+        $this->assertEquals('', Utils::truncateHtml('<input type="file" id="file" multiple />', 6, true));
+
     }
 
     public function testSafeTruncateHtml()
     {
-        $this->assertEquals(Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 1), '<p>This…</p>');
-        $this->assertEquals(Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 4), '<p>This…</p>');
+        $this->assertEquals('<p>This…</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 1));
+        $this->assertEquals('<p>This…</p>', Utils::safeTruncateHtml('<p>This is a string to truncate</p>', 4));
     }
 
     public function testGenerateRandomString()
@@ -143,21 +148,21 @@ public function download()
 
     public function testGetMimeType()
     {
-        $this->assertEquals(Utils::getMimeType(''), 'application/octet-stream');
-        $this->assertEquals(Utils::getMimeType('jpg'), 'image/jpeg');
-        $this->assertEquals(Utils::getMimeType('png'), 'image/png');
-        $this->assertEquals(Utils::getMimeType('txt'), 'text/plain');
-        $this->assertEquals(Utils::getMimeType('doc'), 'application/msword');
+        $this->assertEquals('application/octet-stream', Utils::getMimeType(''));
+        $this->assertEquals('image/jpeg', Utils::getMimeType('jpg'));
+        $this->assertEquals('image/png', Utils::getMimeType('png'));
+        $this->assertEquals('text/plain', Utils::getMimeType('txt'));
+        $this->assertEquals('application/msword', Utils::getMimeType('doc'));
     }
 
     public function testNormalizePath()
     {
-        $this->assertEquals(Utils::normalizePath('/test'), '/test');
-        $this->assertEquals(Utils::normalizePath('test'), 'test');
-        $this->assertEquals(Utils::normalizePath('../test'), 'test');
-        $this->assertEquals(Utils::normalizePath('/../test'), '/test');
-        $this->assertEquals(Utils::normalizePath('/test/../test2'), '/test2');
-        $this->assertEquals(Utils::normalizePath('/test/./test2'), '/test/test2');
+        $this->assertEquals('/test', Utils::normalizePath('/test'));
+        $this->assertEquals('test', Utils::normalizePath('test'));
+        $this->assertEquals('test', Utils::normalizePath('../test'));
+        $this->assertEquals('/test', Utils::normalizePath('/../test'));
+        $this->assertEquals('/test2', Utils::normalizePath('/test/../test2'));
+        $this->assertEquals('/test/test2', Utils::normalizePath('/test/./test2'));
     }
 
     public function testIsFunctionDisabled()
@@ -191,7 +196,7 @@ public function testArrayFilterRecursive()
         $this->assertContainsOnly('string', $array);
         $this->assertFalse(isset($array['test']));
         $this->assertTrue(isset($array['test2']));
-        $this->assertEquals($array['test2'], 'test2');
+        $this->assertEquals('test2', $array['test2']);
     }
 
     public function testPathPrefixedByLangCode()
@@ -227,7 +232,42 @@ public function testResolve()
             ]
         ];
 
-        $this->assertEquals(Utils::resolve($array, 'test.test2'), 'test2Value');
+        $this->assertEquals('test2Value', Utils::resolve($array, 'test.test2'));
+    }
+
+    public function testGetDotNotation()
+    {
+        $array = [
+            'test' => [
+                'test2' => 'test2Value',
+                'test3' => [
+                    'test4' => 'test4Value'
+                ]
+            ]
+        ];
+
+        $this->assertEquals('test2Value', Utils::getDotNotation($array, 'test.test2'));
+        $this->assertEquals('test4Value', Utils::getDotNotation($array, 'test.test3.test4'));
+        $this->assertEquals('defaultValue', Utils::getDotNotation($array, 'test.non_existent', 'defaultValue'));
+    }
+
+    public function testSetDotNotation()
+    {
+        $array = [
+            'test' => [
+                'test2' => 'test2Value',
+                'test3' => [
+                    'test4' => 'test4Value'
+                ]
+            ]
+        ];
+
+        $new = [
+            'test1' => 'test1Value'
+        ];
+
+        Utils::setDotNotation($array, 'test.test3.test4' , $new);
+        $this->assertEquals('test1Value', $array['test']['test3']['test4']['test1']);
     }
 
     public function testIsPositive()
@@ -260,4 +300,4 @@ public function testVerifyNonce()
     {
         $this->assertTrue(Utils::verifyNonce(Utils::getNonce('test-action'), 'test-action'));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/Grav/Console/Gpm/InstallCommandTest.php b/tests/unit/Grav/Console/Gpm/InstallCommandTest.php
new file mode 100644
index 0000000000..e76843b358
--- /dev/null
+++ b/tests/unit/Grav/Console/Gpm/InstallCommandTest.php
@@ -0,0 +1,28 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+
+/**
+ * Class InstallCommandTest
+ */
+class InstallCommandTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var InstallCommand */
+    protected $installCommand;
+
+
+    protected function _before()
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->installCommand = new InstallCommand();
+
+    }
+
+    protected function _after()
+    {
+    }
+}
\ No newline at end of file
diff --git a/user/pages/01.home/default.md b/user/pages/01.home/default.md
index 64ea8aebab..3ebb8dda0d 100644
--- a/user/pages/01.home/default.md
+++ b/user/pages/01.home/default.md
@@ -7,7 +7,7 @@ title: Home
 
 Congratulations! You have installed the **Base Grav Package** that provides a **simple page** and the default **antimatter** theme to get you started.
 
->>>>> If you want a more **full-featured** base install, you should check out [**Skeleton** packages available in the downloads](http://getgrav.org/downloads).
+!!! If you want a more **full-featured** base install, you should check out [**Skeleton** packages available in the downloads](http://getgrav.org/downloads).
 
 ### Find out all about Grav
 
@@ -36,4 +36,4 @@ Creating a new page is a simple affair in **Grav**.  Simply follow these simple
 3. Save this file in the `user/pages/02.mypage/` folder as `default.md`. This will tell **Grav** to render the page using the **default** template.
 4. That is it! Reload your browser to see your new page in the menu.
 
->>> NOTE: The page will automatically show up in the Menu after the "Home" menu item. If you wish to change the name that shows up in the Menu, simple add: `menu: My Page` between the dashes in the page content. This is called the YAML front matter, and it is where you configure page-specific options.
+! NOTE: The page will automatically show up in the Menu after the "Home" menu item. If you wish to change the name that shows up in the Menu, simple add: `menu: My Page` between the dashes in the page content. This is called the YAML front matter, and it is where you configure page-specific options.
diff --git a/webserver-configs/Caddyfile b/webserver-configs/Caddyfile
index 014017c93c..682947087e 100644
--- a/webserver-configs/Caddyfile
+++ b/webserver-configs/Caddyfile
@@ -1,8 +1,31 @@
 :8080
 gzip
 fastcgi / 127.0.0.1:9000 php
+
+# Begin - Security
+# deny all direct access for these folders
 rewrite {
-    regexp .*
-    ext    /
-    to     /index.php?_url={uri}
+    r       /(.git|cache|bin|logs|backups|tests)/.*$
+    status  403
+}
+# deny running scripts inside core system folders
+rewrite {
+    r       /(system|vendor)/.*\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$
+    status  403
+}
+# deny running scripts inside user folder
+rewrite {
+    r       /user/.*\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$
+    status  403
+}
+# deny access to specific files in the root folder
+rewrite {
+    r       /(LICENSE.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess)
+    status  403
+}
+## End - Security
+
+# global rewrite should come last.
+rewrite {
+    to  {path} {path}/ /index.php?_url={uri}
 }
diff --git a/webserver-configs/lighttpd.conf b/webserver-configs/lighttpd.conf
index a4775a555a..df77c69028 100644
--- a/webserver-configs/lighttpd.conf
+++ b/webserver-configs/lighttpd.conf
@@ -36,7 +36,7 @@ $HTTP["url"] =~ "^/grav_path/(.git|cache|bin|logs|backup|tests)/(.*)" {
 $HTTP["url"] =~ "^/grav_path/(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$" {
     url.access-deny = ("")
 }
-$HTTP["url"] =~ "^/grav_path/(\.(.*))|(\.(.*)/)" {
+$HTTP["url"] =~ "^/grav_path/(\.(.*))" {
     url.access-deny = ("")
 }
 url.access-deny = (".md","~",".inc")
diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
index 04d1798892..f002a87673 100644
--- a/webserver-configs/nginx.conf
+++ b/webserver-configs/nginx.conf
@@ -12,8 +12,7 @@ server {
     # `location /subfolder {`
     # and the rewrite to use `/subfolder/index.php`
     location / {
-        try_files $uri $uri/ /index.html;
-        if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
+        location / { try_files $uri $uri/ /index.php?_url=$uri; }
     }
     ## End - Index