diff --git a/.env.example b/.env.example
index 907bb477..cd7fdb90 100644
--- a/.env.example
+++ b/.env.example
@@ -37,3 +37,4 @@ VANILLA_FORUM_SECRET=
 DISQUS_API_KEY=
 DISQUS_API_SECRET=
 DISQUS_DOMAIN=
+DISQUS_ENABLED=false
diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index 14b81839..139142ad 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -52,8 +52,9 @@ public function update($id)
             if (!Input::has('password')) {
                 $this->validator->setData(Input::except(['password', 'password_confirmation']));
             }
-            $input = $this->validator->validate('update');
             $user  = $this->userRepo->getById($id);
+            $input = $this->validator->bind('nickName', ['userId' => $user->id])->bind('email', ['userId' => $user->id])
+                ->validate('update');
             $this->userRepo->update($user, $input);
             return Response::json(['success' => true]);
         } catch (ValidationException $e) {
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index dd000d93..0acdf167 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -100,42 +100,27 @@ public function postRegister()
         }
 
         try {
-            $input        = $this->validator->validate('register');
-            $existingUser = $this->userRepo->getByEmail($input['email']);
-            // duplicated user verification
-            if ($existingUser === null) {
-                $input['password'] = Hash::make($input['password']);
-                $user              = $this->userRepo->create($input);
-                if (!empty($user)) {
-                    Auth::login($user);
-                    try {
-                        $subject = Lang::get('emails.welcome.subject', ['siteName' => Config::get('gzero.siteName')]);
-                        Mail::send( // welcome email
-                            'emails.auth.welcome',
-                            ['user' => $user],
-                            function ($message) use ($input, $subject) {
-                                $message->subject($subject)
-                                    ->to($input['email'], $input['firstName'] . ' ' . $input['lastName']);
-                            }
-                        );
-                    } catch (\Swift_TransportException $e) {
-                        /**@TODO Better way to handle exceptions on production */
-                        Log::error('Unable to send welcome email: ' . $e->getMessage());
-                    }
+            $input             = $this->validator->validate('register');
+            $input['password'] = Hash::make($input['password']);
+            $user              = $this->userRepo->create($input);
+            if (!empty($user)) {
+                Auth::login($user);
+                try {
+                    $subject = Lang::get('emails.welcome.subject', ['siteName' => Config::get('gzero.siteName')]);
+                    Mail::send( // welcome email
+                        'emails.auth.welcome',
+                        ['user' => $user],
+                        function ($message) use ($input, $subject) {
+                            $message->subject($subject)
+                                ->to($input['email'], $input['firstName'] . ' ' . $input['lastName']);
+                        }
+                    );
+                } catch (\Swift_TransportException $e) {
+                    /**@TODO Better way to handle exceptions on production */
+                    Log::error('Unable to send welcome email: ' . $e->getMessage());
                 }
-                return redirect()->intended('account');
-            } else {
-                Session::flash(
-                    'messages',
-                    [
-                        [
-                            'code' => 'error',
-                            'text' => Lang::get('common.emailAlreadyInUseMessage')
-                        ]
-                    ]
-                );
-                return redirect()->route('register')->withInput();
             }
+            return redirect()->intended('account');
         } catch (ValidationException $e) {
             return redirect()->route('register')->withInput()->withErrors($e->getErrors());
         }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index b1160400..03821542 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -38,7 +38,7 @@ function ($view) {
                 if ($user) {
                     $data = [
                         "id"       => $user["id"],
-                        "username" => $user["firstName"] . ' ' . $user["lastName"],
+                        "username" => $user->getPresenter()->displayName(),
                         "email"    => $user["email"],
                         //"avatar"    => $user["avatar"],
                     ];
diff --git a/changelog.md b/changelog.md
index f88de85a..f433a8d8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,41 @@
 ###Changelog:
+##v0.0.6
+*GZERO PLATFORM*
+
+- Added user nickName field
+- Added email field to edit user account form
+- Added missing disquss counter
+- Added handling social accounts without email field
+- Fixed api url on edit account when multi language is disabled
+- Fixed SEO fields formatting issues
+- Fixed lang code in html tag
+- Fixed loading mask dimensions
+
+*GZERO ADMIN*
+
+- Added user nickName field
+
+*GZERO API*
+
+- Added user nickName field
+
+*GZERO CMS*
+
+- Added user nickName field
+- Added unique nickname for users with empty on user creation
+- Fixed SEO fields in translation presenter
+
+*GZERO SOCIAL*
+
+- Added user email from social response for user creation
+- Unique social id is now used as fallback for response with missing email
+- Fixed social login buttons so that they are visible only for configured services
+- Fixed loading mask
+
+*GZERO VANILLA-INTEGRATION*
+
+- Added user nickName field
+
 ##v0.0.5
 *GZERO PLATFORM*
 
diff --git a/composer.lock b/composer.lock
index 2a4f7f59..98b3cd81 100644
--- a/composer.lock
+++ b/composer.lock
@@ -684,16 +684,16 @@
         },
         {
             "name": "gzero/admin",
-            "version": "v0.0.5",
+            "version": "v0.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrupaZero/admin.git",
-                "reference": "91d26ff1343af8fce90f20ab283b270f16540b5d"
+                "reference": "c37d3e4f51186a1d18a0344ce9e21fa13d70fecd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrupaZero/admin/zipball/91d26ff1343af8fce90f20ab283b270f16540b5d",
-                "reference": "91d26ff1343af8fce90f20ab283b270f16540b5d",
+                "url": "https://api.github.com/repos/GrupaZero/admin/zipball/c37d3e4f51186a1d18a0344ce9e21fa13d70fecd",
+                "reference": "c37d3e4f51186a1d18a0344ce9e21fa13d70fecd",
                 "shasum": ""
             },
             "require": {
@@ -726,20 +726,20 @@
                 "gzero cms",
                 "laravel"
             ],
-            "time": "2016-03-26 10:52:14"
+            "time": "2016-04-09 17:29:02"
         },
         {
             "name": "gzero/api",
-            "version": "v0.0.5",
+            "version": "v0.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrupaZero/api.git",
-                "reference": "9934bc87c430140f65ccaabc31cf8be0918095bf"
+                "reference": "cfb4d3d761ce2a7f8aca3222e6e015ca8ac217aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrupaZero/api/zipball/9934bc87c430140f65ccaabc31cf8be0918095bf",
-                "reference": "9934bc87c430140f65ccaabc31cf8be0918095bf",
+                "url": "https://api.github.com/repos/GrupaZero/api/zipball/cfb4d3d761ce2a7f8aca3222e6e015ca8ac217aa",
+                "reference": "cfb4d3d761ce2a7f8aca3222e6e015ca8ac217aa",
                 "shasum": ""
             },
             "require": {
@@ -785,20 +785,20 @@
                 "cms",
                 "laravel"
             ],
-            "time": "2016-03-26 10:47:33"
+            "time": "2016-04-09 17:27:11"
         },
         {
             "name": "gzero/cms",
-            "version": "v0.0.5",
+            "version": "v0.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrupaZero/cms.git",
-                "reference": "8174fa694ba80e965709a3b2d50bf8dff5a112ba"
+                "reference": "3068086679e76e8db5ae804000ec61e6000b9f01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrupaZero/cms/zipball/8174fa694ba80e965709a3b2d50bf8dff5a112ba",
-                "reference": "8174fa694ba80e965709a3b2d50bf8dff5a112ba",
+                "url": "https://api.github.com/repos/GrupaZero/cms/zipball/3068086679e76e8db5ae804000ec61e6000b9f01",
+                "reference": "3068086679e76e8db5ae804000ec61e6000b9f01",
                 "shasum": ""
             },
             "require": {
@@ -849,7 +849,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2016-03-25 17:32:26"
+            "time": "2016-04-09 14:12:53"
         },
         {
             "name": "gzero/eloquent-tree",
@@ -901,16 +901,16 @@
         },
         {
             "name": "gzero/social",
-            "version": "v1.1",
+            "version": "v1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrupaZero/social.git",
-                "reference": "0db632f92a5f450ce488582c777c83a7eb804cfd"
+                "reference": "936c5de59bd5fa40e28b52e9e92c97b243500b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrupaZero/social/zipball/0db632f92a5f450ce488582c777c83a7eb804cfd",
-                "reference": "0db632f92a5f450ce488582c777c83a7eb804cfd",
+                "url": "https://api.github.com/repos/GrupaZero/social/zipball/936c5de59bd5fa40e28b52e9e92c97b243500b6e",
+                "reference": "936c5de59bd5fa40e28b52e9e92c97b243500b6e",
                 "shasum": ""
             },
             "require": {
@@ -954,20 +954,20 @@
                 "plugin",
                 "social"
             ],
-            "time": "2016-03-26 10:57:44"
+            "time": "2016-04-09 14:13:14"
         },
         {
             "name": "gzero/vanilla-integration",
-            "version": "v1.0",
+            "version": "v1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrupaZero/vanilla-integration.git",
-                "reference": "14b1bc646fb71eda2aada85e66eaaf97b9b064c0"
+                "reference": "7e758c61f075d692009cf97b9bbb80322366a2ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrupaZero/vanilla-integration/zipball/14b1bc646fb71eda2aada85e66eaaf97b9b064c0",
-                "reference": "14b1bc646fb71eda2aada85e66eaaf97b9b064c0",
+                "url": "https://api.github.com/repos/GrupaZero/vanilla-integration/zipball/7e758c61f075d692009cf97b9bbb80322366a2ca",
+                "reference": "7e758c61f075d692009cf97b9bbb80322366a2ca",
                 "shasum": ""
             },
             "require": {
@@ -1011,7 +1011,7 @@
                 "laravel",
                 "vanilla forum"
             ],
-            "time": "2016-01-02 15:50:22"
+            "time": "2016-04-03 21:23:07"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -1160,16 +1160,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.1.31",
+            "version": "v5.1.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "d899fbda59bf3ffcde11a9b443c01043b76f40b3"
+                "reference": "0e73cba565b0ef5b158da62f641dc6770b806102"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/d899fbda59bf3ffcde11a9b443c01043b76f40b3",
-                "reference": "d899fbda59bf3ffcde11a9b443c01043b76f40b3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/0e73cba565b0ef5b158da62f641dc6770b806102",
+                "reference": "0e73cba565b0ef5b158da62f641dc6770b806102",
                 "shasum": ""
             },
             "require": {
@@ -1183,7 +1183,7 @@
                 "monolog/monolog": "~1.11",
                 "mtdowling/cron-expression": "~1.0",
                 "nesbot/carbon": "~1.19",
-                "paragonie/random_compat": "~1.1",
+                "paragonie/random_compat": "~1.4",
                 "php": ">=5.5.9",
                 "psy/psysh": "0.7.*",
                 "swiftmailer/swiftmailer": "~5.1",
@@ -1284,7 +1284,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2016-02-24 15:13:21"
+            "time": "2016-04-07 14:12:37"
         },
         {
             "name": "laravel/socialite",
@@ -1551,16 +1551,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.18.1",
+            "version": "1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45"
+                "reference": "064b38c16790249488e7a8b987acf1c9d7383c09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
-                "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/064b38c16790249488e7a8b987acf1c9d7383c09",
+                "reference": "064b38c16790249488e7a8b987acf1c9d7383c09",
                 "shasum": ""
             },
             "require": {
@@ -1575,13 +1575,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",
@@ -1590,11 +1590,11 @@
                 "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": {
@@ -1625,7 +1625,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2016-03-13 16:08:35"
+            "time": "2016-04-02 13:12:58"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -2132,16 +2132,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "ee91ec301cd88ee38ab14505025fe94bbc19a9c1"
+                "reference": "6100a40569b2be1b6aba1cc6a92fe6cb71024fc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/ee91ec301cd88ee38ab14505025fe94bbc19a9c1",
-                "reference": "ee91ec301cd88ee38ab14505025fe94bbc19a9c1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/6100a40569b2be1b6aba1cc6a92fe6cb71024fc8",
+                "reference": "6100a40569b2be1b6aba1cc6a92fe6cb71024fc8",
                 "shasum": ""
             },
             "require": {
@@ -2187,20 +2187,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-28 16:19:47"
+            "time": "2016-03-09 16:30:49"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5377825bb6496514f63603af417fa07afaa12357"
+                "reference": "b6e5e9087ed7affbd4c38948da8f93513a87de43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5377825bb6496514f63603af417fa07afaa12357",
-                "reference": "5377825bb6496514f63603af417fa07afaa12357",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b6e5e9087ed7affbd4c38948da8f93513a87de43",
+                "reference": "b6e5e9087ed7affbd4c38948da8f93513a87de43",
                 "shasum": ""
             },
             "require": {
@@ -2240,20 +2240,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 05:09:39"
+            "time": "2016-03-04 07:52:28"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "e96f1ff28e2b8b2f3b906245b18d5e6a52e73648"
+                "reference": "ef78aaaa3e54d2e4b873cc4c7d591969f9bf0b5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/e96f1ff28e2b8b2f3b906245b18d5e6a52e73648",
-                "reference": "e96f1ff28e2b8b2f3b906245b18d5e6a52e73648",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/ef78aaaa3e54d2e4b873cc4c7d591969f9bf0b5f",
+                "reference": "ef78aaaa3e54d2e4b873cc4c7d591969f9bf0b5f",
                 "shasum": ""
             },
             "require": {
@@ -2297,20 +2297,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-25 23:34:19"
+            "time": "2016-03-13 10:12:56"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf"
+                "reference": "f7cbc7b68f5c55615f752b6dd80ba1403b2eab83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf",
-                "reference": "c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f7cbc7b68f5c55615f752b6dd80ba1403b2eab83",
+                "reference": "f7cbc7b68f5c55615f752b6dd80ba1403b2eab83",
                 "shasum": ""
             },
             "require": {
@@ -2352,20 +2352,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-28 16:19:47"
+            "time": "2016-03-22 08:55:46"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.3",
+            "version": "v2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3"
+                "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3",
-                "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/47d2d8cade9b1c3987573d2943bb9352536cdb87",
+                "reference": "47d2d8cade9b1c3987573d2943bb9352536cdb87",
                 "shasum": ""
             },
             "require": {
@@ -2412,20 +2412,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 05:14:19"
+            "time": "2016-03-07 14:04:32"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "addcb70b33affbca4f3979b0d000259b63dd6711"
+                "reference": "0bacc7c9fc1905cfce20212633013a5b300dce52"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/addcb70b33affbca4f3979b0d000259b63dd6711",
-                "reference": "addcb70b33affbca4f3979b0d000259b63dd6711",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/0bacc7c9fc1905cfce20212633013a5b300dce52",
+                "reference": "0bacc7c9fc1905cfce20212633013a5b300dce52",
                 "shasum": ""
             },
             "require": {
@@ -2461,24 +2461,25 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-22 16:12:29"
+            "time": "2016-03-10 10:49:29"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6aeb70d26da8f30753111b3f9cf47eb0421c0735"
+                "reference": "b69b6e103712870a3137e9132115d800b2713aac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6aeb70d26da8f30753111b3f9cf47eb0421c0735",
-                "reference": "6aeb70d26da8f30753111b3f9cf47eb0421c0735",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b69b6e103712870a3137e9132115d800b2713aac",
+                "reference": "b69b6e103712870a3137e9132115d800b2713aac",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
                 "symfony/expression-language": "~2.4"
@@ -2516,20 +2517,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-28 16:19:47"
+            "time": "2016-03-25 17:55:03"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "11082f03c03e17dd2ca9c149988b229e04829fdc"
+                "reference": "22abe7c5d7f1856661b32306f32a615f6a364835"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/11082f03c03e17dd2ca9c149988b229e04829fdc",
-                "reference": "11082f03c03e17dd2ca9c149988b229e04829fdc",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/22abe7c5d7f1856661b32306f32a615f6a364835",
+                "reference": "22abe7c5d7f1856661b32306f32a615f6a364835",
                 "shasum": ""
             },
             "require": {
@@ -2598,7 +2599,66 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-28 20:37:08"
+            "time": "2016-03-25 18:14:10"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "1289d16209491b584839022f29257ad859b8532d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-01-20 09:13:37"
         },
         {
             "name": "symfony/polyfill-php56",
@@ -2710,16 +2770,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "faa89438017392585abdf7f5a47f3f5f282d93c1"
+                "reference": "19beeea4abd3b1566a1e6cdb15f72d0bae2e1fff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/faa89438017392585abdf7f5a47f3f5f282d93c1",
-                "reference": "faa89438017392585abdf7f5a47f3f5f282d93c1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/19beeea4abd3b1566a1e6cdb15f72d0bae2e1fff",
+                "reference": "19beeea4abd3b1566a1e6cdb15f72d0bae2e1fff",
                 "shasum": ""
             },
             "require": {
@@ -2755,20 +2815,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-02 13:32:58"
+            "time": "2016-03-17 11:37:14"
         },
         {
             "name": "symfony/routing",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "c63128f6dd5095351a87cd7c8801963001e22aff"
+                "reference": "f3fad0ea232dcce8cd20388db5a4f492f9a24ed5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/c63128f6dd5095351a87cd7c8801963001e22aff",
-                "reference": "c63128f6dd5095351a87cd7c8801963001e22aff",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/f3fad0ea232dcce8cd20388db5a4f492f9a24ed5",
+                "reference": "f3fad0ea232dcce8cd20388db5a4f492f9a24ed5",
                 "shasum": ""
             },
             "require": {
@@ -2829,20 +2889,20 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-02-04 13:52:46"
+            "time": "2016-03-18 18:55:39"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4c61cf815af17eee4cebf0e4c66f56a2f704cfd8"
+                "reference": "e75d88c9af3c9c06341f4dad7ce776c9bddf94de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4c61cf815af17eee4cebf0e4c66f56a2f704cfd8",
-                "reference": "4c61cf815af17eee4cebf0e4c66f56a2f704cfd8",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e75d88c9af3c9c06341f4dad7ce776c9bddf94de",
+                "reference": "e75d88c9af3c9c06341f4dad7ce776c9bddf94de",
                 "shasum": ""
             },
             "require": {
@@ -2892,20 +2952,20 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-01 20:45:15"
+            "time": "2016-03-24 09:06:43"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v2.7.10",
+            "version": "v2.7.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e4fdc92abb3dae0d840f4276af701d58ddc9b733"
+                "reference": "c88d135c41c10d178e9724c69cbf699c5112883d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4fdc92abb3dae0d840f4276af701d58ddc9b733",
-                "reference": "e4fdc92abb3dae0d840f4276af701d58ddc9b733",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c88d135c41c10d178e9724c69cbf699c5112883d",
+                "reference": "c88d135c41c10d178e9724c69cbf699c5112883d",
                 "shasum": ""
             },
             "require": {
@@ -2951,7 +3011,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2016-02-12 17:39:33"
+            "time": "2016-03-07 11:06:07"
         },
         {
             "name": "thomaswelton/gravatarlib",
@@ -4536,16 +4596,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v2.8.3",
+            "version": "v2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2"
+                "reference": "745c19467255cf32eaf311f000eecafd83ca5586"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2",
-                "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/745c19467255cf32eaf311f000eecafd83ca5586",
+                "reference": "745c19467255cf32eaf311f000eecafd83ca5586",
                 "shasum": ""
             },
             "require": {
@@ -4589,20 +4649,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-27 11:34:40"
+            "time": "2016-03-04 07:54:35"
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.8.3",
+            "version": "v2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "517ab0554b6a5744d04480cb06873ffbd9442d73"
+                "reference": "7d362c22710980730d46a5d039e788946a2938cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/517ab0554b6a5744d04480cb06873ffbd9442d73",
-                "reference": "517ab0554b6a5744d04480cb06873ffbd9442d73",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/7d362c22710980730d46a5d039e788946a2938cb",
+                "reference": "7d362c22710980730d46a5d039e788946a2938cb",
                 "shasum": ""
             },
             "require": {
@@ -4642,20 +4702,20 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-30 15:58:35"
+            "time": "2016-03-10 19:33:53"
         },
         {
             "name": "symfony/config",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "79a97025f7bf4bbf8352b5df1905aa136a531066"
+                "reference": "980ee40c28f00acff8906c11b778aab5f0db74c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/79a97025f7bf4bbf8352b5df1905aa136a531066",
-                "reference": "79a97025f7bf4bbf8352b5df1905aa136a531066",
+                "url": "https://api.github.com/repos/symfony/config/zipball/980ee40c28f00acff8906c11b778aab5f0db74c2",
+                "reference": "980ee40c28f00acff8906c11b778aab5f0db74c2",
                 "shasum": ""
             },
             "require": {
@@ -4695,20 +4755,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-23 15:16:06"
+            "time": "2016-03-04 07:55:57"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451"
+                "reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/23ae8f9648d0a7fe94a47c8e20e5bf37c489a451",
-                "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/f82499a459dcade2ea56df94cc58b19c8bde3d20",
+                "reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20",
                 "shasum": ""
             },
             "require": {
@@ -4744,7 +4804,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-23 15:16:06"
+            "time": "2016-03-27 10:24:39"
         },
         {
             "name": "symfony/polyfill-apcu",
@@ -4801,16 +4861,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.0.3",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "4a204804952ff267ace88cf499e0b4bb302a475e"
+                "reference": "6015187088421e9499d8f8316bdb396f8b806c06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4a204804952ff267ace88cf499e0b4bb302a475e",
-                "reference": "4a204804952ff267ace88cf499e0b4bb302a475e",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6015187088421e9499d8f8316bdb396f8b806c06",
+                "reference": "6015187088421e9499d8f8316bdb396f8b806c06",
                 "shasum": ""
             },
             "require": {
@@ -4846,20 +4906,20 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2016-01-03 15:35:16"
+            "time": "2016-03-04 07:55:57"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.3",
+            "version": "v2.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995"
+                "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
-                "reference": "2a4ee40acb880c56f29fb1b8886e7ffe94f3b995",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/584e52cb8f788a887553ba82db6caacb1d6260bb",
+                "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb",
                 "shasum": ""
             },
             "require": {
@@ -4895,7 +4955,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-02-23 07:41:20"
+            "time": "2016-03-04 07:54:35"
         }
     ],
     "aliases": [],
diff --git a/config/disqus.php b/config/disqus.php
index 2f65c80a..6054d1d5 100644
--- a/config/disqus.php
+++ b/config/disqus.php
@@ -3,5 +3,5 @@
     'api_key'    => env('DISQUS_API_KEY', ''),
     'api_secret' => env('DISQUS_API_SECRET', ''),
     'domain'     => env('DISQUS_DOMAIN', ''), //<DISQUS_DOMAIN>.disqus.com/embed.js
-    'enabled'    => false,
+    'enabled'    => env('DISQUS_ENABLED', 'false'),
 ];
diff --git a/config/gzero.php b/config/gzero.php
index 3f4468b3..31abbfab 100644
--- a/config/gzero.php
+++ b/config/gzero.php
@@ -6,6 +6,7 @@
     'seoTitleAlternativeField'       => 'title',
     'seoDescriptionAlternativeField' => 'body',
     'seoDescLength'                  => 160,
+    'useUsersNickNames'              => true,
     'siteDesc'                       => 'Content management system.',
     'multilang'                      => [
         'enabled'   => true,
diff --git a/public/js/all.js b/public/js/all.js
index ab7751b7..aa50f4bd 100644
--- a/public/js/all.js
+++ b/public/js/all.js
@@ -1 +1 @@
-function addLoadEvent(){var t=window.onload;"function"!=typeof window.onload?window.onload=checkCookie:window.onload=function(){t&&t(),checkCookie()}}function getCookie(t){var e,i,n,o=document.cookie.split(";");for(e=0;e<o.length;e++)if(i=o[e].substr(0,o[e].indexOf("=")),n=o[e].substr(o[e].indexOf("=")+1),i=i.replace(/^\s+|\s+$/g,""),i==t)return unescape(n)}function setCookie(){var t=new Date;t.setDate(t.getDate()+365);var e=escape("1")+",domain=."+document.domain+("; path=/; expires="+t.toUTCString());document.cookie="cookies_info="+e,document.getElementById("cookie-info").getAttributeNode("class").value="cookie-box"}function checkCookie(){var t=getCookie("cookies_info");if(null===t||""===t||"undefined"==typeof t){var e=document.getElementById("close-cookie-info"),i=document.getElementById("cookie-info");i&&setTimeout(function(){i.getAttributeNode("class").value="active"},10),e&&(e.addEventListener?e.addEventListener("click",function(){setCookie()},!1):e.attachEvent&&e.attachEvent("onclick",function(){setCookie()}))}}function setFormValidationErrors(t,e){var i=$("input[name="+t+"]").parent(".form-group");i.hasClass("has-error")?i.find(".help-block").text(e):i.addClass("has-error").append('<p class="help-block">'+e+"</p>")}function setGlobalMessage(t,e){$("#content").prepend('<div class="message-box"><div class="alert alert-'+t+' alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+e+"</div></div>")}function clearFormValidationErrors(){var t=$(".form-group.has-error");t.removeClass("has-error"),t.find(".help-block").remove()}function hideMessages(){setTimeout(clearMessages,5e3)}function clearMessages(){var t=$("div.message-box div.alert");t.fadeOut("slow",function(){t.remove()}),$("div.message-box").slideToggle("slow",function(){$(this).remove()})}addLoadEvent(),function(t){jQuery.fn.rPage=function(){function e(e){this.label=function(){var e=this.els.filter(".active").index(),i=this;this.els.each(function(){0==i.isNextOrPrevLink(t(this))?t(this).addClass("page-away-"+Math.abs(e-t(this).index()).toString()):t(this).index()>e?t(this).addClass("right-etc"):t(this).addClass("left-etc")})},this.makeResponsive=function(){this.reset();for(var t=this.calculateWidth();t>this.els.parent().parent().width()-10;){var e=this.removeOne();if(0==e)break;t=this.calculateWidth()}},this.isNextOrPrevLink=function(t){return t.hasClass("pagination-prev")||t.hasClass("pagination-next")||"»"==t.text()||"«"==t.text()},this.isRemovable=function(t){if(this.isNextOrPrevLink(t))return!1;var i=this.els.filter(t).index();return 1==i||this.isNextOrPrevLink(e.find("li").eq(i+1))?!1:"..."==t.text()?!1:!0},this.removeOne=function(){for(var t=this.els.filter(".active").index(),i=e.find("li").length-1,n=i-1;n>0;n--){var o=this.els.filter(".page-away-"+n.toString()),a=o.filter(function(){return"none"!=this.style.display});if(a.length>0)for(var s=0;s<a.length;s++){var r=a.eq(s);if(this.isRemovable(r))return r.css("display","none"),this.needsEtcSign(t,i-1)&&this.els.eq(i-2).before("<li class='disabled removable'><span>...</span></li>"),this.needsEtcSign(1,t)&&this.els.eq(1).after("<li class='disabled removable'><span>...</span></li>"),!0}}return!1},this.needsEtcSign=function(t,i){if(1>=i-t)return!1;for(var n=!1,o=!1,a=t+1;i>a;a++){var s=e.find("li").eq(a);"none"==s.css("display")&&(o=!0),"..."==s.text()&&(n=!0)}return 1==o&&0==n?!0:!1},this.reset=function(){for(var t=0;t<this.els.length;t++)this.els.eq(t).css("display","inline");e.find("li").filter(".removable").remove()},this.calculateWidth=function(){for(var t=0,i=0;i<e.find("li").length;i++)t+=e.find("li").eq(i).children("a").eq(0).outerWidth(),t+=e.find("li").eq(i).children("span").eq(0).outerWidth();return t},this.els=e.find("li"),this.label(),this.makeResponsive();var i;t(window).resize(t.proxy(function(){clearTimeout(i),i=setTimeout(t.proxy(function(){this.makeResponsive()},this),100)},this))}for(var i=t(this),n=0,o=i.length;o>n;n++)new e(t(i[n]))}}(jQuery),function(t,e,i,n){function o(e,i){this.element=e,this.settings=t.extend({},s,i),this._defaults=s,this._name=a,this.init()}var a="metisMenu",s={toggle:!0};o.prototype={init:function(){var e=t(this.element),i=this.settings.toggle;e.find("li.active").has("ul").children("ul").addClass("collapse in"),e.find("li").not(".active").has("ul").children("ul").addClass("collapse"),e.find("li").has("ul").children("a").on("click",function(e){e.preventDefault(),t(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),i&&t(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})}},t.fn[a]=function(e){return this.each(function(){t.data(this,"plugin_"+a)||t.data(this,"plugin_"+a,new o(this,e))})}}(jQuery,window,document),function(t,e,i){function n(i,n,o){var a=e.createElement(i);return n&&(a.id=Z+n),o&&(a.style.cssText=o),t(a)}function o(){return i.innerHeight?i.innerHeight:t(i).height()}function a(e,i){i!==Object(i)&&(i={}),this.cache={},this.el=e,this.value=function(e){var n;return void 0===this.cache[e]&&(n=t(this.el).attr("data-cbox-"+e),void 0!==n?this.cache[e]=n:void 0!==i[e]?this.cache[e]=i[e]:void 0!==X[e]&&(this.cache[e]=X[e])),this.cache[e]},this.get=function(e){var i=this.value(e);return t.isFunction(i)?i.call(this.el,this):i}}function s(t){var e=E.length,i=(z+t)%e;return 0>i?e+i:i}function r(t,e){return Math.round((/%/.test(t)?("x"===e?H.width():o())/100:1)*parseInt(t,10))}function l(t,e){return t.get("photo")||t.get("photoRegex").test(e)}function h(t,e){return t.get("retinaUrl")&&i.devicePixelRatio>1?e.replace(t.get("photoRegex"),t.get("retinaSuffix")):e}function c(t){"contains"in y[0]&&!y[0].contains(t.target)&&t.target!==w[0]&&(t.stopPropagation(),y.focus())}function d(t){d.str!==t&&(y.add(w).removeClass(d.str).addClass(t),d.str=t)}function u(e){z=0,e&&e!==!1&&"nofollow"!==e?(E=t("."+tt).filter(function(){var i=t.data(this,Y),n=new a(this,i);return n.get("rel")===e}),z=E.index(P.el),-1===z&&(E=E.add(P.el),z=E.length-1)):E=t(P.el)}function f(i){t(e).trigger(i),rt.triggerHandler(i)}function g(i){var o;if(!Q){if(o=t(i).data(Y),P=new a(i,o),u(P.get("rel")),!K){K=U=!0,d(P.get("className")),y.css({visibility:"hidden",display:"block",opacity:""}),$=n(lt,"LoadedContent","width:0; height:0; overflow:hidden; visibility:hidden"),x.css({width:"",height:""}).append($),F=k.height()+T.height()+x.outerHeight(!0)-x.height(),D=C.width()+_.width()+x.outerWidth(!0)-x.width(),B=$.outerHeight(!0),N=$.outerWidth(!0);var s=r(P.get("initialWidth"),"x"),l=r(P.get("initialHeight"),"y"),h=P.get("maxWidth"),g=P.get("maxHeight");P.w=Math.max((h!==!1?Math.min(s,r(h,"x")):s)-N-D,0),P.h=Math.max((g!==!1?Math.min(l,r(g,"y")):l)-B-F,0),$.css({width:"",height:P.h}),V.position(),f(et),P.get("onOpen"),q.add(W).hide(),y.focus(),P.get("trapFocus")&&e.addEventListener&&(e.addEventListener("focus",c,!0),rt.one(at,function(){e.removeEventListener("focus",c,!0)})),P.get("returnFocus")&&rt.one(at,function(){t(P.el).focus()})}var p=parseFloat(P.get("opacity"));w.css({opacity:p===p?p:"",cursor:P.get("overlayClose")?"pointer":"",visibility:"visible"}).show(),P.get("closeButton")?I.html(P.get("close")).appendTo(x):I.appendTo("<div/>"),v()}}function p(){y||(J=!1,H=t(i),y=n(lt).attr({id:Y,"class":t.support.opacity===!1?Z+"IE":"",role:"dialog",tabindex:"-1"}).hide(),w=n(lt,"Overlay").hide(),L=t([n(lt,"LoadingOverlay")[0],n(lt,"LoadingGraphic")[0]]),b=n(lt,"Wrapper"),x=n(lt,"Content").append(W=n(lt,"Title"),O=n(lt,"Current"),j=t('<button type="button"/>').attr({id:Z+"Previous"}),S=t('<button type="button"/>').attr({id:Z+"Next"}),R=t('<button type="button"/>').attr({id:Z+"Slideshow"}),L),I=t('<button type="button"/>').attr({id:Z+"Close"}),b.append(n(lt).append(n(lt,"TopLeft"),k=n(lt,"TopCenter"),n(lt,"TopRight")),n(lt,!1,"clear:left").append(C=n(lt,"MiddleLeft"),x,_=n(lt,"MiddleRight")),n(lt,!1,"clear:left").append(n(lt,"BottomLeft"),T=n(lt,"BottomCenter"),n(lt,"BottomRight"))).find("div div").css({"float":"left"}),M=n(lt,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),q=S.add(j).add(O).add(R)),e.body&&!y.parent().length&&t(e.body).append(w,y.append(b,M))}function m(){function i(t){t.which>1||t.shiftKey||t.altKey||t.metaKey||t.ctrlKey||(t.preventDefault(),g(this))}return y?(J||(J=!0,S.click(function(){V.next()}),j.click(function(){V.prev()}),I.click(function(){V.close()}),w.click(function(){P.get("overlayClose")&&V.close()}),t(e).bind("keydown."+Z,function(t){var e=t.keyCode;K&&P.get("escKey")&&27===e&&(t.preventDefault(),V.close()),K&&P.get("arrowKey")&&E[1]&&!t.altKey&&(37===e?(t.preventDefault(),j.click()):39===e&&(t.preventDefault(),S.click()))}),t.isFunction(t.fn.on)?t(e).on("click."+Z,"."+tt,i):t("."+tt).live("click."+Z,i)),!0):!1}function v(){var e,o,a,s=V.prep,c=++ht;if(U=!0,A=!1,f(st),f(it),P.get("onLoad"),P.h=P.get("height")?r(P.get("height"),"y")-B-F:P.get("innerHeight")&&r(P.get("innerHeight"),"y"),P.w=P.get("width")?r(P.get("width"),"x")-N-D:P.get("innerWidth")&&r(P.get("innerWidth"),"x"),P.mw=P.w,P.mh=P.h,P.get("maxWidth")&&(P.mw=r(P.get("maxWidth"),"x")-N-D,P.mw=P.w&&P.w<P.mw?P.w:P.mw),P.get("maxHeight")&&(P.mh=r(P.get("maxHeight"),"y")-B-F,P.mh=P.h&&P.h<P.mh?P.h:P.mh),e=P.get("href"),G=setTimeout(function(){L.show()},100),P.get("inline")){var d=t(e);a=t("<div>").hide().insertBefore(d),rt.one(st,function(){a.replaceWith(d)}),s(d)}else P.get("iframe")?s(" "):P.get("html")?s(P.get("html")):l(P,e)?(e=h(P,e),A=P.get("createImg"),t(A).addClass(Z+"Photo").bind("error."+Z,function(){s(n(lt,"Error").html(P.get("imgError")))}).one("load",function(){c===ht&&setTimeout(function(){var e;P.get("retinaImage")&&i.devicePixelRatio>1&&(A.height=A.height/i.devicePixelRatio,A.width=A.width/i.devicePixelRatio),P.get("scalePhotos")&&(o=function(){A.height-=A.height*e,A.width-=A.width*e},P.mw&&A.width>P.mw&&(e=(A.width-P.mw)/A.width,o()),P.mh&&A.height>P.mh&&(e=(A.height-P.mh)/A.height,o())),P.h&&(A.style.marginTop=Math.max(P.mh-A.height,0)/2+"px"),E[1]&&(P.get("loop")||E[z+1])&&(A.style.cursor="pointer",t(A).bind("click."+Z,function(){V.next()})),A.style.width=A.width+"px",A.style.height=A.height+"px",s(A)},1)}),A.src=e):e&&M.load(e,P.get("data"),function(e,i){c===ht&&s("error"===i?n(lt,"Error").html(P.get("xhrError")):t(this).contents())})}var w,y,b,x,k,C,_,T,E,H,$,M,L,W,O,R,S,j,I,q,P,F,D,B,N,z,A,K,U,Q,G,V,J,X={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,rel:function(){return this.rel},href:function(){return t(this).attr("href")},title:function(){return this.title},createImg:function(){var e=new Image,i=t(this).data("cbox-img-attrs");return"object"==typeof i&&t.each(i,function(t,i){e[t]=i}),e},createIframe:function(){var i=e.createElement("iframe"),n=t(this).data("cbox-iframe-attrs");return"object"==typeof n&&t.each(n,function(t,e){i[t]=e}),"frameBorder"in i&&(i.frameBorder=0),"allowTransparency"in i&&(i.allowTransparency="true"),i.name=(new Date).getTime(),i.allowFullscreen=!0,i}},Y="colorbox",Z="cbox",tt=Z+"Element",et=Z+"_open",it=Z+"_load",nt=Z+"_complete",ot=Z+"_cleanup",at=Z+"_closed",st=Z+"_purge",rt=t("<a/>"),lt="div",ht=0,ct={},dt=function(){function t(){clearTimeout(s)}function e(){(P.get("loop")||E[z+1])&&(t(),s=setTimeout(V.next,P.get("slideshowSpeed")))}function i(){R.html(P.get("slideshowStop")).unbind(l).one(l,n),rt.bind(nt,e).bind(it,t),y.removeClass(r+"off").addClass(r+"on")}function n(){t(),rt.unbind(nt,e).unbind(it,t),R.html(P.get("slideshowStart")).unbind(l).one(l,function(){V.next(),i()}),y.removeClass(r+"on").addClass(r+"off")}function o(){a=!1,R.hide(),t(),rt.unbind(nt,e).unbind(it,t),y.removeClass(r+"off "+r+"on")}var a,s,r=Z+"Slideshow_",l="click."+Z;return function(){a?P.get("slideshow")||(rt.unbind(ot,o),o()):P.get("slideshow")&&E[1]&&(a=!0,rt.one(ot,o),P.get("slideshowAuto")?i():n(),R.show())}}();t[Y]||(t(p),V=t.fn[Y]=t[Y]=function(e,i){var n,o=this;return e=e||{},t.isFunction(o)&&(o=t("<a/>"),e.open=!0),o[0]?(p(),m()&&(i&&(e.onComplete=i),o.each(function(){var i=t.data(this,Y)||{};t.data(this,Y,t.extend(i,e))}).addClass(tt),n=new a(o[0],e),n.get("open")&&g(o[0])),o):o},V.position=function(e,i){function n(){k[0].style.width=T[0].style.width=x[0].style.width=parseInt(y[0].style.width,10)-D+"px",x[0].style.height=C[0].style.height=_[0].style.height=parseInt(y[0].style.height,10)-F+"px"}var a,s,l,h=0,c=0,d=y.offset();if(H.unbind("resize."+Z),y.css({top:-9e4,left:-9e4}),s=H.scrollTop(),l=H.scrollLeft(),P.get("fixed")?(d.top-=s,d.left-=l,y.css({position:"fixed"})):(h=s,c=l,y.css({position:"absolute"})),c+=P.get("right")!==!1?Math.max(H.width()-P.w-N-D-r(P.get("right"),"x"),0):P.get("left")!==!1?r(P.get("left"),"x"):Math.round(Math.max(H.width()-P.w-N-D,0)/2),h+=P.get("bottom")!==!1?Math.max(o()-P.h-B-F-r(P.get("bottom"),"y"),0):P.get("top")!==!1?r(P.get("top"),"y"):Math.round(Math.max(o()-P.h-B-F,0)/2),y.css({top:d.top,left:d.left,visibility:"visible"}),b[0].style.width=b[0].style.height="9999px",a={width:P.w+N+D,height:P.h+B+F,top:h,left:c},e){var u=0;t.each(a,function(t){return a[t]!==ct[t]?void(u=e):void 0}),e=u}ct=a,e||y.css(a),y.dequeue().animate(a,{duration:e||0,complete:function(){n(),U=!1,b[0].style.width=P.w+N+D+"px",b[0].style.height=P.h+B+F+"px",P.get("reposition")&&setTimeout(function(){H.bind("resize."+Z,V.position)},1),t.isFunction(i)&&i()},step:n})},V.resize=function(t){var e;K&&(t=t||{},t.width&&(P.w=r(t.width,"x")-N-D),t.innerWidth&&(P.w=r(t.innerWidth,"x")),$.css({width:P.w}),t.height&&(P.h=r(t.height,"y")-B-F),t.innerHeight&&(P.h=r(t.innerHeight,"y")),t.innerHeight||t.height||(e=$.scrollTop(),$.css({height:"auto"}),P.h=$.height()),$.css({height:P.h}),e&&$.scrollTop(e),V.position("none"===P.get("transition")?0:P.get("speed")))},V.prep=function(i){function o(){return P.w=P.w||$.width(),P.w=P.mw&&P.mw<P.w?P.mw:P.w,P.w}function r(){return P.h=P.h||$.height(),P.h=P.mh&&P.mh<P.h?P.mh:P.h,P.h}if(K){var c,u="none"===P.get("transition")?0:P.get("speed");$.remove(),$=n(lt,"LoadedContent").append(i),$.hide().appendTo(M.show()).css({width:o(),overflow:P.get("scrolling")?"auto":"hidden"}).css({height:r()}).prependTo(x),M.hide(),t(A).css({"float":"none"}),d(P.get("className")),c=function(){function i(){t.support.opacity===!1&&y[0].style.removeAttribute("filter")}var n,o,r=E.length;K&&(o=function(){clearTimeout(G),L.hide(),f(nt),P.get("onComplete")},W.html(P.get("title")).show(),$.show(),r>1?("string"==typeof P.get("current")&&O.html(P.get("current").replace("{current}",z+1).replace("{total}",r)).show(),S[P.get("loop")||r-1>z?"show":"hide"]().html(P.get("next")),j[P.get("loop")||z?"show":"hide"]().html(P.get("previous")),dt(),P.get("preloading")&&t.each([s(-1),s(1)],function(){var i,n=E[this],o=new a(n,t.data(n,Y)),s=o.get("href");s&&l(o,s)&&(s=h(o,s),i=e.createElement("img"),i.src=s)})):q.hide(),P.get("iframe")?(n=P.get("createIframe"),P.get("scrolling")||(n.scrolling="no"),t(n).attr({src:P.get("href"),"class":Z+"Iframe"}).one("load",o).appendTo($),rt.one(st,function(){n.src="//about:blank"}),P.get("fastIframe")&&t(n).trigger("load")):o(),"fade"===P.get("transition")?y.fadeTo(u,1,i):i())},"fade"===P.get("transition")?y.fadeTo(u,0,function(){V.position(0,c)}):V.position(u,c)}},V.next=function(){!U&&E[1]&&(P.get("loop")||E[z+1])&&(z=s(1),g(E[z]))},V.prev=function(){!U&&E[1]&&(P.get("loop")||z)&&(z=s(-1),g(E[z]))},V.close=function(){K&&!Q&&(Q=!0,K=!1,f(ot),P.get("onCleanup"),H.unbind("."+Z),w.fadeTo(P.get("fadeOut")||0,0),y.stop().fadeTo(P.get("fadeOut")||0,0,function(){y.hide(),w.hide(),f(st),$.remove(),setTimeout(function(){Q=!1,f(at),P.get("onClosed")},1)}))},V.remove=function(){y&&(y.stop(),t[Y].close(),y.stop(!1,!0).remove(),w.remove(),Q=!1,y=null,t("."+tt).removeData(Y).removeClass(tt),t(e).unbind("click."+Z).unbind("keydown."+Z))},V.element=function(){return t(P.el)},V.settings=X)}(jQuery,document,window),function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):t(jQuery)}(function(t){var e=-1,i=-1,n=function(t){return parseFloat(t)||0},o=function(e){var i=1,o=t(e),a=null,s=[];return o.each(function(){var e=t(this),o=e.offset().top-n(e.css("margin-top")),r=s.length>0?s[s.length-1]:null;null===r?s.push(e):Math.floor(Math.abs(a-o))<=i?s[s.length-1]=r.add(e):s.push(e),a=o}),s},a=function(e){var i={byRow:!0,property:"height",target:null,remove:!1};return"object"==typeof e?t.extend(i,e):("boolean"==typeof e?i.byRow=e:"remove"===e&&(i.remove=!0),i)},s=t.fn.matchHeight=function(e){var i=a(e);if(i.remove){var n=this;return this.css(i.property,""),t.each(s._groups,function(t,e){e.elements=e.elements.not(n)}),this}return this.length<=1&&!i.target?this:(s._groups.push({elements:this,options:i}),s._apply(this,i),this)};s.version="0.7.0",s._groups=[],s._throttle=80,s._maintainScroll=!1,s._beforeUpdate=null,s._afterUpdate=null,s._rows=o,s._parse=n,s._parseOptions=a,s._apply=function(e,i){var r=a(i),l=t(e),h=[l],c=t(window).scrollTop(),d=t("html").outerHeight(!0),u=l.parents().filter(":hidden");return u.each(function(){var e=t(this);e.data("style-cache",e.attr("style"))}),u.css("display","block"),r.byRow&&!r.target&&(l.each(function(){var e=t(this),i=e.css("display");"inline-block"!==i&&"flex"!==i&&"inline-flex"!==i&&(i="block"),e.data("style-cache",e.attr("style")),e.css({display:i,"padding-top":"0","padding-bottom":"0","margin-top":"0","margin-bottom":"0","border-top-width":"0","border-bottom-width":"0",height:"100px",overflow:"hidden"})}),h=o(l),l.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||"")})),t.each(h,function(e,i){var o=t(i),a=0;if(r.target)a=r.target.outerHeight(!1);else{if(r.byRow&&o.length<=1)return void o.css(r.property,"");o.each(function(){var e=t(this),i=e.attr("style"),n=e.css("display");"inline-block"!==n&&"flex"!==n&&"inline-flex"!==n&&(n="block");var o={display:n};o[r.property]="",e.css(o),e.outerHeight(!1)>a&&(a=e.outerHeight(!1)),i?e.attr("style",i):e.css("display","")})}o.each(function(){var e=t(this),i=0;r.target&&e.is(r.target)||("border-box"!==e.css("box-sizing")&&(i+=n(e.css("border-top-width"))+n(e.css("border-bottom-width")),i+=n(e.css("padding-top"))+n(e.css("padding-bottom"))),e.css(r.property,a-i+"px"))})}),u.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||null)}),s._maintainScroll&&t(window).scrollTop(c/d*t("html").outerHeight(!0)),this},s._applyDataApi=function(){var e={};t("[data-match-height], [data-mh]").each(function(){var i=t(this),n=i.attr("data-mh")||i.attr("data-match-height");n in e?e[n]=e[n].add(i):e[n]=i}),t.each(e,function(){this.matchHeight(!0)})};var r=function(e){s._beforeUpdate&&s._beforeUpdate(e,s._groups),t.each(s._groups,function(){s._apply(this.elements,this.options)}),s._afterUpdate&&s._afterUpdate(e,s._groups)};s._update=function(n,o){if(o&&"resize"===o.type){var a=t(window).width();if(a===e)return;e=a}n?-1===i&&(i=setTimeout(function(){r(o),i=-1},s._throttle)):r(o)},t(s._applyDataApi),t(window).bind("load",function(t){s._update(!1,t)}),t(window).bind("resize orientationchange",function(t){s._update(!0,t)})}),$.fn.serializeObject=function(){var t={},e=this.serializeArray();return $.each(e,function(){void 0!==t[this.name]?(t[this.name].push||(t[this.name]=[t[this.name]]),t[this.name].push(this.value||"")):t[this.name]=this.value||""}),t};var Loading={loadingContainer:".loading",loadingMinHeight:200,start:function(t){var e=this,i=$(t);if(i.length>0){var n=$(e.loadingContainer);n.css("top",i.offset().top+"px"),n.css("left",i.offset().left+"px"),n.css("width",i.width()+"px"),n.css("height",i.height()+"px")}},stop:function(){var t=this;$(t.loadingContainer).removeAttr("style")}};$(function(){var t=$("html").attr("lang");$(".nav-stacked").metisMenu({toggle:!1}),$(".nav-stacked li.active").parents("li").addClass("active").has("ul").children("ul").addClass("collapse in"),$("form").submit(function(t){Loading.start("#main-container")}),$(".pagination").rPage(),$("img.colorbox").click(function(){$(this).colorbox({href:$(this).parent("a").attr("href"),rel:$(this).parent("a").attr("rel"),maxWidth:"95%",maxHeight:"95%"})}),$("a.colorbox").colorbox({rel:$(this).attr("rel"),maxWidth:"95%",maxHeight:"95%"}),"en"!==t&&$.getScript("/js/colorbox/i18n/jquery.colorbox-"+t+".js"),$(".mh-column").matchHeight({property:"min-height"})});
\ No newline at end of file
+function addLoadEvent(){var t=window.onload;"function"!=typeof window.onload?window.onload=checkCookie:window.onload=function(){t&&t(),checkCookie()}}function getCookie(t){var e,i,n,o=document.cookie.split(";");for(e=0;e<o.length;e++)if(i=o[e].substr(0,o[e].indexOf("=")),n=o[e].substr(o[e].indexOf("=")+1),i=i.replace(/^\s+|\s+$/g,""),i==t)return unescape(n)}function setCookie(){var t=new Date;t.setDate(t.getDate()+365);var e=escape("1")+",domain=."+document.domain+("; path=/; expires="+t.toUTCString());document.cookie="cookies_info="+e,document.getElementById("cookie-info").getAttributeNode("class").value="cookie-box"}function checkCookie(){var t=getCookie("cookies_info");if(null===t||""===t||"undefined"==typeof t){var e=document.getElementById("close-cookie-info"),i=document.getElementById("cookie-info");i&&setTimeout(function(){i.getAttributeNode("class").value="active"},10),e&&(e.addEventListener?e.addEventListener("click",function(){setCookie()},!1):e.attachEvent&&e.attachEvent("onclick",function(){setCookie()}))}}function setFormValidationErrors(t,e){var i=$("input[name="+t+"]").parent(".form-group");i.hasClass("has-error")?i.find(".help-block").text(e):i.addClass("has-error").append('<p class="help-block">'+e+"</p>")}function setGlobalMessage(t,e){$("#content").prepend('<div class="message-box"><div class="alert alert-'+t+' alert-dismissible" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>'+e+"</div></div>")}function clearFormValidationErrors(){var t=$(".form-group.has-error");t.removeClass("has-error"),t.find(".help-block").remove()}function hideMessages(){setTimeout(clearMessages,5e3)}function clearMessages(){var t=$("div.message-box div.alert");t.fadeOut("slow",function(){t.remove()}),$("div.message-box").slideToggle("slow",function(){$(this).remove()})}addLoadEvent(),function(t){jQuery.fn.rPage=function(){function e(e){this.label=function(){var e=this.els.filter(".active").index(),i=this;this.els.each(function(){0==i.isNextOrPrevLink(t(this))?t(this).addClass("page-away-"+Math.abs(e-t(this).index()).toString()):t(this).index()>e?t(this).addClass("right-etc"):t(this).addClass("left-etc")})},this.makeResponsive=function(){this.reset();for(var t=this.calculateWidth();t>this.els.parent().parent().width()-10;){var e=this.removeOne();if(0==e)break;t=this.calculateWidth()}},this.isNextOrPrevLink=function(t){return t.hasClass("pagination-prev")||t.hasClass("pagination-next")||"»"==t.text()||"«"==t.text()},this.isRemovable=function(t){if(this.isNextOrPrevLink(t))return!1;var i=this.els.filter(t).index();return 1==i||this.isNextOrPrevLink(e.find("li").eq(i+1))?!1:"..."==t.text()?!1:!0},this.removeOne=function(){for(var t=this.els.filter(".active").index(),i=e.find("li").length-1,n=i-1;n>0;n--){var o=this.els.filter(".page-away-"+n.toString()),a=o.filter(function(){return"none"!=this.style.display});if(a.length>0)for(var s=0;s<a.length;s++){var r=a.eq(s);if(this.isRemovable(r))return r.css("display","none"),this.needsEtcSign(t,i-1)&&this.els.eq(i-2).before("<li class='disabled removable'><span>...</span></li>"),this.needsEtcSign(1,t)&&this.els.eq(1).after("<li class='disabled removable'><span>...</span></li>"),!0}}return!1},this.needsEtcSign=function(t,i){if(1>=i-t)return!1;for(var n=!1,o=!1,a=t+1;i>a;a++){var s=e.find("li").eq(a);"none"==s.css("display")&&(o=!0),"..."==s.text()&&(n=!0)}return 1==o&&0==n?!0:!1},this.reset=function(){for(var t=0;t<this.els.length;t++)this.els.eq(t).css("display","inline");e.find("li").filter(".removable").remove()},this.calculateWidth=function(){for(var t=0,i=0;i<e.find("li").length;i++)t+=e.find("li").eq(i).children("a").eq(0).outerWidth(),t+=e.find("li").eq(i).children("span").eq(0).outerWidth();return t},this.els=e.find("li"),this.label(),this.makeResponsive();var i;t(window).resize(t.proxy(function(){clearTimeout(i),i=setTimeout(t.proxy(function(){this.makeResponsive()},this),100)},this))}for(var i=t(this),n=0,o=i.length;o>n;n++)new e(t(i[n]))}}(jQuery),function(t,e,i,n){function o(e,i){this.element=e,this.settings=t.extend({},s,i),this._defaults=s,this._name=a,this.init()}var a="metisMenu",s={toggle:!0};o.prototype={init:function(){var e=t(this.element),i=this.settings.toggle;e.find("li.active").has("ul").children("ul").addClass("collapse in"),e.find("li").not(".active").has("ul").children("ul").addClass("collapse"),e.find("li").has("ul").children("a").on("click",function(e){e.preventDefault(),t(this).parent("li").toggleClass("active").children("ul").collapse("toggle"),i&&t(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide")})}},t.fn[a]=function(e){return this.each(function(){t.data(this,"plugin_"+a)||t.data(this,"plugin_"+a,new o(this,e))})}}(jQuery,window,document),function(t,e,i){function n(i,n,o){var a=e.createElement(i);return n&&(a.id=Z+n),o&&(a.style.cssText=o),t(a)}function o(){return i.innerHeight?i.innerHeight:t(i).height()}function a(e,i){i!==Object(i)&&(i={}),this.cache={},this.el=e,this.value=function(e){var n;return void 0===this.cache[e]&&(n=t(this.el).attr("data-cbox-"+e),void 0!==n?this.cache[e]=n:void 0!==i[e]?this.cache[e]=i[e]:void 0!==X[e]&&(this.cache[e]=X[e])),this.cache[e]},this.get=function(e){var i=this.value(e);return t.isFunction(i)?i.call(this.el,this):i}}function s(t){var e=H.length,i=(z+t)%e;return 0>i?e+i:i}function r(t,e){return Math.round((/%/.test(t)?("x"===e?E.width():o())/100:1)*parseInt(t,10))}function l(t,e){return t.get("photo")||t.get("photoRegex").test(e)}function h(t,e){return t.get("retinaUrl")&&i.devicePixelRatio>1?e.replace(t.get("photoRegex"),t.get("retinaSuffix")):e}function c(t){"contains"in y[0]&&!y[0].contains(t.target)&&t.target!==w[0]&&(t.stopPropagation(),y.focus())}function d(t){d.str!==t&&(y.add(w).removeClass(d.str).addClass(t),d.str=t)}function u(e){z=0,e&&e!==!1&&"nofollow"!==e?(H=t("."+tt).filter(function(){var i=t.data(this,Y),n=new a(this,i);return n.get("rel")===e}),z=H.index(P.el),-1===z&&(H=H.add(P.el),z=H.length-1)):H=t(P.el)}function f(i){t(e).trigger(i),rt.triggerHandler(i)}function g(i){var o;if(!Q){if(o=t(i).data(Y),P=new a(i,o),u(P.get("rel")),!K){K=U=!0,d(P.get("className")),y.css({visibility:"hidden",display:"block",opacity:""}),$=n(lt,"LoadedContent","width:0; height:0; overflow:hidden; visibility:hidden"),x.css({width:"",height:""}).append($),F=k.height()+T.height()+x.outerHeight(!0)-x.height(),D=C.width()+_.width()+x.outerWidth(!0)-x.width(),B=$.outerHeight(!0),N=$.outerWidth(!0);var s=r(P.get("initialWidth"),"x"),l=r(P.get("initialHeight"),"y"),h=P.get("maxWidth"),g=P.get("maxHeight");P.w=Math.max((h!==!1?Math.min(s,r(h,"x")):s)-N-D,0),P.h=Math.max((g!==!1?Math.min(l,r(g,"y")):l)-B-F,0),$.css({width:"",height:P.h}),V.position(),f(et),P.get("onOpen"),q.add(W).hide(),y.focus(),P.get("trapFocus")&&e.addEventListener&&(e.addEventListener("focus",c,!0),rt.one(at,function(){e.removeEventListener("focus",c,!0)})),P.get("returnFocus")&&rt.one(at,function(){t(P.el).focus()})}var p=parseFloat(P.get("opacity"));w.css({opacity:p===p?p:"",cursor:P.get("overlayClose")?"pointer":"",visibility:"visible"}).show(),P.get("closeButton")?I.html(P.get("close")).appendTo(x):I.appendTo("<div/>"),v()}}function p(){y||(J=!1,E=t(i),y=n(lt).attr({id:Y,"class":t.support.opacity===!1?Z+"IE":"",role:"dialog",tabindex:"-1"}).hide(),w=n(lt,"Overlay").hide(),L=t([n(lt,"LoadingOverlay")[0],n(lt,"LoadingGraphic")[0]]),b=n(lt,"Wrapper"),x=n(lt,"Content").append(W=n(lt,"Title"),O=n(lt,"Current"),j=t('<button type="button"/>').attr({id:Z+"Previous"}),S=t('<button type="button"/>').attr({id:Z+"Next"}),R=t('<button type="button"/>').attr({id:Z+"Slideshow"}),L),I=t('<button type="button"/>').attr({id:Z+"Close"}),b.append(n(lt).append(n(lt,"TopLeft"),k=n(lt,"TopCenter"),n(lt,"TopRight")),n(lt,!1,"clear:left").append(C=n(lt,"MiddleLeft"),x,_=n(lt,"MiddleRight")),n(lt,!1,"clear:left").append(n(lt,"BottomLeft"),T=n(lt,"BottomCenter"),n(lt,"BottomRight"))).find("div div").css({"float":"left"}),M=n(lt,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),q=S.add(j).add(O).add(R)),e.body&&!y.parent().length&&t(e.body).append(w,y.append(b,M))}function m(){function i(t){t.which>1||t.shiftKey||t.altKey||t.metaKey||t.ctrlKey||(t.preventDefault(),g(this))}return y?(J||(J=!0,S.click(function(){V.next()}),j.click(function(){V.prev()}),I.click(function(){V.close()}),w.click(function(){P.get("overlayClose")&&V.close()}),t(e).bind("keydown."+Z,function(t){var e=t.keyCode;K&&P.get("escKey")&&27===e&&(t.preventDefault(),V.close()),K&&P.get("arrowKey")&&H[1]&&!t.altKey&&(37===e?(t.preventDefault(),j.click()):39===e&&(t.preventDefault(),S.click()))}),t.isFunction(t.fn.on)?t(e).on("click."+Z,"."+tt,i):t("."+tt).live("click."+Z,i)),!0):!1}function v(){var e,o,a,s=V.prep,c=++ht;if(U=!0,A=!1,f(st),f(it),P.get("onLoad"),P.h=P.get("height")?r(P.get("height"),"y")-B-F:P.get("innerHeight")&&r(P.get("innerHeight"),"y"),P.w=P.get("width")?r(P.get("width"),"x")-N-D:P.get("innerWidth")&&r(P.get("innerWidth"),"x"),P.mw=P.w,P.mh=P.h,P.get("maxWidth")&&(P.mw=r(P.get("maxWidth"),"x")-N-D,P.mw=P.w&&P.w<P.mw?P.w:P.mw),P.get("maxHeight")&&(P.mh=r(P.get("maxHeight"),"y")-B-F,P.mh=P.h&&P.h<P.mh?P.h:P.mh),e=P.get("href"),G=setTimeout(function(){L.show()},100),P.get("inline")){var d=t(e);a=t("<div>").hide().insertBefore(d),rt.one(st,function(){a.replaceWith(d)}),s(d)}else P.get("iframe")?s(" "):P.get("html")?s(P.get("html")):l(P,e)?(e=h(P,e),A=P.get("createImg"),t(A).addClass(Z+"Photo").bind("error."+Z,function(){s(n(lt,"Error").html(P.get("imgError")))}).one("load",function(){c===ht&&setTimeout(function(){var e;P.get("retinaImage")&&i.devicePixelRatio>1&&(A.height=A.height/i.devicePixelRatio,A.width=A.width/i.devicePixelRatio),P.get("scalePhotos")&&(o=function(){A.height-=A.height*e,A.width-=A.width*e},P.mw&&A.width>P.mw&&(e=(A.width-P.mw)/A.width,o()),P.mh&&A.height>P.mh&&(e=(A.height-P.mh)/A.height,o())),P.h&&(A.style.marginTop=Math.max(P.mh-A.height,0)/2+"px"),H[1]&&(P.get("loop")||H[z+1])&&(A.style.cursor="pointer",t(A).bind("click."+Z,function(){V.next()})),A.style.width=A.width+"px",A.style.height=A.height+"px",s(A)},1)}),A.src=e):e&&M.load(e,P.get("data"),function(e,i){c===ht&&s("error"===i?n(lt,"Error").html(P.get("xhrError")):t(this).contents())})}var w,y,b,x,k,C,_,T,H,E,$,M,L,W,O,R,S,j,I,q,P,F,D,B,N,z,A,K,U,Q,G,V,J,X={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,rel:function(){return this.rel},href:function(){return t(this).attr("href")},title:function(){return this.title},createImg:function(){var e=new Image,i=t(this).data("cbox-img-attrs");return"object"==typeof i&&t.each(i,function(t,i){e[t]=i}),e},createIframe:function(){var i=e.createElement("iframe"),n=t(this).data("cbox-iframe-attrs");return"object"==typeof n&&t.each(n,function(t,e){i[t]=e}),"frameBorder"in i&&(i.frameBorder=0),"allowTransparency"in i&&(i.allowTransparency="true"),i.name=(new Date).getTime(),i.allowFullscreen=!0,i}},Y="colorbox",Z="cbox",tt=Z+"Element",et=Z+"_open",it=Z+"_load",nt=Z+"_complete",ot=Z+"_cleanup",at=Z+"_closed",st=Z+"_purge",rt=t("<a/>"),lt="div",ht=0,ct={},dt=function(){function t(){clearTimeout(s)}function e(){(P.get("loop")||H[z+1])&&(t(),s=setTimeout(V.next,P.get("slideshowSpeed")))}function i(){R.html(P.get("slideshowStop")).unbind(l).one(l,n),rt.bind(nt,e).bind(it,t),y.removeClass(r+"off").addClass(r+"on")}function n(){t(),rt.unbind(nt,e).unbind(it,t),R.html(P.get("slideshowStart")).unbind(l).one(l,function(){V.next(),i()}),y.removeClass(r+"on").addClass(r+"off")}function o(){a=!1,R.hide(),t(),rt.unbind(nt,e).unbind(it,t),y.removeClass(r+"off "+r+"on")}var a,s,r=Z+"Slideshow_",l="click."+Z;return function(){a?P.get("slideshow")||(rt.unbind(ot,o),o()):P.get("slideshow")&&H[1]&&(a=!0,rt.one(ot,o),P.get("slideshowAuto")?i():n(),R.show())}}();t[Y]||(t(p),V=t.fn[Y]=t[Y]=function(e,i){var n,o=this;return e=e||{},t.isFunction(o)&&(o=t("<a/>"),e.open=!0),o[0]?(p(),m()&&(i&&(e.onComplete=i),o.each(function(){var i=t.data(this,Y)||{};t.data(this,Y,t.extend(i,e))}).addClass(tt),n=new a(o[0],e),n.get("open")&&g(o[0])),o):o},V.position=function(e,i){function n(){k[0].style.width=T[0].style.width=x[0].style.width=parseInt(y[0].style.width,10)-D+"px",x[0].style.height=C[0].style.height=_[0].style.height=parseInt(y[0].style.height,10)-F+"px"}var a,s,l,h=0,c=0,d=y.offset();if(E.unbind("resize."+Z),y.css({top:-9e4,left:-9e4}),s=E.scrollTop(),l=E.scrollLeft(),P.get("fixed")?(d.top-=s,d.left-=l,y.css({position:"fixed"})):(h=s,c=l,y.css({position:"absolute"})),c+=P.get("right")!==!1?Math.max(E.width()-P.w-N-D-r(P.get("right"),"x"),0):P.get("left")!==!1?r(P.get("left"),"x"):Math.round(Math.max(E.width()-P.w-N-D,0)/2),h+=P.get("bottom")!==!1?Math.max(o()-P.h-B-F-r(P.get("bottom"),"y"),0):P.get("top")!==!1?r(P.get("top"),"y"):Math.round(Math.max(o()-P.h-B-F,0)/2),y.css({top:d.top,left:d.left,visibility:"visible"}),b[0].style.width=b[0].style.height="9999px",a={width:P.w+N+D,height:P.h+B+F,top:h,left:c},e){var u=0;t.each(a,function(t){return a[t]!==ct[t]?void(u=e):void 0}),e=u}ct=a,e||y.css(a),y.dequeue().animate(a,{duration:e||0,complete:function(){n(),U=!1,b[0].style.width=P.w+N+D+"px",b[0].style.height=P.h+B+F+"px",P.get("reposition")&&setTimeout(function(){E.bind("resize."+Z,V.position)},1),t.isFunction(i)&&i()},step:n})},V.resize=function(t){var e;K&&(t=t||{},t.width&&(P.w=r(t.width,"x")-N-D),t.innerWidth&&(P.w=r(t.innerWidth,"x")),$.css({width:P.w}),t.height&&(P.h=r(t.height,"y")-B-F),t.innerHeight&&(P.h=r(t.innerHeight,"y")),t.innerHeight||t.height||(e=$.scrollTop(),$.css({height:"auto"}),P.h=$.height()),$.css({height:P.h}),e&&$.scrollTop(e),V.position("none"===P.get("transition")?0:P.get("speed")))},V.prep=function(i){function o(){return P.w=P.w||$.width(),P.w=P.mw&&P.mw<P.w?P.mw:P.w,P.w}function r(){return P.h=P.h||$.height(),P.h=P.mh&&P.mh<P.h?P.mh:P.h,P.h}if(K){var c,u="none"===P.get("transition")?0:P.get("speed");$.remove(),$=n(lt,"LoadedContent").append(i),$.hide().appendTo(M.show()).css({width:o(),overflow:P.get("scrolling")?"auto":"hidden"}).css({height:r()}).prependTo(x),M.hide(),t(A).css({"float":"none"}),d(P.get("className")),c=function(){function i(){t.support.opacity===!1&&y[0].style.removeAttribute("filter")}var n,o,r=H.length;K&&(o=function(){clearTimeout(G),L.hide(),f(nt),P.get("onComplete")},W.html(P.get("title")).show(),$.show(),r>1?("string"==typeof P.get("current")&&O.html(P.get("current").replace("{current}",z+1).replace("{total}",r)).show(),S[P.get("loop")||r-1>z?"show":"hide"]().html(P.get("next")),j[P.get("loop")||z?"show":"hide"]().html(P.get("previous")),dt(),P.get("preloading")&&t.each([s(-1),s(1)],function(){var i,n=H[this],o=new a(n,t.data(n,Y)),s=o.get("href");s&&l(o,s)&&(s=h(o,s),i=e.createElement("img"),i.src=s)})):q.hide(),P.get("iframe")?(n=P.get("createIframe"),P.get("scrolling")||(n.scrolling="no"),t(n).attr({src:P.get("href"),"class":Z+"Iframe"}).one("load",o).appendTo($),rt.one(st,function(){n.src="//about:blank"}),P.get("fastIframe")&&t(n).trigger("load")):o(),"fade"===P.get("transition")?y.fadeTo(u,1,i):i())},"fade"===P.get("transition")?y.fadeTo(u,0,function(){V.position(0,c)}):V.position(u,c)}},V.next=function(){!U&&H[1]&&(P.get("loop")||H[z+1])&&(z=s(1),g(H[z]))},V.prev=function(){!U&&H[1]&&(P.get("loop")||z)&&(z=s(-1),g(H[z]))},V.close=function(){K&&!Q&&(Q=!0,K=!1,f(ot),P.get("onCleanup"),E.unbind("."+Z),w.fadeTo(P.get("fadeOut")||0,0),y.stop().fadeTo(P.get("fadeOut")||0,0,function(){y.hide(),w.hide(),f(st),$.remove(),setTimeout(function(){Q=!1,f(at),P.get("onClosed")},1)}))},V.remove=function(){y&&(y.stop(),t[Y].close(),y.stop(!1,!0).remove(),w.remove(),Q=!1,y=null,t("."+tt).removeData(Y).removeClass(tt),t(e).unbind("click."+Z).unbind("keydown."+Z))},V.element=function(){return t(P.el)},V.settings=X)}(jQuery,document,window),function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):t(jQuery)}(function(t){var e=-1,i=-1,n=function(t){return parseFloat(t)||0},o=function(e){var i=1,o=t(e),a=null,s=[];return o.each(function(){var e=t(this),o=e.offset().top-n(e.css("margin-top")),r=s.length>0?s[s.length-1]:null;null===r?s.push(e):Math.floor(Math.abs(a-o))<=i?s[s.length-1]=r.add(e):s.push(e),a=o}),s},a=function(e){var i={byRow:!0,property:"height",target:null,remove:!1};return"object"==typeof e?t.extend(i,e):("boolean"==typeof e?i.byRow=e:"remove"===e&&(i.remove=!0),i)},s=t.fn.matchHeight=function(e){var i=a(e);if(i.remove){var n=this;return this.css(i.property,""),t.each(s._groups,function(t,e){e.elements=e.elements.not(n)}),this}return this.length<=1&&!i.target?this:(s._groups.push({elements:this,options:i}),s._apply(this,i),this)};s.version="0.7.0",s._groups=[],s._throttle=80,s._maintainScroll=!1,s._beforeUpdate=null,s._afterUpdate=null,s._rows=o,s._parse=n,s._parseOptions=a,s._apply=function(e,i){var r=a(i),l=t(e),h=[l],c=t(window).scrollTop(),d=t("html").outerHeight(!0),u=l.parents().filter(":hidden");return u.each(function(){var e=t(this);e.data("style-cache",e.attr("style"))}),u.css("display","block"),r.byRow&&!r.target&&(l.each(function(){var e=t(this),i=e.css("display");"inline-block"!==i&&"flex"!==i&&"inline-flex"!==i&&(i="block"),e.data("style-cache",e.attr("style")),e.css({display:i,"padding-top":"0","padding-bottom":"0","margin-top":"0","margin-bottom":"0","border-top-width":"0","border-bottom-width":"0",height:"100px",overflow:"hidden"})}),h=o(l),l.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||"")})),t.each(h,function(e,i){var o=t(i),a=0;if(r.target)a=r.target.outerHeight(!1);else{if(r.byRow&&o.length<=1)return void o.css(r.property,"");o.each(function(){var e=t(this),i=e.attr("style"),n=e.css("display");"inline-block"!==n&&"flex"!==n&&"inline-flex"!==n&&(n="block");var o={display:n};o[r.property]="",e.css(o),e.outerHeight(!1)>a&&(a=e.outerHeight(!1)),i?e.attr("style",i):e.css("display","")})}o.each(function(){var e=t(this),i=0;r.target&&e.is(r.target)||("border-box"!==e.css("box-sizing")&&(i+=n(e.css("border-top-width"))+n(e.css("border-bottom-width")),i+=n(e.css("padding-top"))+n(e.css("padding-bottom"))),e.css(r.property,a-i+"px"))})}),u.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||null)}),s._maintainScroll&&t(window).scrollTop(c/d*t("html").outerHeight(!0)),this},s._applyDataApi=function(){var e={};t("[data-match-height], [data-mh]").each(function(){var i=t(this),n=i.attr("data-mh")||i.attr("data-match-height");n in e?e[n]=e[n].add(i):e[n]=i}),t.each(e,function(){this.matchHeight(!0)})};var r=function(e){s._beforeUpdate&&s._beforeUpdate(e,s._groups),t.each(s._groups,function(){s._apply(this.elements,this.options)}),s._afterUpdate&&s._afterUpdate(e,s._groups)};s._update=function(n,o){if(o&&"resize"===o.type){var a=t(window).width();if(a===e)return;e=a}n?-1===i&&(i=setTimeout(function(){r(o),i=-1},s._throttle)):r(o)},t(s._applyDataApi),t(window).bind("load",function(t){s._update(!1,t)}),t(window).bind("resize orientationchange",function(t){s._update(!0,t)})}),$.fn.serializeObject=function(){var t={},e=this.serializeArray();return $.each(e,function(){void 0!==t[this.name]?(t[this.name].push||(t[this.name]=[t[this.name]]),t[this.name].push(this.value||"")):t[this.name]=this.value||""}),t};var Loading={loadingContainer:".loading",loadingMinHeight:200,start:function(t){var e=this,i=$(t);if(i.length>0){var n=$(e.loadingContainer);n.css("top",i.offset().top+"px"),n.css("left",i.offset().left+"px"),n.css("width",i.outerWidth()+"px"),n.css("height",i.outerHeight()+"px")}},stop:function(){var t=this;$(t.loadingContainer).removeAttr("style")}};$(function(){var t=$("html").attr("lang");$(".nav-stacked").metisMenu({toggle:!1}),$(".nav-stacked li.active").parents("li").addClass("active").has("ul").children("ul").addClass("collapse in"),$("form").submit(function(t){Loading.start("#main-container")}),$(".pagination").rPage(),$("img.colorbox").click(function(){$(this).colorbox({href:$(this).parent("a").attr("href"),rel:$(this).parent("a").attr("rel"),maxWidth:"95%",maxHeight:"95%"})}),$("a.colorbox").colorbox({rel:$(this).attr("rel"),maxWidth:"95%",maxHeight:"95%"}),"en"!==t&&$.getScript("/js/colorbox/i18n/jquery.colorbox-"+t+".js"),$(".mh-column").matchHeight({property:"min-height"})});
\ No newline at end of file
diff --git a/resources/assets/js/common.js b/resources/assets/js/common.js
index 7a4a05ed..5c2a6e17 100644
--- a/resources/assets/js/common.js
+++ b/resources/assets/js/common.js
@@ -29,8 +29,8 @@ var Loading = {
             var loading = $(me.loadingContainer);
             loading.css('top', destHtml.offset().top + 'px');
             loading.css('left', destHtml.offset().left + 'px');
-            loading.css('width', destHtml.width() + 'px');
-            loading.css('height', destHtml.height() + 'px');
+            loading.css('width', destHtml.outerWidth() + 'px');
+            loading.css('height', destHtml.outerHeight() + 'px');
         }
     },
     stop: function() {
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 5fd521be..789bc1fe 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -20,6 +20,8 @@
     'edit'                     => 'Edit',
     'email'                    => 'E-mail|Emails',
     'emailAlreadyInUseMessage' => 'This email is already registered.',
+    'emailIsMissing'           => 'E-mail is missing, please click <strong>"Edit Account"</strong> button and set your email address.',
+    'emailIsHidden'            => 'E-mail will not be shown publicly.',
     'error'                    => 'ERROR',
     'firstName'                => 'First Name',
     'forgotPassword'           => 'Forgot password?',
@@ -33,10 +35,12 @@
     'loginWith'                => 'or sign in with',
     'logout'                   => 'Logout',
     'newPassword'              => 'New password',
+    'nickName'                 => 'Nick name',
     'noTranslation'            => 'No translation',
     'notAMember'               => 'Not a member yet?',
     'notPublished'             => 'Not published',
     'numberOfViews'            => 'Number of views:',
+    'optional'                 => 'optional',
     'options'                  => 'Options',
     'order'                    => 'Order',
     'pageNotFound'             => 'Page not found',
@@ -45,6 +49,7 @@
     'passwordChange'           => 'Change password',
     'passwordRepeat'           => 'Repeat password',
     'passwordReset'            => 'Reset Password',
+    'passwordSet'              => 'Set Password',
     'path'                     => 'Path',
     'postedBy'                 => 'Posted by',
     'postedOn'                 => 'on',
@@ -58,6 +63,7 @@
     'save'                     => 'Save',
     'send'                     => 'Send',
     'sendReminder'             => 'Send reminder',
+    'setPasswordToLogin'       => 'Set password to be able to sign in using your email address.',
     'sorry'                    => 'Sorry!',
     'status'                   => 'Status',
     'submit'                   => 'Submit',
diff --git a/resources/lang/pl/common.php b/resources/lang/pl/common.php
index 7ddf4890..9e2202e8 100644
--- a/resources/lang/pl/common.php
+++ b/resources/lang/pl/common.php
@@ -20,6 +20,8 @@
     'edit'                     => 'Edytuj',
     'email'                    => 'E-mail|Emaile',
     'emailAlreadyInUseMessage' => 'Ten e-mail jest już zarejestrowany.',
+    'emailIsMissing'           => 'Adres email nie jest ustawiony, kliknij przycik <strong>"Edytuj Konto"</strong> i ustaw swój adres email.',
+    'emailIsHidden'            => 'Adres e-mail nie będzie widoczny publicznie.',
     'error'                    => 'BŁĄD',
     'firstName'                => 'Imię',
     'forgotPassword'           => 'Nie pamiętasz hasła?',
@@ -33,10 +35,12 @@
     'loginWith'                => 'lub zaloguj się z',
     'logout'                   => 'Wyloguj',
     'newPassword'              => 'Nowe hasło',
+    'nickName'                 => 'Nick',
     'noTranslation'            => 'Brak tłumaczenia',
     'notAMember'               => 'Nie masz jeszcze konta?',
     'notPublished'             => 'Niepublikowany',
     'numberOfViews'            => 'Liczba wyświetleń:',
+    'optional'                 => 'opcjonalnie',
     'options'                  => 'Opcje',
     'order'                    => 'Kolejność',
     'pageNotFound'             => 'Nie znaleziono strony',
@@ -45,6 +49,7 @@
     'passwordChange'           => 'Zmień hasło',
     'passwordRepeat'           => 'Powtórz hasło',
     'passwordReset'            => 'Zresetuj hasło',
+    'passwordSet'              => 'Ustaw hasło',
     'path'                     => 'Ścieżka',
     'postedBy'                 => 'Dodane przez',
     'postedOn'                 => 'w dniu',
@@ -58,6 +63,7 @@
     'save'                     => 'Zapisz',
     'send'                     => 'Wyślij',
     'sendReminder'             => 'Wyślij przypomnienie',
+    'setPasswordToLogin'       => 'Ustaw hasło, aby móc zalogować się przy pomocy adresu e-mail.',
     'sorry'                    => 'Wybacz!',
     'status'                   => 'Status',
     'submit'                   => 'Wyślij',
diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php
index 7213dbb3..376ada2a 100644
--- a/resources/views/account/edit.blade.php
+++ b/resources/views/account/edit.blade.php
@@ -15,6 +15,24 @@
        <div class="col-md-5">
            <form id="edit-account-form" action="#" method="POST" role="form">
                <input type="hidden" name="_token" value="{{ csrf_token() }}">
+               <div class="form-group{{ $errors->first('nickName') ? ' has-error' : '' }}">
+                   <label class="control-label" for="firstName">@lang('common.nickName')</label>
+                   <input type="text" id="nickName" name="nickName" class="form-control"
+                          value="{{ $user->nickName }}"
+                          placeholder="@lang('common.nickName')">
+                   @if($errors->first('nickName'))
+                       <p class="help-block">{{ $errors->first('nickName') }}</p>
+                   @endif
+               </div>
+               <div class="form-group{{ $errors->first('email') ? ' has-error' : '' }}">
+                   <label class="control-label" for="email">@choice('common.email', 1)</label>
+                   <input type="email" id="email" name="email" class="form-control"
+                          value="{{ $user->email }}"
+                          placeholder="@choice('common.email', 1)">
+                   @if($errors->first('email'))
+                       <p class="help-block">{{ $errors->first('email') }}</p>
+                   @endif
+               </div>
                <div class="form-group{{ $errors->first('firstName') ? ' has-error' : '' }}">
                    <label class="control-label" for="firstName">@lang('common.firstName')</label>
                    <input type="text" id="firstName" name="firstName" class="form-control"
@@ -34,12 +52,21 @@
                    @endif
                </div>
                @if(strpos($user->email,'@'))
+                   @if($user->password)
                    <div class="separator">
                        <span>@lang('common.passwordChange')</span>
                    </div>
                    <p class="text-muted">
                        <i class="fa fa-info-circle"><!-- icon --></i> @lang('common.leaveBlank')
                    </p>
+                   @else
+                       <div class="separator">
+                           <span>@lang('common.passwordSet')</span>
+                       </div>
+                       <p class="text-success">
+                           <i class="fa fa-info-circle"><!-- icon --></i> @lang('common.setPasswordToLogin')
+                       </p>
+                   @endif
                    <div class="form-group{{ $errors->first('password') ? ' has-error' : '' }}">
                        <label class="control-label" for="password">@lang('common.newPassword')</label>
                        <input type="password" id="password" name="password" class="form-control"
@@ -69,7 +96,7 @@
                 event.preventDefault();
                 Loading.start('#main-container');
                 $.ajax({
-                    url: "/<?php echo $lang->code;?>/api/v1/account/ <?php echo $user->id;?>",
+                    url: "/<?php echo (config('gzero.multilang.enabled')) ? $lang->code .'/' : '';?>api/v1/account/<?php echo $user->id; ?>",
                     data: $('#edit-account-form').serializeObject(),
                     type: 'PUT',
                     success: function (xhr) {
@@ -78,6 +105,10 @@
                         setGlobalMessage('success', "@lang('common.changesSavedMessage')");
                         hideMessages();
                         clearFormValidationErrors();
+                        // reload page to load any view changes
+                        setTimeout(function(){
+                            location.reload();
+                        }, 1000);
                     },
                     error: function(xhr, status, error){
                         Loading.stop();
diff --git a/resources/views/account/index.blade.php b/resources/views/account/index.blade.php
index b72fc482..70ce38a9 100644
--- a/resources/views/account/index.blade.php
+++ b/resources/views/account/index.blade.php
@@ -15,8 +15,12 @@
 
     @if(isset($user->hasSocialIntegrations) && strpos($user->email,'social_') !== false)
         <p>@lang('common.accountConected')</p>
+        <p class="text-danger"><i class="fa fa-exclamation-triangle"><!-- icon --></i> @lang('common.emailIsMissing')</p>
     @else
-        <p><strong>@choice('common.email', 1):</strong> {{ $user->email }}</p>
+        <p>
+            <strong>@choice('common.email', 1):</strong> {{ $user->email }}
+            <small class="help-block">@lang('common.emailIsHidden')</small>
+        </p>
     @endif
 
     <a href="{{ route('account.edit') }}" title="@lang('user.edit_account')" class="btn btn-default">
diff --git a/resources/views/account/menu.blade.php b/resources/views/account/menu.blade.php
index 902c1e7f..fc5fb03c 100644
--- a/resources/views/account/menu.blade.php
+++ b/resources/views/account/menu.blade.php
@@ -1,6 +1,6 @@
 @section('menuTree')
     <img src="{{ Gravatar::src(Auth::user()->email, 150) }}" class="center-block img-avatar img-circle">
-    <h3>{{ Auth::user()->firstName }} {{ Auth::user()->lastName }}</h3>
+    <h3>{{ Auth::user()->getPresenter()->displayName() }}</h3>
     @foreach($menu as $link)
         <li class="{{ (URL::full() ==  $link['url']) ? 'active' : '' }}">
             @if($link['children'])
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 48c67cf9..61885223 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -19,11 +19,20 @@
                     <p class="help-block">{{ $errors->first('email') }}</p>
                 @endif
             </div>
+            <div class="form-group{{ $errors->first('nickName') ? ' has-error' : '' }}">
+                <label class="control-label" for="firstName">@lang('common.nickName')</label>
+                <input type="text" id="nickName" name="nickName" class="form-control"
+                       value="{{old('nickName')}}"
+                       placeholder="@lang('common.nickName')">
+                @if($errors->first('nickName'))
+                    <p class="help-block">{{ $errors->first('nickName') }}</p>
+                @endif
+            </div>
             <div class="form-group{{ $errors->first('firstName') ? ' has-error' : '' }}">
                 <label class="control-label" for="firstName">@lang('common.firstName')</label>
                 <input type="text" id="firstName" name="firstName" class="form-control"
                        value="{{old('firstName')}}"
-                       placeholder="@lang('common.firstName')">
+                       placeholder="@lang('common.firstName') (@lang('common.optional'))">
                 @if($errors->first('firstName'))
                     <p class="help-block">{{ $errors->first('firstName') }}</p>
                 @endif
@@ -32,7 +41,7 @@
                 <label class="control-label" for="lastName">@lang('common.lastName')</label>
                 <input type="text" id="lastName" name="lastName" class="form-control"
                        value="{{old('lastName')}}"
-                       placeholder="@lang('common.lastName')">
+                       placeholder="@lang('common.lastName') (@lang('common.optional'))">
                 @if($errors->first('lastName'))
                     <p class="help-block">{{ $errors->first('lastName') }}</p>
                 @endif
@@ -46,7 +55,7 @@
                 @endif
             </div>
             <div class="form-group">
-                <button id="edit-account" type="submit" class="btn btn-primary btn-lg btn-block">@lang('common.register')</button>
+                <button type="submit" class="btn btn-primary btn-lg btn-block">@lang('common.register')</button>
             </div>
             <input id="accountIntent" type="text" name="accountIntent" class="hidden">
         </form>
diff --git a/resources/views/content/category.blade.php b/resources/views/content/category.blade.php
index 849e4c2b..1c575fe4 100644
--- a/resources/views/content/category.blade.php
+++ b/resources/views/content/category.blade.php
@@ -2,13 +2,8 @@
 @section('bodyClass', $content->theme)
 <?php $activeTranslation = $content->translation($lang->code); ?>
 
-@section('title')
-    {{ $activeTranslation->seoTitle() }}
-@stop
-
-@section('seoDescription')
-    {{ $activeTranslation->seoDescription() }}
-@stop
+@section('title'){{ $activeTranslation->seoTitle() }}@stop
+@section('seoDescription'){{ $activeTranslation->seoDescription() }}@stop
 
 @section('breadcrumbs')
     <div class="utility-container">
@@ -86,3 +81,8 @@ class="disqus-comment-count">
         {!! $children->render() !!}
     @endif
 @stop
+@section('footerScripts')
+    @if(config('disqus.enabled') && config('disqus.domain'))
+        <script id="dsq-count-scr" src="//{{config('disqus.domain')}}.disqus.com/count.js" async></script>
+    @endif
+@stop
diff --git a/resources/views/content/content.blade.php b/resources/views/content/content.blade.php
index ad87efca..96dac48f 100644
--- a/resources/views/content/content.blade.php
+++ b/resources/views/content/content.blade.php
@@ -9,13 +9,8 @@
     @endif
 @stop
 
-@section('title')
-    {{ $activeTranslation->seoTitle() }}
-@stop
-
-@section('seoDescription')
-    {{ $activeTranslation->seoDescription() }}
-@stop
+@section('title'){{ $activeTranslation->seoTitle() }}@stop
+@section('seoDescription'){{ $activeTranslation->seoDescription() }}@stop
 
 @section('breadcrumbs')
     <div class="utility-container">
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 5549b680..35ea7ba6 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -71,3 +71,8 @@ class="disqus-comment-count">
     @endforeach
     {!! $contents->render() !!}
 @stop
+@section('footerScripts')
+    @if(config('disqus.enabled') && config('disqus.domain'))
+        <script id="dsq-count-scr" src="//{{config('disqus.domain')}}.disqus.com/count.js" async></script>
+    @endif
+@stop
diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php
index d49d5b07..aa674960 100644
--- a/resources/views/includes/head.blade.php
+++ b/resources/views/includes/head.blade.php
@@ -2,7 +2,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="@yield('seoDescription', option('general', 'siteDesc'))">
-<title>@yield('title') - {{ option('general', 'siteName') }}</title>
+<title>@yield('title', option('general', 'siteName'))</title>
 @yield('metaData')
 
 @if(option('seo', 'googleAnalyticsId'))
diff --git a/resources/views/includes/navbar.blade.php b/resources/views/includes/navbar.blade.php
index 3b74cb6c..4d6af022 100644
--- a/resources/views/includes/navbar.blade.php
+++ b/resources/views/includes/navbar.blade.php
@@ -35,7 +35,7 @@
                         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                             <img src="{{ Gravatar::src(Auth::user()->email, 35) }}"
                                  class="navbar-avatar img-circle">
-                            {{ Auth::user()->firstName }} {{ Auth::user()->lastName }}
+                            {{ Auth::user()->getPresenter()->displayName() }}
                             <i class="fa fa-caret-down"></i>
                         </a>
                         <ul class="dropdown-menu dropdown-user">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 58063862..88fe7d69 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $lang->code }}">
+<html lang="{{ isset($lang) ? $lang->code : config('app.locale') }}">
 <head>
     @include('includes.head')
 </head>
diff --git a/resources/views/layouts/sidebarLeft.blade.php b/resources/views/layouts/sidebarLeft.blade.php
index 394e4347..00b9822d 100644
--- a/resources/views/layouts/sidebarLeft.blade.php
+++ b/resources/views/layouts/sidebarLeft.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $lang->code }}">
+<html lang="{{ isset($lang) ? $lang->code : config('app.locale') }}">
 <head>
     @include('includes.head')
 </head>
diff --git a/resources/views/layouts/sidebarRight.blade.php b/resources/views/layouts/sidebarRight.blade.php
index e705d6b9..9cbfcd7d 100644
--- a/resources/views/layouts/sidebarRight.blade.php
+++ b/resources/views/layouts/sidebarRight.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $lang->code }}">
+<html lang="{{ isset($lang) ? $lang->code : config('app.locale') }}">
 <head>
     @include('includes.head')
 </head>
diff --git a/resources/views/layouts/withoutBlocks.blade.php b/resources/views/layouts/withoutBlocks.blade.php
index 467a7d6b..7b0ed34a 100644
--- a/resources/views/layouts/withoutBlocks.blade.php
+++ b/resources/views/layouts/withoutBlocks.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ $lang->code }}">
+<html lang="{{ isset($lang) ? $lang->code : config('app.locale') }}">
 <head>
     @include('includes.head')
 </head>
diff --git a/scripts/link_package.sh b/scripts/link_package.sh
index 371fb29a..1974a2f5 100755
--- a/scripts/link_package.sh
+++ b/scripts/link_package.sh
@@ -19,7 +19,7 @@ function contains() {
 }
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PACKAGES=("admin" "api" "cms" "social")
+PACKAGES=("admin" "api" "cms" "social" "vanilla-integration")
 OPERATIONS=("mount" "umount")
 PACKAGE=$1
 OPERATION=$2
diff --git a/tests/_data/dump.sql b/tests/_data/dump.sql
index e212c5a7..1984cfe4 100644
--- a/tests/_data/dump.sql
+++ b/tests/_data/dump.sql
@@ -71,7 +71,7 @@ CREATE TABLE `BlockTypes` (
 
 LOCK TABLES `BlockTypes` WRITE;
 /*!40000 ALTER TABLE `BlockTypes` DISABLE KEYS */;
-INSERT INTO `BlockTypes` VALUES ('basic',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('content',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('menu',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('slider',1,'2016-03-24 09:47:45','2016-03-24 09:47:45'),('widget',1,'2016-03-24 09:47:45','2016-03-24 09:47:45');
+INSERT INTO `BlockTypes` VALUES ('basic',1,'2016-04-06 18:52:43','2016-04-06 18:52:43'),('content',1,'2016-04-06 18:52:43','2016-04-06 18:52:43'),('menu',1,'2016-04-06 18:52:43','2016-04-06 18:52:43'),('slider',1,'2016-04-06 18:52:43','2016-04-06 18:52:43'),('widget',1,'2016-04-06 18:52:43','2016-04-06 18:52:43');
 /*!40000 ALTER TABLE `BlockTypes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -174,7 +174,7 @@ CREATE TABLE `ContentTypes` (
 
 LOCK TABLES `ContentTypes` WRITE;
 /*!40000 ALTER TABLE `ContentTypes` DISABLE KEYS */;
-INSERT INTO `ContentTypes` VALUES ('category',1,'2016-03-24 09:47:44','2016-03-24 09:47:44'),('content',1,'2016-03-24 09:47:44','2016-03-24 09:47:44');
+INSERT INTO `ContentTypes` VALUES ('category',1,'2016-04-06 18:52:42','2016-04-06 18:52:42'),('content',1,'2016-04-06 18:52:42','2016-04-06 18:52:42');
 /*!40000 ALTER TABLE `ContentTypes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -248,7 +248,7 @@ CREATE TABLE `Langs` (
 
 LOCK TABLES `Langs` WRITE;
 /*!40000 ALTER TABLE `Langs` DISABLE KEYS */;
-INSERT INTO `Langs` VALUES ('en','en_US',1,1,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('pl','pl_PL',1,0,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('de','de_DE',0,0,'2016-03-24 09:47:43','2016-03-24 09:47:43'),('fr','fr_FR',0,0,'2016-03-24 09:47:43','2016-03-24 09:47:43');
+INSERT INTO `Langs` VALUES ('en','en_US',1,1,'2016-04-06 18:52:41','2016-04-06 18:52:41'),('pl','pl_PL',1,0,'2016-04-06 18:52:41','2016-04-06 18:52:41'),('de','de_DE',0,0,'2016-04-06 18:52:41','2016-04-06 18:52:41'),('fr','fr_FR',0,0,'2016-04-06 18:52:41','2016-04-06 18:52:41');
 /*!40000 ALTER TABLE `Langs` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -274,7 +274,7 @@ CREATE TABLE `OptionCategories` (
 
 LOCK TABLES `OptionCategories` WRITE;
 /*!40000 ALTER TABLE `OptionCategories` DISABLE KEYS */;
-INSERT INTO `OptionCategories` VALUES ('general','2016-03-24 09:47:44','2016-03-24 09:47:44'),('seo','2016-03-24 09:47:44','2016-03-24 09:47:44');
+INSERT INTO `OptionCategories` VALUES ('general','2016-04-06 18:52:42','2016-04-06 18:52:42'),('seo','2016-04-06 18:52:42','2016-04-06 18:52:42');
 /*!40000 ALTER TABLE `OptionCategories` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -304,7 +304,7 @@ CREATE TABLE `Options` (
 
 LOCK TABLES `Options` WRITE;
 /*!40000 ALTER TABLE `Options` DISABLE KEYS */;
-INSERT INTO `Options` VALUES (1,'siteName','general','{\"en\":\"G-ZERO CMS\",\"pl\":\"G-ZERO CMS\",\"de\":\"G-ZERO CMS\",\"fr\":\"G-ZERO CMS\"}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(2,'siteDesc','general','{\"en\":\"Content management system.\",\"pl\":\"Content management system.\",\"de\":\"Content management system.\",\"fr\":\"Content management system.\"}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(3,'defaultPageSize','general','{\"en\":5,\"pl\":5,\"de\":5,\"fr\":5}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(4,'cookiesPolicyUrl','general','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(5,'seoDescLength','seo','{\"en\":160,\"pl\":160,\"de\":160,\"fr\":160}','2016-03-24 09:47:44','2016-03-24 09:47:44'),(6,'googleAnalyticsId','seo','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-03-24 09:47:44','2016-03-24 09:47:44');
+INSERT INTO `Options` VALUES (1,'siteName','general','{\"en\":\"G-ZERO CMS\",\"pl\":\"G-ZERO CMS\",\"de\":\"G-ZERO CMS\",\"fr\":\"G-ZERO CMS\"}','2016-04-06 18:52:42','2016-04-06 18:52:42'),(2,'siteDesc','general','{\"en\":\"Content management system.\",\"pl\":\"Content management system.\",\"de\":\"Content management system.\",\"fr\":\"Content management system.\"}','2016-04-06 18:52:42','2016-04-06 18:52:42'),(3,'defaultPageSize','general','{\"en\":5,\"pl\":5,\"de\":5,\"fr\":5}','2016-04-06 18:52:42','2016-04-06 18:52:42'),(4,'cookiesPolicyUrl','general','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-04-06 18:52:42','2016-04-06 18:52:42'),(5,'seoDescLength','seo','{\"en\":160,\"pl\":160,\"de\":160,\"fr\":160}','2016-04-06 18:52:42','2016-04-06 18:52:42'),(6,'googleAnalyticsId','seo','{\"en\":null,\"pl\":null,\"de\":null,\"fr\":null}','2016-04-06 18:52:42','2016-04-06 18:52:42');
 /*!40000 ALTER TABLE `Options` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -433,6 +433,7 @@ CREATE TABLE `Users` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
   `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `nickName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `firstName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `lastName` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   `rememberToken` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
@@ -441,7 +442,8 @@ CREATE TABLE `Users` (
   `createdAt` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   `updatedAt` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `users_email_unique` (`email`)
+  UNIQUE KEY `users_email_unique` (`email`),
+  UNIQUE KEY `users_nickname_unique` (`nickName`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -451,7 +453,7 @@ CREATE TABLE `Users` (
 
 LOCK TABLES `Users` WRITE;
 /*!40000 ALTER TABLE `Users` DISABLE KEYS */;
-INSERT INTO `Users` VALUES (1,'admin@gzero.pl','$2y$10$1VzgwEjGBfam3lN2wWeU8.q83SWpt6OlGV8qc71nEveCrDc1Nwlty','John','Doe','cUMbAqMU7uXdeWaGWSRwcmXQFRTe3VZ8PMvEVQvEVEnXBuWcNvCAX3bEXixL',1,0,'2016-03-24 09:47:44','2016-03-24 11:04:42');
+INSERT INTO `Users` VALUES (1,'admin@gzero.pl','$2y$10$gLmbDtx0rHiNMj0iRdG/..OwQ6Z9Bxnie1AfFHn90tsAh/5/ArUwG','Admin','John','Doe','',1,0,'2016-04-06 18:52:42','2016-04-06 18:52:42');
 /*!40000 ALTER TABLE `Users` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -524,4 +526,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-03-24 13:48:55
+-- Dump completed on 2016-04-06 18:53:52
diff --git a/tests/functional/AccountCest.php b/tests/functional/AccountCest.php
index 257461ca..c99f2f2d 100644
--- a/tests/functional/AccountCest.php
+++ b/tests/functional/AccountCest.php
@@ -10,6 +10,7 @@ public function _before(FunctionalTester $I)
         $I->haveRecord(
             'Users',
             [
+                'nickName' => 'JohnyD',
                 'firstName' => 'Johny',
                 'lastName' => 'Doe',
                 'email' => 'john@doe.com',
@@ -35,6 +36,38 @@ public function canAccessUserAccount(FunctionalTester $I)
         $I->canSeeInCurrentUrl('/en/account');
     }
 
+    public function canChangeNickName(FunctionalTester $I)
+    {
+        $I->wantTo('change user nickname');
+        $I->login('john@doe.com', 'test123');
+        $I->click('Edit Account', '.user-nav');
+        $I->canSee('Nick name');
+        $token = $I->grabValueFrom("input[name='_token']");
+        $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyDoe', 'email' => 'john@doe.com',  '_token' => $token]);
+        $I->seeResponseCodeIs(200);
+        $I->amOnPage('/en/account');
+        $I->see('JohnyDoe');
+    }
+
+    public function canChangeEmail(FunctionalTester $I)
+    {
+        $I->wantTo('change user email');
+        $I->login('john@doe.com', 'test123');
+        $I->click('Edit Account', '.user-nav');
+        $I->canSee('E-mail');
+        $token = $I->grabValueFrom("input[name='_token']");
+        $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyD', 'email' => 'john@doe.org', '_token' => $token]);
+        $I->seeResponseCodeIs(200);
+        $I->amOnPage('/en/account');
+        $I->see('john@doe.org');
+        $I->logout();
+        $I->login('john@doe.org', 'test123');
+        $I->amOnPage('/en/account');
+        $I->see('john@doe.org');
+    }
+
     public function canChangeFirstNameAndLastName(FunctionalTester $I)
     {
         $I->wantTo('change user first name & last name');
@@ -43,9 +76,9 @@ public function canChangeFirstNameAndLastName(FunctionalTester $I)
         $I->canSee('Change password');
         $token = $I->grabValueFrom("input[name='_token']");
         $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
-        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['firstName' => 'xxx', 'lastName' => 'yyy', '_token' => $token]);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyD', 'email' => 'john@doe.com', 'firstName' => 'xxx', 'lastName' => 'yyy', '_token' => $token]);
         $I->seeResponseCodeIs(200);
-        $I->amOnPage('/en');
+        $I->amOnPage('/en/account');
         $I->see('xxx yyy');
     }
 
@@ -57,7 +90,7 @@ public function canChangePassword(FunctionalTester $I)
         $I->canSee('Change password');
         $token = $I->grabValueFrom("input[name='_token']");
         $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
-        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['password' => 'test124', 'password_confirmation' => 'test124', '_token' => $token]);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyD', 'email' => 'john@doe.com', 'password' => 'test124', 'password_confirmation' => 'test124', '_token' => $token]);
         $I->seeResponseCodeIs(200);
         $I->logout();
         $I->login('john@doe.com', 'test124');
@@ -65,14 +98,66 @@ public function canChangePassword(FunctionalTester $I)
 
     public function canNotChangePasswordWithoutConfirmation(FunctionalTester $I)
     {
-        $I->wantTo('change user password');
+        $I->wantTo('change user password without confirmation');
         $I->login('john@doe.com', 'test123');
         $I->click('Edit Account', '.user-nav');
         $I->canSee('Change password');
         $token = $I->grabValueFrom("input[name='_token']");
         $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
-        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['password' => 'test124', '_token' => $token]);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyD', 'email' => 'john@doe.com', 'password' => 'test124', '_token' => $token]);
+        $I->seeResponseCodeIs(400);
+    }
+
+    public function canNotChangeNickNameToAlreadyTaken(FunctionalTester $I)
+    {
+        $I->haveRecord(
+            'Users',
+            [
+                'nickName' => 'JohnyDoe',
+                'firstName' => 'Johny',
+                'lastName' => 'Doe',
+                'email' => 'john@domain.com',
+                'password' => bcrypt('test123'),
+                'createdAt' => new DateTime(),
+                'updatedAt' => new DateTime(),
+            ]
+        );
+
+        $I->wantTo('change user nickname to already taken');
+        $I->login('john@doe.com', 'test123');
+        $I->click('Edit Account', '.user-nav');
+        $I->canSee('Nick name');
+        $token = $I->grabValueFrom("input[name='_token']");
+        $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['nickName' => 'JohnyDoe', 'email' => 'john@doe.com',  '_token' => $token]);
+        $I->seeResponseCodeIs(400);
+        $I->canSee('The nick name has already been taken.');
+    }
+
+    public function canNotChangeEmailToAlreadyTaken(FunctionalTester $I)
+    {
+        $I->haveRecord(
+            'Users',
+            [
+                'nickName' => 'JohnyDoe',
+                'firstName' => 'Johny',
+                'lastName' => 'Doe',
+                'email' => 'john@domain.com',
+                'password' => bcrypt('test123'),
+                'createdAt' => new DateTime(),
+                'updatedAt' => new DateTime(),
+            ]
+        );
+
+        $I->wantTo('change user email to already taken');
+        $I->login('john@doe.com', 'test123');
+        $I->click('Edit Account', '.user-nav');
+        $I->canSee('Nick name');
+        $token = $I->grabValueFrom("input[name='_token']");
+        $loggedUser = $I->grabRecord('Users', ['email' => 'john@doe.com']);
+        $I->sendAjaxRequest('PUT', '/en/api/v1/account/' . $loggedUser->id, ['email' => 'john@domain.com', '_token' => $token]);
         $I->seeResponseCodeIs(400);
+        $I->canSee('The email has already been taken.');
     }
 
 }
diff --git a/tests/functional/ContentCest.php b/tests/functional/ContentCest.php
index 2b68749f..4230d865 100644
--- a/tests/functional/ContentCest.php
+++ b/tests/functional/ContentCest.php
@@ -24,7 +24,7 @@ public function canViewArticle(FunctionalTester $I)
 
         $I->canSee($translation->title);
         $I->canSee($translation->body);
-        $I->canSee($user->firstName . ' ' . $user->lastName);
+        $I->canSee($user->nickName);
         $I->canSee(date('d-m-Y', strtotime($content->createdAt)));
     }
 
@@ -186,7 +186,7 @@ public function seePromotedContentOnTopOfTheList(FunctionalTester $I)
         );
         $route              = '/' . $category->route->translations[0]['langCode'] . '/' . $category->route->translations[0]['url'];
 
-        $I->wantTo('see sticky content on the top of the list');
+        $I->wantTo('see promoted content on the top of the list');
         $I->amOnPage($route);
         $I->seeResponseCodeIs(200);
 
diff --git a/tests/functional/LoginCest.php b/tests/functional/LoginCest.php
index 7e06f745..acec8dce 100644
--- a/tests/functional/LoginCest.php
+++ b/tests/functional/LoginCest.php
@@ -19,6 +19,7 @@ public function register(FunctionalTester $I)
         $I->wantTo('register a user');
 
         $I->amOnPage('/en/register');
+        $I->fillField('nickName', 'NickName');
         $I->fillField('firstName', 'John');
         $I->fillField('lastName', 'Doe');
         $I->fillField('email', 'example@example.com');
@@ -36,6 +37,7 @@ public function registerAlreadyExistingUser(FunctionalTester $I)
         $I->haveRecord(
             'Users',
             [
+                'nickName'  => 'NickName',
                 'firstName' => 'John',
                 'lastName'  => 'Doe',
                 'email'     => 'john@doe.com',
@@ -46,12 +48,14 @@ public function registerAlreadyExistingUser(FunctionalTester $I)
         );
 
         $I->amOnPage('/en/register');
+        $I->fillField('nickName', 'NickName');
         $I->fillField('firstName', 'John');
         $I->fillField('lastName', 'Doe');
         $I->fillField('email', 'john@doe.com');
         $I->fillField('password', 'password');
         $I->click('button[type=submit]');
-        $I->see('This email is already registered.');
+        $I->see('The email has already been taken.');
+        $I->see('The nick name has already been taken.');
         $I->dontSeeAuthentication();
     }
 
@@ -60,6 +64,7 @@ public function preventSpamUserRegistrations(FunctionalTester $I)
         $I->wantTo('prevent a spammer users registrations');
 
         $I->amOnPage('/en/register');
+        $I->fillField('nickName', 'NickName');
         $I->fillField('firstName', 'John');
         $I->fillField('lastName', 'Doe');
         $I->fillField('email', 'example@example.com');
@@ -138,4 +143,33 @@ public function logout(FunctionalTester $I)
         $I->logout();
         $I->dontSeeAuthentication();
     }
+
+    public function canRemindPassword(FunctionalTester $I)
+    {
+        $I->wantTo('remind a password');
+        $I->amOnPage('/en/password/remind');
+        $I->see('Forgot password?');
+        $I->see('Enter the email address you used for creating your Account and we will send you instructions.');
+        $I->see('Return to sign in');
+    }
+
+    public function canNotRemindPasswordAsLoggedUser(FunctionalTester $I)
+    {
+        $I->wantTo('remind a password as logged user');
+        $I->haveRecord(
+            'Users',
+            [
+                'nickName'  => 'JohnDoe',
+                'firstName' => 'John',
+                'lastName'  => 'Doe',
+                'email'     => 'john@doe.com',
+                'password'  => bcrypt('password'),
+                'createdAt' => new DateTime(),
+                'updatedAt' => new DateTime(),
+            ]
+        );
+        $I->login('john@doe.com', 'password');
+        $I->amOnPage('/en/password/remind');
+        $I->see('JohnDoe');
+    }
 }