diff --git a/composer.lock b/composer.lock
index 746768c5..f9620212 100644
--- a/composer.lock
+++ b/composer.lock
@@ -143,7 +143,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/bootstrap/zipball/f8fb4c73807c6888d904ea8c04324f2d94169c52",
+                "url": "https://api.github.com/repos/nette/bootstrap/zipball/8d2ee3ac4ad082c23cfb4b2bd198566afd6bb0e0",
                 "reference": "f8fb4c73807c6888d904ea8c04324f2d94169c52",
                 "shasum": ""
             },
@@ -259,16 +259,16 @@
         },
         {
             "name": "nette/component-model",
-            "version": "v2.2.1",
+            "version": "v2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/component-model.git",
-                "reference": "969caabb2c03b4f6556adf1b438ffb4d76c0cf38"
+                "reference": "0dc1f0df61aa8ae25c0911712ee703b4448689db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/component-model/zipball/969caabb2c03b4f6556adf1b438ffb4d76c0cf38",
-                "reference": "969caabb2c03b4f6556adf1b438ffb4d76c0cf38",
+                "url": "https://api.github.com/repos/nette/component-model/zipball/0dc1f0df61aa8ae25c0911712ee703b4448689db",
+                "reference": "0dc1f0df61aa8ae25c0911712ee703b4448689db",
                 "shasum": ""
             },
             "require": {
@@ -305,7 +305,7 @@
             ],
             "description": "Nette Component Model",
             "homepage": "http://nette.org",
-            "time": "2015-02-06 14:13:18"
+            "time": "2015-06-16 13:38:12"
         },
         {
             "name": "nette/database",
@@ -363,16 +363,16 @@
         },
         {
             "name": "nette/di",
-            "version": "v2.3.3",
+            "version": "v2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/di.git",
-                "reference": "72319c90b23437f2397bf533dc8ce6204b2b75bf"
+                "reference": "d690c94f52ae0697e1786860c97861f64bdcfa79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/di/zipball/72319c90b23437f2397bf533dc8ce6204b2b75bf",
-                "reference": "72319c90b23437f2397bf533dc8ce6204b2b75bf",
+                "url": "https://api.github.com/repos/nette/di/zipball/d690c94f52ae0697e1786860c97861f64bdcfa79",
+                "reference": "d690c94f52ae0697e1786860c97861f64bdcfa79",
                 "shasum": ""
             },
             "require": {
@@ -388,11 +388,6 @@
                 "nette/tester": "~1.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -416,7 +411,7 @@
             ],
             "description": "Nette Dependency Injection Component",
             "homepage": "http://nette.org",
-            "time": "2015-05-03 16:16:30"
+            "time": "2015-06-17 13:20:05"
         },
         {
             "name": "nette/finder",
@@ -475,16 +470,16 @@
         },
         {
             "name": "nette/forms",
-            "version": "v2.3.2",
+            "version": "v2.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/forms.git",
-                "reference": "1d22a86c1a193f735740cb5a4a944906217d2341"
+                "reference": "3ff9cc3985d319312dd65a903f1e2a39c2acbf66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/forms/zipball/1d22a86c1a193f735740cb5a4a944906217d2341",
-                "reference": "1d22a86c1a193f735740cb5a4a944906217d2341",
+                "url": "https://api.github.com/repos/nette/forms/zipball/3ff9cc3985d319312dd65a903f1e2a39c2acbf66",
+                "reference": "3ff9cc3985d319312dd65a903f1e2a39c2acbf66",
                 "shasum": ""
             },
             "require": {
@@ -497,17 +492,12 @@
                 "nette/nette": "<2.2"
             },
             "require-dev": {
-                "latte/latte": "~2.3, >=2.3.2",
+                "latte/latte": "~2.3.2",
                 "nette/di": "~2.3",
                 "nette/tester": "~1.3",
                 "tracy/tracy": "~2.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -531,20 +521,20 @@
             ],
             "description": "Nette Forms: greatly facilitates web forms",
             "homepage": "http://nette.org",
-            "time": "2015-05-06 18:07:07"
+            "time": "2015-06-17 16:24:10"
         },
         {
             "name": "nette/http",
-            "version": "v2.3.1",
+            "version": "v2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/http.git",
-                "reference": "c682f0f20caeb1cf57ab8786e6427010a1206a13"
+                "reference": "0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/http/zipball/c682f0f20caeb1cf57ab8786e6427010a1206a13",
-                "reference": "c682f0f20caeb1cf57ab8786e6427010a1206a13",
+                "url": "https://api.github.com/repos/nette/http/zipball/0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee",
+                "reference": "0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee",
                 "shasum": ""
             },
             "require": {
@@ -562,11 +552,6 @@
                 "ext-fileinfo": "to detect type of uploaded files"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -590,20 +575,20 @@
             ],
             "description": "Nette HTTP Component",
             "homepage": "http://nette.org",
-            "time": "2015-04-08 01:05:15"
+            "time": "2015-06-16 12:48:28"
         },
         {
             "name": "nette/mail",
-            "version": "v2.3.0",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/mail.git",
-                "reference": "19d7e1cb8f583c6fe49e896e9a341498decb385d"
+                "reference": "6bd058d2d518f009e9350a8f135452e54fb396e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/mail/zipball/19d7e1cb8f583c6fe49e896e9a341498decb385d",
-                "reference": "19d7e1cb8f583c6fe49e896e9a341498decb385d",
+                "url": "https://api.github.com/repos/nette/mail/zipball/6bd058d2d518f009e9350a8f135452e54fb396e2",
+                "reference": "6bd058d2d518f009e9350a8f135452e54fb396e2",
                 "shasum": ""
             },
             "require": {
@@ -622,11 +607,6 @@
                 "ext-fileinfo": "to detect type of attached files"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -650,7 +630,7 @@
             ],
             "description": "Nette Mail: Sending E-mails",
             "homepage": "http://nette.org",
-            "time": "2015-02-24 22:24:13"
+            "time": "2015-06-17 16:33:22"
         },
         {
             "name": "nette/neon",
@@ -982,16 +962,16 @@
         },
         {
             "name": "nette/utils",
-            "version": "v2.3.1",
+            "version": "v2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "cda96ff718e7bad5e949527dbfa1d6d0498181d9"
+                "reference": "1754fccaa3577b6d88abffcd883939da334a3b8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/cda96ff718e7bad5e949527dbfa1d6d0498181d9",
-                "reference": "cda96ff718e7bad5e949527dbfa1d6d0498181d9",
+                "url": "https://api.github.com/repos/nette/utils/zipball/1754fccaa3577b6d88abffcd883939da334a3b8a",
+                "reference": "1754fccaa3577b6d88abffcd883939da334a3b8a",
                 "shasum": ""
             },
             "require": {
@@ -1010,11 +990,6 @@
                 "ext-mbstring": "to use Strings::lower() etc..."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev"
-                }
-            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1038,7 +1013,7 @@
             ],
             "description": "Nette Utility Classes",
             "homepage": "http://nette.org",
-            "time": "2015-03-17 21:49:28"
+            "time": "2015-06-17 17:12:44"
         },
         {
             "name": "tracy/tracy",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 39617eb7..1dca57db 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -55,68 +55,6 @@
         "description": "Nette SafeStream: Atomic Operations",
         "homepage": "http://nette.org"
     },
-    {
-        "name": "nette/utils",
-        "version": "v2.3.1",
-        "version_normalized": "2.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nette/utils.git",
-            "reference": "cda96ff718e7bad5e949527dbfa1d6d0498181d9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nette/utils/zipball/cda96ff718e7bad5e949527dbfa1d6d0498181d9",
-            "reference": "cda96ff718e7bad5e949527dbfa1d6d0498181d9",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.1"
-        },
-        "conflict": {
-            "nette/nette": "<2.2"
-        },
-        "require-dev": {
-            "nette/tester": "~1.0"
-        },
-        "suggest": {
-            "ext-gd": "to use Image",
-            "ext-iconv": "to use Strings::webalize() and toAscii()",
-            "ext-intl": "for script transliteration in Strings::webalize() and toAscii()",
-            "ext-mbstring": "to use Strings::lower() etc..."
-        },
-        "time": "2015-03-17 21:49:28",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause",
-            "GPL-2.0",
-            "GPL-3.0"
-        ],
-        "authors": [
-            {
-                "name": "David Grudl",
-                "homepage": "http://davidgrudl.com"
-            },
-            {
-                "name": "Nette Community",
-                "homepage": "http://nette.org/contributors"
-            }
-        ],
-        "description": "Nette Utility Classes",
-        "homepage": "http://nette.org"
-    },
     {
         "name": "nette/finder",
         "version": "v2.3.0",
@@ -233,68 +171,6 @@
         "description": "Nette RobotLoader: comfortable autoloading",
         "homepage": "http://nette.org"
     },
-    {
-        "name": "nette/mail",
-        "version": "v2.3.0",
-        "version_normalized": "2.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nette/mail.git",
-            "reference": "19d7e1cb8f583c6fe49e896e9a341498decb385d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nette/mail/zipball/19d7e1cb8f583c6fe49e896e9a341498decb385d",
-            "reference": "19d7e1cb8f583c6fe49e896e9a341498decb385d",
-            "shasum": ""
-        },
-        "require": {
-            "ext-iconv": "*",
-            "nette/utils": "~2.2",
-            "php": ">=5.3.1"
-        },
-        "conflict": {
-            "nette/nette": "<2.2"
-        },
-        "require-dev": {
-            "nette/di": "~2.3",
-            "nette/tester": "~1.3"
-        },
-        "suggest": {
-            "ext-fileinfo": "to detect type of attached files"
-        },
-        "time": "2015-02-24 22:24:13",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause",
-            "GPL-2.0",
-            "GPL-3.0"
-        ],
-        "authors": [
-            {
-                "name": "David Grudl",
-                "homepage": "http://davidgrudl.com"
-            },
-            {
-                "name": "Nette Community",
-                "homepage": "http://nette.org/contributors"
-            }
-        ],
-        "description": "Nette Mail: Sending E-mails",
-        "homepage": "http://nette.org"
-    },
     {
         "name": "nette/security",
         "version": "v2.3.0",
@@ -409,58 +285,6 @@
         "description": "Nette PHP Reflection Component",
         "homepage": "http://nette.org"
     },
-    {
-        "name": "nette/component-model",
-        "version": "v2.2.1",
-        "version_normalized": "2.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/nette/component-model.git",
-            "reference": "969caabb2c03b4f6556adf1b438ffb4d76c0cf38"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/nette/component-model/zipball/969caabb2c03b4f6556adf1b438ffb4d76c0cf38",
-            "reference": "969caabb2c03b4f6556adf1b438ffb4d76c0cf38",
-            "shasum": ""
-        },
-        "require": {
-            "nette/utils": "~2.2",
-            "php": ">=5.3.1"
-        },
-        "conflict": {
-            "nette/nette": "<2.2"
-        },
-        "require-dev": {
-            "nette/tester": "~1.3"
-        },
-        "time": "2015-02-06 14:13:18",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause",
-            "GPL-2.0",
-            "GPL-3.0"
-        ],
-        "authors": [
-            {
-                "name": "David Grudl",
-                "homepage": "http://davidgrudl.com"
-            },
-            {
-                "name": "Nette Community",
-                "homepage": "http://nette.org/contributors"
-            }
-        ],
-        "description": "Nette Component Model",
-        "homepage": "http://nette.org"
-    },
     {
         "name": "nette/php-generator",
         "version": "v2.3.0",
@@ -691,35 +515,43 @@
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/http",
-        "version": "v2.3.1",
-        "version_normalized": "2.3.1.0",
+        "name": "nette/application",
+        "version": "v2.3.3",
+        "version_normalized": "2.3.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/http.git",
-            "reference": "c682f0f20caeb1cf57ab8786e6427010a1206a13"
+            "url": "https://github.com/nette/application.git",
+            "reference": "6ab5299669e86a7892abee0522a0662fba392c0c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/http/zipball/c682f0f20caeb1cf57ab8786e6427010a1206a13",
-            "reference": "c682f0f20caeb1cf57ab8786e6427010a1206a13",
+            "url": "https://api.github.com/repos/nette/application/zipball/6ab5299669e86a7892abee0522a0662fba392c0c",
+            "reference": "6ab5299669e86a7892abee0522a0662fba392c0c",
             "shasum": ""
         },
         "require": {
-            "nette/utils": "~2.2, >=2.2.2",
+            "nette/component-model": "~2.2",
+            "nette/http": "~2.2",
+            "nette/reflection": "~2.2",
+            "nette/security": "~2.2",
+            "nette/utils": "~2.2",
             "php": ">=5.3.1"
         },
         "conflict": {
             "nette/nette": "<2.2"
         },
         "require-dev": {
+            "latte/latte": "~2.3",
             "nette/di": "~2.3",
-            "nette/tester": "~1.0"
+            "nette/forms": "~2.2",
+            "nette/robot-loader": "~2.2",
+            "nette/tester": "~1.3"
         },
         "suggest": {
-            "ext-fileinfo": "to detect type of uploaded files"
+            "latte/latte": "Allows using Latte in templates",
+            "nette/forms": "Allows to use Nette\\Application\\UI\\Form"
         },
-        "time": "2015-04-08 01:05:15",
+        "time": "2015-05-03 14:19:18",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -748,29 +580,26 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette HTTP Component",
+        "description": "Nette Application MVC Component",
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/application",
-        "version": "v2.3.3",
-        "version_normalized": "2.3.3.0",
+        "name": "nette/bootstrap",
+        "version": "v2.3.2",
+        "version_normalized": "2.3.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/application.git",
-            "reference": "6ab5299669e86a7892abee0522a0662fba392c0c"
+            "url": "https://github.com/nette/bootstrap.git",
+            "reference": "f8fb4c73807c6888d904ea8c04324f2d94169c52"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/application/zipball/6ab5299669e86a7892abee0522a0662fba392c0c",
-            "reference": "6ab5299669e86a7892abee0522a0662fba392c0c",
+            "url": "https://api.github.com/repos/nette/bootstrap/zipball/8d2ee3ac4ad082c23cfb4b2bd198566afd6bb0e0",
+            "reference": "f8fb4c73807c6888d904ea8c04324f2d94169c52",
             "shasum": ""
         },
         "require": {
-            "nette/component-model": "~2.2",
-            "nette/http": "~2.2",
-            "nette/reflection": "~2.2",
-            "nette/security": "~2.2",
+            "nette/di": "~2.3",
             "nette/utils": "~2.2",
             "php": ">=5.3.1"
         },
@@ -778,23 +607,25 @@
             "nette/nette": "<2.2"
         },
         "require-dev": {
-            "latte/latte": "~2.3",
-            "nette/di": "~2.3",
-            "nette/forms": "~2.2",
+            "latte/latte": "~2.2",
+            "nette/application": "~2.3",
+            "nette/caching": "~2.3",
+            "nette/database": "~2.3",
+            "nette/forms": "~2.3",
+            "nette/http": "~2.3",
+            "nette/mail": "~2.3",
             "nette/robot-loader": "~2.2",
-            "nette/tester": "~1.3"
+            "nette/safe-stream": "~2.2",
+            "nette/security": "~2.3",
+            "nette/tester": "~1.3",
+            "tracy/tracy": "~2.3"
         },
         "suggest": {
-            "latte/latte": "Allows using Latte in templates",
-            "nette/forms": "Allows to use Nette\\Application\\UI\\Form"
+            "nette/robot-loader": "to use Configurator::createRobotLoader()",
+            "tracy/tracy": "to use Configurator::enableDebugger()"
         },
-        "time": "2015-05-03 14:19:18",
+        "time": "2015-05-21 14:47:56",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "classmap": [
@@ -817,43 +648,40 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette Application MVC Component",
+        "description": "Nette Bootstrap",
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/di",
+        "name": "nette/database",
         "version": "v2.3.3",
         "version_normalized": "2.3.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/di.git",
-            "reference": "72319c90b23437f2397bf533dc8ce6204b2b75bf"
+            "url": "https://github.com/nette/database.git",
+            "reference": "1ceeb2f851964cde04f06bbd5653d22a1c711c57"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/di/zipball/72319c90b23437f2397bf533dc8ce6204b2b75bf",
-            "reference": "72319c90b23437f2397bf533dc8ce6204b2b75bf",
+            "url": "https://api.github.com/repos/nette/database/zipball/1ceeb2f851964cde04f06bbd5653d22a1c711c57",
+            "reference": "1ceeb2f851964cde04f06bbd5653d22a1c711c57",
             "shasum": ""
         },
         "require": {
-            "nette/neon": "~2.3",
-            "nette/php-generator": "~2.3",
-            "nette/utils": "~2.3",
+            "ext-pdo": "*",
+            "nette/caching": "~2.2",
+            "nette/utils": "~2.2",
             "php": ">=5.3.1"
         },
         "conflict": {
             "nette/nette": "<2.2"
         },
         "require-dev": {
+            "mockery/mockery": "~0.9.1",
+            "nette/di": "~2.3",
             "nette/tester": "~1.3"
         },
-        "time": "2015-05-03 16:16:30",
+        "time": "2015-05-20 13:28:17",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
             "classmap": [
@@ -876,51 +704,164 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette Dependency Injection Component",
+        "description": "Nette Database Component",
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/bootstrap",
+        "name": "latte/latte",
         "version": "v2.3.2",
         "version_normalized": "2.3.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/bootstrap.git",
-            "reference": "f8fb4c73807c6888d904ea8c04324f2d94169c52"
+            "url": "https://github.com/nette/latte.git",
+            "reference": "3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/bootstrap/zipball/f8fb4c73807c6888d904ea8c04324f2d94169c52",
-            "reference": "f8fb4c73807c6888d904ea8c04324f2d94169c52",
+            "url": "https://api.github.com/repos/nette/latte/zipball/3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8",
+            "reference": "3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8",
             "shasum": ""
         },
         "require": {
+            "ext-tokenizer": "*",
+            "php": ">=5.3.1"
+        },
+        "require-dev": {
+            "nette/tester": "~1.3"
+        },
+        "suggest": {
+            "ext-fileinfo": "to use filter |datastream",
+            "ext-mbstring": "to use filters like lower, upper, capitalize, ..."
+        },
+        "time": "2015-05-04 14:29:27",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause",
+            "GPL-2.0",
+            "GPL-3.0"
+        ],
+        "authors": [
+            {
+                "name": "David Grudl",
+                "homepage": "http://davidgrudl.com"
+            },
+            {
+                "name": "Nette Community",
+                "homepage": "http://nette.org/contributors"
+            }
+        ],
+        "description": "Latte: the amazing template engine for PHP",
+        "homepage": "http://latte.nette.org",
+        "keywords": [
+            "templating",
+            "twig"
+        ]
+    },
+    {
+        "name": "tracy/tracy",
+        "version": "v2.3.2",
+        "version_normalized": "2.3.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nette/tracy.git",
+            "reference": "0203026d9d4fe0b702146c9dc634dbd9faae64f6"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nette/tracy/zipball/0203026d9d4fe0b702146c9dc634dbd9faae64f6",
+            "reference": "0203026d9d4fe0b702146c9dc634dbd9faae64f6",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.1"
+        },
+        "require-dev": {
             "nette/di": "~2.3",
-            "nette/utils": "~2.2",
+            "nette/tester": "~1.3"
+        },
+        "time": "2015-05-03 16:36:14",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src"
+            ],
+            "files": [
+                "src/shortcuts.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause",
+            "GPL-2.0",
+            "GPL-3.0"
+        ],
+        "authors": [
+            {
+                "name": "David Grudl",
+                "homepage": "http://davidgrudl.com"
+            },
+            {
+                "name": "Nette Community",
+                "homepage": "http://nette.org/contributors"
+            }
+        ],
+        "description": "Tracy: useful PHP debugger",
+        "homepage": "http://tracy.nette.org",
+        "keywords": [
+            "debug",
+            "debugger",
+            "nette"
+        ]
+    },
+    {
+        "name": "nette/utils",
+        "version": "v2.3.2",
+        "version_normalized": "2.3.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nette/utils.git",
+            "reference": "1754fccaa3577b6d88abffcd883939da334a3b8a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nette/utils/zipball/1754fccaa3577b6d88abffcd883939da334a3b8a",
+            "reference": "1754fccaa3577b6d88abffcd883939da334a3b8a",
+            "shasum": ""
+        },
+        "require": {
             "php": ">=5.3.1"
         },
         "conflict": {
             "nette/nette": "<2.2"
         },
         "require-dev": {
-            "latte/latte": "~2.2",
-            "nette/application": "~2.3",
-            "nette/caching": "~2.3",
-            "nette/database": "~2.3",
-            "nette/forms": "~2.3",
-            "nette/http": "~2.3",
-            "nette/mail": "~2.3",
-            "nette/robot-loader": "~2.2",
-            "nette/safe-stream": "~2.2",
-            "nette/security": "~2.3",
-            "nette/tester": "~1.3",
-            "tracy/tracy": "~2.3"
+            "nette/tester": "~1.0"
         },
         "suggest": {
-            "nette/robot-loader": "to use Configurator::createRobotLoader()",
-            "tracy/tracy": "to use Configurator::enableDebugger()"
+            "ext-gd": "to use Image",
+            "ext-iconv": "to use Strings::webalize() and toAscii()",
+            "ext-intl": "for script transliteration in Strings::webalize() and toAscii()",
+            "ext-mbstring": "to use Strings::lower() etc..."
         },
-        "time": "2015-05-21 14:47:56",
+        "time": "2015-06-17 17:12:44",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -944,39 +885,37 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette Bootstrap",
+        "description": "Nette Utility Classes",
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/database",
-        "version": "v2.3.3",
-        "version_normalized": "2.3.3.0",
+        "name": "nette/di",
+        "version": "v2.3.4",
+        "version_normalized": "2.3.4.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/database.git",
-            "reference": "1ceeb2f851964cde04f06bbd5653d22a1c711c57"
+            "url": "https://github.com/nette/di.git",
+            "reference": "d690c94f52ae0697e1786860c97861f64bdcfa79"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/database/zipball/1ceeb2f851964cde04f06bbd5653d22a1c711c57",
-            "reference": "1ceeb2f851964cde04f06bbd5653d22a1c711c57",
+            "url": "https://api.github.com/repos/nette/di/zipball/d690c94f52ae0697e1786860c97861f64bdcfa79",
+            "reference": "d690c94f52ae0697e1786860c97861f64bdcfa79",
             "shasum": ""
         },
         "require": {
-            "ext-pdo": "*",
-            "nette/caching": "~2.2",
-            "nette/utils": "~2.2",
+            "nette/neon": "~2.3",
+            "nette/php-generator": "~2.3",
+            "nette/utils": "~2.3",
             "php": ">=5.3.1"
         },
         "conflict": {
             "nette/nette": "<2.2"
         },
         "require-dev": {
-            "mockery/mockery": "~0.9.1",
-            "nette/di": "~2.3",
             "nette/tester": "~1.3"
         },
-        "time": "2015-05-20 13:28:17",
+        "time": "2015-06-17 13:20:05",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -1000,46 +939,40 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette Database Component",
+        "description": "Nette Dependency Injection Component",
         "homepage": "http://nette.org"
     },
     {
-        "name": "nette/forms",
+        "name": "nette/http",
         "version": "v2.3.2",
         "version_normalized": "2.3.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/forms.git",
-            "reference": "1d22a86c1a193f735740cb5a4a944906217d2341"
+            "url": "https://github.com/nette/http.git",
+            "reference": "0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/forms/zipball/1d22a86c1a193f735740cb5a4a944906217d2341",
-            "reference": "1d22a86c1a193f735740cb5a4a944906217d2341",
+            "url": "https://api.github.com/repos/nette/http/zipball/0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee",
+            "reference": "0f1e5e62c801f70937d43737ce5a6f4ecbdec7ee",
             "shasum": ""
         },
         "require": {
-            "nette/component-model": "~2.2",
-            "nette/http": "~2.2",
-            "nette/utils": "~2.2",
+            "nette/utils": "~2.2, >=2.2.2",
             "php": ">=5.3.1"
         },
         "conflict": {
             "nette/nette": "<2.2"
         },
         "require-dev": {
-            "latte/latte": "~2.3, >=2.3.2",
             "nette/di": "~2.3",
-            "nette/tester": "~1.3",
-            "tracy/tracy": "~2.2"
+            "nette/tester": "~1.0"
         },
-        "time": "2015-05-06 18:07:07",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
+        "suggest": {
+            "ext-fileinfo": "to detect type of uploaded files"
         },
+        "time": "2015-06-16 12:48:28",
+        "type": "library",
         "installation-source": "dist",
         "autoload": {
             "classmap": [
@@ -1062,42 +995,93 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Nette Forms: greatly facilitates web forms",
+        "description": "Nette HTTP Component",
         "homepage": "http://nette.org"
     },
     {
-        "name": "latte/latte",
-        "version": "v2.3.2",
-        "version_normalized": "2.3.2.0",
+        "name": "nette/component-model",
+        "version": "v2.2.2",
+        "version_normalized": "2.2.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/latte.git",
-            "reference": "3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8"
+            "url": "https://github.com/nette/component-model.git",
+            "reference": "0dc1f0df61aa8ae25c0911712ee703b4448689db"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/latte/zipball/3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8",
-            "reference": "3b79dd39f9a51c1ca3d92deedf94362b0a9f79e8",
+            "url": "https://api.github.com/repos/nette/component-model/zipball/0dc1f0df61aa8ae25c0911712ee703b4448689db",
+            "reference": "0dc1f0df61aa8ae25c0911712ee703b4448689db",
             "shasum": ""
         },
         "require": {
-            "ext-tokenizer": "*",
+            "nette/utils": "~2.2",
             "php": ">=5.3.1"
         },
+        "conflict": {
+            "nette/nette": "<2.2"
+        },
         "require-dev": {
             "nette/tester": "~1.3"
         },
-        "suggest": {
-            "ext-fileinfo": "to use filter |datastream",
-            "ext-mbstring": "to use filters like lower, upper, capitalize, ..."
-        },
-        "time": "2015-05-04 14:29:27",
+        "time": "2015-06-16 13:38:12",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause",
+            "GPL-2.0",
+            "GPL-3.0"
+        ],
+        "authors": [
+            {
+                "name": "David Grudl",
+                "homepage": "http://davidgrudl.com"
+            },
+            {
+                "name": "Nette Community",
+                "homepage": "http://nette.org/contributors"
             }
+        ],
+        "description": "Nette Component Model",
+        "homepage": "http://nette.org"
+    },
+    {
+        "name": "nette/forms",
+        "version": "v2.3.3",
+        "version_normalized": "2.3.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/nette/forms.git",
+            "reference": "3ff9cc3985d319312dd65a903f1e2a39c2acbf66"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/nette/forms/zipball/3ff9cc3985d319312dd65a903f1e2a39c2acbf66",
+            "reference": "3ff9cc3985d319312dd65a903f1e2a39c2acbf66",
+            "shasum": ""
         },
+        "require": {
+            "nette/component-model": "~2.2",
+            "nette/http": "~2.2",
+            "nette/utils": "~2.2",
+            "php": ">=5.3.1"
+        },
+        "conflict": {
+            "nette/nette": "<2.2"
+        },
+        "require-dev": {
+            "latte/latte": "~2.3.2",
+            "nette/di": "~2.3",
+            "nette/tester": "~1.3",
+            "tracy/tracy": "~2.2"
+        },
+        "time": "2015-06-17 16:24:10",
+        "type": "library",
         "installation-source": "dist",
         "autoload": {
             "classmap": [
@@ -1120,49 +1104,45 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Latte: the amazing template engine for PHP",
-        "homepage": "http://latte.nette.org",
-        "keywords": [
-            "templating",
-            "twig"
-        ]
+        "description": "Nette Forms: greatly facilitates web forms",
+        "homepage": "http://nette.org"
     },
     {
-        "name": "tracy/tracy",
-        "version": "v2.3.2",
-        "version_normalized": "2.3.2.0",
+        "name": "nette/mail",
+        "version": "v2.3.1",
+        "version_normalized": "2.3.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/nette/tracy.git",
-            "reference": "0203026d9d4fe0b702146c9dc634dbd9faae64f6"
+            "url": "https://github.com/nette/mail.git",
+            "reference": "6bd058d2d518f009e9350a8f135452e54fb396e2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/nette/tracy/zipball/0203026d9d4fe0b702146c9dc634dbd9faae64f6",
-            "reference": "0203026d9d4fe0b702146c9dc634dbd9faae64f6",
+            "url": "https://api.github.com/repos/nette/mail/zipball/6bd058d2d518f009e9350a8f135452e54fb396e2",
+            "reference": "6bd058d2d518f009e9350a8f135452e54fb396e2",
             "shasum": ""
         },
         "require": {
+            "ext-iconv": "*",
+            "nette/utils": "~2.2",
             "php": ">=5.3.1"
         },
+        "conflict": {
+            "nette/nette": "<2.2"
+        },
         "require-dev": {
             "nette/di": "~2.3",
             "nette/tester": "~1.3"
         },
-        "time": "2015-05-03 16:36:14",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3-dev"
-            }
+        "suggest": {
+            "ext-fileinfo": "to detect type of attached files"
         },
+        "time": "2015-06-17 16:33:22",
+        "type": "library",
         "installation-source": "dist",
         "autoload": {
             "classmap": [
-                "src"
-            ],
-            "files": [
-                "src/shortcuts.php"
+                "src/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -1181,12 +1161,7 @@
                 "homepage": "http://nette.org/contributors"
             }
         ],
-        "description": "Tracy: useful PHP debugger",
-        "homepage": "http://tracy.nette.org",
-        "keywords": [
-            "debug",
-            "debugger",
-            "nette"
-        ]
+        "description": "Nette Mail: Sending E-mails",
+        "homepage": "http://nette.org"
     }
 ]
diff --git a/vendor/nette/component-model/src/ComponentModel/Component.php b/vendor/nette/component-model/src/ComponentModel/Component.php
index f11a33d8..2f3d0dd4 100644
--- a/vendor/nette/component-model/src/ComponentModel/Component.php
+++ b/vendor/nette/component-model/src/ComponentModel/Component.php
@@ -277,8 +277,12 @@ private function refreshMonitors($depth, & $missing = NULL, & $listeners = array
 
 		if ($depth === 0) { // call listeners
 			$method = $missing === NULL ? 'detached' : 'attached';
+			$prev = array();
 			foreach ($listeners as $item) {
-				$item[0]->$method($item[1]);
+				if (!in_array($item, $prev, TRUE)) {
+					$item[0]->$method($item[1]);
+					$prev[] = $item;
+				}
 			}
 		}
 	}
diff --git a/vendor/nette/component-model/src/ComponentModel/Container.php b/vendor/nette/component-model/src/ComponentModel/Container.php
index 706b65b4..799cbd24 100644
--- a/vendor/nette/component-model/src/ComponentModel/Container.php
+++ b/vendor/nette/component-model/src/ComponentModel/Container.php
@@ -200,7 +200,8 @@ public function getComponents($deep = FALSE, $filterType = NULL)
 			$iterator = new \RecursiveIteratorIterator($iterator, $deep);
 		}
 		if ($filterType) {
-			$iterator = new Nette\Iterators\Filter($iterator, function($item) use ($filterType) {
+			$class = PHP_VERSION_ID < 50400 ? 'Nette\Iterators\Filter' : 'CallbackFilterIterator';
+			$iterator = new $class($iterator, function($item) use ($filterType) {
 				return $item instanceof $filterType;
 			});
 		}
diff --git a/vendor/nette/di/composer.json b/vendor/nette/di/composer.json
index 2f84e0e9..74b0c385 100644
--- a/vendor/nette/di/composer.json
+++ b/vendor/nette/di/composer.json
@@ -28,10 +28,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/vendor/nette/di/src/DI/Compiler.php b/vendor/nette/di/src/DI/Compiler.php
index 6e44cb5e..7601027d 100644
--- a/vendor/nette/di/src/DI/Compiler.php
+++ b/vendor/nette/di/src/DI/Compiler.php
@@ -250,8 +250,8 @@ public static function parseServices(ContainerBuilder $builder, array $config, $
 
 		foreach ($services as $origName => $def) {
 			if ((string) (int) $origName === (string) $origName) {
-				$name = (count($builder->getDefinitions()) + 1)
-					. preg_replace('#\W+#', '_', $def instanceof Statement ? '.' . $def->getEntity() : (is_scalar($def) ? ".$def" : ''));
+				$postfix = $def instanceof Statement && is_string($def->getEntity()) ? '.' . $def->getEntity() : (is_scalar($def) ? ".$def" : '');
+				$name = (count($builder->getDefinitions()) + 1) . preg_replace('#\W+#', '_', $postfix);
 			} else {
 				$name = ($namespace ? $namespace . '.' : '') . strtr($origName, '\\', '_');
 			}
diff --git a/vendor/nette/di/src/DI/ContainerBuilder.php b/vendor/nette/di/src/DI/ContainerBuilder.php
index f2e741c2..d1f9e0d6 100644
--- a/vendor/nette/di/src/DI/ContainerBuilder.php
+++ b/vendor/nette/di/src/DI/ContainerBuilder.php
@@ -79,6 +79,14 @@ public function removeDefinition($name)
 	{
 		$name = isset($this->aliases[$name]) ? $this->aliases[$name] : $name;
 		unset($this->definitions[$name]);
+
+		if ($this->classes) {
+			foreach ($this->classes as & $tmp) {
+				foreach ($tmp as & $names) {
+					$names = array_values(array_diff($names, array($name)));
+				}
+			}
+		}
 	}
 
 
diff --git a/vendor/nette/forms/composer.json b/vendor/nette/forms/composer.json
index f974b7ec..4ddd17a9 100644
--- a/vendor/nette/forms/composer.json
+++ b/vendor/nette/forms/composer.json
@@ -22,7 +22,7 @@
 	"require-dev": {
 		"nette/di": "~2.3",
 		"nette/tester": "~1.3",
-		"latte/latte": "~2.3, >=2.3.2",
+		"latte/latte": "~2.3.2",
 		"tracy/tracy": "~2.2"
 	},
 	"conflict": {
@@ -31,10 +31,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/vendor/nette/forms/src/Bridges/FormsLatte/FormMacros.php b/vendor/nette/forms/src/Bridges/FormsLatte/FormMacros.php
index b0c56834..0708bf53 100644
--- a/vendor/nette/forms/src/Bridges/FormsLatte/FormMacros.php
+++ b/vendor/nette/forms/src/Bridges/FormsLatte/FormMacros.php
@@ -198,7 +198,7 @@ public function macroNameEnd(MacroNode $node, PhpWriter $writer)
 			$node->content = $parts[1] . $parts[2] . '<?php echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd($_form, FALSE) ?>' . $parts[3];
 		} elseif ($tagName === 'label') {
 			if ($node->htmlNode->isEmpty) {
-				$node->content = $parts[1] . '<?php echo $_input->getLabel()->getHtml() ?>' . $parts[3];
+				$node->content = $parts[1] . "<?php echo \$_input->{method_exists(\$_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->getHtml() ?>" . $parts[3];
 			}
 		} elseif ($tagName === 'button') {
 			if ($node->htmlNode->isEmpty) {
diff --git a/vendor/nette/forms/src/Forms/Controls/CheckboxList.php b/vendor/nette/forms/src/Forms/Controls/CheckboxList.php
index 6e1837f6..80000b14 100644
--- a/vendor/nette/forms/src/Forms/Controls/CheckboxList.php
+++ b/vendor/nette/forms/src/Forms/Controls/CheckboxList.php
@@ -96,9 +96,11 @@ public function getControlPart($key)
 	/**
 	 * @return Html
 	 */
-	public function getLabelPart($key)
+	public function getLabelPart($key = NULL)
 	{
-		return parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key);
+		return func_num_args()
+			? parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key)
+			: $this->getLabel();
 	}
 
 }
diff --git a/vendor/nette/forms/src/Forms/Controls/RadioList.php b/vendor/nette/forms/src/Forms/Controls/RadioList.php
index 7134f3aa..2d775247 100644
--- a/vendor/nette/forms/src/Forms/Controls/RadioList.php
+++ b/vendor/nette/forms/src/Forms/Controls/RadioList.php
@@ -149,9 +149,11 @@ public function getControlPart($key)
 	/**
 	 * @return Html
 	 */
-	public function getLabelPart($key)
+	public function getLabelPart($key = NULL)
 	{
-		return parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key);
+		return func_num_args()
+			? parent::getLabel($this->items[$key])->for($this->getHtmlId() . '-' . $key)
+			: $this->getLabel();
 	}
 
 }
diff --git a/vendor/nette/forms/src/Forms/Form.php b/vendor/nette/forms/src/Forms/Form.php
index b90acb4a..a04c78e7 100644
--- a/vendor/nette/forms/src/Forms/Form.php
+++ b/vendor/nette/forms/src/Forms/Form.php
@@ -159,7 +159,7 @@ protected function attached($obj)
 
 	/**
 	 * Returns self.
-	 * @return Form
+	 * @return self
 	 */
 	public function getForm($need = TRUE)
 	{
diff --git a/vendor/nette/forms/src/Forms/Rules.php b/vendor/nette/forms/src/Forms/Rules.php
index 893f1956..bad7871c 100644
--- a/vendor/nette/forms/src/Forms/Rules.php
+++ b/vendor/nette/forms/src/Forms/Rules.php
@@ -96,7 +96,7 @@ public function addRule($validator, $message = NULL, $arg = NULL)
 	 * Adds a validation condition and returns new branch.
 	 * @param  mixed      condition type
 	 * @param  mixed      optional condition arguments
-	 * @return Rules      new branch
+	 * @return self       new branch
 	 */
 	public function addCondition($validator, $arg = NULL)
 	{
@@ -109,7 +109,7 @@ public function addCondition($validator, $arg = NULL)
 	 * @param  IControl form control
 	 * @param  mixed      condition type
 	 * @param  mixed      optional condition arguments
-	 * @return Rules      new branch
+	 * @return self       new branch
 	 */
 	public function addConditionOn(IControl $control, $validator, $arg = NULL)
 	{
@@ -128,7 +128,7 @@ public function addConditionOn(IControl $control, $validator, $arg = NULL)
 
 	/**
 	 * Adds a else statement.
-	 * @return Rules      else branch
+	 * @return self      else branch
 	 */
 	public function elseCondition()
 	{
diff --git a/vendor/nette/forms/src/assets/netteForms.js b/vendor/nette/forms/src/assets/netteForms.js
index 81cf84bb..d204c645 100644
--- a/vendor/nette/forms/src/assets/netteForms.js
+++ b/vendor/nette/forms/src/assets/netteForms.js
@@ -472,7 +472,7 @@ Nette.toggleControl = function(elem, rules, success, firsttime, value) {
 
 				for (var i = 0; i < els.length; i++) {
 					if (els[i].name === name && !Nette.inArray(handled, els[i])) {
-						Nette.addEvent(els[i], oldIE && curElem.type in {checkbox: 1, radio: 1} ? 'click' : 'change', handler);
+						Nette.addEvent(els[i], oldIE && els[i].type in {checkbox: 1, radio: 1} ? 'click' : 'change', handler);
 						handled.push(els[i]);
 					}
 				}
@@ -541,7 +541,13 @@ Nette.initForm = function(form) {
 Nette.initOnLoad = function() {
 	Nette.addEvent(window, 'load', function() {
 		for (var i = 0; i < document.forms.length; i++) {
-			Nette.initForm(document.forms[i]);
+			var form = document.forms[i];
+			for (var j = 0; j < form.elements.length; j++) {
+				if (form.elements[j].getAttribute('data-nette-rules')) {
+					Nette.initForm(form);
+					break;
+				}
+			}
 		}
 	});
 };
diff --git a/vendor/nette/http/composer.json b/vendor/nette/http/composer.json
index f5962275..ba48e5ce 100644
--- a/vendor/nette/http/composer.json
+++ b/vendor/nette/http/composer.json
@@ -30,10 +30,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/vendor/nette/http/src/Http/Helpers.php b/vendor/nette/http/src/Http/Helpers.php
index c8c40d2f..ff47e9c7 100644
--- a/vendor/nette/http/src/Http/Helpers.php
+++ b/vendor/nette/http/src/Http/Helpers.php
@@ -39,20 +39,14 @@ public static function formatDate($time)
 	public static function ipMatch($ip, $mask)
 	{
 		list($mask, $size) = explode('/', $mask . '/');
-		$ipv4 = strpos($ip, '.');
-		$max = $ipv4 ? 32 : 128;
-		if (($ipv4 xor strpos($mask, '.')) || $size < 0 || $size > $max) {
+		$tmp = function ($n) { return sprintf('%032b', $n); };
+		$ip = implode('', array_map($tmp, unpack('N*', inet_pton($ip))));
+		$mask = implode('', array_map($tmp, unpack('N*', inet_pton($mask))));
+		$max = strlen($ip);
+		if (!$max || $max !== strlen($mask) || $size < 0 || $size > $max) {
 			return FALSE;
-		} elseif ($ipv4) {
-			$arr = array(ip2long($ip), ip2long($mask));
-		} else {
-			$arr = unpack('N*', inet_pton($ip) . inet_pton($mask));
-			$size = $size === '' ? 0 : $max - $size;
 		}
-		$bits = implode('', array_map(function ($n) {
-			return sprintf('%032b', $n);
-		}, $arr));
-		return substr($bits, 0, $max - $size) === substr($bits, $max, $max - $size);
+		return strncmp($ip, $mask, $size === '' ? $max : $size) === 0;
 	}
 
 
diff --git a/vendor/nette/mail/composer.json b/vendor/nette/mail/composer.json
index 1628d0d6..5737f5fe 100644
--- a/vendor/nette/mail/composer.json
+++ b/vendor/nette/mail/composer.json
@@ -31,10 +31,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/vendor/nette/mail/src/Mail/Message.php b/vendor/nette/mail/src/Mail/Message.php
index 51a1724e..dd917759 100644
--- a/vendor/nette/mail/src/Mail/Message.php
+++ b/vendor/nette/mail/src/Mail/Message.php
@@ -301,6 +301,16 @@ public function addAttachment($file, $content = NULL, $contentType = NULL)
 	}
 
 
+	/**
+	 * Gets all email attachments.
+	 * @return MimePart[]
+	 */
+	public function getAttachments()
+	{
+		return $this->attachments;
+	}
+
+
 	/**
 	 * Creates file MIME part.
 	 * @return MimePart
diff --git a/vendor/nette/mail/src/Mail/SmtpMailer.php b/vendor/nette/mail/src/Mail/SmtpMailer.php
index 22ddd5ee..1988394e 100644
--- a/vendor/nette/mail/src/Mail/SmtpMailer.php
+++ b/vendor/nette/mail/src/Mail/SmtpMailer.php
@@ -159,7 +159,7 @@ protected function disconnect()
 
 
 	/**
-	 * Writes data to server and checks response.
+	 * Writes data to server and checks response against expected code if some provided.
 	 * @param  string
 	 * @param  int   response code
 	 * @param  string  error message
@@ -168,8 +168,11 @@ protected function disconnect()
 	protected function write($line, $expectedCode = NULL, $message = NULL)
 	{
 		fwrite($this->connection, $line . Message::EOL);
-		if ($expectedCode && !in_array((int) $this->read(), (array) $expectedCode, TRUE)) {
-			throw new SmtpException('SMTP server did not accept ' . ($message ? $message : $line));
+		if ($expectedCode) {
+			$response = $this->read();
+			if (!in_array((int) $response, (array) $expectedCode, TRUE)) {
+				throw new SmtpException('SMTP server did not accept ' . ($message ? $message : $line) . ' with error: ' . trim($response));
+			}
 		}
 	}
 
diff --git a/vendor/nette/utils/composer.json b/vendor/nette/utils/composer.json
index f1e133bf..3c00f350 100644
--- a/vendor/nette/utils/composer.json
+++ b/vendor/nette/utils/composer.json
@@ -31,10 +31,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/vendor/nette/utils/src/Utils/ArrayHash.php b/vendor/nette/utils/src/Utils/ArrayHash.php
index 0f7e6551..3db7c602 100644
--- a/vendor/nette/utils/src/Utils/ArrayHash.php
+++ b/vendor/nette/utils/src/Utils/ArrayHash.php
@@ -21,7 +21,7 @@ class ArrayHash extends \stdClass implements \ArrayAccess, \Countable, \Iterator
 	/**
 	 * @param  array to wrap
 	 * @param  bool
-	 * @return ArrayHash
+	 * @return self
 	 */
 	public static function from($arr, $recursive = TRUE)
 	{
diff --git a/vendor/nette/utils/src/Utils/Arrays.php b/vendor/nette/utils/src/Utils/Arrays.php
index 80c75eb1..12cfc9f1 100644
--- a/vendor/nette/utils/src/Utils/Arrays.php
+++ b/vendor/nette/utils/src/Utils/Arrays.php
@@ -236,4 +236,28 @@ public static function normalize(array $arr, $filling = NULL)
 		return $res;
 	}
 
+
+	/**
+	 * Picks element from the array by key and return its value.
+	 * @param  array
+	 * @param  string|int array key
+	 * @param  mixed
+	 * @return mixed
+	 * @throws Nette\InvalidArgumentException if item does not exist and default value is not provided
+	 */
+	public static function pick(array & $arr, $key, $default = NULL)
+	{
+		if (array_key_exists($key, $arr)) {
+			$value = $arr[$key];
+			unset($arr[$key]);
+			return $value;
+
+		} elseif (func_num_args() < 3) {
+			throw new Nette\InvalidArgumentException("Missing item '$key'.");
+
+		} else {
+			return $default;
+		}
+	}
+
 }
diff --git a/vendor/nette/utils/src/Utils/DateTime.php b/vendor/nette/utils/src/Utils/DateTime.php
index 3dad9055..9351aeb9 100644
--- a/vendor/nette/utils/src/Utils/DateTime.php
+++ b/vendor/nette/utils/src/Utils/DateTime.php
@@ -39,7 +39,7 @@ class DateTime extends \DateTime
 	/**
 	 * DateTime object factory.
 	 * @param  string|int|\DateTime
-	 * @return DateTime
+	 * @return self
 	 */
 	public static function from($time)
 	{
@@ -106,7 +106,7 @@ public function getTimestamp()
 	 * @param string The format the $time parameter should be in
 	 * @param string String representing the time
 	 * @param string|\DateTimeZone desired timezone (default timezone is used if NULL is passed)
-	 * @return DateTime|FALSE
+	 * @return self|FALSE
 	 */
 	public static function createFromFormat($format, $time, $timezone = NULL)
 	{
diff --git a/vendor/nette/utils/src/Utils/Image.php b/vendor/nette/utils/src/Utils/Image.php
index 9c64a6a6..59382ab7 100644
--- a/vendor/nette/utils/src/Utils/Image.php
+++ b/vendor/nette/utils/src/Utils/Image.php
@@ -139,7 +139,7 @@ public static function rgb($red, $green, $blue, $transparency = 0)
 	 * @param  mixed  detected image format
 	 * @throws Nette\NotSupportedException if gd extension is not loaded
 	 * @throws UnknownImageFileException if file not found or file type is not known
-	 * @return Image
+	 * @return self
 	 */
 	public static function fromFile($file, & $format = NULL)
 	{
@@ -180,7 +180,7 @@ public static function getFormatFromString($s)
 	 * Create a new image from the image stream in the string.
 	 * @param  string
 	 * @param  mixed  detected image format
-	 * @return Image
+	 * @return self
 	 * @throws ImageException
 	 */
 	public static function fromString($s, & $format = NULL)
@@ -190,7 +190,6 @@ public static function fromString($s, & $format = NULL)
 		}
 
 		if (func_num_args() > 1) {
-			trigger_error(__METHOD__ . '() second argument $format is deprecated; use finfo_buffer() instead.', E_USER_DEPRECATED);
 			$format = @static::getFormatFromString($s);
 		}
 
@@ -205,7 +204,7 @@ public static function fromString($s, & $format = NULL)
 	 * @param  int
 	 * @param  int
 	 * @param  array
-	 * @return Image
+	 * @return self
 	 */
 	public static function fromBlank($width, $height, $color = NULL)
 	{
diff --git a/vendor/nette/utils/src/Utils/Random.php b/vendor/nette/utils/src/Utils/Random.php
index 9999309b..8865a22e 100644
--- a/vendor/nette/utils/src/Utils/Random.php
+++ b/vendor/nette/utils/src/Utils/Random.php
@@ -26,6 +26,10 @@ class Random
 	 */
 	public static function generate($length = 10, $charlist = '0-9a-z')
 	{
+		if ($length === 0) {
+			return ''; // mcrypt_create_iv does not support zero length
+		}
+
 		$charlist = str_shuffle(preg_replace_callback('#.-.#', function($m) {
 			return implode('', range($m[0][0], $m[0][2]));
 		}, $charlist));
diff --git a/vendor/nette/utils/src/Utils/Strings.php b/vendor/nette/utils/src/Utils/Strings.php
index f0f363f1..4cfbd781 100644
--- a/vendor/nette/utils/src/Utils/Strings.php
+++ b/vendor/nette/utils/src/Utils/Strings.php
@@ -434,6 +434,68 @@ public static function random($length = 10, $charlist = '0-9a-z')
 	}
 
 
+	/**
+	 * Returns part of $haystack before $nth occurence of $needle.
+	 * @param  string
+	 * @param  string
+	 * @param  int  negative value means searching from the end
+	 * @return string|FALSE  returns FALSE if the needle was not found
+	 */
+	public static function before($haystack, $needle, $nth = 1)
+	{
+		$pos = self::pos($haystack, $needle, $nth);
+		return $pos === FALSE
+			? FALSE
+			: substr($haystack, 0, $pos);
+	}
+
+
+	/**
+	 * Returns part of $haystack after $nth occurence of $needle.
+	 * @param  string
+	 * @param  string
+	 * @param  int  negative value means searching from the end
+	 * @return string|FALSE  returns FALSE if the needle was not found
+	 */
+	public static function after($haystack, $needle, $nth = 1)
+	{
+		$pos = self::pos($haystack, $needle, $nth);
+		return $pos === FALSE
+			? FALSE
+			: (string) substr($haystack, $pos + strlen($needle));
+	}
+
+
+	/**
+	 * Returns position of $nth occurence of $needle in $haystack.
+	 * @return int|FALSE  offset in bytes or FALSE if the needle was not found
+	 */
+	private static function pos($haystack, $needle, $nth = 1)
+	{
+		if (!$nth) {
+			return FALSE;
+		} elseif ($nth > 0) {
+			if (strlen($needle) === 0) {
+				return 0;
+			}
+			$pos = 0;
+			while (FALSE !== ($pos = strpos($haystack, $needle, $pos)) && --$nth) {
+				$pos++;
+			}
+		} else {
+			$len = strlen($haystack);
+			if (strlen($needle) === 0) {
+				return $len;
+			}
+			$pos = $len - 1;
+			while (FALSE !== ($pos = strrpos($haystack, $needle, $pos - $len)) && ++$nth) {
+				$pos--;
+			}
+		}
+		return $pos;
+	}
+
+
 	/**
 	 * Splits string by a regular expression.
 	 * @param  string